diff options
| author | Christian Brauner <brauner@kernel.org> | 2023-07-03 16:49:12 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-07-04 10:21:11 +0200 |
| commit | 33ab231f83cc12d0157711bbf84e180c3be7d7bc (patch) | |
| tree | 68583c47b8f059d999c7d869c1a1ae3be8c6af78 | |
| parent | fs: no need to check source (diff) | |
| download | linux-33ab231f83cc12d0157711bbf84e180c3be7d7bc.tar.xz linux-33ab231f83cc12d0157711bbf84e180c3be7d7bc.zip | |
fs: don't assume arguments are non-NULL
The helper is explicitly documented as locking zero, one, or two
arguments. While all current callers do pass non-NULL arguments there's
no need or requirement for them to do so according to the code and the
unlock_two_nondirectories() helper is pretty clear about it as well. So
only call WARN_ON_ONCE() if the checked inode is valid.
Fixes: 2454ad83b90a ("fs: Restrict lock_two_nondirectories() to non-directory inodes")
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Jan Kara <jack@suse.cz>
Message-Id: <20230703-vfs-rename-source-v1-2-37eebb29b65b@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c index d37fad91c8da..8fefb69e1f84 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1156,8 +1156,10 @@ lock: */ void lock_two_nondirectories(struct inode *inode1, struct inode *inode2) { - WARN_ON_ONCE(S_ISDIR(inode1->i_mode)); - WARN_ON_ONCE(S_ISDIR(inode2->i_mode)); + if (inode1) + WARN_ON_ONCE(S_ISDIR(inode1->i_mode)); + if (inode2) + WARN_ON_ONCE(S_ISDIR(inode2->i_mode)); lock_two_inodes(inode1, inode2, I_MUTEX_NORMAL, I_MUTEX_NONDIR2); } EXPORT_SYMBOL(lock_two_nondirectories); |