From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A700298CC4; Tue, 21 Jul 2026 22:28:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784672891; cv=none; b=rNROvEBYfKqYRGhxSvYffKiqJhAfntK0vg6VcZsl29CZgG5AhOSL3DWwiuSIZkejmLq1zC41WN9gMCU0egnndYftofFB3CsNmBwePjI1LBMIhseQeoscdJygRQXeD1zV69RIbyDlR1wSL3h25Z6RODwDICDhdv/Fqyx9fzHF39Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784672891; c=relaxed/simple; bh=9ef1+LbeP5hdwHCGorigVoWYy4ENFzpLv2j85tzOwu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eFeJNMoElLT46qkR7pJfhWDVRv2fzt4kJfEbjVCxdwVR0pHFLoAApWG7tbtU5v9Y3fLoWTuDv+QOv0DEqXzPSkXs+h0xO4K/heSJZ5ptsqaq8I75ZCzddtbo5RnXxU++oEuKjowNJMUjTUdDm20eTaIdsnHrT5rGzpysMjAFKEM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=noJ/oP+W; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="noJ/oP+W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62C581F00A3A; Tue, 21 Jul 2026 22:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784672885; bh=dgXVcnjBf/HhtjWktCxKn9BROpha67Y+z+5ZMxGXa6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=noJ/oP+WjFX+HtkFxNLfCljf/f+jOS4NwsBmxWmZo7ltyLPhtHzNR/+kh4j/xUiHT XJMSZnhrYKXiRTVZhzIfJZRxLrf6e2F/Ozgpd6PrFEPaV2uFTczy1Cf6USATUr6M5w 9sJDysIQOiJ7UvqZgbauenxdkk+73GFo2eLe0Lks= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Jan Kara , Christian Brauner , Sasha Levin Subject: [PATCH 5.15 794/843] proc: rename proc_setattr to proc_nochmod_setattr Date: Tue, 21 Jul 2026 17:27:09 +0200 Message-ID: <20260721152423.923317336@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152405.946368001@linuxfoundation.org> References: <20260721152405.946368001@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig [ Upstream commit 690005b0b1e6b567c88b7790e6d90d4d6c9e09cc ] 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// 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 Link: https://patch.msgid.link/20260325063711.3298685-5-hch@lst.de Reviewed-by: Jan Kara Signed-off-by: Christian Brauner Stable-dep-of: 6255da28d4bb ("proc: protect ptrace_may_access() with exec_update_lock (FD links)") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/proc/base.c | 22 +++++++++++----------- fs/proc/fd.c | 12 ++++++------ fs/proc/internal.h | 4 ++-- fs/proc/namespaces.c | 4 ++-- fs/proc/proc_net.c | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -721,7 +721,7 @@ static int proc_fd_access_allowed(struct return allowed; } -int proc_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, +int proc_nochmod_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, struct iattr *attr) { int error; @@ -795,7 +795,7 @@ static int proc_pid_permission(struct us 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) @@ -1868,7 +1868,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 *d 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 @@ -2887,7 +2887,7 @@ static struct dentry *proc_##LSM##_attr_ 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 @@ -2946,7 +2946,7 @@ static struct dentry *proc_attr_dir_look 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 @@ -3403,7 +3403,7 @@ static struct dentry *proc_tgid_base_loo 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, }; @@ -3603,7 +3603,7 @@ static int proc_tid_comm_permission(stru } static const struct inode_operations proc_tid_comm_inode_operations = { - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, .permission = proc_tid_comm_permission, }; @@ -3730,7 +3730,7 @@ static const struct file_operations proc 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, @@ -3926,7 +3926,7 @@ static int proc_task_getattr(struct user 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, }; --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -82,8 +82,8 @@ static int seq_fdinfo_open(struct inode * that the current task has PTRACE_MODE_READ in addition to the normal * POSIX-like checks. */ -static int proc_fdinfo_permission(struct mnt_idmap *idmap, struct inode *inode, - int mask) +static int proc_fdinfo_permission(struct user_namespace *mnt_userns, + struct inode *inode, int mask) { bool allowed = false; struct task_struct *task = get_proc_task(inode); @@ -97,12 +97,12 @@ static int proc_fdinfo_permission(struct if (!allowed) return -EACCES; - return generic_permission(idmap, inode, mask); + return generic_permission(mnt_userns, inode, mask); } 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 = { @@ -328,7 +328,7 @@ int proc_fd_permission(struct user_names const struct inode_operations proc_fd_inode_operations = { .lookup = proc_lookupfd, .permission = proc_fd_permission, - .setattr = proc_setattr, + .setattr = proc_nochmod_setattr, }; static struct dentry *proc_fdinfo_instantiate(struct dentry *dentry, @@ -369,7 +369,7 @@ static int proc_readfdinfo(struct file * 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 = { --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -178,8 +178,8 @@ extern int proc_pid_statm(struct seq_fil extern const struct dentry_operations pid_dentry_operations; extern int pid_getattr(struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int); -extern int proc_setattr(struct user_namespace *, struct dentry *, - struct iattr *); +int proc_nochmod_setattr(struct user_namespace *mnt_userns, 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 *); --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -92,7 +92,7 @@ static int proc_ns_readlink(struct dentr 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, @@ -179,5 +179,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, }; --- a/fs/proc/proc_net.c +++ b/fs/proc/proc_net.c @@ -311,7 +311,7 @@ static int proc_tgid_net_getattr(struct 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)