The branch, v3-6-test has been updated
via 24ac26d Fix bug #8686 - Packet validation checks can be done before
length validation causing uninitialized memory read.
from 0453544 Fix bug #8687 - net memberships usage info is wrong
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf
Author: Volker Lendecke <volker.lende...@sernet.de>
Date: Wed Jan 4 11:09:54 2012 -0800
Fix bug #8686 - Packet validation checks can be done before length
validation causing uninitialized memory read.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/process.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index b370423..5aa19cb 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1442,8 +1442,8 @@ static connection_struct *switch_message(uint8 type,
struct smb_request *req, in
/* Make sure this is an SMB packet. smb_size contains NetBIOS header
* so subtract 4 from it. */
- if (!valid_smb_header(req->inbuf)
- || (size < (smb_size - 4))) {
+ if ((size < (smb_size - 4)) ||
+ !valid_smb_header(req->inbuf)) {
DEBUG(2,("Non-SMB packet of length %d. Terminating server\n",
smb_len(req->inbuf)));
exit_server_cleanly("Non-SMB packet");
--
Samba Shared Repository
