Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1018986yba; Thu, 4 Apr 2019 02:33:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqwoIAw+eerx0jcbFYltCFLX0NNXHcZJz8ieRwdrj75er+DOAGIGqI6nXmwGZ9dE0gT5Jbws X-Received: by 2002:aa7:8ac8:: with SMTP id b8mr4787845pfd.234.1554370403754; Thu, 04 Apr 2019 02:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554370403; cv=none; d=google.com; s=arc-20160816; b=nDRQlPaJSEncXUaFdrRdSOx5ptmfAVyzNsuKEnQBS/FucNshzbtd5VPOK6zLfL79et WwnkR4MK3bbVOJz09XwKfLDQY59atsSsDCozJkB07UTO7u//zufVCwd0YnSqaCmNTdqn vseHKNwDV1YMiD09x6cSt3T0A6s/4P2D8ylGYhfx5NkFtYo4Tit2Ekhuw5EVHRvvLOsI AKaJyQPCSrOAMS38dkbh2EAxDng8Er+MsyfY49MTJ/PHMM4phm78E6qyg/qAlhqKtcCr L0yWgL6wiN91FgRYxKBAOgwSWn+f9IHGxJvhW+G3cGSMbIqbOfrAMgvkeBCWyt9ITl7c TQgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yIAG61Wycfl6oAnqvSv2b29CheT7du/Ksx2DWKrH/r4=; b=mI1vWQXYLW1yAz6jju3V29BGAvo0dB9XJIh9ZP2fONK3uUaeIkhLCnKK5k+lwhPvd3 F64De7o+HARwlfLP4o2qBcIGD0iGn6K0t2xxKkA4g9aASk2lIHPZudsBd0UILw1R6qy8 791ngyKrW7aAvTAvtthpUhsghOxpag76Ny9YnaN7yzNmeTbiXpiHrauvIVPz06FzLuAh bFgGveOEDqLk2hJ/7dJMUboscNfuWffs1d0LyqgXY2UKo0At/T5pORKigH/CNgQOS4Dy yp2gz0DMX//TftTrU2UIOMe3TGAv3AbHknIziw2JPl/iroZw/01ZWWnGWfn2u7PQxVjV +BYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BMVdKDY1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j24si11660907pll.286.2019.04.04.02.33.08; Thu, 04 Apr 2019 02:33:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BMVdKDY1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732981AbfDDJbA (ORCPT + 99 others); Thu, 4 Apr 2019 05:31:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:48970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732866AbfDDJJl (ORCPT ); Thu, 4 Apr 2019 05:09:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F276820693; Thu, 4 Apr 2019 09:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368980; bh=qbkwKAx67sh2p/AhNiHXlPuy10+HA4VUvrX6Mz1jqf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BMVdKDY1ofvjBkFRkSv8UOjnmwyBBoTvNZZwwCsizBCO767a0eALfycFWE4lpTJd/ TV9vXg5Shra+eucbQ9wzVuts6GVnWFj4qKePgoTumc5CJwO+pbnAo8Ci+9fREORCIR AB+z9jACe66ILmW4ikizIOz69S3LggMrB+xRPWUI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 5.0 045/246] cifs: Accept validate negotiate if server return NT_STATUS_NOT_SUPPORTED Date: Thu, 4 Apr 2019 10:45:45 +0200 Message-Id: <20190404084620.605241308@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084619.236418459@linuxfoundation.org> References: <20190404084619.236418459@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 969ae8e8d4ee54c99134d3895f2adf96047f5bee ] Old windows version or Netapp SMB server will return NT_STATUS_NOT_SUPPORTED since they do not allow or implement FSCTL_VALIDATE_NEGOTIATE_INFO. The client should accept the response provided it's properly signed. See https://blogs.msdn.microsoft.com/openspecification/2012/06/28/smb3-secure-dialect-negotiation/ and MS-SMB2 validate negotiate response processing: https://msdn.microsoft.com/en-us/library/hh880630.aspx Samba client had already handled it. https://bugzilla.samba.org/attachment.cgi?id=13285&action=edit Signed-off-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/smb2pdu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 104905732fbe..53642a237bf9 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -986,8 +986,14 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon) rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, FSCTL_VALIDATE_NEGOTIATE_INFO, true /* is_fsctl */, (char *)pneg_inbuf, inbuflen, (char **)&pneg_rsp, &rsplen); - - if (rc != 0) { + if (rc == -EOPNOTSUPP) { + /* + * Old Windows versions or Netapp SMB server can return + * not supported error. Client should accept it. + */ + cifs_dbg(VFS, "Server does not support validate negotiate\n"); + return 0; + } else if (rc != 0) { cifs_dbg(VFS, "validate protocol negotiate failed: %d\n", rc); rc = -EIO; goto out_free_inbuf; -- 2.19.1