Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf4cc40e authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller
Browse files

net/{ipv4,ipv6}: Do not put target net if input nsid is invalid 



The cleanup path will put the target net when netnsid is set.  So we must
reset netnsid if the input is invalid.

Fixes: d7e38611 ("net/ipv4: Put target net when address dump fails due to bad attributes")
Fixes: 242afaa6 ("net/ipv6: Put target net when address dump fails due to bad attributes")
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 863d4187

net/ipv4/devinet.c

+1 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,7 @@ static int inet_valid_dump_ifaddr_req(const struct nlmsghdr *nlh, 


			net = rtnl_get_net_ns_capable(sk, fillargs->netnsid);

			if (IS_ERR(net)) {

				fillargs->netnsid = -1;

				NL_SET_ERR_MSG(extack, "ipv4: Invalid target network namespace id");

				return PTR_ERR(net);

			}

net/ipv6/addrconf.c

+1 −0
Original line number Diff line number Diff line
@@ -5058,6 +5058,7 @@ static int inet6_valid_dump_ifaddr_req(const struct nlmsghdr *nlh, 
			fillargs->netnsid = nla_get_s32(tb[i]);

			net = rtnl_get_net_ns_capable(sk, fillargs->netnsid);

			if (IS_ERR(net)) {

				fillargs->netnsid = -1;

				NL_SET_ERR_MSG_MOD(extack, "Invalid target network namespace id");

				return PTR_ERR(net);

			}