Commit d61b3b41 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: vicodec: check for valid format in v4l2_fwht_en/decode 



These functions did not return an error if state->info was NULL
or an unsupported pixelformat was selected (should not happen,
but just to be on the safe side).

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 0113c50f

drivers/media/platform/vicodec/codec-v4l2-fwht.c

+11 −4
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ const struct v4l2_fwht_pixfmt_info *v4l2_fwht_get_pixfmt(u32 idx) 
	return v4l2_fwht_pixfmts + idx;

}



unsigned int v4l2_fwht_encode(struct v4l2_fwht_state *state,

			      u8 *p_in, u8 *p_out)

int v4l2_fwht_encode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)

{

	unsigned int size = state->width * state->height;

	const struct v4l2_fwht_pixfmt_info *info = state->info;
@@ -62,6 +61,8 @@ unsigned int v4l2_fwht_encode(struct v4l2_fwht_state *state, 
	u32 encoding;

	u32 flags = 0;



	if (!info)

		return -EINVAL;

	rf.width = state->width;

	rf.height = state->height;

	rf.luma = p_in;
@@ -137,6 +138,8 @@ unsigned int v4l2_fwht_encode(struct v4l2_fwht_state *state, 
		rf.cr = rf.cb + 2;

		rf.luma++;

		break;

	default:

		return -EINVAL;

	}



	cf.width = state->width;
@@ -180,8 +183,7 @@ unsigned int v4l2_fwht_encode(struct v4l2_fwht_state *state, 
	return cf.size + sizeof(*p_hdr);

}



int v4l2_fwht_decode(struct v4l2_fwht_state *state,

		     u8 *p_in, u8 *p_out)

int v4l2_fwht_decode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)

{

	unsigned int size = state->width * state->height;

	unsigned int chroma_size = size;
@@ -191,6 +193,9 @@ int v4l2_fwht_decode(struct v4l2_fwht_state *state, 
	struct fwht_cframe cf;

	u8 *p;



	if (!state->info)

		return -EINVAL;



	p_hdr = (struct fwht_cframe_hdr *)p_in;

	cf.width = ntohl(p_hdr->width);

	cf.height = ntohl(p_hdr->height);
@@ -320,6 +325,8 @@ int v4l2_fwht_decode(struct v4l2_fwht_state *state, 
			*p++ = 0;

		}

		break;

	default:

		return -EINVAL;

	}

	return 0;

}

drivers/media/platform/vicodec/codec-v4l2-fwht.h

+2 −5
Original line number Diff line number Diff line
@@ -41,10 +41,7 @@ struct v4l2_fwht_state { 
const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_pixfmt(u32 pixelformat);

const struct v4l2_fwht_pixfmt_info *v4l2_fwht_get_pixfmt(u32 idx);



unsigned int v4l2_fwht_encode(struct v4l2_fwht_state *state,

			      u8 *p_in, u8 *p_out);



int v4l2_fwht_decode(struct v4l2_fwht_state *state,

		     u8 *p_in, u8 *p_out);

int v4l2_fwht_encode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out);

int v4l2_fwht_decode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE