From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47362 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752108AbdDKDlv (ORCPT ); Mon, 10 Apr 2017 23:41:51 -0400 Date: Tue, 11 Apr 2017 05:41:42 +0200 From: Greg Kroah-Hartman To: Pavel Shilovskiy Cc: Stable , Steve French Subject: Re: [PATCH] CIFS: Remove encryption from the capabilities flags Message-ID: <20170411034142.GA28032@kroah.com> References: <1488237604-10798-1-git-send-email-pshilov@microsoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: stable-owner@vger.kernel.org List-ID: On Mon, Apr 10, 2017 at 09:29:41PM +0000, Pavel Shilovskiy wrote: > On Mon, Feb 27, 2017 at 5:20 PM, Pavel Shilovsky wrote: > > Currently the client claims to support encryption but it doesn't. > > This results in rejecting TreeConnect requests by a server that > > expects them to be encrypted. Fix it by removing encryption from the > > capabilities flags. This problem affects kernels from v4.5 to v4.10. > > > > Cc: Steve French > > Cc: Stable # v4.5-v4.10 > > Signed-off-by: Pavel Shilovsky > > --- > > fs/cifs/smb2ops.c | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index > > 5d456eb..87a58f0 100644 > > --- a/fs/cifs/smb2ops.c > > +++ b/fs/cifs/smb2ops.c > > @@ -1925,7 +1925,9 @@ struct smb_version_values smb21_values = { > > struct smb_version_values smb30_values = { > > .version_string = SMB30_VERSION_STRING, > > .protocol_id = SMB30_PROT_ID, > > - .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION, > > + .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING > > + | SMB2_GLOBAL_CAP_LARGE_MTU > > + | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES, > > .large_lock_type = 0, > > .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK, > > .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK, @@ -1945,7 > > +1947,9 @@ struct smb_version_values smb30_values = { struct > > smb_version_values smb302_values = { > > .version_string = SMB302_VERSION_STRING, > > .protocol_id = SMB302_PROT_ID, > > - .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION, > > + .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING > > + | SMB2_GLOBAL_CAP_LARGE_MTU > > + | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES, > > .large_lock_type = 0, > > .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK, > > .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK, > > -- > > 2.7.4 > > > > Do you have any update on this patch? It seems suitable at least for 4.9 and 4.10 kernels. What was the commit id for this in Linus's tree? Did you read Documentation/stable_kernel_rules.txt for how to get something merged into a stable kernel? If this isn't in Linus's tree, I need a whole lot of text explaining that, and some signed-off-by from the maintainers. None of which happened here, which is why it is long gone from my patch queue. thanks, greg k-h