[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  3c35914 s3: Fix input check in is_encrypted_packet
      from  b0d0af8 Fix bug 7716 - acl_xattr and acl_tdb modules don't store unmodified copies of security descriptors.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 3c35914be1ce5f7ca4734066db3ce246c50587fb
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 6 17:40:58 2010 +0200

    s3: Fix input check in is_encrypted_packet

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

Summary of changes:
 source3/smbd/seal.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 0cf730e..1d8d464 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -55,7 +55,9 @@ bool is_encrypted_packet(const uint8_t *inbuf)
 	uint16_t enc_num;
 
 	/* Ignore non-session messages or non 0xFF'E' messages. */
-	if(CVAL(inbuf,0) || !(inbuf[4] == 0xFF && inbuf[5] == 'E')) {
+	if(CVAL(inbuf,0)
+	   || (smb_len(inbuf) < 8)
+	   || !(inbuf[4] == 0xFF && inbuf[5] == 'E')) {
 		return false;
 	}
 


-- 
Samba Shared Repository