diff options
| author | Max Kellermann <max.kellermann@ionos.com> | 2025-05-13 17:03:25 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-05-15 12:03:12 +0200 |
| commit | 28a3f6ab2fe0c8275680dff228957474d74fdc94 (patch) | |
| tree | 55ab8b7e6d343f568e5427e8d2ae73b5e48a3dcc | |
| parent | d8c5507cd140d9471472ece673e70250b957c595 (diff) | |
fs/open: make chmod_common() and chown_common() killable
Allows killing processes that are waiting for the inode lock.
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Link: https://lore.kernel.org/20250513150327.1373061-2-max.kellermann@ionos.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/open.c | 9 |
1 files changed, 7 insertions, 2 deletions
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); |