diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-06-26 14:28:07 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-29 00:14:54 +0200 |
| commit | 4fe41c0bb14f6ae7e52aa7f180e66c7695eb6fa0 (patch) | |
| tree | 06414965d1d469d5092e57ab8de72609c30bfb0f | |
| parent | 984fdaf9149d96d0d28600443981d87d13eb355c (diff) | |
| download | samba-4fe41c0bb14f6ae7e52aa7f180e66c7695eb6fa0.tar.gz samba-4fe41c0bb14f6ae7e52aa7f180e66c7695eb6fa0.tar.bz2 samba-4fe41c0bb14f6ae7e52aa7f180e66c7695eb6fa0.zip | |
s3:smb2_server: check the credit_charge against the already granted credits
metze
| -rw-r--r-- | source3/smbd/smb2_server.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index c4d7d926d1..872e5b9dce 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -371,13 +371,6 @@ static bool smb2_validate_message_id(struct smbd_server_connection *sconn, return true; } - if (sconn->smb2.credits_granted == 0) { - DEBUG(0,("smb2_validate_message_id: client used more " - "credits than granted, message_id (%llu)\n", - (unsigned long long)message_id)); - return false; - } - if (sconn->smb2.supports_multicredit) { credit_charge = SVAL(inhdr, SMB2_HDR_CREDIT_CHARGE); credit_charge = MAX(credit_charge, 1); @@ -391,6 +384,18 @@ static bool smb2_validate_message_id(struct smbd_server_connection *sconn, (unsigned long long) sconn->smb2.max_credits, (unsigned long long) sconn->smb2.seqnum_low)); + if (sconn->smb2.credits_granted < credit_charge) { + DEBUG(0, ("smb2_validate_message_id: client used more " + "credits than granted, mid %llu, credits_granted %llu, " + "charge %llu, max_credits %llu, seqnum_low: %llu\n", + (unsigned long long) message_id, + (unsigned long long) sconn->smb2.credits_granted, + (unsigned long long) credit_charge, + (unsigned long long) sconn->smb2.max_credits, + (unsigned long long) sconn->smb2.seqnum_low)); + return false; + } + /* * now check the message ids * |