Commit a58b45a4 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

ksmbd: set RSS capable in FSCTL_QUERY_NETWORK_INTERFACE_INFO 



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: default avatarZiwei Xie <zw.xie@high-flyer.cn>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 305f8bda

fs/ksmbd/mgmt/user_config.c

+10 −0
Original line number Diff line number Diff line
@@ -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;

}

fs/ksmbd/mgmt/user_config.h

+1 −0
Original line number Diff line number Diff line
@@ -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__ */

fs/ksmbd/smb2pdu.c

+10 −5
Original line number Diff line number Diff line
@@ -1448,10 +1448,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;

	}



	if (user_guest(sess->user)) {

		if (conn->sign) {

			ksmbd_debug(SMB, "Guest login not allowed when signing enabled\n");
@@ -2055,9 +2061,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);
@@ -7260,6 +7263,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);