Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd123007 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Steve French
Browse files

SMB2: Fix share type handling 



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: faaf946a ("CIFS: Add tree connect/disconnect capability for SMB2")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent ecdcf622

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;