samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

smb: client: Avoid race in open_cached_dir with lease breaks

Browse Source 
commit 3ca02e63edccb78ef3659bebc68579c7224a6ca2 upstream.

A pre-existing valid cfid returned from find_or_create_cached_dir might
race with a lease break, meaning open_cached_dir doesn't consider it
valid, and thinks it's newly-constructed. This leaks a dentry reference
if the allocation occurs before the queued lease break work runs.

Avoid the race by extending holding the cfid_list_lock across
find_or_create_cached_dir and when the result is checked.

Cc: stable@vger.kernel.org
Reviewed-by: Henrique Carvalho <henrique.carvalho@suse.com>
Signed-off-by: Paul Aurich <paul@darkrain42.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paul Aurich
2025-05-06 22:28:09 -07:00
committed by Greg Kroah-Hartman
parent 671c05434d
commit 2ed98e89eb
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/smb/client/cached_dir.c
View File

@@ -29,7 +29,6 @@ static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids,
{ {
struct cached_fid *cfid; struct cached_fid *cfid;
spin_lock(&cfids->cfid_list_lock);
list_for_each_entry(cfid, &cfids->entries, entry) { list_for_each_entry(cfid, &cfids->entries, entry) {
if (!strcmp(cfid->path, path)) { if (!strcmp(cfid->path, path)) {
/* /*
@@ -38,25 +37,20 @@ static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids,
* being deleted due to a lease break. * being deleted due to a lease break.
*/ */
if (!cfid->time || !cfid->has_lease) { if (!cfid->time || !cfid->has_lease) {
spin_unlock(&cfids->cfid_list_lock);
return NULL; return NULL;
} }
kref_get(&cfid->refcount); kref_get(&cfid->refcount);
spin_unlock(&cfids->cfid_list_lock);
return cfid; return cfid;
} }
} }
if (lookup_only) { if (lookup_only) {
spin_unlock(&cfids->cfid_list_lock);
return NULL; return NULL;
} }
if (cfids->num_entries >= max_cached_dirs) { if (cfids->num_entries >= max_cached_dirs) {
spin_unlock(&cfids->cfid_list_lock);
return NULL; return NULL;
} }
cfid = init_cached_dir(path); cfid = init_cached_dir(path);
if (cfid == NULL) { if (cfid == NULL) {
spin_unlock(&cfids->cfid_list_lock);
return NULL; return NULL;
} }
cfid->cfids = cfids; cfid->cfids = cfids;
@@ -74,7 +68,6 @@ static struct cached_fid *find_or_create_cached_dir(struct cached_fids *cfids,
*/ */
cfid->has_lease = true; cfid->has_lease = true;
spin_unlock(&cfids->cfid_list_lock);
return cfid; return cfid;
} }
@@ -185,8 +178,10 @@ replay_again:
if (!utf16_path) if (!utf16_path)
return -ENOMEM; return -ENOMEM;
spin_lock(&cfids->cfid_list_lock);
cfid = find_or_create_cached_dir(cfids, path, lookup_only, tcon->max_cached_dirs); cfid = find_or_create_cached_dir(cfids, path, lookup_only, tcon->max_cached_dirs);
if (cfid == NULL) { if (cfid == NULL) {
spin_unlock(&cfids->cfid_list_lock);
kfree(utf16_path); kfree(utf16_path);
return -ENOENT; return -ENOENT;
} }
@@ -195,7 +190,6 @@ replay_again:
* Otherwise, it is either a new entry or laundromat worker removed it * Otherwise, it is either a new entry or laundromat worker removed it
* from @cfids->entries. Caller will put last reference if the latter. * from @cfids->entries. Caller will put last reference if the latter.
*/ */
spin_lock(&cfids->cfid_list_lock);
if (cfid->has_lease && cfid->time) { if (cfid->has_lease && cfid->time) {
spin_unlock(&cfids->cfid_list_lock); spin_unlock(&cfids->cfid_list_lock);
*ret_cfid = cfid; *ret_cfid = cfid;