diff options
| author | Hangbin Liu <liuhangbin@gmail.com> | 2019-05-09 14:55:07 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-09 09:31:16 -0700 |
| commit | 873017af778439f2f8e3d87f28ddb1fcaf244a76 (patch) | |
| tree | ac2656ca88cd00d3a8ac99891dd6eb1577ce9b0f /net/8021q | |
| parent | 6c2ea9ebafa79eea9098a134a422391638879f45 (diff) | |
| download | linux-stable-873017af778439f2f8e3d87f28ddb1fcaf244a76.tar.gz linux-stable-873017af778439f2f8e3d87f28ddb1fcaf244a76.tar.bz2 linux-stable-873017af778439f2f8e3d87f28ddb1fcaf244a76.zip | |
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")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index f044ae56a313..2a9a60733594 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -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); |