[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  d50fa9c Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.
      from  0921e75 s4-dbcheck: fixed transaction nesting in dbcheck

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d50fa9c21e1c3b6f7126c33e24966099c7567225
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 22 09:06:48 2011 -0700

    Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.
    
    Just drop the connection, not SMB_ASSERT.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Sep 22 19:41:31 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/smbd/smb2_server.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index d1b7ac5..0ffeb48 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -322,8 +322,13 @@ static bool smb2_validate_message_id(struct smbd_server_connection *sconn,
 		return false;
 	}
 
+	if (sconn->smb2.credits_granted == 0) {
+		smbd_server_connection_terminate(sconn, "smb2_validate_message_id: "
+			"terminating connection: client used more credits than granted\n");
+		return false;
+	}
+
 	/* client just used a credit. */
-	SMB_ASSERT(sconn->smb2.credits_granted > 0);
 	sconn->smb2.credits_granted -= 1;
 
 	/* Mark the message_id as seen in the bitmap. */


-- 
Samba Shared Repository