Skip to contentSkip to conversation

net: Only honor ifindex in IP_PKTINFO if non-0

PATCH In review David Ahern 2 participants 5 messages Feb 16, 2018 – Mar 6, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: Only honor ifindex in IP_PKTINFO if non-0

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

---
 net/ipv4/ip_sockglue.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
net/ipv4/ip_sockglue.c +4 -2
index 008be04ac1cc..9dca0fb8c482 100644
@@ -258,7 +258,8 @@ 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;
-			ipc->oif = src_info->ipi6_ifindex;
+			if (src_info->ipi6_ifindex)
+				ipc->oif = src_info->ipi6_ifindex;
 			ipc->addr = src_info->ipi6_addr.s6_addr32[3];
 			continue;
 		}
@@ -288,7 +289,8 @@ 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);
-			ipc->oif = info->ipi_ifindex;
+			if (info->ipi_ifindex)
+				ipc->oif = info->ipi_ifindex;
 			ipc->addr = info->ipi_spec_dst.s_addr;
 			break;
 		}
Signature · 1 line
2.11.0
maintainer
#1 lore raw

From: David Ahern <[email protected]>
Date: Fri, 16 Feb 2018 11:03:03 -0800

Quoted 4 lines

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

Ok, this behavior meets reasonable expectations, applied, thanks.

None of the documation is clear about this relationship between ip_pktinfo's ifindex and settings made by SO_BINDTODEVICE.

#2 lore raw
Quoted 6 lines · David Miller

From: David Ahern <[email protected]>
Date: Fri, 16 Feb 2018 11:03:03 -0800

Quoted 3 lines

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

Quoted 7 lines
Quoted 1 line

Ok, this behavior meets reasonable expectations, applied, thanks.

None of the documation is clear about this relationship between ip_pktinfo's ifindex and settings made by SO_BINDTODEVICE.

It is my understanding that SO_BINDTODEVICE is the strongest -- it requires admin to set. From there IP_PKTINFO and IP_UNICAST_IF are non-root options and hence weaker. If that is the proper expectation, then the right thing to do is probably to error out if ipc.oif is already set. I was concerned that would break existing apps, so this seemed to be a compromise.

#3 lore raw
In reply to David Ahern
Quoted 8 lines · David Ahern

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

---
 net/ipv4/ip_sockglue.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Dave: Any chance this can get backported to 4.14 and 4.9 stable releases? Right now, net-snmp is dead in the water with VRF because it uses IP_PKTINFO to set the source address AND in the process sets the ifindex to 0 to allow asymmetric routing (request received on one interface and response goes out a different one). This patch allows 'ip vrf exec mgmt snmpd' to work.

maintainer
#4 lore raw

From: David Ahern <[email protected]>
Date: Tue, 6 Mar 2018 13:52:05 -0700

Quoted 10 lines · David Ahern
Quoted 8 lines

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

---
 net/ipv4/ip_sockglue.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Quoted 6 lines

Dave: Any chance this can get backported to 4.14 and 4.9 stable releases? Right now, net-snmp is dead in the water with VRF because it uses IP_PKTINFO to set the source address AND in the process sets the ifindex to 0 to allow asymmetric routing (request received on one interface and response goes out a different one). This patch allows 'ip vrf exec mgmt snmpd' to work.

Ok, I've put this patch into 'net' and will let it soak there, and also queue it up for a future -stable submission.

Thanks David.