| Message ID | 20240222121747.2193246-1-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 10bfd453da64a057bcfd1a49fb6b271c48653cdb |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ipv6: fix potential "struct net" leak in inet6_rtm_getaddr() | expand |
On 2/22/24 5:17 AM, Eric Dumazet wrote: > It seems that if userspace provides a correct IFA_TARGET_NETNSID value > but no IFA_ADDRESS and IFA_LOCAL attributes, inet6_rtm_getaddr() > returns -EINVAL with an elevated "struct net" refcount. > > Fixes: 6ecf4c37eb3e ("ipv6: enable IFA_TARGET_NETNSID for RTM_GETADDR") > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Christian Brauner <brauner@kernel.org> > Cc: David Ahern <dsahern@kernel.org> > --- > net/ipv6/addrconf.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > Reviewed-by: David Ahern <dsahern@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 22 Feb 2024 12:17:47 +0000 you wrote: > It seems that if userspace provides a correct IFA_TARGET_NETNSID value > but no IFA_ADDRESS and IFA_LOCAL attributes, inet6_rtm_getaddr() > returns -EINVAL with an elevated "struct net" refcount. > > Fixes: 6ecf4c37eb3e ("ipv6: enable IFA_TARGET_NETNSID for RTM_GETADDR") > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Christian Brauner <brauner@kernel.org> > Cc: David Ahern <dsahern@kernel.org> > > [...] Here is the summary with links: - [net] ipv6: fix potential "struct net" leak in inet6_rtm_getaddr() https://git.kernel.org/netdev/net/c/10bfd453da64 You are awesome, thank you!
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 5a839c5fb1a5aa55e5c7f2ad8081e401a76d5a93..055230b669cf21d87738a4371543c599c3476f98 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5509,9 +5509,10 @@ static int inet6_rtm_getaddr(struct sk_buff *in_skb, struct nlmsghdr *nlh, } addr = extract_addr(tb[IFA_ADDRESS], tb[IFA_LOCAL], &peer); - if (!addr) - return -EINVAL; - + if (!addr) { + err = -EINVAL; + goto errout; + } ifm = nlmsg_data(nlh); if (ifm->ifa_index) dev = dev_get_by_index(tgt_net, ifm->ifa_index);
It seems that if userspace provides a correct IFA_TARGET_NETNSID value but no IFA_ADDRESS and IFA_LOCAL attributes, inet6_rtm_getaddr() returns -EINVAL with an elevated "struct net" refcount. Fixes: 6ecf4c37eb3e ("ipv6: enable IFA_TARGET_NETNSID for RTM_GETADDR") Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Christian Brauner <brauner@kernel.org> Cc: David Ahern <dsahern@kernel.org> --- net/ipv6/addrconf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)