Commit b237b058 authored by Ming Qian's avatar Ming Qian Committed by Hans Verkuil
Browse files

media: amphion: fix CHECKED_RETURN issues reported by coverity 



calling "vpu_cmd_send/vpu_get_buffer_state/vpu_session_alloc_fs"
without checking return value

Fixes: 9f599f35 ("media: amphion: add vpu core driver")
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarMing Qian <ming.qian@nxp.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent f000e6ca

drivers/media/platform/amphion/vdec.c

+4 −1
Original line number Diff line number Diff line
@@ -1019,6 +1019,7 @@ static int vdec_response_frame_abnormal(struct vpu_inst *inst) 
{

	struct vdec_t *vdec = inst->priv;

	struct vpu_fs_info info;

	int ret;



	if (!vdec->req_frame_count)

		return 0;
@@ -1026,7 +1027,9 @@ static int vdec_response_frame_abnormal(struct vpu_inst *inst) 
	memset(&info, 0, sizeof(info));

	info.type = MEM_RES_FRAME;

	info.tag = vdec->seq_tag + 0xf0;

	vpu_session_alloc_fs(inst, &info);

	ret = vpu_session_alloc_fs(inst, &info);

	if (ret)

		return ret;

	vdec->req_frame_count--;



	return 0;

drivers/media/platform/amphion/vpu_cmds.c

+2 −1
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ static void vpu_core_keep_active(struct vpu_core *core) 


	dev_dbg(core->dev, "try to wake up\n");

	mutex_lock(&core->cmd_lock);

	vpu_cmd_send(core, &pkt);

	if (vpu_cmd_send(core, &pkt))

		dev_err(core->dev, "fail to keep active\n");

	mutex_unlock(&core->cmd_lock);

}

drivers/media/platform/amphion/vpu_dbg.c

+9 −2
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ static char *vpu_stat_name[] = { 
	[VPU_BUF_STATE_ERROR] = "error",

};



static inline const char *to_vpu_stat_name(int state)

{

	if (state <= VPU_BUF_STATE_ERROR)

		return vpu_stat_name[state];

	return "unknown";

}



static int vpu_dbg_instance(struct seq_file *s, void *data)

{

	struct vpu_inst *inst = s->private;
@@ -141,7 +148,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *data) 
		num = scnprintf(str, sizeof(str),

				"output [%2d] state = %10s, %8s\n",

				i, vb2_stat_name[vb->state],

				vpu_stat_name[vpu_get_buffer_state(vbuf)]);

				to_vpu_stat_name(vpu_get_buffer_state(vbuf)));

		if (seq_write(s, str, num))

			return 0;

	}
@@ -156,7 +163,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *data) 
		num = scnprintf(str, sizeof(str),

				"capture[%2d] state = %10s, %8s\n",

				i, vb2_stat_name[vb->state],

				vpu_stat_name[vpu_get_buffer_state(vbuf)]);

				to_vpu_stat_name(vpu_get_buffer_state(vbuf)));

		if (seq_write(s, str, num))

			return 0;

	}