From patchwork Tue Jan 22 15:00:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 10775643 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED05113B4 for ; Tue, 22 Jan 2019 15:00:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3FFE29F54 for ; Tue, 22 Jan 2019 15:00:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1CF429D16; Tue, 22 Jan 2019 15:00:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1BB229F7E for ; Tue, 22 Jan 2019 15:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728930AbfAVPAp (ORCPT ); Tue, 22 Jan 2019 10:00:45 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:44060 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728836AbfAVPAp (ORCPT ); Tue, 22 Jan 2019 10:00:45 -0500 Received: by mail-wr1-f65.google.com with SMTP id z5so27662703wrt.11 for ; Tue, 22 Jan 2019 07:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SO2i4BLHruEkDka/N/Z8762jTWVr8gQeNkUZzbgbJP8=; b=US/3ueqEXiZ3nTwumthKzzgmjcUuN0BB6EFlWO8usI5k+JeVn/wZqqSsdKu68dxR4u GSLFZLJv5/njCp+vuhxLVrHYjkCBjZnQOi/eKrfk5bDME2RhlOnzlTJVpurdKwUtG3CY 1n96e9oLrItqCO8aNx4vCL4CwJ5Lp4SXQ0Y3Ow+rSdXQKbsgpv+hMuZQ17+clyrLEPdE 5SiLsUUbZZ6LRfsUm4ps+e8ekvIUfofrelZddb7D79cnrlKbFrcPN1IYSTp4xfIumXe0 DEjvgm7ppvN5ktqi/xDj7nHVT3gZwxIoZdhI3lK0MXa+Opw1VvbI+DL1kbDpmYSof+OR nvFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SO2i4BLHruEkDka/N/Z8762jTWVr8gQeNkUZzbgbJP8=; b=V7nSMU0wyI7UXbVy5JnDGRMv4ZHeSbAYCEYYHGwMPHn6TvXfSy+2kSHEGAqjsWnYOO bCaYSnii5311Wdn/cok/nXVuz03/XxR1weKH9oqfQ7uLBgpqXZ7FastyxHxRVeGvnkkx Zmg5oZ2Mz7Tj3MPPgFXmNPXM5F9dctUN65Qi0QmYOe01CMW09+aapOk2iJJoQXyQREer lTbGcSV2kNnvq2D1BOrgwtoIc7Cn9WhoHzPEgkDYIiiMggxT94+bjyQn+h41L4V070o+ /KiVHmPByV7I84zoNnp3NQRVb/0qWcNUp0WPVcFQ5FhA0eIRvHqHapgeVgAQ0hk7P8zw D9kQ== X-Gm-Message-State: AJcUukeA06mc39NrWqweQjMnSBbZ07eLnUYHlq1Ac/Z4sp14Jy30OPby k1gUogKob8jRlyOhz6H3Vnvy3Q7HjZM= X-Google-Smtp-Source: ALg8bN5rNdRJZX5X11JNk6qqZoiKM9rDXoRVt86aGZg4zldjQNLlF8p6mL9TvQwg0P1WZZjW71leUg== X-Received: by 2002:a5d:6684:: with SMTP id l4mr35889123wru.154.1548169242429; Tue, 22 Jan 2019 07:00:42 -0800 (PST) Received: from localhost.localdomain ([87.70.46.65]) by smtp.gmail.com with ESMTPSA id m21sm41053061wmi.43.2019.01.22.07.00.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jan 2019 07:00:41 -0800 (PST) From: Dafna Hirschfeld To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, helen.koike@collabora.com, Dafna Hirschfeld Subject: [PATCH] media: vicodec: ensure comp frame pointer kept in range Date: Tue, 22 Jan 2019 07:00:34 -0800 Message-Id: <20190122150034.49696-1-dafna3@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure that the pointer to the compressed frame does not get out of the buffer. Signed-off-by: Dafna Hirschfeld --- drivers/media/platform/vicodec/codec-fwht.c | 73 +++++++++++++------ drivers/media/platform/vicodec/codec-fwht.h | 8 +- .../media/platform/vicodec/codec-v4l2-fwht.c | 8 +- drivers/media/platform/vicodec/vicodec-core.c | 4 + 4 files changed, 62 insertions(+), 31 deletions(-) diff --git a/drivers/media/platform/vicodec/codec-fwht.c b/drivers/media/platform/vicodec/codec-fwht.c index e5e0a80c2f73..e12f04a99d3f 100644 --- a/drivers/media/platform/vicodec/codec-fwht.c +++ b/drivers/media/platform/vicodec/codec-fwht.c @@ -104,16 +104,20 @@ static int rlc(const s16 *in, __be16 *output, int blocktype) * This function will worst-case increase rlc_in by 65*2 bytes: * one s16 value for the header and 8 * 8 coefficients of type s16. */ -static s16 derlc(const __be16 **rlc_in, s16 *dwht_out) +static int derlc(const __be16 **rlc_in, s16 *dwht_out, s16 *stat, + const __be16 *after_rlco) { /* header */ const __be16 *input = *rlc_in; - s16 ret = ntohs(*input++); int dec_count = 0; s16 block[8 * 8 + 16]; s16 *wp = block; int i; + if (input >= after_rlco) + return -1; + *stat = ntohs(*input++); + /* * Now de-compress, it expands one byte to up to 15 bytes * (or fills the remainder of the 64 bytes with zeroes if it @@ -123,9 +127,15 @@ static s16 derlc(const __be16 **rlc_in, s16 *dwht_out) * allow for overflow if the incoming data was malformed. */ while (dec_count < 8 * 8) { - s16 in = ntohs(*input++); - int length = in & 0xf; - int coeff = in >> 4; + s16 in; + int length; + int coeff; + + if (input >= after_rlco) + return -1; + in = ntohs(*input++); + length = in & 0xf; + coeff = in >> 4; /* fill remainder with zeros */ if (length == 15) { @@ -150,7 +160,7 @@ static s16 derlc(const __be16 **rlc_in, s16 *dwht_out) dwht_out[x + y * 8] = *wp++; } *rlc_in = input; - return ret; + return 0; } static const int quant_table[] = { @@ -808,9 +818,9 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm, return encoding; } -static void decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref, - u32 height, u32 width, u32 coded_width, - bool uncompressed) +static int decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref, + u32 height, u32 width, u32 coded_width, + bool uncompressed, const __be16 *after_rlco) { unsigned int copies = 0; s16 copy[8 * 8]; @@ -821,9 +831,11 @@ static void decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref, height = round_up(height, 8); if (uncompressed) { + if (after_rlco < *rlco + width * height / 2) + return -1; memcpy(ref, *rlco, width * height); *rlco += width * height / 2; - return; + return 0; } /* @@ -835,6 +847,7 @@ static void decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref, for (j = 0; j < height / 8; j++) { for (i = 0; i < width / 8; i++) { u8 *refp = ref + j * 8 * coded_width + i * 8; + int ret; if (copies) { memcpy(cf->de_fwht, copy, sizeof(copy)); @@ -847,8 +860,9 @@ static void decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref, continue; } - stat = derlc(rlco, cf->coeffs); - + ret = derlc(rlco, cf->coeffs, &stat, after_rlco); + if (ret < 0) + return -1; if (stat & PFRAME_BIT) dequantize_inter(cf->coeffs); else @@ -865,17 +879,21 @@ static void decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref, fill_decoder_block(refp, cf->de_fwht, coded_width); } } + return 0; } -void fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref, - u32 hdr_flags, unsigned int components_num, - unsigned int width, unsigned int height, - unsigned int coded_width) +int fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref, + u32 hdr_flags, unsigned int components_num, + unsigned int width, unsigned int height, + unsigned int coded_width) { const __be16 *rlco = cf->rlc_data; + const __be16 *after_rlco = cf->rlc_data + (cf->size / sizeof(*rlco)); - decode_plane(cf, &rlco, ref->luma, height, width, coded_width, - hdr_flags & FWHT_FL_LUMA_IS_UNCOMPRESSED); + if (decode_plane(cf, &rlco, ref->luma, height, width, coded_width, + hdr_flags & FWHT_FL_LUMA_IS_UNCOMPRESSED, + after_rlco) < 0) + return -1; if (components_num >= 3) { u32 h = height; @@ -888,13 +906,20 @@ void fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref, w /= 2; c /= 2; } - decode_plane(cf, &rlco, ref->cb, h, w, c, - hdr_flags & FWHT_FL_CB_IS_UNCOMPRESSED); - decode_plane(cf, &rlco, ref->cr, h, w, c, - hdr_flags & FWHT_FL_CR_IS_UNCOMPRESSED); + if (decode_plane(cf, &rlco, ref->cb, h, w, c, + hdr_flags & FWHT_FL_CB_IS_UNCOMPRESSED, + after_rlco) < 0) + return -1; + if (decode_plane(cf, &rlco, ref->cr, h, w, c, + hdr_flags & FWHT_FL_CR_IS_UNCOMPRESSED, + after_rlco) < 0) + return -1; } if (components_num == 4) - decode_plane(cf, &rlco, ref->alpha, height, width, coded_width, - hdr_flags & FWHT_FL_ALPHA_IS_UNCOMPRESSED); + if (decode_plane(cf, &rlco, ref->alpha, height, width, coded_width, + hdr_flags & FWHT_FL_ALPHA_IS_UNCOMPRESSED, + after_rlco) < 0) + return -1; + return 0; } diff --git a/drivers/media/platform/vicodec/codec-fwht.h b/drivers/media/platform/vicodec/codec-fwht.h index ad8cfc60a152..ce7aa8a4d761 100644 --- a/drivers/media/platform/vicodec/codec-fwht.h +++ b/drivers/media/platform/vicodec/codec-fwht.h @@ -139,9 +139,9 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm, bool is_intra, bool next_is_intra, unsigned int width, unsigned int height, unsigned int stride, unsigned int chroma_stride); -void fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref, - u32 hdr_flags, unsigned int components_num, - unsigned int width, unsigned int height, - unsigned int coded_width); +int fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref, + u32 hdr_flags, unsigned int components_num, + unsigned int width, unsigned int height, + unsigned int coded_width); #endif diff --git a/drivers/media/platform/vicodec/codec-v4l2-fwht.c b/drivers/media/platform/vicodec/codec-v4l2-fwht.c index ee6903b8896c..d8c58d0a667c 100644 --- a/drivers/media/platform/vicodec/codec-v4l2-fwht.c +++ b/drivers/media/platform/vicodec/codec-v4l2-fwht.c @@ -280,6 +280,7 @@ int v4l2_fwht_decode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out) state->ycbcr_enc = ntohl(state->header.ycbcr_enc); state->quantization = ntohl(state->header.quantization); cf.rlc_data = (__be16 *)p_in; + cf.size = ntohl(state->header.size); hdr_width_div = (flags & FWHT_FL_CHROMA_FULL_WIDTH) ? 1 : 2; hdr_height_div = (flags & FWHT_FL_CHROMA_FULL_HEIGHT) ? 1 : 2; @@ -287,9 +288,10 @@ int v4l2_fwht_decode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out) hdr_height_div != info->height_div) return -EINVAL; - fwht_decode_frame(&cf, &state->ref_frame, flags, components_num, - state->visible_width, state->visible_height, - state->coded_width); + if (fwht_decode_frame(&cf, &state->ref_frame, flags, components_num, + state->visible_width, state->visible_height, + state->coded_width) < 0) + return -EINVAL; /* * TODO - handle the case where the compressed stream encodes a diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c index b84dae343645..953b9c4816a5 100644 --- a/drivers/media/platform/vicodec/vicodec-core.c +++ b/drivers/media/platform/vicodec/vicodec-core.c @@ -186,6 +186,10 @@ static int device_process(struct vicodec_ctx *ctx, return ret; vb2_set_plane_payload(&dst_vb->vb2_buf, 0, ret); } else { + unsigned int comp_frame_size = ntohl(ctx->state.header.size); + + if (comp_frame_size > ctx->comp_max_size) + return -EINVAL; state->info = q_dst->info; ret = v4l2_fwht_decode(state, p_src, p_dst); if (ret < 0)