Commit 331e06bb authored by Zhen Lei's avatar Zhen Lei Committed by Mauro Carvalho Chehab
Browse files

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: d566e78d ("media: venus : hfi: add venus image info into smem")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 38367073

drivers/media/platform/qcom/venus/hfi_msgs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}