Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2986287imu; Mon, 19 Nov 2018 09:01:15 -0800 (PST) X-Google-Smtp-Source: AJdET5dbTpbAa03ZIJRkl45TYbMBZLI5BewQhoC9gE8pAbqTpinX6/XAJt2z3b9un0rBAlkKVPlM X-Received: by 2002:a63:e001:: with SMTP id e1mr20939238pgh.39.1542646875654; Mon, 19 Nov 2018 09:01:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542646875; cv=none; d=google.com; s=arc-20160816; b=adWaDOYcpy4HCnByqog/11y8J7dYFFeszp6w2yYKLaLCkORglI6e/lxbJ2J7pGKHf1 B67gqMDFV/Kn664G5pXLnQxazyaTS1uTMa3AGBtIGB5GDw0azWZRyWvKWQwq1sKTX1LR WSJj4Lrm2PoziCESOPJEDYajoxUlrUig5nN1koGTvRO/Rccnmdz7p6wAV0ge7EJztHFE DMD9ZBe8SXDcKsjYViWcALE3o4KUQDFJ607UCuL4P1f8gnO1u6MM1kIuH+ff6fZaydC/ GSQELKd1SDEAL8KLhHuY+9KFvPpQ+qiUPxHMf9yR/uvkB2ufP4ciwxMEY7i1n0QQrusc mzSA== 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=1ypHGJKVwl1RbRMrgZTMU9nuYG1hyeq+MrI9Ezswa7Q=; b=kZwQSj3en6xg7p5gtLQN10gZYNTk4oDpCmo/brpaZZDXCn++dy5nzaUHfJMilh0fn/ z12rXI2ruAtB0DTkWU+cR+mV0pZ33A0F4Id9bjwEZWTGteQDCcOH1oA9HMjZjAC6ssOy abZoUWL4uhs5z+FzFKfgvbS+mWT2ByL16z37eD3Eq9oYhr1Y8IDAI74kBjYSkQubLw4d 6J7t45ZAt44SMK6fAKDyRoRMHhSi02vSdF8j7GQSz0xCwE+Frk8W+ennMnwPgunvDj7K Sy4mZm8y7Tsjc81xTyumTCsnFkNOV/+k143iPheN9W8k9VbfKrbaGKVAc6GQgSBn/5wO z3Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iQIAEXf7; 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 k19-v6si40495331pls.211.2018.11.19.09.01.00; Mon, 19 Nov 2018 09:01:15 -0800 (PST) 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=iQIAEXf7; 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 S2404980AbeKTDXO (ORCPT + 99 others); Mon, 19 Nov 2018 22:23:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:35144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403980AbeKTDXM (ORCPT ); Mon, 19 Nov 2018 22:23:12 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 1DE5D2148E; Mon, 19 Nov 2018 16:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542646737; bh=WahMsRuBxL2nAPrJ4ZMmfi3Zbuo215R7x1p6PJeM/dw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iQIAEXf7HXCBHUOfkQqU/5Hruijzv54TORRb7r3O6Nlu7z7C8xBOPKl0L55weOZfY HEmNobmpW2V2bdQsLDVNQqVaVm/8neHBmTFQmUodwcSiiwDh8Du8KTJtnKuA2MO6Se 6EG6lHPw/08Fn3tP82tlOafzFEeURy8a+v1iB1AI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve French , Ronnie Sahlberg Subject: [PATCH 4.4 064/160] smb3: do not attempt cifs operation in smb3 query info error path Date: Mon, 19 Nov 2018 17:28:23 +0100 Message-Id: <20181119162637.594941192@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162630.031306128@linuxfoundation.org> References: <20181119162630.031306128@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steve French commit 1e77a8c204c9d1b655c61751b8ad0fde22421dbb upstream. If backupuid mount option is sent, we can incorrectly retry (on access denied on query info) with a cifs (FindFirst) operation on an smb3 mount which causes the server to force the session close. We set backup intent on open so no need for this fallback. See kernel bugzilla 201435 Signed-off-by: Steve French CC: Stable Reviewed-by: Ronnie Sahlberg Signed-off-by: Greg Kroah-Hartman --- fs/cifs/inode.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -756,7 +756,15 @@ cifs_get_inode_info(struct inode **inode } else if (rc == -EREMOTE) { cifs_create_dfs_fattr(&fattr, sb); rc = 0; - } else if (rc == -EACCES && backup_cred(cifs_sb)) { + } else if ((rc == -EACCES) && backup_cred(cifs_sb) && + (strcmp(server->vals->version_string, SMB1_VERSION_STRING) + == 0)) { + /* + * For SMB2 and later the backup intent flag is already + * sent if needed on open and there is no path based + * FindFirst operation to use to retry with + */ + srchinf = kzalloc(sizeof(struct cifs_search_info), GFP_KERNEL); if (srchinf == NULL) {