Skip to content

Commit fd843a6

Browse files
PlaidCatPlaidCat
committed
smb: prevent use-after-free due to open_cached_dir error paths
jira LE-2522 cve CVE-2024-53177 Rebuild_History Non-Buildable kernel-5.14.0-503.29.1.el9_5 commit-author Paul Aurich <[email protected]> commit a9685b4 If open_cached_dir() encounters an error parsing the lease from the server, the error handling may race with receiving a lease break, resulting in open_cached_dir() freeing the cfid while the queued work is pending. Update open_cached_dir() to drop refs rather than directly freeing the cfid. Have cached_dir_lease_break(), cfids_laundromat_worker(), and invalidate_all_cached_dirs() clear has_lease immediately while still holding cfids->cfid_list_lock, and then use this to also simplify the reference counting in cfids_laundromat_worker() and invalidate_all_cached_dirs(). Fixes this KASAN splat (which manually injects an error and lease break in open_cached_dir()): ================================================================== BUG: KASAN: slab-use-after-free in smb2_cached_lease_break+0x27/0xb0 Read of size 8 at addr ffff88811cc24c10 by task kworker/3:1/65 CPU: 3 UID: 0 PID: 65 Comm: kworker/3:1 Not tainted 6.12.0-rc6-g255cf264e6e5-dirty #87 Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 11/12/2020 Workqueue: cifsiod smb2_cached_lease_break Call Trace: <TASK> dump_stack_lvl+0x77/0xb0 print_report+0xce/0x660 kasan_report+0xd3/0x110 smb2_cached_lease_break+0x27/0xb0 process_one_work+0x50a/0xc50 worker_thread+0x2ba/0x530 kthread+0x17c/0x1c0 ret_from_fork+0x34/0x60 ret_from_fork_asm+0x1a/0x30 </TASK> Allocated by task 2464: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 __kasan_kmalloc+0xaa/0xb0 open_cached_dir+0xa7d/0x1fb0 smb2_query_path_info+0x43c/0x6e0 cifs_get_fattr+0x346/0xf10 cifs_get_inode_info+0x157/0x210 cifs_revalidate_dentry_attr+0x2d1/0x460 cifs_getattr+0x173/0x470 vfs_statx_path+0x10f/0x160 vfs_statx+0xe9/0x150 vfs_fstatat+0x5e/0xc0 __do_sys_newfstatat+0x91/0xf0 do_syscall_64+0x95/0x1a0 entry_SYSCALL_64_after_hwframe+0x76/0x7e Freed by task 2464: kasan_save_stack+0x33/0x60 kasan_save_track+0x14/0x30 kasan_save_free_info+0x3b/0x60 __kasan_slab_free+0x51/0x70 kfree+0x174/0x520 open_cached_dir+0x97f/0x1fb0 smb2_query_path_info+0x43c/0x6e0 cifs_get_fattr+0x346/0xf10 cifs_get_inode_info+0x157/0x210 cifs_revalidate_dentry_attr+0x2d1/0x460 cifs_getattr+0x173/0x470 vfs_statx_path+0x10f/0x160 vfs_statx+0xe9/0x150 vfs_fstatat+0x5e/0xc0 __do_sys_newfstatat+0x91/0xf0 do_syscall_64+0x95/0x1a0 entry_SYSCALL_64_after_hwframe+0x76/0x7e Last potentially related work creation: kasan_save_stack+0x33/0x60 __kasan_record_aux_stack+0xad/0xc0 insert_work+0x32/0x100 __queue_work+0x5c9/0x870 queue_work_on+0x82/0x90 open_cached_dir+0x1369/0x1fb0 smb2_query_path_info+0x43c/0x6e0 cifs_get_fattr+0x346/0xf10 cifs_get_inode_info+0x157/0x210 cifs_revalidate_dentry_attr+0x2d1/0x460 cifs_getattr+0x173/0x470 vfs_statx_path+0x10f/0x160 vfs_statx+0xe9/0x150 vfs_fstatat+0x5e/0xc0 __do_sys_newfstatat+0x91/0xf0 do_syscall_64+0x95/0x1a0 entry_SYSCALL_64_after_hwframe+0x76/0x7e The buggy address belongs to the object at ffff88811cc24c00 which belongs to the cache kmalloc-1k of size 1024 The buggy address is located 16 bytes inside of freed 1024-byte region [ffff88811cc24c00, ffff88811cc25000) Cc: [email protected] Signed-off-by: Paul Aurich <[email protected]> Signed-off-by: Steve French <[email protected]> (cherry picked from commit a9685b4) Signed-off-by: Jonathan Maple <[email protected]>
1 parent bc9e88b commit fd843a6

File tree

1 file changed

+29
-41
lines changed

1 file changed

+29
-41
lines changed

‎fs/smb/client/cached_dir.c

