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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 42ECBC3A5A3 for ; Tue, 27 Aug 2019 08:03:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AEE320828 for ; Tue, 27 Aug 2019 08:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892985; bh=SZ7LXaA9SMy5Zlfp47yQEpZ46W5F86EzMhFJ3rNeoKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UHSohfksJeLyywFuCYb6nyXUc4q0obEG/1S9/fOnMgQmwVStsU2HXgUnUjM19aS2k DCKkgHYj4ZmlvoJwabucD2oWyhvgvd0FImwu7MOBr50zSKV2XJza207OkR0KhGJmV6 ErMoRnIlJ0iXypxGIKVX6Ht7H+dSwvIlgXdumtt4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732196AbfH0IDD (ORCPT ); Tue, 27 Aug 2019 04:03:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:60318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732160AbfH0IDA (ORCPT ); Tue, 27 Aug 2019 04:03:00 -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 A291C206BA; Tue, 27 Aug 2019 08:02:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892980; bh=SZ7LXaA9SMy5Zlfp47yQEpZ46W5F86EzMhFJ3rNeoKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RUW4AJmCe3TYhYMjwdqyiVjtd2np3j3YKobJfGGnzq18KfEqLOow1H7HkgVIvIiQw bBKPcr7smXaeyKH0fQOxFcIhHYz5fXHdAI0PnG0A/0uH5IYnzpYQnqyymHA39qrHXe /o3xMFNVbsl1Wvw/ZAbgtFN71TPR547f5TEkA7VE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sebastien Tisserant , Pavel Shilovsky , Steve French , Sasha Levin Subject: [PATCH 5.2 081/162] SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL Date: Tue, 27 Aug 2019 09:50:09 +0200 Message-Id: <20190827072740.934485846@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@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 [ Upstream commit ee9d66182392695535cc9fccfcb40c16f72de2a9 ] Fix kernel oops when mounting a encryptData CIFS share with CONFIG_DEBUG_VIRTUAL Signed-off-by: Sebastien Tisserant Reviewed-by: Pavel Shilovsky Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/smb2ops.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index ae10d6e297c3a..42de31d206169 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -3439,7 +3439,15 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, unsigned int orig_len, static inline void smb2_sg_set_buf(struct scatterlist *sg, const void *buf, unsigned int buflen) { - sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf)); + void *addr; + /* + * VMAP_STACK (at least) puts stack into the vmalloc address space + */ + if (is_vmalloc_addr(buf)) + addr = vmalloc_to_page(buf); + else + addr = virt_to_page(buf); + sg_set_page(sg, addr, buflen, offset_in_page(buf)); } /* Assumes the first rqst has a transform header as the first iov. -- 2.20.1