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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C987C433F5 for ; Mon, 30 May 2022 14:31:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241450AbiE3OaZ (ORCPT ); Mon, 30 May 2022 10:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241542AbiE3ORl (ORCPT ); Mon, 30 May 2022 10:17:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 916DE55205; Mon, 30 May 2022 06:47:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A660360DDE; Mon, 30 May 2022 13:47:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E073CC36AED; Mon, 30 May 2022 13:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653918460; bh=w45OzuGuLmtj9sEylkHgxYIfZXvDGqEsrxVIkJCabSU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BzAFH/DsZYx0earz7+CMjU3uSb2I9Yi7Kbds74T0dMAQ6s9Wui2QXtgc3d+Li5FZu 7uf+QrSbg1zfIR47LKD0r306csXYQSjXfklrWxWcPHdVKQLZSVwVum5uPFLrdOxLQ5 x3jKX64RYsHAxu5DWaHjUJkYmeV0LUQRG20VDoJ/mtD6IaYLe23mqocXPqEr52Rvt8 UEyI6j76hzTNLiaVUHBAz32OcgWBZGiZHU5DkAaWi4y4hQfHHVUu+EPM+zw7VG+Ql+ Fcunu3khKHTd0AJpNSAQp2NkQmmEjKGT7z/h6Fq9PnHqNS7DJm0B8iMy7+enZvTJnZ pXdsyeCinhvyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luca Weiss , Stanimir Varbanov , Mauro Carvalho Chehab , Sasha Levin , agross@kernel.org, bjorn.andersson@linaro.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 15/55] media: venus: hfi: avoid null dereference in deinit Date: Mon, 30 May 2022 09:46:21 -0400 Message-Id: <20220530134701.1935933-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530134701.1935933-1-sashal@kernel.org> References: <20220530134701.1935933-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: Luca Weiss [ Upstream commit 86594f6af867b5165d2ba7b5a71fae3a5961e56c ] If venus_probe fails at pm_runtime_put_sync the error handling first calls hfi_destroy and afterwards hfi_core_deinit. As hfi_destroy sets core->ops to NULL, hfi_core_deinit cannot call the core_deinit function anymore. Avoid this null pointer derefence by skipping the call when necessary. Signed-off-by: Luca Weiss Signed-off-by: Stanimir Varbanov Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/venus/hfi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c index 3d8b1284d1f3..68964a80fe61 100644 --- a/drivers/media/platform/qcom/venus/hfi.c +++ b/drivers/media/platform/qcom/venus/hfi.c @@ -104,6 +104,9 @@ int hfi_core_deinit(struct venus_core *core, bool blocking) mutex_lock(&core->lock); } + if (!core->ops) + goto unlock; + ret = core->ops->core_deinit(core); if (!ret) -- 2.35.1