From patchwork Wed Jul 7 07:45:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 470788 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5749226jao; Wed, 7 Jul 2021 00:45:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEBu9XNXfnTO8zm+ZfnW+1qphvZos9GHExkK6HS+EIkJUyPYkLQYd5P2Q011nZumKMagaN X-Received: by 2002:a02:a14d:: with SMTP id m13mr20788025jah.51.1625643947982; Wed, 07 Jul 2021 00:45:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625643947; cv=none; d=google.com; s=arc-20160816; b=0UVgGzi0Tst7A4dtT+tf+Rk/CzwrnU8+GNLFFKS1FhIOxUXmaXmFF/bSWmQCU2KJxC pOjHjNontPOs0X/WcuemJ5c+mWS2H3mLfluM8Yufihlk0Jj5FCdhbbG42z4JcQu7IL0G xkB4zC6Vs8vlGsMpOfC7inytM5AKQ6tk40N9ZRESU23dsCGinnMV6D0ZXmVQJyZrpyIm M0429xxgV4ar22BxoKyMlmVmyWhK61PsReleeyS4qig+Kdt3nNPyFuFwrI6mzGf+civ+ 47Vrr3XCyH5RQiouqiBy0mLU3PVtkEYhgBVxqUNVqBKgxGNwHSikt2xvuY0WhBNahZP9 WI3A== 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 :message-id:date:subject:cc:to:from; bh=eV7p7OBryacaBF+s3tQGCMFAU/g77f/GIjXxxqdfC1g=; b=QgoNt3c4ZMFNv78r03kFedkKwKXNqgjm7RN2I7Ty7/9i0anw6r2KRTtkpWj3+m7Bq9 Fks5xKTO9G9lkgWbgionIvTvK0OelgGsZWbGAUD1DGataVJZbfxVTxBW9XAZ982MnWSi 12XlS5k9LVccmbc97TJVm2w85P1s2+5TLU11v5XeSynO59gWNaUo7sJyOeXUc1fJpZ/u gK66Ty5rDaPCL1Sf6P5LRgfnVct1vOLqKTsHTR0kcpDzQW4IbCmluiBZbQH1QF48WyyR Q+jLv4w5TBcp86kD5ep7AohOScxjSoWi05bgV1LKR/vL9F1f07jtVbqoEhYjpPShvtlZ sQCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q3si23685332ilu.88.2021.07.07.00.45.47; Wed, 07 Jul 2021 00:45:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230526AbhGGHs0 (ORCPT + 17 others); Wed, 7 Jul 2021 03:48:26 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:10283 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbhGGHsZ (ORCPT ); Wed, 7 Jul 2021 03:48:25 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4GKWYB0WKYz1CGDj; Wed, 7 Jul 2021 15:40:14 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 7 Jul 2021 15:45:36 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 7 Jul 2021 15:45:35 +0800 From: Zhen Lei To: Stanimir Varbanov , Andy Gross , Bjorn Andersson , "Mauro Carvalho Chehab" , linux-media , linux-arm-msm , linux-kernel CC: Zhen Lei , Stephen Boyd , Dikshita Agarwal Subject: [PATCH 1/1] media: venus: hfi: fix return value check in sys_get_prop_image_version() Date: Wed, 7 Jul 2021 15:45:17 +0800 Message-ID: <20210707074517.2775-1-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 --- drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.25.1 Reviewed-by: Stephen Boyd diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c index d9fde66f6fa8..9a2bdb002edc 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); }