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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 016E4C4320E for ; Sat, 28 Aug 2021 15:38:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD465604AC for ; Sat, 28 Aug 2021 15:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234466AbhH1PjN (ORCPT ); Sat, 28 Aug 2021 11:39:13 -0400 Received: from new3-smtp.messagingengine.com ([66.111.4.229]:57757 "EHLO new3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231368AbhH1PjI (ORCPT ); Sat, 28 Aug 2021 11:39:08 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id ECEF7580A77; Sat, 28 Aug 2021 11:38:17 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sat, 28 Aug 2021 11:38:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svenpeter.dev; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=D4PCd0JOhWxqQ 0FHLtGzqrwB4RN73vh1ozYKHe2Vr6c=; b=rp/coHPSJpRsYRFZEpxdqPJWHVy1/ XP9fwqWZkTA8puZ+wweuwWDcMD67nLgqnPSHJCIU9HbeplW1+CFC3vJC4ylxReTq pGaCDh2vbyxbGMPn6Ypq7LDPFmOIEg5m2V1ozmjMgzprAyIlgflFoqqyEPOu9iDy yXNiPgA7x9MaaN+9ErygG1PfLAZb3gaphcZSh72f09ujk6WWHCrZH9vMkOJON/YC deWzL+nzhPh9/drASa48mKmF1AbhTXEXAPMCsOpTB2NAuwYYLy+miV+SUYT4tL7p 4anGIrlSdzZbEH/oRU/YmGz7t+/NdHX0xwVZKt2Hcys98kqJ77AWMIrmg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=D4PCd0JOhWxqQ0FHLtGzqrwB4RN73vh1ozYKHe2Vr6c=; b=Qln4h02r 1mZd5/ji4lV6ubnGH9nj1q/ACldcUehel8GJW/hLWalmYvgJ5kNCy7lLfMBLY3mm BII5kQpsvlRJcSECkXQrBTNHDK52ENw5BnzU/O6RdkgK7mKgH56p0iJqsNyhQMTd nsiqvnzhXMd6zww7OefKdMKLuwP9cynksTGGU2ze69TEnlH4Q5QugSZj3val11/k AqRMVmjsAuxTTxXMVy16Y7UHiPa0YZz19AF2VNtBO42hK3TL6bU0DALSLnaZrR+C 7DNvcKokMZVnoez4zz94gTEcVeot+0BOEqotY0zRAMNYKeDAPgGHnu5mztkBkU+S qLW68lDpKaYngA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudduhedgleduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefuvhgvnhcu rfgvthgvrhcuoehsvhgvnhesshhvvghnphgvthgvrhdruggvvheqnecuggftrfgrthhtvg hrnheptedvkeetleeuffffhfekteetffeggffgveehieelueefvddtueffveevlefhfeej necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshhvvg hnsehsvhgvnhhpvghtvghrrdguvghv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 28 Aug 2021 11:38:15 -0400 (EDT) From: Sven Peter To: iommu@lists.linux-foundation.org Cc: Sven Peter , Joerg Roedel , Will Deacon , Robin Murphy , Arnd Bergmann , Mohamed Mediouni , Alexander Graf , Hector Martin , Alyssa Rosenzweig , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/8] iommu/dma: Fail unaligned map requests for untrusted devs Date: Sat, 28 Aug 2021 17:36:36 +0200 Message-Id: <20210828153642.19396-3-sven@svenpeter.dev> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210828153642.19396-1-sven@svenpeter.dev> References: <20210828153642.19396-1-sven@svenpeter.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If swiotlb is enabled we should never try to create any mappings that would expose more memory than requested to the device. WARN_ON and refuse those mappings just in case. Signed-off-by: Sven Peter --- drivers/iommu/dma-iommu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index e8eae34e9e4f..d6e273ec3de6 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -534,13 +534,20 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, struct iommu_dma_cookie *cookie = domain->iova_cookie; struct iova_domain *iovad = &cookie->iovad; size_t iova_off = iova_offset(iovad, phys); + size_t size_aligned = iova_align(iovad, size + iova_off); dma_addr_t iova; if (static_branch_unlikely(&iommu_deferred_attach_enabled) && iommu_deferred_attach(dev, domain)) return DMA_MAPPING_ERROR; - size = iova_align(iovad, size + iova_off); + if (IS_ENABLED(CONFIG_SWIOTLB) && dev_is_untrusted(dev)) { + if (WARN_ON(iova_off)) + return DMA_MAPPING_ERROR; + if (WARN_ON(size_aligned != size)) + return DMA_MAPPING_ERROR; + } + size = size_aligned; iova = iommu_dma_alloc_iova(domain, size, dma_mask, dev); if (!iova) -- 2.25.1