Skip to contentSkip to conversation

vlan: disable SIOCSHWTSTAMP in container

PATCH In review Hangbin Liu 3 participants 3 messages May 9, 2019

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

PATCH 1/1 vlan: disable SIOCSHWTSTAMP in container

With NET_ADMIN enabled in container, a normal user could be mapped to root and is able to change the real device's rx filter via ioctl on vlan, which would affect the other ptp process on host. Fix it by disabling SIOCSHWTSTAMP in container.

Fixes a6111d3c93d0 ("vlan: Pass SIOC[SG]HWTSTAMP ioctls to real device")
---
 net/8021q/vlan_dev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
net/8021q/vlan_dev.c +3 -1
index f044ae56a313..2a9a60733594 100644
@@ -370,10 +370,12 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	ifrr.ifr_ifru = ifr->ifr_ifru;
 
 	switch (cmd) {
+	case SIOCSHWTSTAMP:
+		if (!net_eq(dev_net(dev), &init_net))
+			break;
 	case SIOCGMIIPHY:
 	case SIOCGMIIREG:
 	case SIOCSMIIREG:
-	case SIOCSHWTSTAMP:
 	case SIOCGHWTSTAMP:
 		if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
 			err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
Signature · 1 line
2.19.2
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Hangbin Liu

With NET_ADMIN enabled in container, a normal user could be mapped to root and is able to change the real device's rx filter via ioctl on vlan, which would affect the other ptp process on host. Fix it by disabling SIOCSHWTSTAMP in container.

Fixes a6111d3c93d0 ("vlan: Pass SIOC[SG]HWTSTAMP ioctls to real device")
maintainer
#2 lore raw
In reply to Hangbin Liu

From: Hangbin Liu <[email protected]>
Date: Thu, 9 May 2019 14:55:07 +0800

Quoted 7 lines

With NET_ADMIN enabled in container, a normal user could be mapped to root and is able to change the real device's rx filter via ioctl on vlan, which would affect the other ptp process on host. Fix it by disabling SIOCSHWTSTAMP in container.

Fixes a6111d3c93d0 ("vlan: Pass SIOC[SG]HWTSTAMP ioctls to real device")

Applied and queued up for -stable.