Commit 18d46769 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

ksmbd: remove RFC1002 check in smb2 request 



In smb_common.c you have this function :   ksmbd_smb_request() which
is called from connection.c once you have read the initial 4 bytes for
the next length+smb2 blob.

It checks the first byte of this 4 byte preamble for valid values,
i.e. a NETBIOSoverTCP SESSION_MESSAGE or a SESSION_KEEP_ALIVE.

We don't need to check this for ksmbd since it only implements SMB2
over TCP port 445.
The netbios stuff was only used in very old servers when SMB ran over
TCP port 139.
Now that we run over TCP port 445, this is actually not a NB header anymore
and you can just treat it as a 4 byte length field that must be less
than 16Mbyte. and remove the references to the RFC1002 constants that no
longer applies.

Cc: Tom Talpey <tom@talpey.com>
Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Cc: Ralph Böhme <slow@samba.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Acked-by: default avatarHyunchul Lee <hyc.lee@gmail.com>
Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 5816b3e6

fs/ksmbd/smb_common.c

+1 −14
Original line number Diff line number Diff line
@@ -155,20 +155,7 @@ int ksmbd_verify_smb_message(struct ksmbd_work *work) 
 */

bool ksmbd_smb_request(struct ksmbd_conn *conn)

{

	int type = *(char *)conn->request_buf;



	switch (type) {

	case RFC1002_SESSION_MESSAGE:

		/* Regular SMB request */

		return true;

	case RFC1002_SESSION_KEEP_ALIVE:

		ksmbd_debug(SMB, "RFC 1002 session keep alive\n");

		break;

	default:

		ksmbd_debug(SMB, "RFC 1002 unknown request type 0x%x\n", type);

	}



	return false;

	return conn->request_buf[0] == 0;

}



static bool supported_protocol(int idx)

fs/ksmbd/smb_common.h

+0 −8
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ 
#define CIFS_DEFAULT_IOSIZE	(64 * 1024)

#define MAX_CIFS_SMALL_BUFFER_SIZE 448 /* big enough for most */



/* RFC 1002 session packet types */

#define RFC1002_SESSION_MESSAGE			0x00

#define RFC1002_SESSION_REQUEST			0x81

#define RFC1002_POSITIVE_SESSION_RESPONSE	0x82

#define RFC1002_NEGATIVE_SESSION_RESPONSE	0x83

#define RFC1002_RETARGET_SESSION_RESPONSE	0x84

#define RFC1002_SESSION_KEEP_ALIVE		0x85



/* Responses when opening a file. */

#define F_SUPERSEDED	0

#define F_OPENED	1