linux-kernel - Re: [PATCH v5 09/10] media: Avoid parsing quantization and huffman tables

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 2 Dec 2020 13:12:38 +0100
From:   Hans Verkuil <hverkuil-cisco@...all.nl>
To:     "Mirela Rabulea (OSS)" <mirela.rabulea@....nxp.com>,
        mchehab@...nel.org, shawnguo@...nel.org, robh+dt@...nel.org,
        p.zabel@...gutronix.de
Cc:     paul.kocialkowski@...tlin.com, linux-media@...r.kernel.org,
        linux-kernel@...r.kernel.org, linux-imx@....com,
        s.hauer@...gutronix.de, aisheng.dong@....com,
        daniel.baluta@....com, robert.chiras@....com,
        laurentiu.palcu@....com, mark.rutland@....com,
        devicetree@...r.kernel.org, ezequiel@...labora.com,
        laurent.pinchart+renesas@...asonboard.com,
        niklas.soderlund+renesas@...natech.se,
        dafna.hirschfeld@...labora.com,
        Mirela Rabulea <mirela.rabulea@....com>
Subject: Re: [PATCH v5 09/10] media: Avoid parsing quantization and huffman
 tables

On 12/11/2020 04:05, Mirela Rabulea (OSS) wrote:
> From: Mirela Rabulea <mirela.rabulea@....com>
> 
> These are optional in struct v4l2_jpeg_header, so do not parse if
> not requested, save some time.
> 
> Signed-off-by: Mirela Rabulea <mirela.rabulea@....com>
> ---
>  drivers/media/v4l2-core/v4l2-jpeg.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-jpeg.c b/drivers/media/v4l2-core/v4l2-jpeg.c
> index d77e04083d57..7576cd0ce6b9 100644
> --- a/drivers/media/v4l2-core/v4l2-jpeg.c
> +++ b/drivers/media/v4l2-core/v4l2-jpeg.c
> @@ -307,6 +307,9 @@ static int jpeg_parse_quantization_tables(struct jpeg_stream *stream,
>  {
>  	int len = jpeg_get_word_be(stream);
>  
> +	if (!tables)
> +		return 0;
> +

It feels more natural to check for a non-NULL out->quantization_tables
or non-NULL out->huffman_tables pointer in v4l2_jpeg_parse_header()
rather than in these low-level functions. It's weird to have this check here.

Regards,

	Hans

>  	if (len < 0)
>  		return len;
>  	/* Lq = 2 + n * 65 (for baseline DCT), n >= 1 */
> @@ -361,6 +364,9 @@ static int jpeg_parse_huffman_tables(struct jpeg_stream *stream,
>  	int mt;
>  	int len = jpeg_get_word_be(stream);
>  
> +	if (!tables)
> +		return 0;
> +
>  	if (len < 0)
>  		return len;
>  	/* Table B.5 - Huffman table specification parameter sizes and values */
>