ksmbd: set RSS capable in FSCTL_QUERY_NETWORK_INTERFACE_INFO

[ Upstream commit a58b45a4dbfd0bf2ebb157789da4d8e6368afb1b ]

Set RSS capable in FSCTL_QUERY_NETWORK_INTERFACE_INFO if netdev has
multi tx queues. And add ksmbd_compare_user() to avoid racy condition
issue in ksmbd_free_user(). because windows client is simultaneously used
to send session setup requests for multichannel connection.

Tested-by: Ziwei Xie <zw.xie@high-flyer.cn>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Stable-dep-of: 7b4323373d84 ("ksmbd: fix deadlock in ksmbd_find_crypto_ctx()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ksmbd/mgmt/user_config.c b/fs/ksmbd/mgmt/user_config.c
index 1019d3677d553a025784fbb45e4fe420a00ef950..279d00feff2168cde8e936f6e89f716fdf11fe28 100644 (file)
--- a/fs/ksmbd/mgmt/user_config.c
+++ b/fs/ksmbd/mgmt/user_config.c
@@ -67,3 +67,13 @@ int ksmbd_anonymous_user(struct ksmbd_user *user)
                return 1;
        return 0;
 }
+
+bool ksmbd_compare_user(struct ksmbd_user *u1, struct ksmbd_user *u2)
+{
+       if (strcmp(u1->name, u2->name))
+               return false;
+       if (memcmp(u1->passkey, u2->passkey, u1->passkey_sz))
+               return false;
+
+       return true;
+}

diff --git a/fs/ksmbd/mgmt/user_config.h b/fs/ksmbd/mgmt/user_config.h
index aff80b0295790c005a33f6ba6b4a4d4f84f2ef29..6a44109617f149fc3b70e21ae9a85088c4da0ecd 100644 (file)
--- a/fs/ksmbd/mgmt/user_config.h
+++ b/fs/ksmbd/mgmt/user_config.h
@@ -64,4 +64,5 @@ struct ksmbd_user *ksmbd_login_user(const char *account);
 struct ksmbd_user *ksmbd_alloc_user(struct ksmbd_login_response *resp);
 void ksmbd_free_user(struct ksmbd_user *user);
 int ksmbd_anonymous_user(struct ksmbd_user *user);
+bool ksmbd_compare_user(struct ksmbd_user *u1, struct ksmbd_user *u2);
 #endif /* __USER_CONFIG_MANAGEMENT_H__ */

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 22d9fcb5f7ca4fb9eaef6080d91619df07f77d33..c8c2b326ee04256518eb4a32385ca7c11dc06e55 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -1463,10 +1463,16 @@ static int ntlm_authenticate(struct ksmbd_work *work)
                        ksmbd_free_user(user);
                        return 0;
                }
-               ksmbd_free_user(sess->user);
+
+               if (!ksmbd_compare_user(sess->user, user)) {
+                       ksmbd_free_user(user);
+                       return -EPERM;
+               }
+               ksmbd_free_user(user);
+       } else {
+               sess->user = user;
        }
 
-       sess->user = user;
        if (user_guest(sess->user)) {
                rsp->SessionFlags = SMB2_SESSION_FLAG_IS_GUEST_LE;
        } else {
@@ -2071,9 +2077,6 @@ int smb2_session_logoff(struct ksmbd_work *work)
 
        ksmbd_debug(SMB, "request\n");
 
-       /* Got a valid session, set connection state */
-       WARN_ON(sess->conn != conn);
-
        /* setting CifsExiting here may race with start_tcp_sess */
        ksmbd_conn_set_need_reconnect(work);
        ksmbd_close_session_fds(work);
@@ -7302,6 +7305,8 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,
                nii_rsp->IfIndex = cpu_to_le32(netdev->ifindex);
 
                nii_rsp->Capability = 0;
+               if (netdev->real_num_tx_queues > 1)
+                       nii_rsp->Capability |= cpu_to_le32(RSS_CAPABLE);
                if (ksmbd_rdma_capable_netdev(netdev))
                        nii_rsp->Capability |= cpu_to_le32(RDMA_CAPABLE);