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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 DAF4FC32750 for ; Wed, 14 Aug 2019 02:20:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A95C72085A for ; Wed, 14 Aug 2019 02:20:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749257; bh=ndA4KxKtbR7lRQXfS31J4+E8hVJVSqZcUpl0AVYQsPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z+C2nY93PVNCOvwyGxGssyEQ1jVvCUC5fb5svUp6tVZ1XKsBAHTHj62iaBsQqPt19 Tz/k8vmYWUPsYa/MbU5KHJvcMnmPvLlWhgQBLdCzhb1Zn7dr7YoktQ+zODfBRBLZYp 34SaDYUBFwzmTgr+Xq/vdXNq7sHAhTC46lzyxv1w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728898AbfHNCUv (ORCPT ); Tue, 13 Aug 2019 22:20:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:50254 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729703AbfHNCTW (ORCPT ); Tue, 13 Aug 2019 22:19:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 30705214DA; Wed, 14 Aug 2019 02:19:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749161; bh=ndA4KxKtbR7lRQXfS31J4+E8hVJVSqZcUpl0AVYQsPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WhufkB0zw+H0a9cYVotwGqYYX5+p4AeSvUpVD+AWOIPST04hB6IeYdRBQGn1WC81F Ea0/BhOA661P0K4kN3xELR8yYQokU7Yw7qMFX/8DSbE1OHHuFs7oCZXF9dWDjU4/Ox ockZLV2yHl478DEFyWFloLJ9poOIvjIfQ5u6E/oM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sebastien Tisserant , Pavel Shilovsky , Steve French , Sasha Levin , linux-cifs@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 29/44] SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL Date: Tue, 13 Aug 2019 22:18:18 -0400 Message-Id: <20190814021834.16662-29-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021834.16662-1-sashal@kernel.org> References: <20190814021834.16662-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From: Sebastien Tisserant [ 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 23326b0cd5628..58a502e622aa4 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -2168,7 +2168,15 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, struct smb_rqst *old_rq) 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)); } static struct scatterlist * -- 2.20.1