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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 7E77FC2D0CE for ; Wed, 22 Jan 2020 00:34:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50C6921835 for ; Wed, 22 Jan 2020 00:34:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="C96zecB2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728925AbgAVAeq (ORCPT ); Tue, 21 Jan 2020 19:34:46 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28939 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726876AbgAVAeq (ORCPT ); Tue, 21 Jan 2020 19:34:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579653284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=MJ4SkbpxcRrIWzJPxY9eWD1fiCB6FFP/Gm3vsvFDakM=; b=C96zecB2//mkxDIQEXU6N2fHHuCw/Ptt+7pJzUsIWrNekErxn4qb7/P3ODX7m2eF78seM1 jkWPZnJdpbqpJF+ndRVeTRoOGeNToTPxMHvG34NvFU4jw3Yoax1qe6mbesQHjiwLm9kzI4 BwwuEkRBsj9E4XdDEtsR8ZwXmC700XM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-dI-WQVENOiO03h8Q7VUfgQ-1; Tue, 21 Jan 2020 19:34:40 -0500 X-MC-Unique: dI-WQVENOiO03h8Q7VUfgQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE5251882CC2; Wed, 22 Jan 2020 00:34:38 +0000 (UTC) Received: from cantor.redhat.com (ovpn-118-59.phx2.redhat.com [10.3.118.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 794937DB34; Wed, 22 Jan 2020 00:34:38 +0000 (UTC) From: Jerry Snitselaar To: iommu@lists.linux-foundation.org Cc: Joerg Roedel , Lu Baolu , David Woodhouse , stable@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] iommu/vt-d: call __dmar_remove_one_dev_info with valid pointer Date: Tue, 21 Jan 2020 17:34:26 -0700 Message-Id: <20200122003426.16079-1-jsnitsel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It is possible for archdata.iommu to be set to DEFER_DEVICE_DOMAIN_INFO or DUMMY_DEVICE_DOMAIN_INFO so check for those values before calling __dmar_remove_one_dev_info. Without a check it can result in a null pointer dereference. This has been seen while booting a kdump kernel on an HP dl380 gen9. Cc: Joerg Roedel Cc: Lu Baolu Cc: David Woodhouse Cc: stable@vger.kernel.org # 5.3+ Cc: linux-kernel@vger.kernel.org Fixes: ae23bfb68f28 ("iommu/vt-d: Detach domain before using a private on= e") Signed-off-by: Jerry Snitselaar --- drivers/iommu/intel-iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 1801f0aaf013..932267f49f9a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5163,7 +5163,8 @@ static void dmar_remove_one_dev_info(struct device = *dev) =20 spin_lock_irqsave(&device_domain_lock, flags); info =3D dev->archdata.iommu; - if (info) + if (info && info !=3D DEFER_DEVICE_DOMAIN_INFO + && info !=3D DUMMY_DEVICE_DOMAIN_INFO) __dmar_remove_one_dev_info(info); spin_unlock_irqrestore(&device_domain_lock, flags); } --=20 2.24.0