From patchwork Thu Feb 23 08:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 60844 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp204792wrd; Thu, 23 Feb 2023 00:43:52 -0800 (PST) X-Google-Smtp-Source: AK7set9cB44ORbz3BYjN+cTQugn5gJN7UvIFzR/7pz1rqWlW1dtJ+XTXopwR5zdBiSIH2+c9Uw7B X-Received: by 2002:a05:6a00:1804:b0:5b2:5466:34e1 with SMTP id y4-20020a056a00180400b005b2546634e1mr10595315pfa.3.1677141832152; Thu, 23 Feb 2023 00:43:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677141832; cv=none; d=google.com; s=arc-20160816; b=Sd7j4pquH35J4d5dhtcm3/CMy9kzodgaHdZGOnaOQodvakEBBggIM6P8oXOCHa0/gB Dra8YdV+jwt+oCtEovDzdaiq64HZeXUvRPCuqWVtbCNr8hDpWBEAI2mU+TgpXwTOCXeU QrqiHn7KouFGAFQB+1Jsdv+SwiIiJl0WRuxVsK437sZZ6VxHY86TTZc9yjDU8UOgKOT3 VFc5/mkPTjD+y0bFWWt2FA8jKAXu41TCGvxXLhyagta4LgWCzdNEdec+P26kzEh11g3J jFGpoTjzWTqDIgnPDsBYcAdM4Um9Yarjc1l0iYGg0mfbiPup86Jw3IlXKxyG7rw0oTHD Rsdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=OjqLWavRD0c6v8aVSvb9AaJsN7Lwf9zVFC8nWTsOnEs=; b=X+KOM3nptjQ0Y9W70OHOh19jiIq5TwuTuBCwlsRWqervV2KyJ34iU3Zx2+p5+ldkgN U1SZx8x6SHCkPA83iYDRhpQizLQ6Zl8XKaJfIU0Vuo/sP/VjYSFJoUTnKKAA57QW7jPd /WDmovZOQL2oeyfuaMfrBBZ3NMAlqd6eUc+/6z8TTQAN8yAFOD4QkzLxkDqmFj+FgsuR ffuMMLUnkep8DSjFFkfck/MorfsMvIRsh5qVN5qCOiwF2efGQfz/bgtu2k7cUoSm/SYq 6uTsU4ur8ZTJcQKGhRbEKDQrk42FfCCJAff5rcaKKoCIKo4/jIJW08pNSTIQZZv5y+vR fEaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=XcoE4Ylv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l191-20020a6388c8000000b00502f9ffb8bbsi706995pgd.297.2023.02.23.00.43.39; Thu, 23 Feb 2023 00:43:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=XcoE4Ylv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233499AbjBWIiI (ORCPT + 99 others); Thu, 23 Feb 2023 03:38:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233226AbjBWIiE (ORCPT ); Thu, 23 Feb 2023 03:38:04 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78E1C65A7 for ; Thu, 23 Feb 2023 00:38:03 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 284F63783B; Thu, 23 Feb 2023 08:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1677141482; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OjqLWavRD0c6v8aVSvb9AaJsN7Lwf9zVFC8nWTsOnEs=; b=XcoE4YlvtCiamYLn8g2S1Pj6VcaqlTj+gK7/cEw7ISx8Q/iDAJzhtWF7Zw5DeGF7XJiC+C ooCyNKSmxcbUBM8q+AnHcQBzl2DbK8eI4khAxz0FyLFsZtOb10x1OFClrzxXLbp9XpDAml qSo8ro2tRB43uUi1XEdkQgHSoP8xaNM= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F1E3B139B5; Thu, 23 Feb 2023 08:38:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id VjLNOekl92OCTQAAMHmgww (envelope-from ); Thu, 23 Feb 2023 08:38:01 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org Cc: johan+linaro@kernel.org, Juergen Gross , Marc Zyngier , Thomas Gleixner Subject: [PATCH] irqdomain: fix regression for Xen guests Date: Thu, 23 Feb 2023 09:38:00 +0100 Message-Id: <20230223083800.31347-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758610673547774359?= X-GMAIL-MSGID: =?utf-8?q?1758610673547774359?= The recent switch to per-domain locking caused a NULL dereference in irq_domain_create_hierarchy(), as Xen code is calling msi_create_irq_domain() with a NULL parent pointer. Fix that by testing parent to be set before dereferencing it. For a non-existing parent the irq-domain's root will stay to point to itself. Fixes: 9dbb8e3452ab ("irqdomain: Switch to per-domain locking") Signed-off-by: Juergen Gross Reviewed-by: Johan Hovold --- kernel/irq/irqdomain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index aa5b7eeeceb8..6522dfb2e49c 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1172,7 +1172,8 @@ struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent, domain = __irq_domain_create(fwnode, 0, ~0, 0, ops, host_data); if (domain) { - domain->root = parent->root; + if (parent) + domain->root = parent->root; domain->parent = parent; domain->flags |= flags;