Skip to content

Commit e43aae0

Browse files
Eric Dumazetsmb49
authored andcommitted
udp6: fix potential access to stale information
BugLink: https://bugs.launchpad.net/bugs/2023328 [ Upstream commit 1c5950f ] lena wang reported an issue caused by udpv6_sendmsg() mangling msg->msg_name and msg->msg_namelen, which are later read from ____sys_sendmsg() : /* * If this is sendmmsg() and sending to current destination address was * successful, remember it. */ if (used_address && err >= 0) { used_address->name_len = msg_sys->msg_namelen; if (msg_sys->msg_name) memcpy(&used_address->name, msg_sys->msg_name, used_address->name_len); } udpv6_sendmsg() wants to pretend the remote address family is AF_INET in order to call udp_sendmsg(). A fix would be to modify the address in-place, instead of using a local variable, but this could have other side effects. Instead, restore initial values before we return from udpv6_sendmsg(). Fixes: c71d8eb ("net: Fix security_socket_sendmsg() bypass problem.") Reported-by: lena wang <lena.wang@mediatek.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Maciej Żenczykowski <maze@google.com> Link: https://lore.kernel.org/r/20230412130308.1202254-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com>
1 parent fc5ef89 commit e43aae0

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

net/ipv6/udp.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,9 +1359,11 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
13591359
msg->msg_name = &sin;
13601360
msg->msg_namelen = sizeof(sin);
13611361
do_udp_sendmsg:
1362-
if (__ipv6_only_sock(sk))
1363-
return -ENETUNREACH;
1364-
return udp_sendmsg(sk, msg, len);
1362+
err = __ipv6_only_sock(sk) ?
1363+
-ENETUNREACH : udp_sendmsg(sk, msg, len);
1364+
msg->msg_name = sin6;
1365+
msg->msg_namelen = addr_len;
1366+
return err;
13651367
}
13661368
}
13671369

0 commit comments

Comments
 (0)