]> git.itanic.dy.fi Git - linux-stable/commitdiff
ksmbd: block asynchronous requests when making a delay on session setup
authorNamjae Jeon <linkinjeon@kernel.org>
Tue, 2 May 2023 23:43:30 +0000 (08:43 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:53:56 +0000 (11:53 +0200)
[ Upstream commit b096d97f47326b1e2dbdef1c91fab69ffda54d17 ]

ksmbd make a delay of 5 seconds on session setup to avoid dictionary
attacks. But the 5 seconds delay can be bypassed by using asynchronous
requests. This patch block all requests on current connection when
making a delay on sesstion setup failure.

Cc: stable@vger.kernel.org
Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-20482
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ksmbd/smb2pdu.c

index d3f33194faf1aaa3b728b221011874232b88905b..e7594a56cbfe340cff016bf8862ca741cb494d2c 100644 (file)
@@ -1862,8 +1862,11 @@ int smb2_sess_setup(struct ksmbd_work *work)
 
                        sess->last_active = jiffies;
                        sess->state = SMB2_SESSION_EXPIRED;
-                       if (try_delay)
+                       if (try_delay) {
+                               ksmbd_conn_set_need_reconnect(conn);
                                ssleep(5);
+                               ksmbd_conn_set_need_negotiate(conn);
+                       }
                }
        }