提交 446266b0 编写于 作者: D Daniel Borkmann 提交者: David S. Miller

net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails

Commit 5c766d64 ("ipv4: introduce address lifetime") leaves the ifa
resource that was allocated via inet_alloc_ifa() unfreed when returning
the function with -EINVAL. Thus, free it first via inet_free_ifa().
Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
Reviewed-by: NJiri Pirko <jiri@resnulli.us>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 9bb8eeb5
...@@ -772,7 +772,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, ...@@ -772,7 +772,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
ci = nla_data(tb[IFA_CACHEINFO]); ci = nla_data(tb[IFA_CACHEINFO]);
if (!ci->ifa_valid || ci->ifa_prefered > ci->ifa_valid) { if (!ci->ifa_valid || ci->ifa_prefered > ci->ifa_valid) {
err = -EINVAL; err = -EINVAL;
goto errout; goto errout_free;
} }
*pvalid_lft = ci->ifa_valid; *pvalid_lft = ci->ifa_valid;
*pprefered_lft = ci->ifa_prefered; *pprefered_lft = ci->ifa_prefered;
...@@ -780,6 +780,8 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, ...@@ -780,6 +780,8 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
return ifa; return ifa;
errout_free:
inet_free_ifa(ifa);
errout: errout:
return ERR_PTR(err); return ERR_PTR(err);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册