diff options
author | Jakub Kicinski <kuba@kernel.org> | 2023-01-12 18:56:47 -0800 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-12 19:59:56 -0800 |
commit | a99da46ac01a12e582684771b486c9292326d7a4 (patch) | |
tree | 498c7833f9efc9a35c99fa281ada1527c4b01f97 /fs/ksmbd/connection.c | |
parent | 55b98837e37da723c8b73ec0b48fe68c682b57d7 (diff) | |
parent | d9fc1511728c15df49ff18e49a494d00f78b7cd4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/usb/r8152.c
be53771c87f4 ("r8152: add vendor/device ID pair for Microsoft Devkit")
ec51fbd1b8a2 ("r8152: add USB device driver for config selection")
https://lore.kernel.org/all/20230113113339.658c4723@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/ksmbd/connection.c')
-rw-r--r-- | fs/ksmbd/connection.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ksmbd/connection.c b/fs/ksmbd/connection.c index 12be8386446a..fd0a288af299 100644 --- a/fs/ksmbd/connection.c +++ b/fs/ksmbd/connection.c @@ -316,9 +316,12 @@ int ksmbd_conn_handler_loop(void *p) /* 4 for rfc1002 length field */ size = pdu_size + 4; - conn->request_buf = kvmalloc(size, GFP_KERNEL); + conn->request_buf = kvmalloc(size, + GFP_KERNEL | + __GFP_NOWARN | + __GFP_NORETRY); if (!conn->request_buf) - continue; + break; memcpy(conn->request_buf, hdr_buf, sizeof(hdr_buf)); if (!ksmbd_smb_request(conn)) |