[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4156-gfba250e

[Volker Lendecke]

The branch, v3-devel has been updated
       via  fba250ece45f6632c7d89b0ea28baab047e41a8f (commit)
       via  8b81b85200b7ca18cf81fdbbc3254d8578b35f43 (commit)
      from  768aa82361a2c4b0aab71433b7593723a2868f0a (commit)

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


- Log -----------------------------------------------------------------
commit fba250ece45f6632c7d89b0ea28baab047e41a8f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Sep 12 21:20:02 2008 +0200

    remove a pointless empty line

commit 8b81b85200b7ca18cf81fdbbc3254d8578b35f43
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Sep 12 21:19:37 2008 +0200

    Add a paranoia check on incoming PDUs

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

Summary of changes:
 source/libsmb/async_smb.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index eedc7d4..79999b5 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -756,7 +756,13 @@ static void handle_incoming_pdu(struct cli_state *cli)
 				goto invalidate_requests;
 			}
 		}
+	}
 
+	if ((IVAL(pdu, 4) != 0x424d53ff) /* 0xFF"SMB" */
+	    && (IVAL(pdu, 4) != 0x424d45ff)) /* 0xFF"EMB" */ {
+		DEBUG(10, ("Got non-SMB PDU\n"));
+		status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+		goto invalidate_requests;
 	}
 
 	/*


-- 
Samba Shared Repository