From 28a3f6ab2fe0c8275680dff228957474d74fdc94 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 13 May 2025 17:03:25 +0200 Subject: 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 --- fs/open.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'fs/open.c') 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); -- cgit v1.2.3 From d68687564280b09d80e7cf8ce20bb71880586d3a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 13 May 2025 17:03:26 +0200 Subject: fs/open: make do_truncate() killable Allows killing processes that are waiting for the inode lock. Signed-off-by: Max Kellermann Link: https://lore.kernel.org/20250513150327.1373061-3-max.kellermann@ionos.com Signed-off-by: Christian Brauner --- fs/open.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'fs/open.c') diff --git a/fs/open.c b/fs/open.c index d2f2df52c458..7828234a7caa 100644 --- a/fs/open.c +++ b/fs/open.c @@ -60,7 +60,10 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry, if (ret) newattrs.ia_valid |= ret | ATTR_FORCE; - inode_lock(dentry->d_inode); + ret = inode_lock_killable(dentry->d_inode); + if (ret) + return ret; + /* Note any delegations or leases have already been broken: */ ret = notify_change(idmap, dentry, &newattrs, NULL); inode_unlock(dentry->d_inode); -- cgit v1.2.3