Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe8a57b6 authored by Thierry Escande's avatar Thierry Escande Committed by Mauro Carvalho Chehab
Browse files

media: s5p-jpeg: Handle parsing error in s5p_jpeg_parse_hdr() 



This patch modifies the s5p_jpeg_parse_hdr() function so it only
modifies the passed s5p_jpeg_q_data structure if the jpeg header parsing
is successful.

Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Acked-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: default avatarJacek Anaszewski <jacek.anaszewski@gmail.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent fa3cb90b

drivers/media/platform/s5p-jpeg/jpeg-core.c

+21 −17
Original line number Diff line number Diff line
@@ -1206,22 +1206,9 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result, 
			break;

		}

	}

	result->w = width;

	result->h = height;

	result->sos = sos;

	result->dht.n = n_dht;

	while (n_dht--) {

		result->dht.marker[n_dht] = dht[n_dht];

		result->dht.len[n_dht] = dht_len[n_dht];

	}

	result->dqt.n = n_dqt;

	while (n_dqt--) {

		result->dqt.marker[n_dqt] = dqt[n_dqt];

		result->dqt.len[n_dqt] = dqt_len[n_dqt];

	}

	result->sof = sof;

	result->sof_len = sof_len;

	result->size = result->components = components;



	if (notfound || !sos)

		return false;



	switch (subsampling) {

	case 0x11:
@@ -1240,7 +1227,24 @@ static bool s5p_jpeg_parse_hdr(struct s5p_jpeg_q_data *result, 
		return false;

	}



	return !notfound && sos;

	result->w = width;

	result->h = height;

	result->sos = sos;

	result->dht.n = n_dht;

	while (n_dht--) {

		result->dht.marker[n_dht] = dht[n_dht];

		result->dht.len[n_dht] = dht_len[n_dht];

	}

	result->dqt.n = n_dqt;

	while (n_dqt--) {

		result->dqt.marker[n_dqt] = dqt[n_dqt];

		result->dqt.len[n_dqt] = dqt_len[n_dqt];

	}

	result->sof = sof;

	result->sof_len = sof_len;

	result->size = result->components = components;



	return true;

}



static int s5p_jpeg_querycap(struct file *file, void *priv,