Commit 7cb453e5 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Greg Kroah-Hartman

CIFS: Fix credit calculations in compound mid callback

[ Upstream commit 3d3003fc ]

The current code doesn't do proper accounting for credits
in SMB1 case: it adds one credit per response only if we get
a complete response while it needs to return it unconditionally.
Fix this and also include malformed responses for SMB2+ into
accounting for credits because such responses have Credit
Granted field, thus nothing prevents to get a proper credit
value from them.
Signed-off-by: default avatarPavel Shilovsky <>
Reviewed-by: default avatarRonnie Sahlberg <>
Signed-off-by: default avatarSteve French <>
Signed-off-by: default avatarSasha Levin <>
parent fe182af7
......@@ -154,7 +154,11 @@ smb2_get_credits(struct mid_q_entry *mid)
struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)mid->resp_buf;
return le16_to_cpu(shdr->CreditRequest);
if (mid->mid_state == MID_RESPONSE_RECEIVED
|| mid->mid_state == MID_RESPONSE_MALFORMED)
return le16_to_cpu(shdr->CreditRequest);
return 0;
static int
......@@ -784,17 +784,8 @@ static void
cifs_compound_callback(struct mid_q_entry *mid)
struct TCP_Server_Info *server = mid->server;
unsigned int optype = mid->optype;
unsigned int credits_received = 0;
if (mid->mid_state == MID_RESPONSE_RECEIVED) {
if (mid->resp_buf)
credits_received = server->ops->get_credits(mid);
cifs_dbg(FYI, "Bad state for cancelled MID\n");
add_credits(server, credits_received, optype);
add_credits(server, server->ops->get_credits(mid), mid->optype);
static void
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment