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=unavailable 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 918A4C64E75 for ; Mon, 26 Oct 2020 23:55:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 544F922281 for ; Mon, 26 Oct 2020 23:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756537; bh=qgHC9+KJFOVaZqnF2h2PQVHOpkvApWP1S7LFooBaEcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gyshu9NA/OSSff/pWbHsBKK7e0JI10wAvmjSrco4Gf0B6P3e67YJ6cgCCJPbvxmKJ 8l1V4y53wNPZK31h50U029KegETag15KTdEzaciCRyCyq9dCNWrg6ApR+ea/NyStFi GGHnEzow/a1Llcwph3GjWHNIxRuzrbxX5In3NORw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2410439AbgJZXy0 (ORCPT ); Mon, 26 Oct 2020 19:54:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:58936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2410256AbgJZXxz (ORCPT ); Mon, 26 Oct 2020 19:53:55 -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 37F9620B1F; Mon, 26 Oct 2020 23:53:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603756434; bh=qgHC9+KJFOVaZqnF2h2PQVHOpkvApWP1S7LFooBaEcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=biwpPb3kQPtfgmzCMoysDYKkVQk5DsPP0/g0mVu+GpdthQdKc4Dln9ijx8P4goFx9 bIDLbRQ6F7H9OnVKNgSdEbVXhGGu0cUpsP93bXU0u2/CuQppKsGmCN391Xwm86oumV Ary+qUMEfnZthIV8jbtmoEXLHTlGH1lg32fFddDo= 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 5.8 089/132] bus/fsl_mc: Do not rely on caller to provide non NULL mc_io Date: Mon, 26 Oct 2020 19:51:21 -0400 Message-Id: <20201026235205.1023962-89-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201026235205.1023962-1-sashal@kernel.org> References: <20201026235205.1023962-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: linux-kernel@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 6ae48ad804091..e1dfe4a765198 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