proc: rename proc_setattr to proc_nochmod_setattr

What is currently proc_setattr is a special version added after the more
general procfs ->seattr in commit 6d76fa58b050 ("Don't allow chmod() on
the /proc/<pid>/ files").  Give it a name that reflects that to free the
proc_setattr name and better describe what is doing.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://patch.msgid.link/20260325063711.3298685-5-hch@lst.de
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 4eec684baca9f75f4e0791fc84666b60f0aabd76..76660614875c4137ac4845e38249d1d1f324bbff 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -721,7 +721,7 @@ static bool proc_fd_access_allowed(struct inode *inode)
        return allowed;
 }
 
-int proc_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
+int proc_nochmod_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                 struct iattr *attr)
 {
        int error;
@@ -794,7 +794,7 @@ static int proc_pid_permission(struct mnt_idmap *idmap,
 
 
 static const struct inode_operations proc_def_inode_operations = {
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static int proc_single_show(struct seq_file *m, void *v)
@@ -1866,7 +1866,7 @@ out:
 const struct inode_operations proc_pid_link_inode_operations = {
        .readlink       = proc_pid_readlink,
        .get_link       = proc_pid_get_link,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 
@@ -2316,7 +2316,7 @@ proc_map_files_get_link(struct dentry *dentry,
 static const struct inode_operations proc_map_files_link_inode_operations = {
        .readlink       = proc_pid_readlink,
        .get_link       = proc_map_files_get_link,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static struct dentry *
@@ -2395,7 +2395,7 @@ out:
 static const struct inode_operations proc_map_files_inode_operations = {
        .lookup         = proc_map_files_lookup,
        .permission     = proc_fd_permission,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static int
@@ -2882,7 +2882,7 @@ static struct dentry *proc_##LSM##_attr_dir_lookup(struct inode *dir, \
 static const struct inode_operations proc_##LSM##_attr_dir_inode_ops = { \
        .lookup         = proc_##LSM##_attr_dir_lookup, \
        .getattr        = pid_getattr, \
-       .setattr        = proc_setattr, \
+       .setattr        = proc_nochmod_setattr, \
 }
 
 #ifdef CONFIG_SECURITY_SMACK
@@ -2941,7 +2941,7 @@ static struct dentry *proc_attr_dir_lookup(struct inode *dir,
 static const struct inode_operations proc_attr_dir_inode_operations = {
        .lookup         = proc_attr_dir_lookup,
        .getattr        = pid_getattr,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 #endif
@@ -3450,7 +3450,7 @@ static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *de
 static const struct inode_operations proc_tgid_base_inode_operations = {
        .lookup         = proc_tgid_base_lookup,
        .getattr        = pid_getattr,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
        .permission     = proc_pid_permission,
 };
 
@@ -3647,7 +3647,7 @@ static int proc_tid_comm_permission(struct mnt_idmap *idmap,
 }
 
 static const struct inode_operations proc_tid_comm_inode_operations = {
-               .setattr        = proc_setattr,
+               .setattr        = proc_nochmod_setattr,
                .permission     = proc_tid_comm_permission,
 };
 
@@ -3776,7 +3776,7 @@ static const struct file_operations proc_tid_base_operations = {
 static const struct inode_operations proc_tid_base_inode_operations = {
        .lookup         = proc_tid_base_lookup,
        .getattr        = pid_getattr,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static struct dentry *proc_task_instantiate(struct dentry *dentry,
@@ -3989,7 +3989,7 @@ static loff_t proc_dir_llseek(struct file *file, loff_t offset, int whence)
 static const struct inode_operations proc_task_inode_operations = {
        .lookup         = proc_task_lookup,
        .getattr        = proc_task_getattr,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
        .permission     = proc_pid_permission,
 };
 

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 9eeccff49b2abf57d766ce17fe47070c379ed2c8..8a48ff4a19ecb349042faff7df4778e657c6d725 100644 (file)
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -102,7 +102,7 @@ static int proc_fdinfo_permission(struct mnt_idmap *idmap, struct inode *inode,
 
 static const struct inode_operations proc_fdinfo_file_inode_operations = {
        .permission     = proc_fdinfo_permission,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static const struct file_operations proc_fdinfo_file_operations = {
@@ -361,7 +361,7 @@ const struct inode_operations proc_fd_inode_operations = {
        .lookup         = proc_lookupfd,
        .permission     = proc_fd_permission,
        .getattr        = proc_fd_getattr,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static struct dentry *proc_fdinfo_instantiate(struct dentry *dentry,
@@ -402,7 +402,7 @@ static int proc_fdinfo_iterate(struct file *file, struct dir_context *ctx)
 const struct inode_operations proc_fdinfo_inode_operations = {
        .lookup         = proc_lookupfdinfo,
        .permission     = proc_fdinfo_permission,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 const struct file_operations proc_fdinfo_operations = {

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index c1e8eb984da817086b609bfdba084e7d59b5c3ef..64dc44832808ad932f7cc80885ca927149968156 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -257,8 +257,8 @@ extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
 extern const struct dentry_operations pid_dentry_operations;
 extern int pid_getattr(struct mnt_idmap *, const struct path *,
                       struct kstat *, u32, unsigned int);
-extern int proc_setattr(struct mnt_idmap *, struct dentry *,
-                       struct iattr *);
+int proc_nochmod_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
+                       struct iattr *attr);
 extern void proc_pid_evict_inode(struct proc_inode *);
 extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *, umode_t);
 extern void pid_update_inode(struct task_struct *, struct inode *);

diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index ea2b597fd92cdb7856358205b09dab0ea962214f..39f4169f669f632fb46155e8a6cab79298e00465 100644 (file)
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -92,7 +92,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
 static const struct inode_operations proc_ns_link_inode_operations = {
        .readlink       = proc_ns_readlink,
        .get_link       = proc_ns_get_link,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static struct dentry *proc_ns_instantiate(struct dentry *dentry,
@@ -178,5 +178,5 @@ out_no_task:
 const struct inode_operations proc_ns_dir_inode_operations = {
        .lookup         = proc_ns_dir_lookup,
        .getattr        = pid_getattr,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };

diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 52f0b75cbce2caa3b010b18f8fcc18d995ea2b0e..184cddeb8215cb6f2a4be568acc3e77eae5c0f28 100644 (file)
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -322,7 +322,7 @@ static int proc_tgid_net_getattr(struct mnt_idmap *idmap,
 const struct inode_operations proc_net_inode_operations = {
        .lookup         = proc_tgid_net_lookup,
        .getattr        = proc_tgid_net_getattr,
-       .setattr        = proc_setattr,
+       .setattr        = proc_nochmod_setattr,
 };
 
 static int proc_tgid_net_readdir(struct file *file, struct dir_context *ctx)