Commit 446266b0 authored Aug 02, 2013 by Daniel Borkmann Committed by David S. Miller Aug 02, 2013

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: Daniel Borkmann <dborkman@redhat.com>
Reviewed-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9bb8eeb5

net/ipv4/devinet.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -772,7 +772,7 @@ static struct in_ifaddr rtm_to_ifaddr(struct net net, struct nlmsghdr *nlh,
		ci = nla_data(tb[IFA_CACHEINFO]);
		if (!ci->ifa_valid \|\| ci->ifa_prefered > ci->ifa_valid) {
		err = -EINVAL;
		goto errout;
		goto errout_free;
		}
		*pvalid_lft = ci->ifa_valid;
		*pprefered_lft = ci->ifa_prefered;
		@@ -780,6 +780,8 @@ static struct in_ifaddr rtm_to_ifaddr(struct net net, struct nlmsghdr *nlh,

		return ifa;

		errout_free:
		inet_free_ifa(ifa);
		errout:
		return ERR_PTR(err);
		}