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;
From:   laurentiu.tudor@nxp.com
To:     gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Cc:     ioana.ciornei@nxp.com, diana.craciun@oss.nxp.com,
        jon@solid-run.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH 4/6] bus: fsl-mc: check for null irq array
Date:   Tue,  8 Feb 2022 16:59:26 +0200
Message-Id: <20220208145928.12468-5-laurentiu.tudor@nxp.com>
In-Reply-To: <20220208145928.12468-1-laurentiu.tudor@nxp.com>
References: <20220208145928.12468-1-laurentiu.tudor@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9XpURDw7C0KEm6/9YuKzx3rW+ZYooivs7K3WiE20AgGqpc0CgyitpLE2Osgt?=
 =?us-ascii?Q?cxWKHb0SjIRgXh/998nV5hCeXAjUfNS52E44kpr2Pgf2MEoLtOjdVoRl+5j5?=
 =?us-ascii?Q?pvinVx4PUlTan+HmY+3KnWUJky7umbKcdVrV6wwzVaF+fUQIKNxD8H7A7P7F?=
 =?us-ascii?Q?/2Gnpb1TdMTt6XfOV0ZQgzXVdmuSbIopPhpigzq0sLV3WSS1hxSujzwz+ktW?=
 =?us-ascii?Q?OZQIn5WnYYKH/GFYyXOihY1ph2q/W+1SfPoR/LyZ0IOphCMmM+A9bFWajoht?=
 =?us-ascii?Q?QvD2ymlefRkQS3fmPqMOs80Eo3dzxNoYvwzo4EnLGSGf605xodEjSRPMrvUq?=
 =?us-ascii?Q?N6PkXb/G39gh0jB2vgLRzhpnztyI8Ij3viiRqKSRfrNPhljjNXzeWWzwSIZA?=
 =?us-ascii?Q?kk5vBx7WCahkPPZeVJdEHpybhfdqZnlMuhe1VcJ8fyAUB3d2kwwQ+LFNQuAq?=
 =?us-ascii?Q?2IXnOMUpJGgfHDMwJx7VSMbEvvkZKh+cjrxz7sgGpQ81Nt7bFAhsFv0HBDz/?=
 =?us-ascii?Q?zC/TxISunoO3AedFUdknf0Vsk5IPGTs5/NXOCF0jb45dj2AlHGJxTgvhe5rd?=
 =?us-ascii?Q?afYdGQQmdVFrw8WS7wLG+lkBt69+4226NgfOwUliMFIu6Qnmobmp9urFgN0y?=
 =?us-ascii?Q?bpgwy+W8vtTFmpR7QMqbi239OrKyeHy2WblPiYyYF42346rug85GfV5ZQLfV?=
 =?us-ascii?Q?R/WY9ZpbPWvFglm9xIGwsO3FLHQ9MEO24hUvMm1Z/aQg/B8fNTYTjOwGgOtx?=
 =?us-ascii?Q?PzR2vozJfuuwglAiaCXXSRVn4S+UFQ1JKLuGk9XOGMt9QLvNHv5nrP3EjtTf?=
 =?us-ascii?Q?WvSt9fndvRtcSFN91xzxx4DnTWHMZ/ngqhv8tu9qNuJJp105Y2UEF/8shGti?=
 =?us-ascii?Q?aI4NPuqc97eKVZQNZF7ekuNJwI3qe0GPjWTfn9UCKV5axhBCnS7Z3I629JEk?=
 =?us-ascii?Q?F2zW+Khh83G4S/X55tBzdpu61mYme2n2i1VyMyi86yyU9r2hSoEGw0Yf3ocv?=
 =?us-ascii?Q?UZ1wOcGNMviL0c+qFK7j5sz+5jcjmFXCQj8MNVp9fxIrgOkRzKJIgt+uPSXD?=
 =?us-ascii?Q?rM+vc1asuPH0jD+/nWDcxF71UjNjP5R11V/YNItqpZnykSgUjRcR8pzwet9o?=
 =?us-ascii?Q?E+uceXfAxsANb2k9hMvgJWVZ1uYML3464syibzaQvfoUhXdNlu/zE8h6n/Tk?=
 =?us-ascii?Q?4j9d678dM8LcxJ6iLN7gmJDSiogu9MnocxouhxtQXi85gYQZDjlW46wXUSpz?=
 =?us-ascii?Q?gnPebbbqSLcTr1fBzKGfbfQAEpG7EcUk1yTCAEHv3kWgv++Xt1vD3PcjbrJf?=
 =?us-ascii?Q?xMZaw2hZH5pgNpLmajdBpWZSV1Txjn2yE7EumSeOHsY5Rc3AGLYTFRppMxxl?=
 =?us-ascii?Q?JN0FkgXT2rsG+7LY9GVMX8IE8tD7zjsEaLmhvmgOo2w5B3IqqG2l7QamKSFI?=
 =?us-ascii?Q?m4GI3DeiuLvoHvjBFRu0WZHvYwVo/RCeV4I5PmA74xuqM9ogfuHMuXw9TdMG?=
 =?us-ascii?Q?nRKbAsiK8oBJ9WgwvD0ssGL90tfb82sM729gemMYaEw3UF6RYO+z4xl9oHuY?=
 =?us-ascii?Q?lpjBPEm/QwOemlMI2DoB+HUTR8XHe+dXX/N2Sbp1LDAUDzYx8g7RZigbanEv?=
 =?us-ascii?Q?Yg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bcd9d908-8bb8-4a7f-dcc9-08d9eb13a2ff
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 14:59:42.3250
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qQDPiXpdRoWDE2SZQpUSyl7+jo+J9rXq6wzRBQt/vSh7mcSGgDn2BGOcCKZd5e538DveANctoHlGBPiPowrbeA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3018
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

In VFIO case, the irq array in the fsl_mc device is not initialized,
so given that in upcoming patches this code will also get called by
VFIO add a check for null in the irq teardown function.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 drivers/bus/fsl-mc/dprc-driver.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c
index 36681cf7c42e..8482c4fca835 100644
--- a/drivers/bus/fsl-mc/dprc-driver.c
+++ b/drivers/bus/fsl-mc/dprc-driver.c
@@ -767,7 +767,12 @@ static int dprc_probe(struct fsl_mc_device *mc_dev)
  */
 static void dprc_teardown_irq(struct fsl_mc_device *mc_dev)
 {
-	struct fsl_mc_device_irq *irq = mc_dev->irqs[0];
+	struct fsl_mc_device_irq *irq;
+
+	if (!mc_dev->irqs)
+		return;
+
+	irq = mc_dev->irqs[0];
 
 	(void)disable_dprc_irq(mc_dev);
 
-- 
2.17.1