Patch "SMB2: Fix share type handling" has been added to the 4.4-stable tree
This is a note to let you know that I've just added the patch titled
SMB2: Fix share type handling
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
smb2-fix-share-type-handling.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Apr 10 10:31:53 CEST 2018
From: Christophe JAILLET <[email protected]>
Date: Fri, 12 May 2017 17:59:32 +0200
Subject: SMB2: Fix share type handling
From: Christophe JAILLET <[email protected]>
[ Upstream commit cd1230070ae1c12fd34cf6a557bfa81bf9311009 ]
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.
--- fs/cifs/smb2pdu.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
fs/cifs/smb2pdu.c +9 -5
@@ -999,15 +999,19 @@ SMB2_tcon(const unsigned int xid, struct 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;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/cpuidle-dt-add-missing-of_node_put.patch queue-4.4/edac-mv64x60-fix-an-error-handling-path.patch queue-4.4/smb2-fix-share-type-handling.patch queue-4.4/asoc-intel-sst-fix-the-return-value-of-sst_send_byte_stream_mrfld.patch