From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8902EC3F68F for ; Thu, 13 Feb 2020 15:23:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57DB72469A for ; Thu, 13 Feb 2020 15:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607397; bh=34JpyfKjva3rhXTyg4I/8Ci1RhB0a4u9w93euC206PY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m9UgIQzcH0qc1C2jBI730a8QrbLrbA9kYhvsCOUsP41mcBQM2bijAVGJiGfhkrMi2 EDAIz4N52qku3k3NnyLJ+y0sAlzUX5YPDn5vHql5h1XDqMvJdb/nkY46ZblJXqENkl re021fwPxBpz9FxdgLsqHPphpUoW95JX4zdezQkY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728324AbgBMPXQ (ORCPT ); Thu, 13 Feb 2020 10:23:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:33858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728316AbgBMPXP (ORCPT ); Thu, 13 Feb 2020 10:23:15 -0500 Received: from localhost (unknown [104.132.1.104]) (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 7904A24699; Thu, 13 Feb 2020 15:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607395; bh=34JpyfKjva3rhXTyg4I/8Ci1RhB0a4u9w93euC206PY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dd+iV0wPL4lqFPSjL2FdTnCYzOY5dT4ddr+01XDa7DPGDPsqHAPvOpoYj3yW/ZQFN 80trYdEZD3cczkB6zJNmDpqcw2QDLW1gb/y0pye4VOtkbsIwBv1gauP9SAQBmBeyh3 C503O2JA9fd0dvxFaSfK190dOaA8y4wz5R0zb1Ic= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ronnie Sahlberg , Steve French Subject: [PATCH 4.4 76/91] cifs: fail i/o on soft mounts if sessionsetup errors out Date: Thu, 13 Feb 2020 07:20:33 -0800 Message-Id: <20200213151851.774679691@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151821.384445454@linuxfoundation.org> References: <20200213151821.384445454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ronnie Sahlberg commit b0dd940e582b6a60296b9847a54012a4b080dc72 upstream. RHBZ: 1579050 If we have a soft mount we should fail commands for session-setup failures (such as the password having changed/ account being deleted/ ...) and return an error back to the application. Signed-off-by: Ronnie Sahlberg Signed-off-by: Steve French CC: Stable Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2pdu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -250,9 +250,14 @@ smb2_reconnect(__le16 smb2_command, stru */ mutex_lock(&tcon->ses->session_mutex); rc = cifs_negotiate_protocol(0, tcon->ses); - if (!rc && tcon->ses->need_reconnect) + if (!rc && tcon->ses->need_reconnect) { rc = cifs_setup_session(0, tcon->ses, nls_codepage); - + if ((rc == -EACCES) && !tcon->retry) { + rc = -EHOSTDOWN; + mutex_unlock(&tcon->ses->session_mutex); + goto failed; + } + } if (rc || !tcon->need_reconnect) { mutex_unlock(&tcon->ses->session_mutex); goto out; @@ -286,6 +291,7 @@ out: case SMB2_SET_INFO: rc = -EAGAIN; } +failed: unload_nls(nls_codepage); return rc; }