From: Christian Brauner <christian.brauner@ubuntu.com>
To: "David S. Miller" <davem@davemloft.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@ucw.cz>, Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Stephen Hemminger <stephen@networkplumber.org>,
linux-pm@vger.kernel.org,
Christian Brauner <christian.brauner@ubuntu.com>
Subject: [PATCH v7 9/9] net: fix sysfs permssions when device changes network namespace
Date: Thu, 27 Feb 2020 04:37:19 +0100 [thread overview]
Message-ID: <20200227033719.1652190-10-christian.brauner@ubuntu.com> (raw)
In-Reply-To: <20200227033719.1652190-1-christian.brauner@ubuntu.com>
Now that we moved all the helpers in place and make use netdev_change_owner()
to fixup the permissions when moving network devices between network
namespaces.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
/* v2 */
unchanged
/* v3 */
unchanged
/* v4 */
unchanged
/* v5 */
unchanged
/* v6 */
unchanged
/* v7 */
unchanged
---
net/core/dev.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index a69e8bd7ed74..0f9c4684fcbd 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10016,6 +10016,7 @@ EXPORT_SYMBOL(unregister_netdev);
int dev_change_net_namespace(struct net_device *dev, struct net *net, const char *pat)
{
+ struct net *net_old = dev_net(dev);
int err, new_nsid, new_ifindex;
ASSERT_RTNL();
@@ -10031,7 +10032,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
/* Get out if there is nothing todo */
err = 0;
- if (net_eq(dev_net(dev), net))
+ if (net_eq(net_old, net))
goto out;
/* Pick the destination device name, and ensure
@@ -10107,6 +10108,12 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
err = device_rename(&dev->dev, dev->name);
WARN_ON(err);
+ /* Adapt owner in case owning user namespace of target network
+ * namespace is different from the original one.
+ */
+ err = netdev_change_owner(dev, net_old, net);
+ WARN_ON(err);
+
/* Add the device back in the hashes */
list_netdevice(dev);
--
2.25.1
next prev parent reply other threads:[~2020-02-27 3:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 3:37 [PATCH v7 0/9] net: fix sysfs permssions when device changes network Christian Brauner
2020-02-27 3:37 ` [PATCH v7 1/9] sysfs: add sysfs_file_change_owner() Christian Brauner
2020-02-27 3:37 ` [PATCH v7 2/9] sysfs: add sysfs_link_change_owner() Christian Brauner
2020-02-27 3:37 ` [PATCH v7 3/9] sysfs: add sysfs_group{s}_change_owner() Christian Brauner
2020-02-27 3:37 ` [PATCH v7 4/9] sysfs: add sysfs_change_owner() Christian Brauner
2020-02-27 3:37 ` [PATCH v7 5/9] device: add device_change_owner() Christian Brauner
2020-02-27 3:37 ` [PATCH v7 6/9] drivers/base/power: add dpm_sysfs_change_owner() Christian Brauner
2020-02-27 3:37 ` [PATCH v7 7/9] net-sysfs: add netdev_change_owner() Christian Brauner
2020-02-27 3:37 ` [PATCH v7 8/9] net-sysfs: add queue_change_owner() Christian Brauner
2020-02-27 3:37 ` Christian Brauner [this message]
2020-02-27 4:15 ` [PATCH v7 0/9] net: fix sysfs permssions when device changes network David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200227033719.1652190-10-christian.brauner@ubuntu.com \
--to=christian.brauner@ubuntu.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).