diff options
| author | Vadim Fedorenko <vadim.fedorenko@linux.dev> | 2023-03-15 08:33:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-17 11:13:11 +0200 |
| commit | e0fc29181d49784ed6fd2a559d5e6acadd3659d2 (patch) | |
| tree | d54fbecebe0916535ec299335e9b4cd087013b93 /net | |
| parent | 39470f8de0868e58092883d06ee85da6577e2167 (diff) | |
| download | linux-stable-e0fc29181d49784ed6fd2a559d5e6acadd3659d2.tar.gz linux-stable-e0fc29181d49784ed6fd2a559d5e6acadd3659d2.tar.bz2 linux-stable-e0fc29181d49784ed6fd2a559d5e6acadd3659d2.zip | |
vlan: partially enable SIOCSHWTSTAMP in container
[ Upstream commit 731b73dba359e3ff00517c13aa0daa82b34ff466 ]
Setting timestamp filter was explicitly disabled on vlan devices in
containers because it might affect other processes on the host. But it's
absolutely legit in case when real device is in the same namespace.
Fixes: 873017af7784 ("vlan: disable SIOCSHWTSTAMP in container")
Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 84ef83772114..c80add6edf59 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -369,7 +369,7 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) switch (cmd) { case SIOCSHWTSTAMP: - if (!net_eq(dev_net(dev), &init_net)) + if (!net_eq(dev_net(dev), dev_net(real_dev))) break; case SIOCGMIIPHY: case SIOCGMIIREG: |