Patch "[media] s5p-jpeg: don't return a random width/height" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
[media] s5p-jpeg: don't return a random width/height
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s5p-jpeg-don-t-return-a-random-width-height.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
a16e37726c444cbda91e73ed5f742e717bfe866fMon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <[email protected]>
Date: Thu, 18 May 2017 10:40:00 -0300
Subject: [media] s5p-jpeg: don't return a random width/height
From: Mauro Carvalho Chehab <[email protected]>
commit a16e37726c444cbda91e73ed5f742e717bfe866f upstream.
Gcc 7.1 complains about:
drivers/media/platform/s5p-jpeg/jpeg-core.c: In function 's5p_jpeg_parse_hdr.isra.9':drivers/media/platform/s5p-jpeg/jpeg-core.c:1207:12: warning: 'width' may be used uninitialized in this function [-Wmaybe-uninitialized]
result->w = width;
~~~~~~~~~~^~~~~~~drivers/media/platform/s5p-jpeg/jpeg-core.c:1208:12: warning: 'height' may be used uninitialized in this function [-Wmaybe-uninitialized]
result->h = height;
~~~~~~~~~~^~~~~~~~
Indeed the code would allow it to return a random value (although it shouldn't happen, in practice). So, explicitly set both to zero, just in case.
--- drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/platform/s5p-jpeg/jpeg-core.c +4 -4
@@ -1099,10 +1099,10 @@ static bool s5p_jpeg_parse_hdr(struct s5 struct s5p_jpeg_ctx *ctx) {int c, components =0 , notfound, n_dht =0 , n_dqt =0 ; -unsigned int height, width, word, subsampling =0 , sos =0 , sof =0 , - sof_len =0 ; -unsigned int dht[S5P_JPEG_MAX_MARKER ], dht_len[S5P_JPEG_MAX_MARKER ], - dqt[S5P_JPEG_MAX_MARKER ], dqt_len[S5P_JPEG_MAX_MARKER ]; +unsigned int height =0 , width =0 , word, subsampling =0 ; +unsigned int sos =0 , sof =0 , sof_len =0 ; +unsigned int dht[S5P_JPEG_MAX_MARKER ], dht_len[S5P_JPEG_MAX_MARKER ]; +unsigned int dqt[S5P_JPEG_MAX_MARKER ], dqt_len[S5P_JPEG_MAX_MARKER ];long length;struct s5p_jpeg_buffer jpeg_buffer;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch queue-4.9/s5p-jpeg-don-t-return-a-random-width-height.patch