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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 3DE78C43219 for ; Tue, 30 Apr 2019 11:44:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B7A721734 for ; Tue, 30 Apr 2019 11:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624663; bh=mhXp3yi9SmczJXGFbcmNB5kdXerbdBiyCIswjE75ejQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GM1lRFkftMDyBw1haIOBSvDvfcHjCQWxU2Ej3eWcpLHDsD3RSNjPRnWHL1tZfHORV 9rvh6oE3S8qeljVOzNHvND4kkARGV5wqPD8axthTItOW8V8+jVsC6AiPycwSJbPcsL RYPCvdjTQflLfpoSwNltivVZrNfAqQ/GfJVC0Xhw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730174AbfD3LoV (ORCPT ); Tue, 30 Apr 2019 07:44:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:55472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730162AbfD3LoT (ORCPT ); Tue, 30 Apr 2019 07:44:19 -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 4400021670; Tue, 30 Apr 2019 11:44:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624658; bh=mhXp3yi9SmczJXGFbcmNB5kdXerbdBiyCIswjE75ejQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eFHCdZGqmNR0Or7ReHgEPN2NC9cG4jHLDPnGorM5rPXJAUluaNT+CW2UI6r8fKBYx Py+IFuXgNG34t84j7Bz77tZV9uGgbm4l+3bBUQd9XYyOjUxCWfJ35Zl3vqfQL1kxj8 SmeCPhhDw4CTEKQe7d1rH8e3ZCGtxy7k05XNeiAs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Frank Sorenson , Steve French , Ronnie Sahlberg Subject: [PATCH 4.19 024/100] cifs: do not attempt cifs operation on smb2+ rename error Date: Tue, 30 Apr 2019 13:37:53 +0200 Message-Id: <20190430113610.027990865@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113608.616903219@linuxfoundation.org> References: <20190430113608.616903219@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Frank Sorenson commit 652727bbe1b17993636346716ae5867627793647 upstream. A path-based rename returning EBUSY will incorrectly try opening the file with a cifs (NT Create AndX) operation on an smb2+ mount, which causes the server to force a session close. If the mount is smb2+, skip the fallback. Signed-off-by: Frank Sorenson Signed-off-by: Steve French CC: Stable Reviewed-by: Ronnie Sahlberg Signed-off-by: Greg Kroah-Hartman --- fs/cifs/inode.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1735,6 +1735,10 @@ cifs_do_rename(const unsigned int xid, s if (rc == 0 || rc != -EBUSY) goto do_rename_exit; + /* Don't fall back to using SMB on SMB 2+ mount */ + if (server->vals->protocol_id != 0) + goto do_rename_exit; + /* open-file renames don't work across directories */ if (to_dentry->d_parent != from_dentry->d_parent) goto do_rename_exit;