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 80F63C2D0A3 for ; Tue, 27 Oct 2020 00:18:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 413FE20723 for ; Tue, 27 Oct 2020 00:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757895; bh=ZODP1nIE2OjC2ZptfpiokPd7+rZyu16TGrn5HsmzT7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sDCbMaZDjFVntjM+Fn2UHnZIQVft9nrPcA4eMWHCWgXjaet6sL6C8N3ktykzm3bIk 8pEKtHtzhE1jpm2TPZM71dpbD5HUWa4r1dwLCiL/NnEpQVBnrTq6f//NLf3eNfMWCi 1Vdqx/G4vMEj9mke1xpoMaW9YR6JpYTVXPKD+Bb0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440841AbgJ0ASN (ORCPT ); Mon, 26 Oct 2020 20:18:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:59272 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439204AbgJ0AKV (ORCPT ); Mon, 26 Oct 2020 20:10:21 -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 88EFF221F8; Tue, 27 Oct 2020 00:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603757421; bh=ZODP1nIE2OjC2ZptfpiokPd7+rZyu16TGrn5HsmzT7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x3oIXiwQxAtPxK7/tx+1qkftfTJcvpgfCoRLxIIv3ppe6ZeSX5tJx0n2DhSui49w9 95kAR0qMzSP23VM1vE2MoTHsKsVo0xSiFJq0zExrp7A6Qt5GO7qM7kglVd5OwmaBlV bfSYVfOfuo67Bw9O+9Q+eeguWtrjypTjGvL5mSDQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Diana Craciun , Laurentiu Tudor , Greg Kroah-Hartman , Sasha Levin , devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 4.14 29/46] bus/fsl_mc: Do not rely on caller to provide non NULL mc_io Date: Mon, 26 Oct 2020 20:09:28 -0400 Message-Id: <20201027000946.1026923-29-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201027000946.1026923-1-sashal@kernel.org> References: <20201027000946.1026923-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/staging/fsl-mc/bus/mc-io.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/staging/fsl-mc/bus/mc-io.c b/drivers/staging/fsl-mc/bus/mc-io.c index f65c23ce83f16..deec2d04c2dd9 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/staging/fsl-mc/bus/mc-io.c @@ -166,7 +166,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