From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7C49C54FCF for ; Tue, 24 Mar 2020 09:11:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC1522070A for ; Tue, 24 Mar 2020 09:11:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727564AbgCXJLg (ORCPT ); Tue, 24 Mar 2020 05:11:36 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:44583 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727543AbgCXJLa (ORCPT ); Tue, 24 Mar 2020 05:11:30 -0400 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jGfao-0004NC-H9; Tue, 24 Mar 2020 10:11:26 +0100 Received: from pza by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1jGfan-0005DC-Ou; Tue, 24 Mar 2020 10:11:25 +0100 Date: Tue, 24 Mar 2020 10:11:25 +0100 From: Philipp Zabel To: Adrian Ratiu Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ezequiel Garcia , kernel@collabora.com, kernel@pengutronix.de, Tim Harvey Subject: Re: [PATCH 1/2] media: coda: jpeg: support optimized huffman tables Message-ID: <20200324091125.GA12488@pengutronix.de> References: <20200323130937.3666244-1-adrian.ratiu@collabora.com> <20200323130937.3666244-2-adrian.ratiu@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200323130937.3666244-2-adrian.ratiu@collabora.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 09:58:04 up 33 days, 16:28, 77 users, load average: 0.06, 0.14, 0.19 User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: pza@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Adrian, On Mon, Mar 23, 2020 at 03:09:36PM +0200, Adrian Ratiu wrote: > Each jpeg can have the huffman tables optimized for its specific content > meaning that the table lenghts and values don't match the standard table > of substitutions so there's no reason to hardcode and expect the sandard > lenghts, otherwise we just end up rejecting optimized jpegs altogether. Thank you, that is a great improvement. There's one issue remaining below: > Tested on CODA960. > > Signed-off-by: Adrian Ratiu > --- > drivers/media/platform/coda/coda-jpeg.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/coda/coda-jpeg.c > index 6a11b64efb6b..162ba28a6b95 100644 > --- a/drivers/media/platform/coda/coda-jpeg.c > +++ b/drivers/media/platform/coda/coda-jpeg.c > @@ -343,7 +343,8 @@ int coda_jpeg_decode_header(struct coda_ctx *ctx, struct vb2_buffer *vb) > v4l2_err(&dev->v4l2_dev, "missing Huffman table\n"); > return -EINVAL; > } > - if (huffman_tables[i].length != ((i & 2) ? 178 : 28)) { > + if (huffman_tables[i].length < 17 || > + huffman_tables[i].length > 178) { The maximum length of the DC tables is 16 + 12, so this should still be checked for a maximum length of 28 if (i & 2) == 0. > v4l2_err(&dev->v4l2_dev, > "invalid Huffman table %d length: %zu\n", > i, huffman_tables[i].length); > @@ -357,10 +358,12 @@ int coda_jpeg_decode_header(struct coda_ctx *ctx, struct vb2_buffer *vb) > return -ENOMEM; > ctx->params.jpeg_huff_tab = huff_tab; > } > - memcpy(huff_tab->luma_dc, huffman_tables[0].start, 16 + 12); > - memcpy(huff_tab->chroma_dc, huffman_tables[1].start, 16 + 12); > - memcpy(huff_tab->luma_ac, huffman_tables[2].start, 16 + 162); > - memcpy(huff_tab->chroma_ac, huffman_tables[3].start, 16 + 162); > + > + memset(huff_tab, 0, sizeof(*huff_tab)); > + memcpy(huff_tab->luma_dc, huffman_tables[0].start, huffman_tables[0].length); > + memcpy(huff_tab->chroma_dc, huffman_tables[1].start, huffman_tables[1].length); Otherwise these two might overflow the luma_dc and chroma_dc arrays. regards Philipp