Fix bug #8686 - Packet validation checks can be done before length validation causing...

(cherry picked from commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf)
(cherry picked from commit 93c76f96b82ec27be97c390cd1ef5d965766e273)

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 634af0099346a9fe0e9b3b6bfc67d5d6871cece3..cb8600a83665d761fe12eaa2775f06c3664a252b 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1273,8 +1273,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");