Skip to content

Commit 43e7e28

Browse files
dhowellssmfrench
authored andcommitted
cifs: Fix the smbd_response slab to allow usercopy
The handling of received data in the smbdirect client code involves using copy_to_iter() to copy data from the smbd_reponse struct's packet trailer to a folioq buffer provided by netfslib that encapsulates a chunk of pagecache. If, however, CONFIG_HARDENED_USERCOPY=y, this will result in the checks then performed in copy_to_iter() oopsing with something like the following: CIFS: Attempting to mount //172.31.9.1/test CIFS: VFS: RDMA transport established usercopy: Kernel memory exposure attempt detected from SLUB object 'smbd_response_0000000091e24ea1' (offset 81, size 63)! ------------[ cut here ]------------ kernel BUG at mm/usercopy.c:102! ... RIP: 0010:usercopy_abort+0x6c/0x80 ... Call Trace: <TASK> __check_heap_object+0xe3/0x120 __check_object_size+0x4dc/0x6d0 smbd_recv+0x77f/0xfe0 [cifs] cifs_readv_from_socket+0x276/0x8f0 [cifs] cifs_read_from_socket+0xcd/0x120 [cifs] cifs_demultiplex_thread+0x7e9/0x2d50 [cifs] kthread+0x396/0x830 ret_from_fork+0x2b8/0x3b0 ret_from_fork_asm+0x1a/0x30 The problem is that the smbd_response slab's packet field isn't marked as being permitted for usercopy. Fix this by passing parameters to kmem_slab_create() to indicate that copy_to_iter() is permitted from the packet region of the smbd_response slab objects, less the header space. Fixes: ee4cdf7 ("netfs: Speed up buffered reading") Reported-by: Stefan Metzmacher <[email protected]> Link: https://lore.kernel.org/r/[email protected]/ Signed-off-by: David Howells <[email protected]> Reviewed-by: Stefan Metzmacher <[email protected]> Tested-by: Stefan Metzmacher <[email protected]> cc: Paulo Alcantara <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] Signed-off-by: Steve French <[email protected]>
1 parent 711741f commit 43e7e28

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

fs/smb/client/smbdirect.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1475,6 +1475,9 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)
14751475
char name[MAX_NAME_LEN];
14761476
int rc;
14771477

1478+
if (WARN_ON_ONCE(sp->max_recv_size < sizeof(struct smbdirect_data_transfer)))
1479+
return -ENOMEM;
1480+
14781481
scnprintf(name, MAX_NAME_LEN, "smbd_request_%p", info);
14791482
info->request_cache =
14801483
kmem_cache_create(
@@ -1492,12 +1495,17 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)
14921495
goto out1;
14931496

14941497
scnprintf(name, MAX_NAME_LEN, "smbd_response_%p", info);
1498+
1499+
struct kmem_cache_args response_args = {
1500+
.align = __alignof__(struct smbd_response),
1501+
.useroffset = (offsetof(struct smbd_response, packet) +
1502+
sizeof(struct smbdirect_data_transfer)),
1503+
.usersize = sp->max_recv_size - sizeof(struct smbdirect_data_transfer),
1504+
};
14951505
info->response_cache =
1496-
kmem_cache_create(
1497-
name,
1498-
sizeof(struct smbd_response) +
1499-
sp->max_recv_size,
1500-
0, SLAB_HWCACHE_ALIGN, NULL);
1506+
kmem_cache_create(name,
1507+
sizeof(struct smbd_response) + sp->max_recv_size,
1508+
&response_args, SLAB_HWCACHE_ALIGN);
15011509
if (!info->response_cache)
15021510
goto out2;
15031511

0 commit comments

Comments
 (0)