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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 4455DC61DD8 for ; Tue, 27 Oct 2020 00:05:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05C3A20754 for ; Tue, 27 Oct 2020 00:05:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757159; bh=xkXV3LahyLeLfLVmWaTCU4CxiPxrDFtATYTNByEAS+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RUfOMhd40U5i61NkAIg6CCdZ5kzYU3Hr6TUNPIcZF8NuQA7FEaF4cXDruPbeWDUfz OgFKR1vQ+8AIH2Foo0X7qFxLEQaSGAl+nWjRecQnbwf5Wun4RfLbVjUKjRtx0mwu9w E7iRZIjKsHgJJo10lTyeBbWGaF7DEIkvg3Fs7U5E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390850AbgJ0AF5 (ORCPT ); Mon, 26 Oct 2020 20:05:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:53892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438120AbgJ0AFC (ORCPT ); Mon, 26 Oct 2020 20:05:02 -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 4ADB021741; Tue, 27 Oct 2020 00:05:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757101; bh=xkXV3LahyLeLfLVmWaTCU4CxiPxrDFtATYTNByEAS+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eVtdBO7ZGbnv0nwB3hrZYjXc0p/4Nop6RxpgZPaKvu5o7EuSQqEQfMXVHObySWGQB D00mJYsvYfHk/jVtYRKpzneh1pYs4SyQ8j4M45amgBRaoESAiXYSWqMTXHuRlnI+qz GCpOTgxsb92PEp8/39xK3AOnL50JyLQP5IzHuhNQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Diana Craciun , Laurentiu Tudor , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.19 39/60] bus/fsl_mc: Do not rely on caller to provide non NULL mc_io Date: Mon, 26 Oct 2020 20:03:54 -0400 Message-Id: <20201027000415.1026364-39-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201027000415.1026364-1-sashal@kernel.org> References: <20201027000415.1026364-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Diana Craciun [ Upstream commit 5026cf605143e764e1785bbf9158559d17f8d260 ] Before destroying the mc_io, check first that it was allocated. Reviewed-by: Laurentiu Tudor Acked-by: Laurentiu Tudor Signed-off-by: Diana Craciun Link: https://lore.kernel.org/r/20200929085441.17448-11-diana.craciun@oss.nxp.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/bus/fsl-mc/mc-io.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fsl-mc/mc-io.c b/drivers/bus/fsl-mc/mc-io.c index 7226cfc49b6fd..3f806599748a4 100644 --- a/drivers/bus/fsl-mc/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -129,7 +129,12 @@ int __must_check fsl_create_mc_io(struct device *dev, */ void fsl_destroy_mc_io(struct fsl_mc_io *mc_io) { - struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; + struct fsl_mc_device *dpmcp_dev; + + if (!mc_io) + return; + + dpmcp_dev = mc_io->dpmcp_dev; if (dpmcp_dev) fsl_mc_io_unset_dpmcp(mc_io); -- 2.25.1