Commit c8c80c99 authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Mauro Carvalho Chehab
Browse files

media: meson: vdec: potential dereference of null pointer 



As the possible failure of the kzalloc(), the 'new_ts' could be NULL
pointer.
Therefore, it should be better to check it in order to avoid the
dereference of the NULL pointer.
Also, the caller esparser_queue() needs to deal with the return value of
the amvdec_add_ts().

Fixes: 876f123b ("media: meson: vdec: bring up to compliance")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Suggested-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 417591a7

drivers/staging/media/meson/vdec/esparser.c

+6 −1
Original line number Diff line number Diff line
@@ -328,7 +328,12 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) 


	offset = esparser_get_offset(sess);



	amvdec_add_ts(sess, vb->timestamp, vbuf->timecode, offset, vbuf->flags);

	ret = amvdec_add_ts(sess, vb->timestamp, vbuf->timecode, offset, vbuf->flags);

	if (ret) {

		v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);

		return ret;

	}



	dev_dbg(core->dev, "esparser: ts = %llu pld_size = %u offset = %08X flags = %08X\n",

		vb->timestamp, payload_size, offset, vbuf->flags);

drivers/staging/media/meson/vdec/vdec_helpers.c

+6 −2
Original line number Diff line number Diff line
@@ -227,13 +227,16 @@ int amvdec_set_canvases(struct amvdec_session *sess, 
}

EXPORT_SYMBOL_GPL(amvdec_set_canvases);



void amvdec_add_ts(struct amvdec_session *sess, u64 ts,

int amvdec_add_ts(struct amvdec_session *sess, u64 ts,

		  struct v4l2_timecode tc, u32 offset, u32 vbuf_flags)

{

	struct amvdec_timestamp *new_ts;

	unsigned long flags;



	new_ts = kzalloc(sizeof(*new_ts), GFP_KERNEL);

	if (!new_ts)

		return -ENOMEM;



	new_ts->ts = ts;

	new_ts->tc = tc;

	new_ts->offset = offset;
@@ -242,6 +245,7 @@ void amvdec_add_ts(struct amvdec_session *sess, u64 ts, 
	spin_lock_irqsave(&sess->ts_spinlock, flags);

	list_add_tail(&new_ts->list, &sess->timestamps);

	spin_unlock_irqrestore(&sess->ts_spinlock, flags);

	return 0;

}

EXPORT_SYMBOL_GPL(amvdec_add_ts);

drivers/staging/media/meson/vdec/vdec_helpers.h

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void amvdec_dst_buf_done_offset(struct amvdec_session *sess, 
 * @offset: offset in the VIFIFO where the associated packet was written

 * @flags: the vb2_v4l2_buffer flags

 */

void amvdec_add_ts(struct amvdec_session *sess, u64 ts,

int amvdec_add_ts(struct amvdec_session *sess, u64 ts,

		  struct v4l2_timecode tc, u32 offset, u32 flags);

void amvdec_remove_ts(struct amvdec_session *sess, u64 ts);