Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2993407imu; Mon, 19 Nov 2018 09:06:12 -0800 (PST) X-Google-Smtp-Source: AJdET5ckfBtk9iC+HDu5PJ5O2upxl6+vUbvcrnjgmWSGtdpn71X0bGRgalFDb8eOwEHlCq3vSRUx X-Received: by 2002:a17:902:110a:: with SMTP id d10-v6mr23423249pla.85.1542647172707; Mon, 19 Nov 2018 09:06:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542647172; cv=none; d=google.com; s=arc-20160816; b=NIhsMrks81O6nUVKCrk8wLM5MHFL2FY+LMbgC216dKWltKvKH1pdwIfDPkxayCEvJ0 nuHIT1+d7xvpYNgjDo5CVLrBMcNM8C9iiTfo9Ur/PHbenJv/gztR/MUqs4C/obAdd2Zq QIwtmeUg+V0Lu/xkm2WvIKsyR6yYfb/e2YXoeb58WSfS400YqtAO8MHIHftHtmmQRfBz P4g46+hox/qckOeLw2fsZXFwlwolOkr/UHDeEDonQ7sVTuzG6AZVlgXzz2urE8SWP47Y SPcgg8r3PMGCfmI/2Nn7Igxiyq1VSouHIhfPhmEwHuVRfo7kUGGGEzsfXjmDgQchyKGX 72Wg== 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=hdhSq87b1QNLQh2enMnHLCtE0lbxnY6oHJ2s8TuOJAQ=; b=BfNZTy0nYeatlSmf4wIpUoZ6kPX0JFYFg4Lp/X0J7wB5NJz1ylntmSP7bnCyI+dsiA t0jvMOzoUCshmTONYObZw1xtriIeasojbw5MBtyV5vVMjab9xuXVDHT0/Bj/W4nwnyZl hbKFb2IHIF0bKJEhjwO/9w5xem9KEjs9ymQMnoCCU036OjUxBmGn7eCvlI9R42ZSuu39 Frk8Za9DN7i8teAft4u58lyF1PKsLpqfvwNgEnaQ3zAfIR1Aoi+TVhEGHborCNKqjyFw cRoHRl3LJVnRQegbXcxdGm1ebLsbthgEjJeIOtxXqn3ff/UChMcXfqv1frVK12R7oTJf XQGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="kPJrcs/Q"; 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 a34si38677914pgb.458.2018.11.19.09.05.56; Mon, 19 Nov 2018 09:06:12 -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="kPJrcs/Q"; 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 S2406570AbeKTD2u (ORCPT + 99 others); Mon, 19 Nov 2018 22:28:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:43296 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405880AbeKTD2t (ORCPT ); Mon, 19 Nov 2018 22:28:49 -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 7BC2F214D9; Mon, 19 Nov 2018 17:04:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542647072; bh=p+zeSzI+Q6RzvQ6WW4094Ej0dXwSLwBVKGzbIVvptcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kPJrcs/QAbD9uMQK91heSIv3M29c4VqhgR0CG00dtw18jYvffTnGtZ0Bd5FCTKP+4 29sgBvgUL8f48mR4njZWamSBEhnHJYHO97BTPKuBmVjuSJRsOCZJ3L8ophU7xOS8i9 qsDz+EApQdAH5IcCmouVUHg8+9dPaD73xmKXniQo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve French , Ronnie Sahlberg Subject: [PATCH 3.18 40/90] smb3: do not attempt cifs operation in smb3 query info error path Date: Mon, 19 Nov 2018 17:29:22 +0100 Message-Id: <20181119162627.243558835@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162620.585061184@linuxfoundation.org> References: <20181119162620.585061184@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 3.18-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 @@ -741,7 +741,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) {