Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp415869pxa; Fri, 21 Aug 2020 10:29:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYtL8KmmAjLwZrg7CIye4r0qnBFkYcShNsnwLe4z1LgrARu2eCzhhI5QBhsWV4T+W/IDOp X-Received: by 2002:a05:6402:1bc1:: with SMTP id ch1mr3888101edb.142.1598030977912; Fri, 21 Aug 2020 10:29:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598030977; cv=none; d=google.com; s=arc-20160816; b=TykRqO/VVLXTP3Vpn8qORXy6t3hD1JMWhT/UdCkxd4+SSDkqe01WdFDhHTvLeG2ucN gVMgNP20Lo3IYcadk2df03SwjSvCbWGG4x+ZMw9aP+kwP7ObzpCbdmpAxUHfRkSx4Oi9 ZsGGPwvDAAEBNX98fFNZdvX1fGd+4GWjOdBm6FkJLjaTKF39/YGxtZPhGoR7tNs09Tcq xDLbSF6mOPZf1pk6EgZ95tb/Zvfu141fsaPnDDkiQtpqokzLCwyN5vPHgJMzQuJMginY zoNu9Kjc9XyXxNfI/3LwedgTjew0dWD8zU60ftyzFncZn0/kkwHN4z0bJcJx3UBS9e9l j6bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Lf6M7yQQKWo8prYPU1G4x+oyKDxk3rTs7bKWY8Vh5p8=; b=JztEU9yAUASVcDjHLdtcsUa+cDBnb0/svywQFw6017FUGvGQrCwOH78L+5X9UCRiex I/3Z7wX5IQLomYAc15AIuaHE9u5o65RKpwdbggWJslSCr9QYxKJMT3djQ6dLx3zhr5BE nGgT9pdCyLvWkzbR03zz1wVBiZ5YzjEkz3BIa3WnXmb3peaFQ4x8gRDsVMCZDU/RKfwc UyOLet6y7Swqx/Hbor+reyR6LJEBXk69YsGqrxgItH5qEIHhXP22RRYJzA8GEnzsVbGg ijdWKSdIXKKrWMPNw6JY63sx7svSl0HkOgQCOfSJcDs6U9hOUSix4QdCiQe7ckzp+6ig JOPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OgJWzexR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y24si1641317eje.87.2020.08.21.10.29.14; Fri, 21 Aug 2020 10:29:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OgJWzexR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729117AbgHUR1j (ORCPT + 99 others); Fri, 21 Aug 2020 13:27:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:46556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727047AbgHUQOt (ORCPT ); Fri, 21 Aug 2020 12:14:49 -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 B41EA20FC3; Fri, 21 Aug 2020 16:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026487; bh=hFA+ejo3MW88ZO4xFBQQQLDRxo0rFnG78sbE4dwsNds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OgJWzexRD3iYaXuZ1LcccMryCrJg+wxQK8WRNJmrdv6lMUcVVtfpsBBf4u0aaw9K8 Izx5QeM2NBbiYBc7SabIOK3xXXD59TFRKpMjtdB6jXla9O/1YR2Tfxw7wpyhmW7111 phD77EteYRnwR7kxPHpoowQIzC3+ojkcvgKA9RL8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Robin Murphy , Prakash Gupta , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.8 19/62] iommu/iova: Don't BUG on invalid PFNs Date: Fri, 21 Aug 2020 12:13:40 -0400 Message-Id: <20200821161423.347071-19-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161423.347071-1-sashal@kernel.org> References: <20200821161423.347071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robin Murphy [ Upstream commit d3e3d2be688b4b5864538de61e750721a311e4fc ] Unlike the other instances which represent a complete loss of consistency within the rcache mechanism itself, or a fundamental and obvious misconfiguration by an IOMMU driver, the BUG_ON() in iova_magazine_free_pfns() can be provoked at more or less any time in a "spooky action-at-a-distance" manner by any old device driver passing nonsense to dma_unmap_*() which then propagates through to queue_iova(). Not only is this well outside the IOVA layer's control, it's also nowhere near fatal enough to justify panicking anyway - all that really achieves is to make debugging the offending driver more difficult. Let's simply WARN and otherwise ignore bogus PFNs. Reported-by: Prakash Gupta Signed-off-by: Robin Murphy Reviewed-by: Prakash Gupta Link: https://lore.kernel.org/r/acbd2d092b42738a03a21b417ce64e27f8c91c86.1591103298.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/iova.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index 49fc01f2a28d4..45a251da54537 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c @@ -811,7 +811,9 @@ iova_magazine_free_pfns(struct iova_magazine *mag, struct iova_domain *iovad) for (i = 0 ; i < mag->size; ++i) { struct iova *iova = private_find_iova(iovad, mag->pfns[i]); - BUG_ON(!iova); + if (WARN_ON(!iova)) + continue; + private_free_iova(iovad, iova); } -- 2.25.1