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=unavailable 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 7C4A6C83004 for ; Tue, 28 Apr 2020 18:35:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CC4920730 for ; Tue, 28 Apr 2020 18:35:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098943; bh=rBjYhz4tebMF76RZq8sdFFmdhFBtKxzNe4YRzXvRD2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Cy6Wd6GXCQiOAnNM/8mr0vZYN5AL4aiNKsP7otAk3mawsxVRdRO5if1f8ytZGXOYE qKTvzb3xNsJ0eoP+/TiBaEZ2uTo3gXnGCVPwNMlDb5nl2rVQ+Fir0eBKKabP/SIDu8 bmb5rwdLgYGcyTsdEOAgr73XohdPJSdq/+Z5CYvI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730287AbgD1Sfm (ORCPT ); Tue, 28 Apr 2020 14:35:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:52730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730268AbgD1Sfc (ORCPT ); Tue, 28 Apr 2020 14:35:32 -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 115DE20B1F; Tue, 28 Apr 2020 18:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098932; bh=rBjYhz4tebMF76RZq8sdFFmdhFBtKxzNe4YRzXvRD2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1/Mxz28oLnzds1CTciHS/RycVW1akD2SGMJRJ7HEx5YvJUXTR348ltNlcalrY5HbM r3wOHtffptd58k7KAaHjgR9K8v+NSuEwRHEnJduJQ3eGUJULFpDM9E77QPfQg9RzWj 2hpkkx0KnvNjS3UNrmjny9aykacwc/LbvxEzXDZ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Paulo Alcantara (SUSE)" , Steve French , Ronnie Sahlberg , Aurelien Aptel Subject: [PATCH 5.6 130/167] cifs: fix uninitialised lease_key in open_shroot() Date: Tue, 28 Apr 2020 20:25:06 +0200 Message-Id: <20200428182241.828129804@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182225.451225420@linuxfoundation.org> References: <20200428182225.451225420@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: Paulo Alcantara commit 0fe0781f29dd8ab618999e6bda33c782ebbdb109 upstream. SMB2_open_init() expects a pre-initialised lease_key when opening a file with a lease, so set pfid->lease_key prior to calling it in open_shroot(). This issue was observed when performing some DFS failover tests and the lease key was never randomly generated. Signed-off-by: Paulo Alcantara (SUSE) Signed-off-by: Steve French Reviewed-by: Ronnie Sahlberg Reviewed-by: Aurelien Aptel CC: Stable Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2ops.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -693,6 +693,11 @@ int open_shroot(unsigned int xid, struct if (smb3_encryption_required(tcon)) flags |= CIFS_TRANSFORM_REQ; + if (!server->ops->new_lease_key) + return -EIO; + + server->ops->new_lease_key(pfid); + memset(rqst, 0, sizeof(rqst)); resp_buftype[0] = resp_buftype[1] = CIFS_NO_BUFFER; memset(rsp_iov, 0, sizeof(rsp_iov));