Skip to content

Commit 690005b

Browse files
Christoph Hellwigbrauner
authored andcommitted
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 6d76fa5 ("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>
1 parent d0fdc1c commit 690005b

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

fs/proc/base.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ static bool proc_fd_access_allowed(struct inode *inode)
721721
return allowed;
722722
}
723723

724-
int proc_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
724+
int proc_nochmod_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
725725
struct iattr *attr)
726726
{
727727
int error;
@@ -794,7 +794,7 @@ static int proc_pid_permission(struct mnt_idmap *idmap,
794794

795795

796796
static const struct inode_operations proc_def_inode_operations = {
797-
.setattr = proc_setattr,
797+
.setattr = proc_nochmod_setattr,
798798
};
799799

800800
static int proc_single_show(struct seq_file *m, void *v)
@@ -1866,7 +1866,7 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
18661866
const struct inode_operations proc_pid_link_inode_operations = {
18671867
.readlink = proc_pid_readlink,
18681868
.get_link = proc_pid_get_link,
1869-
.setattr = proc_setattr,
1869+
.setattr = proc_nochmod_setattr,
18701870
};
18711871

18721872

@@ -2316,7 +2316,7 @@ proc_map_files_get_link(struct dentry *dentry,
23162316
static const struct inode_operations proc_map_files_link_inode_operations = {
23172317
.readlink = proc_pid_readlink,
23182318
.get_link = proc_map_files_get_link,
2319-
.setattr = proc_setattr,
2319+
.setattr = proc_nochmod_setattr,
23202320
};
23212321

23222322
static struct dentry *
@@ -2395,7 +2395,7 @@ static struct dentry *proc_map_files_lookup(struct inode *dir,
23952395
static const struct inode_operations proc_map_files_inode_operations = {
23962396
.lookup = proc_map_files_lookup,
23972397
.permission = proc_fd_permission,
2398-
.setattr = proc_setattr,
2398+
.setattr = proc_nochmod_setattr,
23992399
};
24002400

24012401
static int
@@ -2882,7 +2882,7 @@ static struct dentry *proc_##LSM##_attr_dir_lookup(struct inode *dir, \
28822882
static const struct inode_operations proc_##LSM##_attr_dir_inode_ops = { \
28832883
.lookup = proc_##LSM##_attr_dir_lookup, \
28842884
.getattr = pid_getattr, \
2885-
.setattr = proc_setattr, \
2885+
.setattr = proc_nochmod_setattr, \
28862886
}
28872887

28882888
#ifdef CONFIG_SECURITY_SMACK
@@ -2941,7 +2941,7 @@ static struct dentry *proc_attr_dir_lookup(struct inode *dir,
29412941
static const struct inode_operations proc_attr_dir_inode_operations = {
29422942
.lookup = proc_attr_dir_lookup,
29432943
.getattr = pid_getattr,
2944-
.setattr = proc_setattr,
2944+
.setattr = proc_nochmod_setattr,
29452945
};
29462946

29472947
#endif
@@ -3450,7 +3450,7 @@ static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *de
34503450
static const struct inode_operations proc_tgid_base_inode_operations = {
34513451
.lookup = proc_tgid_base_lookup,
34523452
.getattr = pid_getattr,
3453-
.setattr = proc_setattr,
3453+
.setattr = proc_nochmod_setattr,
34543454
.permission = proc_pid_permission,
34553455
};
34563456

@@ -3647,7 +3647,7 @@ static int proc_tid_comm_permission(struct mnt_idmap *idmap,
36473647
}
36483648

36493649
static const struct inode_operations proc_tid_comm_inode_operations = {
3650-
.setattr = proc_setattr,
3650+
.setattr = proc_nochmod_setattr,
36513651
.permission = proc_tid_comm_permission,
36523652
};
36533653

@@ -3776,7 +3776,7 @@ static const struct file_operations proc_tid_base_operations = {
37763776
static const struct inode_operations proc_tid_base_inode_operations = {
37773777
.lookup = proc_tid_base_lookup,
37783778
.getattr = pid_getattr,
3779-
.setattr = proc_setattr,
3779+
.setattr = proc_nochmod_setattr,
37803780
};
37813781

37823782
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)
39893989
static const struct inode_operations proc_task_inode_operations = {
39903990
.lookup = proc_task_lookup,
39913991
.getattr = proc_task_getattr,
3992-
.setattr = proc_setattr,
3992+
.setattr = proc_nochmod_setattr,
39933993
.permission = proc_pid_permission,
39943994
};
39953995

fs/proc/fd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static int proc_fdinfo_permission(struct mnt_idmap *idmap, struct inode *inode,
102102

103103
static const struct inode_operations proc_fdinfo_file_inode_operations = {
104104
.permission = proc_fdinfo_permission,
105-
.setattr = proc_setattr,
105+
.setattr = proc_nochmod_setattr,
106106
};
107107

108108
static const struct file_operations proc_fdinfo_file_operations = {
@@ -361,7 +361,7 @@ const struct inode_operations proc_fd_inode_operations = {
361361
.lookup = proc_lookupfd,
362362
.permission = proc_fd_permission,
363363
.getattr = proc_fd_getattr,
364-
.setattr = proc_setattr,
364+
.setattr = proc_nochmod_setattr,
365365
};
366366

367367
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)
402402
const struct inode_operations proc_fdinfo_inode_operations = {
403403
.lookup = proc_lookupfdinfo,
404404
.permission = proc_fdinfo_permission,
405-
.setattr = proc_setattr,
405+
.setattr = proc_nochmod_setattr,
406406
};
407407

408408
const struct file_operations proc_fdinfo_operations = {

fs/proc/internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
257257
extern const struct dentry_operations pid_dentry_operations;
258258
extern int pid_getattr(struct mnt_idmap *, const struct path *,
259259
struct kstat *, u32, unsigned int);
260-
extern int proc_setattr(struct mnt_idmap *, struct dentry *,
261-
struct iattr *);
260+
int proc_nochmod_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
261+
struct iattr *attr);
262262
extern void proc_pid_evict_inode(struct proc_inode *);
263263
extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *, umode_t);
264264
extern void pid_update_inode(struct task_struct *, struct inode *);

fs/proc/namespaces.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl
9292
static const struct inode_operations proc_ns_link_inode_operations = {
9393
.readlink = proc_ns_readlink,
9494
.get_link = proc_ns_get_link,
95-
.setattr = proc_setattr,
95+
.setattr = proc_nochmod_setattr,
9696
};
9797

9898
static struct dentry *proc_ns_instantiate(struct dentry *dentry,
@@ -178,5 +178,5 @@ static struct dentry *proc_ns_dir_lookup(struct inode *dir,
178178
const struct inode_operations proc_ns_dir_inode_operations = {
179179
.lookup = proc_ns_dir_lookup,
180180
.getattr = pid_getattr,
181-
.setattr = proc_setattr,
181+
.setattr = proc_nochmod_setattr,
182182
};

fs/proc/proc_net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ static int proc_tgid_net_getattr(struct mnt_idmap *idmap,
322322
const struct inode_operations proc_net_inode_operations = {
323323
.lookup = proc_tgid_net_lookup,
324324
.getattr = proc_tgid_net_getattr,
325-
.setattr = proc_setattr,
325+
.setattr = proc_nochmod_setattr,
326326
};
327327

328328
static int proc_tgid_net_readdir(struct file *file, struct dir_context *ctx)

0 commit comments

Comments
 (0)