Lines changed: 29 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
348348
SMB2_query_info_free(&rqst[1]);
349349
free_rsp_buf(resp_buftype[0], rsp_iov[0].iov_base);
350350
free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);
351+
out:
351352
if (rc) {
352353
spin_lock(&cfids->cfid_list_lock);
353354
if (cfid->on_list) {
@@ -359,23 +360,14 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,
359360
/*
360361
* We are guaranteed to have two references at this
361362
* point. One for the caller and one for a potential
362-
* lease. Release the Lease-ref so that the directory
363-
* will be closed when the caller closes the cached
364-
* handle.
363+
* lease. Release one here, and the second below.
365364
*/
366365
cfid->has_lease = false;
367-
spin_unlock(&cfids->cfid_list_lock);
368366
kref_put(&cfid->refcount, smb2_close_cached_fid);
369-
goto out;
370367
}
371368
spin_unlock(&cfids->cfid_list_lock);
372-
}
373-
out:
374-
if (rc) {
375-
if (cfid->is_open)
376-
SMB2_close(0, cfid->tcon, cfid->fid.persistent_fid,
377-
cfid->fid.volatile_fid);
378-
free_cached_dir(cfid);
369+
370+
kref_put(&cfid->refcount, smb2_close_cached_fid);
379371
} else {
380372
*ret_cfid = cfid;
381373
atomic_inc(&tcon->num_remote_opens);
@@ -511,25 +503,24 @@ void invalidate_all_cached_dirs(struct cifs_tcon *tcon)
511503
cfids->num_entries--;
512504
cfid->is_open = false;
513505
cfid->on_list = false;
514-
/* To prevent race with smb2_cached_lease_break() */
515-
kref_get(&cfid->refcount);
506+
if (cfid->has_lease) {
507+
/*
508+
* The lease was never cancelled from the server,
509+
* so steal that reference.
510+
*/
511+
cfid->has_lease = false;
512+
} else
513+
kref_get(&cfid->refcount);
516514
}
517515
spin_unlock(&cfids->cfid_list_lock);
518516

519517
list_for_each_entry_safe(cfid, q, &entry, entry) {
520518
list_del(&cfid->entry);
521519
cancel_work_sync(&cfid->lease_break);
522-
if (cfid->has_lease) {
523-
/*
524-
* We lease was never cancelled from the server so we
525-
* need to drop the reference.
526-
*/
527-
spin_lock(&cfids->cfid_list_lock);
528-
cfid->has_lease = false;
529-
spin_unlock(&cfids->cfid_list_lock);
530-
kref_put(&cfid->refcount, smb2_close_cached_fid);
531-
}
532-
/* Drop the extra reference opened above*/
520+
/*
521+
* Drop the ref-count from above, either the lease-ref (if there
522+
* was one) or the extra one acquired.
523+
*/
533524
kref_put(&cfid->refcount, smb2_close_cached_fid);
534525
}
535526
}
@@ -540,9 +531,6 @@ smb2_cached_lease_break(struct work_struct *work)
540531
struct cached_fid *cfid = container_of(work,
541532
struct cached_fid, lease_break);
542533

543-
spin_lock(&cfid->cfids->cfid_list_lock);
544-
cfid->has_lease = false;
545-
spin_unlock(&cfid->cfids->cfid_list_lock);
546534
kref_put(&cfid->refcount, smb2_close_cached_fid);
547535
}
548536

@@ -560,6 +548,7 @@ int cached_dir_lease_break(struct cifs_tcon *tcon, __u8 lease_key[16])
560548
!memcmp(lease_key,
561549
cfid->fid.lease_key,
562550
SMB2_LEASE_KEY_SIZE)) {
551+
cfid->has_lease = false;
563552
cfid->time = 0;
564553
/*
565554
* We found a lease remove it from the list
@@ -637,8 +626,14 @@ static void cfids_laundromat_worker(struct work_struct *work)
637626
cfid->on_list = false;
638627
list_move(&cfid->entry, &entry);
639628
cfids->num_entries--;
640-
/* To prevent race with smb2_cached_lease_break() */
641-
kref_get(&cfid->refcount);
629+
if (cfid->has_lease) {
630+
/*
631+
* Our lease has not yet been cancelled from the
632+
* server. Steal that reference.
633+
*/
634+
cfid->has_lease = false;
635+
} else
636+
kref_get(&cfid->refcount);
642637
}
643638
}
644639
spin_unlock(&cfids->cfid_list_lock);
@@ -650,17 +645,10 @@ static void cfids_laundromat_worker(struct work_struct *work)
650645
* with it.
651646
*/
652647
cancel_work_sync(&cfid->lease_break);
653-
if (cfid->has_lease) {
654-
/*
655-
* Our lease has not yet been cancelled from the server
656-
* so we need to drop the reference.
657-
*/
658-
spin_lock(&cfids->cfid_list_lock);
659-
cfid->has_lease = false;
660-
spin_unlock(&cfids->cfid_list_lock);
661-
kref_put(&cfid->refcount, smb2_close_cached_fid);
662-
}
663-
/* Drop the extra reference opened above */
648+
/*
649+
* Drop the ref-count from above, either the lease-ref (if there
650+
* was one) or the extra one acquired.
651+
*/
664652
kref_put(&cfid->refcount, smb2_close_cached_fid);
665653
}
666654
queue_delayed_work(cifsiod_wq, &cfids->laundromat_work,

0 commit comments

Comments
 (0)