Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp5327624pxv; Wed, 7 Jul 2021 00:48:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnbUVO8j2gRcbzVa5xB5w6d9aOkiGSH99SPV9VJzLfssjcSiOg7QYN4l99aunbjrnmil3C X-Received: by 2002:a05:6402:d54:: with SMTP id ec20mr862038edb.41.1625644128932; Wed, 07 Jul 2021 00:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625644128; cv=none; d=google.com; s=arc-20160816; b=tFkILb5BeiPTjfsQFXoH9DYvfIssKeA6ULdtA9SuhwYGbVEF5kHNYF3/RjvaFyDLi/ v/vs+OLyoUrsyQ6qXtfEBrTE6PgDGzDGYEiY4j2kaWyv7nyBregs2TGmplzq1cBFEv6L dJCTrAG73s+dIOXD7xklaTP+lmGw8aLtxX430WtF+ORHwzjJbck7vfPKhG8NihfAbWOm wL/o9RK6l6LjR8rnA317KtHXR1wq0m5JpDnf0B79yQlYhC07Tw8huH1XiuTVuzDaML7v Hed1t17+IL9Oc61mVsopiVg8fe0VF79T2bGKbylGXqvM5DHNOEEX0Rmnla3OFAjxkipK uIrg== 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=bAkOS9vsGcffLYKrvqOlMNEI5Nrg3re0d9VpOBE/qcEaUFn5YTNYs8bx2QgQNb9GOy yhIm6FYAlPnICPgEHKMyV7PY3DwoEMJdpPKt1yynceBjaKuBSL8bCIX4GsCnHdTKINR0 bZKr5oWQwSKIL0fMOb8Jn09iyxXa8JLT+sOy/B1ko7Ci80ulFK3POp182iTsAhfxsxWz YxCNP+GxzYpF8DUSZNxSQJhug42lCMRD53Yw8HX4XYM3/14V1Wh0AQq9m8PgkZe43M2a K4VWWODEMZtWvU0/j7eNP+GjONo6pRep4Bjv1x0c03CcJbhnSiKpfmlWDd/uAIz4faQw 7Hdg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 bh4si14910849ejb.56.2021.07.07.00.48.26; Wed, 07 Jul 2021 00:48:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S231173AbhGGHs0 (ORCPT + 99 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 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII 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-kernel@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(-) 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); } -- 2.25.1