From patchwork Mon Sep 13 13:13:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509755 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp587522jao; Mon, 13 Sep 2021 07:04:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOe1cxe6M9aEMaJ0QqF1kl5aEDa9AfcEAp4PatAbZL7bCRuC7ELsHGFJhRdHGN7yylpI0L X-Received: by 2002:a02:2e44:: with SMTP id u4mr1682358jae.58.1631541876264; Mon, 13 Sep 2021 07:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631541876; cv=none; d=google.com; s=arc-20160816; b=nZe1rLbCMQgKZm7swZBbTvNVgwdZn4/MJlVXxAQGNpm2yoqsUDetqyChuXZ/qgsyms w8tElDAyyNGkiXl+7sk1U8vhnUrHuKWuhr+dZr8H+ThV/FxGvKK6mj71yFsQcnFzz0om 2XSLEjvIjppsjmxg0i2KiKpz4wEMiEvfvuHhqqdmPPZMf83S713QEn/fttnP5yalisjU KHBPf8fXPW0QMsrJnTs7cTweaU7tBI9KaZKwzhTW/G1+Yc2HBrI/qpy3UkwfbRFbeGE8 aWLQjoV5Pg6NEHFGjNajxw5nVUQsA8W8GMeEOPzz6PrdJ872+Ri0ziK0FrR+ymrOMjYe MmdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ld50Iks8ig8hC4b8rjgPezwGnqy+i39uAkkny03kEIg=; b=cXJfWvYphdfe2IV4pZRzU8kS/KIsMxYOaS5+8fbYxspXe/6ldAPms2aP/12qg5j0uK 0x7Ys00lfhsxfpGgRlpvKzX9TUWT8B6478AyT0+iPkny+fDTvOu0jq0qq0sHo1Qphr5Y YukupWS7vK0d6fFlNViaXWkYESaDXMlmi8UFtRz47vWoDBwphwIieeQaDUlN0jDwQHkb /V6lZZkeRuLhcTBflkGQZq2s51M3qwz9LQk93663UEUBOALLh/1Wbt38hAuUxWuuHks6 x46wxVEOZYyvoexC0jH33oqJfjrW63mXHzVcHTjE44PJPSsrUHMb1rWy+WBMunJC5Ec0 WaUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TR2tSSw7; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i6si7108180ilq.174.2021.09.13.07.04.36; Mon, 13 Sep 2021 07:04:36 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TR2tSSw7; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242746AbhIMOFj (ORCPT + 11 others); Mon, 13 Sep 2021 10:05:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:50930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343579AbhIMODb (ORCPT ); Mon, 13 Sep 2021 10:03:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0FDE5610A3; Mon, 13 Sep 2021 13:38:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540327; bh=LVvE+y6pzArc+T50kuTgcVtC1abxJP6A1+323kM0ESE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TR2tSSw7FyZIK1+GyQ1jMDHt7VJOOq8kLMm989pEB2e39KImtDymPOrnhnudqaoRV KXrkvRO+NC0Ys45pAlq4Ugx1DfiVC2CEbQbLc7PK0UvZeMmUYp4pQlm1aaJGBgkod1 5fU1b33BeUYiDC/dQ6tqo5BDXdII/5obkew7GV/c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Stanimir Varbanov , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.13 147/300] media: venus: hfi: fix return value check in sys_get_prop_image_version() Date: Mon, 13 Sep 2021 15:13:28 +0200 Message-Id: <20210913131114.365432289@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit 331e06bbde5856059b7a6bb183f12878ed4decb1 ] In case of error, the function qcom_smem_get() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: d566e78dd6af ("media: venus : hfi: add venus image info into smem") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Signed-off-by: Stanimir Varbanov Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c index a2d436d407b2..e8776ac45b02 100644 --- a/drivers/media/platform/qcom/venus/hfi_msgs.c +++ b/drivers/media/platform/qcom/venus/hfi_msgs.c @@ -261,7 +261,7 @@ sys_get_prop_image_version(struct device *dev, smem_tbl_ptr = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_IMG_VER_TBL, &smem_blk_sz); - if (smem_tbl_ptr && smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ) + if (!IS_ERR(smem_tbl_ptr) && smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ) memcpy(smem_tbl_ptr + SMEM_IMG_OFFSET_VENUS, img_ver, VER_STR_SZ); }