s3: Check for the packet size before accessing it

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Jan  4 15:16:20 CET 2012 on sn-devel-104

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index c44826778188f13bcaf4358cc1628e897598e310..f366600ab8f82c3adee2ab709e80ca6ccc8243f7 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1409,8 +1409,7 @@ 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(sconn, req->inbuf)
-           || (size < (smb_size - 4))) {
+       if ((size < (smb_size - 4)) || !valid_smb_header(sconn, req->inbuf)) {
                DEBUG(2,("Non-SMB packet of length %d. Terminating server\n",
                         smb_len(req->inbuf)));
                exit_server_cleanly("Non-SMB packet");