macvlan: disable SIOCSHWTSTAMP in container
Subsystems (2)
PATCH 1/1 macvlan: disable SIOCSHWTSTAMP in container
Miroslav pointed that 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 macvlan, which would affect the other ptp process on host. Fix it by disabling SIOCSHWTSTAMP in container.
--- drivers/net/macvlan.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/macvlan.c +2 -0
@@ -836,6 +836,8 @@ static int macvlan_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)switch (cmd) {case SIOCSHWTSTAMP : +if (!net_eq (dev_net (dev), &init_net)) +break ;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
Quoted 7 lines · Hangbin Liu
Miroslav pointed that with
NET_ADMINenabled in container, a normal user could be mapped to root and is able to change the real device's rx filter via ioctl on macvlan, which would affect the other ptp process on host. Fix it by disabling SIOCSHWTSTAMP in container.Fixes 254c0a2bfedb ("macvlan: pass get_ts_info and SIOC[SG]HWTSTAMP ioctl to real device")Signed-off-by Hangbin Liu <[email protected]>
David Miller
maintainerFrom: Hangbin Liu <[email protected]>
Date: Thu, 9 May 2019 14:54:08 +0800
Quoted 7 lines
Miroslav pointed that with
NET_ADMINenabled in container, a normal user could be mapped to root and is able to change the real device's rx filter via ioctl on macvlan, which would affect the other ptp process on host. Fix it by disabling SIOCSHWTSTAMP in container.Fixes 254c0a2bfedb ("macvlan: pass get_ts_info and SIOC[SG]HWTSTAMP ioctl to real device")Signed-off-by Hangbin Liu <[email protected]>
Applied and queued up for -stable.