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 06EA5C433EF for ; Mon, 30 May 2022 13:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237312AbiE3NdM (ORCPT ); Mon, 30 May 2022 09:33:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237152AbiE3NaJ (ORCPT ); Mon, 30 May 2022 09:30:09 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25BD7E002; Mon, 30 May 2022 06:26:37 -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 ams.source.kernel.org (Postfix) with ESMTPS id 451DFB80D89; Mon, 30 May 2022 13:26:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18BA0C3411F; Mon, 30 May 2022 13:26:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653917192; bh=1rMP8kZatU4ASe70FEHQC3m9PZKnZRDIpdNd/40kEeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJux4ZwpHcT8ehDUuc97DsswlrdybY1JYHcW9flPV+5qvk3B+QuwpE+b911PofYRP URvzUu8OGJhDPHmQtIcvHDxYp7pw6vMP/8Akk9sJXMKyf8za1tkmPjw+rxJmVwK3fk kEMER+V61g0k4QxcqQhv6N0O3Y0lq6vDeepDcy9UVQyYHpPFNLiQPGNSxVB56HRluR BqK6+i7aK42bWRtkLxW6Nss2ExgWqEvqntKfe7Yj9C4ylDNIgOO0ZVVw4cOGyTlnwv muH4jBHRHRx4tTpX481fYARowQVVSSRGED06ZXU1H7BasZZlluvzDDo9uc4oYSvc1+ KlEbH3hhaLiqg== 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.18 050/159] media: venus: hfi: avoid null dereference in deinit Date: Mon, 30 May 2022 09:22:35 -0400 Message-Id: <20220530132425.1929512-50-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530132425.1929512-1-sashal@kernel.org> References: <20220530132425.1929512-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 4e2151fb47f0..1968f09ad177 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