rtnetlink: release net refcnt on error in do_setlink()

NicolasDichtel · davem330 · commit e0ebde0e131b · 2014-11-29T21:05:43.000-08:00
rtnl_link_get_net() holds a reference on the 'struct net', we need to release it in case of error. CC: Eric W. Biederman <ebiederm@xmission.com> Fixes: b51642f ("net: Enable a userns root rtnl calls that are safe for unprivilged users") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
@@ -1498,6 +1498,7 @@ static int do_setlink(const struct sk_buff *skb,
 			goto errout;
 		}
 		if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN)) {
+			put_net(net);
 			err = -EPERM;
 			goto errout;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1498,6 +1498,7 @@ static int do_setlink(const struct sk_buff *skb,`
`1498`	`1498`	`goto errout;`
`1499`	`1499`	`}`
`1500`	`1500`	`if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN)) {`
	`1501`	`+ put_net(net);`
`1501`	`1502`	`err = -EPERM;`
`1502`	`1503`	`goto errout;`
`1503`	`1504`	`}`