Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: venus: hfi: fix return value check in sys_get_prop_image_version()

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 <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

authored by

Zhen Lei and committed by
Mauro Carvalho Chehab
331e06bb 38367073

+1 -1
+1 -1
drivers/media/platform/qcom/venus/hfi_msgs.c
··· 261 261 262 262 smem_tbl_ptr = qcom_smem_get(QCOM_SMEM_HOST_ANY, 263 263 SMEM_IMG_VER_TBL, &smem_blk_sz); 264 - if (smem_tbl_ptr && smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ) 264 + if (!IS_ERR(smem_tbl_ptr) && smem_blk_sz >= SMEM_IMG_OFFSET_VENUS + VER_STR_SZ) 265 265 memcpy(smem_tbl_ptr + SMEM_IMG_OFFSET_VENUS, 266 266 img_ver, VER_STR_SZ); 267 267 }