From: Max Kellermann Date: Tue, 13 May 2025 15:03:25 +0000 (+0200) Subject: fs/open: make chmod_common() and chown_common() killable X-Git-Tag: block-6.16-20250606~51^2~1^2~2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=28a3f6ab2fe0c8275680dff228957474d74fdc94;p=linux-block.git fs/open: make chmod_common() and chown_common() killable Allows killing processes that are waiting for the inode lock. Signed-off-by: Max Kellermann Link: https://lore.kernel.org/20250513150327.1373061-2-max.kellermann@ionos.com Signed-off-by: Christian Brauner --- diff --git a/fs/open.c b/fs/open.c index a9063cca9911..d2f2df52c458 100644 --- a/fs/open.c +++ b/fs/open.c @@ -635,7 +635,9 @@ int chmod_common(const struct path *path, umode_t mode) if (error) return error; retry_deleg: - inode_lock(inode); + error = inode_lock_killable(inode); + if (error) + goto out_mnt_unlock; error = security_path_chmod(path, mode); if (error) goto out_unlock; @@ -650,6 +652,7 @@ out_unlock: if (!error) goto retry_deleg; } +out_mnt_unlock: mnt_drop_write(path->mnt); return error; } @@ -769,7 +772,9 @@ retry_deleg: return -EINVAL; if ((group != (gid_t)-1) && !setattr_vfsgid(&newattrs, gid)) return -EINVAL; - inode_lock(inode); + error = inode_lock_killable(inode); + if (error) + return error; if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= ATTR_KILL_SUID | ATTR_KILL_PRIV | setattr_should_drop_sgid(idmap, inode);