Commit a55dc3cd authored by Namjae Jeon's avatar Namjae Jeon Committed by Zhong Jinghua
Browse files

ksmbd: move credit charge deduction under processing request 

mainline inclusion
from mainline-5.17-rc1
commit 914d7e57
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I60T7G
CVE: NA

Reference: https://git.kernel.org/torvalds/linux/c/914d7e5709ac



-------------------------------

Moves the credit charge deduction from total_credits under the processing
a request. When repeating smb2 lock request and other command request,
there will be a problem that ->total_credits does not decrease.

Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZhong Jinghua <zhongjinghua@huawei.com>
parent 823d3249

fs/ksmbd/smb2misc.c

+2 −5
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn, 
	unsigned int req_len = 0, expect_resp_len = 0, calc_credit_num, max_len;

	unsigned short credit_charge = le16_to_cpu(hdr->CreditCharge);

	void *__hdr = hdr;

	int ret;

	int ret = 0;



	switch (hdr->Command) {

	case SMB2_QUERY_INFO:
@@ -328,10 +328,7 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn, 
	}



	spin_lock(&conn->credits_lock);

	if (credit_charge <= conn->total_credits) {

		conn->total_credits -= credit_charge;

		ret = 0;

	} else {

	if (credit_charge > conn->total_credits) {

		ksmbd_debug(SMB, "Insufficient credits granted, given: %u, granted: %u\n",

			    credit_charge, conn->total_credits);

		ret = 1;

fs/ksmbd/smb2pdu.c

+10 −6
Original line number Diff line number Diff line
@@ -300,9 +300,8 @@ int smb2_set_rsp_credits(struct ksmbd_work *work) 
	struct smb2_hdr *req_hdr = ksmbd_req_buf_next(work);

	struct smb2_hdr *hdr = ksmbd_resp_buf_next(work);

	struct ksmbd_conn *conn = work->conn;

	unsigned short credits_requested;

	unsigned short credits_requested, aux_max;

	unsigned short credit_charge, credits_granted = 0;

	unsigned short aux_max, aux_credits;



	if (work->send_no_response)

		return 0;
@@ -317,6 +316,13 @@ int smb2_set_rsp_credits(struct ksmbd_work *work) 


	credit_charge = max_t(unsigned short,

			      le16_to_cpu(req_hdr->CreditCharge), 1);

	if (credit_charge > conn->total_credits) {

		ksmbd_debug(SMB, "Insufficient credits granted, given: %u, granted: %u\n",

			    credit_charge, conn->total_credits);

		return -EINVAL;

	}



	conn->total_credits -= credit_charge;

	credits_requested = max_t(unsigned short,

				  le16_to_cpu(req_hdr->CreditRequest), 1);
@@ -326,13 +332,11 @@ int smb2_set_rsp_credits(struct ksmbd_work *work) 
	 * TODO: Need to adjuct CreditRequest value according to

	 * current cpu load

	 */

	aux_credits = credits_requested - 1;

	if (hdr->Command == SMB2_NEGOTIATE)

		aux_max = 0;

		aux_max = 1;

	else

		aux_max = conn->vals->max_credits - credit_charge;

	aux_credits = min_t(unsigned short, aux_credits, aux_max);

	credits_granted = credit_charge + aux_credits;

	credits_granted = min_t(unsigned short, credits_requested, aux_max);



	if (conn->vals->max_credits - conn->total_credits < credits_granted)

		credits_granted = conn->vals->max_credits -