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 v6 2/9] sysfs: add sysfs_link_change_owner()
Date: Tue, 25 Feb 2020 14:19:31 +0100 [thread overview]
Message-ID: <20200225131938.120447-3-christian.brauner@ubuntu.com> (raw)
In-Reply-To: <20200225131938.120447-1-christian.brauner@ubuntu.com>
Add a helper to change the owner of a sysfs link.
This function will be used to correctly account for kobject ownership
changes, e.g. when moving network devices between network namespaces.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---
/* v2 */
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>:
- Add comment how ownership of sysfs object is changed.
/* v3 */
- Greg Kroah-Hartman <gregkh@linuxfoundation.org>:
- Add explicit uid/gid parameters.
/* v4 */
- Christian Brauner <christian.brauner@ubuntu.com>:
- Add more documentation.
/* v5 */
unchanged
/* v6 */
unchanged
---
fs/sysfs/file.c | 41 +++++++++++++++++++++++++++++++++++++++++
include/linux/sysfs.h | 10 ++++++++++
2 files changed, 51 insertions(+)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 4ca936ca3ba4..332cd69b378c 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -570,6 +570,47 @@ static int internal_change_owner(struct kernfs_node *kn, kuid_t kuid,
return kernfs_setattr(kn, &newattrs);
}
+/**
+ * sysfs_link_change_owner - change owner of a sysfs file.
+ * @kobj: object of the kernfs_node the symlink is located in.
+ * @targ: object of the kernfs_node the symlink points to.
+ * @name: name of the link.
+ * @kuid: new owner's kuid
+ * @kgid: new owner's kgid
+ *
+ * This function looks up the sysfs symlink entry @name under @kobj and changes
+ * the ownership to @kuid/@kgid. The symlink is looked up in the namespace of
+ * @targ.
+ *
+ * Returns 0 on success or error code on failure.
+ */
+int sysfs_link_change_owner(struct kobject *kobj, struct kobject *targ,
+ const char *name, kuid_t kuid, kgid_t kgid)
+{
+ struct kernfs_node *kn = NULL;
+ int error;
+
+ if (!name || !kobj->state_in_sysfs || !targ->state_in_sysfs)
+ return -EINVAL;
+
+ error = -ENOENT;
+ kn = kernfs_find_and_get_ns(kobj->sd, name, targ->sd->ns);
+ if (!kn)
+ goto out;
+
+ error = -EINVAL;
+ if (kernfs_type(kn) != KERNFS_LINK)
+ goto out;
+ if (kn->symlink.target_kn->priv != targ)
+ goto out;
+
+ error = internal_change_owner(kn, kuid, kgid);
+
+out:
+ kernfs_put(kn);
+ return error;
+}
+
/**
* sysfs_file_change_owner - change owner of a sysfs file.
* @kobj: object.
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index a7884024a911..7e15ebfd750e 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -312,6 +312,8 @@ static inline void sysfs_enable_ns(struct kernfs_node *kn)
int sysfs_file_change_owner(struct kobject *kobj, const char *name, kuid_t kuid,
kgid_t kgid);
+int sysfs_link_change_owner(struct kobject *kobj, struct kobject *targ,
+ const char *name, kuid_t kuid, kgid_t kgid);
#else /* CONFIG_SYSFS */
@@ -532,6 +534,14 @@ static inline int sysfs_file_change_owner(struct kobject *kobj,
return 0;
}
+static inline int sysfs_link_change_owner(struct kobject *kobj,
+ struct kobject *targ,
+ const char *name, kuid_t kuid,
+ kgid_t kgid)
+{
+ return 0;
+}
+
#endif /* CONFIG_SYSFS */
static inline int __must_check sysfs_create_file(struct kobject *kobj,
--
2.25.1
next prev parent reply other threads:[~2020-02-25 13:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 13:19 [PATCH v6 0/9] net: fix sysfs permssions when device changes network Christian Brauner
2020-02-25 13:19 ` [PATCH v6 1/9] sysfs: add sysfs_file_change_owner() Christian Brauner
2020-02-26 8:13 ` Greg Kroah-Hartman
2020-02-25 13:19 ` Christian Brauner [this message]
2020-02-26 8:14 ` [PATCH v6 2/9] sysfs: add sysfs_link_change_owner() Greg Kroah-Hartman
2020-02-25 13:19 ` [PATCH v6 3/9] sysfs: add sysfs_group{s}_change_owner() Christian Brauner
2020-02-25 13:19 ` [PATCH v6 4/9] sysfs: add sysfs_change_owner() Christian Brauner
2020-02-26 8:15 ` Greg Kroah-Hartman
2020-02-25 13:19 ` [PATCH v6 5/9] device: add device_change_owner() Christian Brauner
2020-02-26 8:16 ` Greg Kroah-Hartman
2020-02-25 13:19 ` [PATCH v6 6/9] drivers/base/power: add dpm_sysfs_change_owner() Christian Brauner
2020-02-25 16:13 ` Rafael J. Wysocki
2020-02-26 8:16 ` Greg Kroah-Hartman
2020-02-25 13:19 ` [PATCH v6 7/9] net-sysfs: add netdev_change_owner() Christian Brauner
2020-02-25 13:19 ` [PATCH v6 8/9] net-sysfs: add queue_change_owner() Christian Brauner
2020-02-25 13:19 ` [PATCH v6 9/9] net: fix sysfs permssions when device changes network namespace Christian Brauner
2020-02-26 8:17 ` [PATCH v6 0/9] net: fix sysfs permssions when device changes network Greg Kroah-Hartman
2020-02-27 1:37 ` David Miller
2020-02-27 3:06 ` David Miller
2020-02-27 3:21 ` Christian Brauner
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=20200225131938.120447-3-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).