From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BE071E2838 for ; Mon, 20 Jan 2025 13:57:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737381478; cv=none; b=lv0040wUBhORgCUAv0gA8XrurzscKxKr2rx3mXdaEsZkKb5Fx8lMzFYU4B/hK/Iog6cKFlng4/+zcw9f7d3iaRRoomRkdjHoBHyKlscu38cbb08uzIHE2ZSJ1w/aQNmQxhB4UgvrTZ5KdLaYCF9b31VhKv7G+eCpNfW7TUW6QKY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737381478; c=relaxed/simple; bh=ks3aKUKwkmdseggJO2Iq3bvbuAJ+ioHAeUZSoz3oRdU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=UzfPK+MuLLsdsnpmOCE6B/RrTZXvEPeU2Vb2atM+t+LcasSfn2F3rm5BvvJfxb1tWw9iC9S/VI/6V/7wIEKnZw6zvBUnbpAV4rzClo6/3u8+lGzRrnE5EvLUoJH825mvQv/iTh0mObA6+glbjq23+0D9mPb0ZHcliU1eC4KbBLA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aK9o/IPP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="aK9o/IPP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2FB3C4CEE1; Mon, 20 Jan 2025 13:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1737381478; bh=ks3aKUKwkmdseggJO2Iq3bvbuAJ+ioHAeUZSoz3oRdU=; h=Subject:To:Cc:From:Date:From; b=aK9o/IPPMBlxFlC8To7ZqyCup3ktv0jqalxm6BYqGt7o98jOhJe6b+Ey6m44ltxi8 Gw5hmuN/FbzfyWUeJ12SbpNslmlaTL7EW61l0UCX1R723rlk48lSxL6xG7NEY+EHoM RYwX0umM3SMsBKeABEn36rZxOLo2TbyA45ixJVTY= Subject: FAILED: patch "[PATCH] cifs: support reconnect with alternate password for SMB1" failed to apply to 5.4-stable tree To: msetiya@microsoft.com,stfrench@microsoft.com Cc: From: Date: Mon, 20 Jan 2025 14:57:33 +0100 Message-ID: <2025012032-tidal-chatting-cba2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y git checkout FETCH_HEAD git cherry-pick -x b8ed9da102beb2d0926a1d7a7e652392190151c0 # git commit -s git send-email --to '' --in-reply-to '2025012032-tidal-chatting-cba2@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b8ed9da102beb2d0926a1d7a7e652392190151c0 Mon Sep 17 00:00:00 2001 From: Meetakshi Setiya Date: Fri, 10 Jan 2025 07:10:27 -0500 Subject: [PATCH] cifs: support reconnect with alternate password for SMB1 SMB1 shares the mount and remount code paths with SMB2/3 and already supports password rotation in some scenarios. This patch extends the password rotation support to SMB1 reconnects as well. Cc: stable@vger.kernel.org Signed-off-by: Meetakshi Setiya Signed-off-by: Steve French diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c index 6cb1e81993f8..ab0b949924d7 100644 --- a/fs/smb/client/cifssmb.c +++ b/fs/smb/client/cifssmb.c @@ -152,8 +152,17 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command) spin_unlock(&ses->ses_lock); rc = cifs_negotiate_protocol(0, ses, server); - if (!rc) + if (!rc) { rc = cifs_setup_session(0, ses, server, ses->local_nls); + if ((rc == -EACCES) || (rc == -EHOSTDOWN) || (rc == -EKEYREVOKED)) { + /* + * Try alternate password for next reconnect if an alternate + * password is available. + */ + if (ses->password2) + swap(ses->password2, ses->password); + } + } /* do we need to reconnect tcon? */ if (rc || !tcon->need_reconnect) {