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=-14.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 90F6CC3276C for ; Thu, 2 Jan 2020 22:12:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64A6F21D7D for ; Thu, 2 Jan 2020 22:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003152; bh=YquLg6jkYweR4AX4GUs+bFzHa07A3GIOUgATF3V/FIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ap8NrMkfrIjTLke68tjoA8aB2jmhT+UGj+a0IFw27znaUazhYYDA1Hay4sZ/0wkGy 5NWNhioDZcDVosENtmtISi/WTfadix9WROfjkK31kC4TtyPCN8JqwRwamF9KiW0WTD PO4488O5mL16H8XbWwZeWvv2N7nbXrAduCxWdVio= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726229AbgABWMa (ORCPT ); Thu, 2 Jan 2020 17:12:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:51512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726099AbgABWMY (ORCPT ); Thu, 2 Jan 2020 17:12:24 -0500 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 4109A21D7D; Thu, 2 Jan 2020 22:12:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578003143; bh=YquLg6jkYweR4AX4GUs+bFzHa07A3GIOUgATF3V/FIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VHaqIl2wu1VA3Q8Vy2iwuUoz18/huzNxL6yuCnuKS0d08IY6y8OkOlYnbD0vdJK7h wTlHC0sbKrCu0Ekjc5EpGXpNwGLHMryEGcDRbn+Ra5a2NW+m9SizraOVu1Ze8QlneY T6JLH1m2Yu8KrqX5Un9C0OsshFN096qkfQrRLXCE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Laura Abbott , Kees Cook , Christoph Hellwig , Sasha Levin Subject: [PATCH 5.4 030/191] dma-mapping: Add vmap checks to dma_map_single() Date: Thu, 2 Jan 2020 23:05:12 +0100 Message-Id: <20200102215833.205799110@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102215829.911231638@linuxfoundation.org> References: <20200102215829.911231638@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: Kees Cook [ Upstream commit 4544b9f25e70eae9f70a243de0cc802aa5c8cb69 ] As we've seen from USB and other areas[1], we need to always do runtime checks for DMA operating on memory regions that might be remapped. This adds vmap checks (similar to those already in USB but missing in other places) into dma_map_single() so all callers benefit from the checking. [1] https://git.kernel.org/linus/3840c5b78803b2b6cc1ff820100a74a092c40cbb Suggested-by: Laura Abbott Signed-off-by: Kees Cook [hch: fixed the printk message] Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- include/linux/dma-mapping.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 4a1c4fca475a..0aad641d662c 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -583,6 +583,10 @@ static inline unsigned long dma_get_merge_boundary(struct device *dev) static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr, size_t size, enum dma_data_direction dir, unsigned long attrs) { + /* DMA must never operate on areas that might be remapped. */ + if (dev_WARN_ONCE(dev, is_vmalloc_addr(ptr), + "rejecting DMA map of vmalloc memory\n")) + return DMA_MAPPING_ERROR; debug_dma_map_single(dev, ptr, size); return dma_map_page_attrs(dev, virt_to_page(ptr), offset_in_page(ptr), size, dir, attrs); -- 2.20.1