ksmbd: fix outstanding credits related bugs
Subsystems (3)
PATCH v3 1/1 ksmbd: fix outstanding credits related bugs
outstanding credits must be initialized to 0,
because it means the sum of credits consumed by
in-flight requests.
And outstanding credits must be compared with
total credits in smb2_validate_credit_charge(),
because total credits are the sum of credits
granted by ksmbd.
This patch fix the following error,
while frametest with Windows clients:
Limits exceeding the maximum allowable outstanding requests, given : 128, pending : 8065
---
changes from v2:
- fix underflow issue of outstanding credits while mutli-protocol negotiation with an Windows client
changes from v1:
- Add "Fixes" and stable tags
fs/ksmbd/connection.c | 2 +- fs/ksmbd/smb2misc.c | 2 +- fs/ksmbd/smb_common.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-)
fs/ksmbd/connection.c +1 -1
@@ -62,7 +62,7 @@ struct ksmbd_conn *ksmbd_conn_alloc(void)atomic_set (&conn->req_running,0 );atomic_set (&conn->r_count,0 ); conn->total_credits =1 ; - conn->outstanding_credits =1 ; + conn->outstanding_credits =0 ;init_waitqueue_head (&conn->req_running_q);INIT_LIST_HEAD (&conn->conns_list);
fs/ksmbd/smb2misc.c +1 -1
@@ -338,7 +338,7 @@ static int smb2_validate_credit_charge(struct ksmbd_conn *conn, ret =1 ; } -if ((u64 )conn->outstanding_credits + credit_charge > conn->vals->max_credits) { +if ((u64 )conn->outstanding_credits + credit_charge > conn->total_credits) {ksmbd_debug (SMB ,"Limits exceeding the maximum allowable outstanding requests, given : %u, pending : %u\n" , credit_charge, conn->outstanding_credits); ret =1 ;
fs/ksmbd/smb_common.c +3 -1
@@ -140,8 +140,10 @@ int ksmbd_verify_smb_message(struct ksmbd_work *work) hdr = work->request_buf;if (*(__le32 *)hdr->Protocol ==SMB1_PROTO_NUMBER && - hdr->Command ==SMB_COM_NEGOTIATE ) + hdr->Command ==SMB_COM_NEGOTIATE ) { + work->conn->outstanding_credits +=1 ;return 0 ; + }return -EINVAL ; }
Signature · 1 line
2.17.1
2022-05-20 14:35 GMT+09:00, Hyunchul Lee <[email protected]>:
Quoted 14 lines
outstanding credits must be initialized to 0,
because it means the sum of credits consumed by
in-flight requests.
And outstanding credits must be compared with
total credits insmb2_validate_credit_charge(),
because total credits are the sum of credits
granted by ksmbd.This patch fix the following error,
while frametest with Windows clients:Limits exceeding the maximum allowable outstanding requests, given : 128, pending : 8065
Quoted 6 lines
Fixes b589f5db6d4a ("ksmbd: limits exceeding the maximum allowableoutstanding requests")
Signed-off-by Hyunchul Lee <[email protected]>Reported-by Yufan Chen <[email protected]>Tested-by Yufan Chen <[email protected]>
Thanks!