Skip to content

Commit 5113f72

Browse files
Marios Makassikisgregkh
authored andcommitted
ksmbd: fix recursive locking in vfs helpers
[ Upstream commit 807252f ] Running smb2.rename test from Samba smbtorture suite against a kernel built with lockdep triggers a "possible recursive locking detected" warning. This is because mnt_want_write() is called twice with no mnt_drop_write() in between: -> ksmbd_vfs_mkdir() -> ksmbd_vfs_kern_path_create() -> kern_path_create() -> filename_create() -> mnt_want_write() -> mnt_want_write() Fix this by removing the mnt_want_write/mnt_drop_write calls from vfs helpers that call kern_path_create(). Full lockdep trace below: ============================================ WARNING: possible recursive locking detected 6.6.0-rc5 torvalds#775 Not tainted -------------------------------------------- kworker/1:1/32 is trying to acquire lock: ffff888005ac83f8 (sb_writers#5){.+.+}-{0:0}, at: ksmbd_vfs_mkdir+0xe1/0x410 but task is already holding lock: ffff888005ac83f8 (sb_writers#5){.+.+}-{0:0}, at: filename_create+0xb6/0x260 other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock(sb_writers#5); lock(sb_writers#5); *** DEADLOCK *** May be due to missing lock nesting notation 4 locks held by kworker/1:1/32: #0: ffff8880064e4138 ((wq_completion)ksmbd-io){+.+.}-{0:0}, at: process_one_work+0x40e/0x980 #1: ffff888005b0fdd0 ((work_completion)(&work->work)){+.+.}-{0:0}, at: process_one_work+0x40e/0x980 #2: ffff888005ac83f8 (sb_writers#5){.+.+}-{0:0}, at: filename_create+0xb6/0x260 #3: ffff8880057ce760 (&type->i_mutex_dir_key#3/1){+.+.}-{3:3}, at: filename_create+0x123/0x260 Cc: [email protected] Fixes: 40b268d ("ksmbd: add mnt_want_write to ksmbd vfs functions") Signed-off-by: Marios Makassikis <[email protected]> Acked-by: Namjae Jeon <[email protected]> Signed-off-by: Steve French <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 42e5698 commit 5113f72

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

fs/smb/server/vfs.c

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@ int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode)
174174
return err;
175175
}
176176

177-
err = mnt_want_write(path.mnt);
178-
if (err)
179-
goto out_err;
180-
181177
mode |= S_IFREG;
182178
err = vfs_create(mnt_user_ns(path.mnt), d_inode(path.dentry),
183179
dentry, mode, true);
@@ -187,9 +183,7 @@ int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode)
187183
} else {
188184
pr_err("File(%s): creation failed (err:%d)\n", name, err);
189185
}
190-
mnt_drop_write(path.mnt);
191186

192-
out_err:
193187
done_path_create(&path, dentry);
194188
return err;
195189
}
@@ -220,10 +214,6 @@ int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode)
220214
return err;
221215
}
222216

223-
err = mnt_want_write(path.mnt);
224-
if (err)
225-
goto out_err2;
226-
227217
user_ns = mnt_user_ns(path.mnt);
228218
mode |= S_IFDIR;
229219
err = vfs_mkdir(user_ns, d_inode(path.dentry), dentry, mode);
@@ -234,21 +224,19 @@ int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode)
234224
dentry->d_name.len);
235225
if (IS_ERR(d)) {
236226
err = PTR_ERR(d);
237-
goto out_err1;
227+
goto out_err;
238228
}
239229
if (unlikely(d_is_negative(d))) {
240230
dput(d);
241231
err = -ENOENT;
242-
goto out_err1;
232+
goto out_err;
243233
}
244234

245235
ksmbd_vfs_inherit_owner(work, d_inode(path.dentry), d_inode(d));
246236
dput(d);
247237
}
248238

249-
out_err1:
250-
mnt_drop_write(path.mnt);
251-
out_err2:
239+
out_err:
252240
done_path_create(&path, dentry);
253241
if (err)
254242
pr_err("mkdir(%s): creation failed (err:%d)\n", name, err);
@@ -666,16 +654,11 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname,
666654
goto out3;
667655
}
668656

669-
err = mnt_want_write(newpath.mnt);
670-
if (err)
671-
goto out3;
672-
673657
err = vfs_link(oldpath.dentry, mnt_user_ns(newpath.mnt),
674658
d_inode(newpath.dentry),
675659
dentry, NULL);
676660
if (err)
677661
ksmbd_debug(VFS, "vfs_link failed err %d\n", err);
678-
mnt_drop_write(newpath.mnt);
679662

680663
out3:
681664
done_path_create(&newpath, dentry);

0 commit comments

Comments
 (0)