SMB2: Fix share type handling (cd123007) · Commits · 戴 / test

In fs/cifs/smb2pdu.h, we have: #define SMB2_SHARE_TYPE_DISK 0x01 #define SMB2_SHARE_TYPE_PIPE 0x02 #define SMB2_SHARE_TYPE_PRINT 0x03 Knowing that, with the current code, the SMB2_SHARE_TYPE_PRINT case can never trigger and printer share would be interpreted as disk share. So, test the ShareType value for equality instead. Fixes: ("CIFS: Add tree connect/disconnect capability for SMB2") Signed-off-by:

Christophe JAILLET <christophe.jaillet@wanadoo.fr> Acked-by:

Aurelien Aptel <aaptel@suse.com> Signed-off-by:

Steve French <smfrench@gmail.com>

fs/cifs/smb2pdu.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -1240,15 +1240,19 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses ses, const char tree,
		goto tcon_exit;
		}

		if (rsp->ShareType & SMB2_SHARE_TYPE_DISK)
		switch (rsp->ShareType) {
		case SMB2_SHARE_TYPE_DISK:
		cifs_dbg(FYI, "connection to disk share\n");
		else if (rsp->ShareType & SMB2_SHARE_TYPE_PIPE) {
		break;
		case SMB2_SHARE_TYPE_PIPE:
		tcon->ipc = true;
		cifs_dbg(FYI, "connection to pipe share\n");
		} else if (rsp->ShareType & SMB2_SHARE_TYPE_PRINT) {
		tcon->print = true;
		break;
		case SMB2_SHARE_TYPE_PRINT:
		tcon->ipc = true;
		cifs_dbg(FYI, "connection to printer\n");
		} else {
		break;
		default:
		cifs_dbg(VFS, "unknown share type %d\n", rsp->ShareType);
		rc = -EOPNOTSUPP;
		goto tcon_error_exit;

Admin message