lkml.org 
[lkml]   [2017]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 004/125] [media] s5p-jpeg: dont return a random width/height
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mauro Carvalho Chehab <mchehab@s-opensource.com>

    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.

    Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/platform/s5p-jpeg/jpeg-core.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
    +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
    @@ -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;


    \
     
     \ /
      Last update: 2017-07-25 22:41    [W:4.125 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site