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

Commit 474aa514 authored by David Ahern's avatar David Ahern Committed by Greg Kroah-Hartman
Browse files

net: Only honor ifindex in IP_PKTINFO if non-0 




[ Upstream commit 2cbb4ea7de167b02ffa63e9cdfdb07a7e7094615 ]

Only allow ifindex from IP_PKTINFO to override SO_BINDTODEVICE settings
if the index is actually set in the message.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06d3f43d

net/ipv4/ip_sockglue.c

+4 −2
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, 
			src_info = (struct in6_pktinfo *)CMSG_DATA(cmsg);

			if (!ipv6_addr_v4mapped(&src_info->ipi6_addr))

				return -EINVAL;

			if (src_info->ipi6_ifindex)

				ipc->oif = src_info->ipi6_ifindex;

			ipc->addr = src_info->ipi6_addr.s6_addr32[3];

			continue;
@@ -288,6 +289,7 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc, 
			if (cmsg->cmsg_len != CMSG_LEN(sizeof(struct in_pktinfo)))

				return -EINVAL;

			info = (struct in_pktinfo *)CMSG_DATA(cmsg);

			if (info->ipi_ifindex)

				ipc->oif = info->ipi_ifindex;

			ipc->addr = info->ipi_spec_dst.s_addr;

			break;