shithub: riscv

Info  •  Files  •  Log  •  Branches

cifsd: clarify SMBv1 is supported, not SMB 2/3.

SMB 2/3 is not supported by cifsd, so clarify that in the man page and update teh code to mention in the log file if SMB2/3 is attempted. Also, while in the code, fix a typo, add a few more commands to the explicitly unsupported list, and align the return value for unsupported calls to the SMBv1 spec.

--- a/sys/man/8/cifsd

+++ b/sys/man/8/cifsd

@@ -1,6 +1,6 @@

 .TH CIFSD 8

 .SH NAME

-cifsd \- CIFS/SMB network daemon

+cifsd \- CIFS/SMBv1 network daemon

 .SH SYNOPSIS

 .PP

 .B ip/cifsd

@@ -25,6 +25,7 @@

 exports filesystems to

 .SM CIFS or

 .SM SMB

+version 1

 clients like Microsoft \(tm Windows.

 .PP

 It is normally started by the network listen process via the

--- a/sys/src/cmd/ip/cifsd/dat.h

+++ b/sys/src/cmd/ip/cifsd/dat.h

@@ -139,9 +139,11 @@

 	STATUS_SMB_BAD_TID				= 0x00050002,

 	STATUS_SMB_BAD_FID				= 0x00060001,

 	STATUS_OS2_INVALID_ACCESS		= 0x000C0001,

+	STATUS_SMB_BAD_COMMAND			= 0x00160002,

 	STATUS_SMB_BAD_UID				= 0x005B0002,

 	STATUS_OS2_INVALID_LEVEL  		= 0x007C0001,

 	STATUS_NO_MORE_FILES			= 0x80000006,

+	STATUS_NOT_IMPLEMENTED			= 0xC0000002,

 	STATUS_INVALID_HANDLE			= 0xC0000008,

 	STATUS_NO_SUCH_FILE				= 0xC000000F,

 	STATUS_ACCESS_DENIED			= 0xC0000022,

--- a/sys/src/cmd/ip/cifsd/main.c

+++ b/sys/src/cmd/ip/cifsd/main.c

@@ -7,6 +7,7 @@

 	LENHDR = 4,

 	MAGIC = 0xFF | ('S'<<8) | ('M'<<16) | ('B'<<24),

+	MAGIC_SMB2 = 0xFE | ('S'<<8) | ('M'<<16) | ('B'<<24),

 	SMB_FLAGS_CASE_INSENSITIVE = 0x08,

 	SMB_FLAGS_CANONICALIZED_PATHS = 0x10,

@@ -88,8 +89,8 @@

 		exits("botch");

 		return;

 	}

-	if(magic != MAGIC){

-		logit("bad smb magic");

+	if(magic != MAGIC) {

+		logit("bad smb magic [%x] %s", magic, (magic == MAGIC_SMB2 ? "(SMB2/3 not supported)" : ""));

 		exits("botch");

 		return;

 	}

--- a/sys/src/cmd/ip/cifsd/smb.c

+++ b/sys/src/cmd/ip/cifsd/smb.c

@@ -135,7 +135,7 @@

 			free(mcr);

 		}

 		remoteuser = getuser();

-		logit("auth successfull");

+		logit("auth successful");

 		break;

 	}

 	sessionuid = (namehash(getuser()) & 0x7FFF) | 1;

@@ -794,6 +794,12 @@

 }

 void

+smbstatusnotimplemented(Req *r, uchar *, uchar *, uchar *)

+{

+	r->respond(r, STATUS_NOT_IMPLEMENTED);

+}

+

+void

 smbecho(Req *r, uchar *h, uchar *p, uchar *e)

 {

 	uchar *t, *d, *de;

@@ -1711,7 +1717,7 @@

 void

 smbnoandxcommand(Req *r, uchar *, uchar *, uchar *)

 {

-	r->respond(r, (r->cmd == 0xFF) ? STATUS_INVALID_SMB : 0);

+	r->respond(r, (r->cmd == 0xFF) ? STATUS_SMB_BAD_COMMAND : 0);

 }

 struct {

@@ -1731,6 +1737,10 @@

 	[0x23] { "SMB_COM_QUERY_INFORMATION2", smbqueryinformation2 },

 	[0x24] { "SMB_COM_LOCKING_ANDX", smblockingandx },

 	[0x25] { "SMB_COM_TRANSACTION", smbtransaction },

+	[0x27] { "SMB_COM_IOCTL", smbstatusnotimplemented },

+	[0x28] { "SMB_COM_IOCTL_SECONDARY", smbstatusnotimplemented },

+	[0x29] { "SMB_COM_COPY", smbstatusnotimplemented },

+	[0x2a] { "SMB_COM_MOVE", smbstatusnotimplemented },

 	[0x2b] { "SMB_COM_ECHO", smbecho },

 	[0x2d] { "SMB_COM_OPEN_ANDX", smbopenandx },

 	[0x2e] { "SMB_COM_READ_ANDX", smbreadandx },

@@ -1737,6 +1747,7 @@

 	[0x2f] { "SMB_COM_WRITE_ANDX", smbwriteandx },

 	[0x32] { "SMB_COM_TRANSACTION2", smbtransaction },

 	[0x34] { "SMB_COM_FIND_CLOSE2", smbcloseflush },

+	[0x40] { "SMB_IOS", smbnoandxcommand },

 	[0x71] { "SMB_COM_DISCONNECT_TREE", smbdisconnecttree },

 	[0x72] { "SMB_COM_NEGOTIATE", smbnegotiate },

 	[0x73] { "SMB_COM_SESSION_SETUP_ANX", smbsessionsetupandx },

@@ -1750,6 +1761,7 @@

 void

 smbcmd(Req *r, int cmd, uchar *h, uchar *p, uchar *e)

 {

+	logit("processing [%.2x] command", cmd);

 	if((cmd >= nelem(optab)) || (optab[cmd].fun == nil)){

 		logit("[%.2x] command not implemented", cmd);

 		r->respond(r, STATUS_NOT_SUPPORTED);