From patchwork Sat Nov 5 20:16:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1198645pzb; Sat, 5 Nov 2022 13:16:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6JLFiPBjg+rvmSOiIb8uvft4AvL7VgQMGAs4yPDdzJYt5+fDaZHt9u6s4n6QTSh8BMPCay X-Received: by 2002:a05:6402:4445:b0:461:b506:de51 with SMTP id o5-20020a056402444500b00461b506de51mr10667377edb.388.1667679402409; Sat, 05 Nov 2022 13:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667679402; cv=none; d=google.com; s=arc-20160816; b=WC62WHwNV6sZ6F9KiFN0w+o+JaqCC/YwAAfSWJpzsYoJMTSiaelU/S2WRk/FQt8GXD dF9vPnm4BI6jqUp9aoF6+0z2SF4EPIuDzCrgamPmt1UzH+NSKGwCjxgSXDf8MiGkGCY0 tmy2mWsxqRHAi9WllWHpf8RoQfwQlFuguh5tY1exIGqKYaKe9SBEv8DEY5WNU9IialOt MxFWvZFYWVSPX0yhqMN9UK9QEopRiCZUpPZVhW4Nws9r3vRH2/jw1arHmI4/UyUFAAld O88YVUNg9CpBUe2Kg8NChdu88+n9qHVH1LMNqOVEfq3fEwKSonrNpaPW7lYv0jXbYHiz +3Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=imIoTbTOJge8nDNOggZEPHBDZfPYTH80hFHpefCmFNY=; b=xZrsCmJJXM3LZ/KSykJR7dRaCVHuIS/N1I3iUhm4sARtUyNRDiUnUaVQArWcc7QLhd IIDstdr7JRkn8KrKQbmznm5H5sw/rmsGrpARkysD56AZ30XpocPLlO1O6jiSz5UvJWdY mQd0RQTt6RxFIgIQmkSp3f8QT0yKrSrfcxesLeYN4apSvib9qjLL/4Rp746iw144LO+1 rFqpOy6kEg8sLAWfAUWj4l7ran7GeUH5Pgu/SYLry4kGd635433UUVM6Bdt8BrYV8c3s mig7WDjd2nZ6h9DTZVP6GgMyi3AdMdztq8+OWd++UCf4NIkpjOpq2KNNNThD+WZ0871L uAgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id he13-20020a1709073d8d00b007826de24087si3542459ejc.228.2022.11.05.13.16.41; Sat, 05 Nov 2022 13:16:42 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE28E68B0A6; Sat, 5 Nov 2022 22:16:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C982C68B0A6 for ; Sat, 5 Nov 2022 22:16:31 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id EDA0420009 for ; Sat, 5 Nov 2022 20:16:30 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Nov 2022 21:16:26 +0100 Message-Id: <20221105201629.1980-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/dts2pts_bsf: Check ctx for NULL before ff_cbs_flush() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QW38kwMldxdA Fixes: null pointer dereference Fixes: 52155/clusterfuzz-testcase-minimized-ffmpeg_BSF_DTS2PTS_fuzzer-5760107527143424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/dts2pts_bsf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dts2pts_bsf.c b/libavcodec/dts2pts_bsf.c index bf20b1ec8a..8142562d2c 100644 --- a/libavcodec/dts2pts_bsf.c +++ b/libavcodec/dts2pts_bsf.c @@ -505,7 +505,8 @@ static void dts2pts_flush(AVBSFContext *ctx) s->root = NULL; ff_cbs_fragment_reset(&s->au); - ff_cbs_flush(s->cbc); + if (s->cbc) + ff_cbs_flush(s->cbc); } static void dts2pts_close(AVBSFContext *ctx) From patchwork Sat Nov 5 20:16:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1198716pzb; Sat, 5 Nov 2022 13:16:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6XJSMn7CeVBUa+XO3XIG7rVGK4p6sALv9MSA+6DmrAcCrbRjyMUP5E78VlsrDor5PENu/0 X-Received: by 2002:a17:907:9809:b0:7ad:d945:554f with SMTP id ji9-20020a170907980900b007add945554fmr30783642ejc.552.1667679411217; Sat, 05 Nov 2022 13:16:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667679411; cv=none; d=google.com; s=arc-20160816; b=aNhkDjjU/WGfFxMR4BNcIQc7O/KwI2KXTw3Ns+kyHxw/GgGk6II/jmoqolXBdgL9pH lpnkJIrXnzk/7xe8cS1gMDI9blXSvPlLMheLnt44JhtqcUfmVb/jASELwVgsP+iunNBw r6NAwEN0Bcuk23Vl4jZ8wxSEYfXEYooIZmxuwrTLmtfP1sV8TqvlJMLam6+KMpsk7hIO H9yJcSai+Q/2vW2Qf54hIRh28heTxfP39kZPbcwPjyl1CKjtgUXPD2QtxexcbNr7xLTN WVBdFOZe4xgxHL7BmM1DDWmKvm9j6/eKZxTy020uSoW1fsBG3ffplAfywTf4brppFSkS M7Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=ZqXAEK264ST8yjK1g9acvSM0hxlfV+YrPCuznKnPG+c=; b=uEsJDwmtErQ2teI89Or9zlOnAGrtUaTiQqCNti8oFBbBBC0aIfhFh3TbHF5VXIMJpW 1d1Iqp+xJ3irEj4TKlBwXYqJfvC0c4M1NeeyPULP+uYxDF0Z+iVSKmxMvXehk4iKDci4 2q7eCD3az3T8uRgnGP0exjD+UdI0tz9Yf9ep6ZINmSswgtpzPA0tDACVshtJuAh7ONyl hUBLq2P1MbxqCn2tn5PXub17cKTlM1p4pbsHj0yV3Tlo/BYX7ph39coV+SpwgPTDMlT2 2ZJ7Q9JF0tUf13CaSUMtT48WgrxfeIwI1eKUiQ6U8RIVFn7o3ErBcpj6jCPH91vj09bX eOhw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dr16-20020a170907721000b007ae127fa284si3856169ejc.371.2022.11.05.13.16.50; Sat, 05 Nov 2022 13:16:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06CCA68B1B3; Sat, 5 Nov 2022 22:16:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2249868B1CE for ; Sat, 5 Nov 2022 22:16:34 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 0270C1BF20A for ; Sat, 5 Nov 2022 20:16:32 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Nov 2022 21:16:27 +0100 Message-Id: <20221105201629.1980-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221105201629.1980-1-michael@niedermayer.cc> References: <20221105201629.1980-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/bonk: decode multiple passes in intlist_read() at once X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CeQ/Q6rvntu+ This makes the worst case much faster Fixes: Timeout Fixes: 51363/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5660734784143360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 409694f710..471e09fe14 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -159,6 +159,7 @@ static int intlist_read(BonkContext *s, int *buf, int entries, int base_2_part) int n_zeros = 0, step = 256, dominant = 0; int pos = 0, level = 0; BitCount *bits = s->bits; + int passes = 1; memset(buf, 0, entries * sizeof(*buf)); if (base_2_part) { @@ -222,21 +223,25 @@ static int intlist_read(BonkContext *s, int *buf, int entries, int base_2_part) x = 0; n_zeros = 0; for (i = 0; n_zeros < entries; i++) { + if (x >= max_x) + return AVERROR_INVALIDDATA; + if (pos >= entries) { pos = 0; - level += 1 << low_bits; + level += passes << low_bits; + passes = 1; + if (bits[x].bit && bits[x].count > entries - n_zeros) + passes = bits[x].count / (entries - n_zeros); } - if (x >= max_x) - return AVERROR_INVALIDDATA; - if (buf[pos] >= level) { if (bits[x].bit) - buf[pos] += 1 << low_bits; + buf[pos] += passes << low_bits; else n_zeros++; - bits[x].count--; + av_assert1(bits[x].count >= passes); + bits[x].count -= passes; x += bits[x].count == 0; } From patchwork Sat Nov 5 20:16:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39182 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1198779pzb; Sat, 5 Nov 2022 13:16:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7xHSaRxztxXLkzDWl4jUv4l57YVE+o4UvsGR5o8trwBaYpJ99H1Eru20SMOjbJLta3L6xM X-Received: by 2002:a17:907:3f25:b0:7ae:319c:90b2 with SMTP id hq37-20020a1709073f2500b007ae319c90b2mr9647396ejc.515.1667679419049; Sat, 05 Nov 2022 13:16:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667679419; cv=none; d=google.com; s=arc-20160816; b=ZJkDD9p5xzQ4H+4ifGJngtV+xo4OGvoDZAnXpuLdsJFAMJQrqYj5X06hpCjYPYLuyj LqH0m10UsiiidBUQpdWG1tPlr3Cl+D5YOseKQGBjWKcQFEVOommUTOF/GX4JpntT6lNy /nDeG5BNRkPeAoQnm6EXVso0dAJcvhEuEQSD0UAxPEQEshdu0TxkFflDxCDFuyndMKBH B1OddM1+Qit08BhZJewxuWziops+AC02qRWEybs2SyUNG8TXJhYQGpRExTjsa2bdMpIW ymUcorzS+7zvuTfKVfpPUyFhi7rAkX+yfPVMEoEo4rM4wSNeA+JtDNLEYv8vu7PnzoAE IKZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=4jSeYRdJY7rTI1YWtM/1nAfIC1xIqXj/9lZyxgvlC2M=; b=gN+YiXSKOv9X1YRbbqViED+CgbJrBU6tozzYt4LyOMT8hmU0SlNXR86S/GE+Sv9VPN h/37kaysFTPXh4e18rG42rzL6RxpOTHN8qTJXcuoIniEBt+GJRoUeJqgWZ2ABYUottez v3v+lz47iWJPh5HW//eaGPJK1b7c9eQtVLvgA6QW1NoXhYKhMGwTW9qKLxxgqQLIk60e Kf61UEEAxfGKClWD8V/E/IpUgwiYSpgno1+cHXmZOp+9h6/SQX5/QgoPVVlMwwBfUYcB BISU7ap8ttCLOM7oTFO9KlusjdTDdfCYssYRKqYX/iu5VFp0WbDtUN10UNCQ6gbtuHUh trww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b19-20020a50ccd3000000b004549b880c67si3326668edj.42.2022.11.05.13.16.58; Sat, 05 Nov 2022 13:16:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 035DD68B244; Sat, 5 Nov 2022 22:16:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4048168B1CE for ; Sat, 5 Nov 2022 22:16:36 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 31ADF240007 for ; Sat, 5 Nov 2022 20:16:34 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Nov 2022 21:16:28 +0100 Message-Id: <20221105201629.1980-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221105201629.1980-1-michael@niedermayer.cc> References: <20221105201629.1980-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/bonk: Check unquant for overflow X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8vMqKp7+ZMi6 Fixes: signed integer overflow: -2889074 * 2048 cannot be represented in type 'int' Fixes: 51363/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5660734784143360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 471e09fe14..1695229dbd 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -363,12 +363,17 @@ static int bonk_decode(AVCodecContext *avctx, AVFrame *frame, return ret; for (int i = 0; i < samples_per_packet; i++) { + int64_t t64; for (int j = 0; j < s->down_sampling - 1; j++) { sample[0] = predictor_calc_error(s->k, state, s->n_taps, 0); sample++; } - sample[0] = predictor_calc_error(s->k, state, s->n_taps, s->input_samples[i] * quant); + t64 = s->input_samples[i] * (int64_t)quant; + if ((int32_t)t64 != t64) + return AVERROR_INVALIDDATA; + + sample[0] = predictor_calc_error(s->k, state, s->n_taps, t64); sample++; } From patchwork Sat Nov 5 20:16:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 39183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1198848pzb; Sat, 5 Nov 2022 13:17:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4MIVGrZV53wkBNXXOefZ6yKi0AGJl4gNg8F4GhNXc+YHQP5wtXn0KTWAqfIwfJkzZTkxgL X-Received: by 2002:a17:907:78b:b0:741:3d29:33d2 with SMTP id xd11-20020a170907078b00b007413d2933d2mr42116511ejb.103.1667679426705; Sat, 05 Nov 2022 13:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667679426; cv=none; d=google.com; s=arc-20160816; b=0JM3+JE1jz1iijJGXWSzjDHRALGuohCDICVoAQbfWg8HGIxXOhHEjn+4toYumC1HTP HLl5qRjKGt0z79jI+czK042cxM1Ov1OGj6QJ0gXo7wz6+D1D0frsJW5JZUjGEtfNp4Y9 cuygRbbiwCfr7PpRqOpDQbaoWenpcX/O3R/gqMrmdcTF2PzZ4KLYiF5GIQAa/bBQYCmI G6xdx2WkWnEzB2FNC5lVcuh/LGfqsWfI+tObk/5mXHjDLkZJZfxFHfMnIkq54Cn9dAHL N+kvvaSRU0nEZ0XOA20ehKiQe3rrjEM+v0IVBUK7wqsnsCnCZUiA7na6mLGy9rb21d/K zRcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=xO7cBE8cBWu1B92WjR321qulp5km92I/UH1Ne4+NMuU=; b=VbXxG28DLJMmtPgVWDX/HGqGnLiBKgVJbKgZ6ChEyqQWBTUlJV2MvtZC+1cQanST4t FZ9CfvvJLX7ugBwKxYq2tFAwqVDeFdDP8DG+ILEiB0aFBO3pAV/Pd1SJqUDLb+QQQacE A/VtJ2PdrhH7+45E1d353A3NGmz3d/LcqXrV7303f9G7Fruouyqek2eq7amC/rmV4phQ La/SphmQ0OFqvD7WciTX4sw+5lUctHvJqQVoe2del1JBmVoea7URsX6B+U5w+9Aud8FW Y3jHQ7VNPA8Yg6RB7Xjm21BD6JXj0TIc6DwdzU/psSG/GoRyiAhB4FTi6Nh6JUYMRJr+ WYpA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x16-20020a05640226d000b0045a5bd66302si4240777edd.571.2022.11.05.13.17.06; Sat, 05 Nov 2022 13:17:06 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19DFD68B296; Sat, 5 Nov 2022 22:16:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B790568B244 for ; Sat, 5 Nov 2022 22:16:37 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id E9F67E0008 for ; Sat, 5 Nov 2022 20:16:36 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Nov 2022 21:16:29 +0100 Message-Id: <20221105201629.1980-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221105201629.1980-1-michael@niedermayer.cc> References: <20221105201629.1980-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/bonk: Check for undefined overflow in predictor_calc_error() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PGiYIurYs1Xk Fixes: signed integer overflow: 22 * -2107998208 cannot be represented in type 'int' Fixes: 51363/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5660734784143360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bonk.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 1695229dbd..40963aa7c6 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -278,10 +278,13 @@ static int predictor_calc_error(int *k, int *state, int order, int error) *state_ptr = &(state[order-2]); for (i = order-2; i >= 0; i--, k_ptr--, state_ptr--) { - int k_value = *k_ptr, state_value = *state_ptr; + int64_t k_value = *k_ptr, state_value = *state_ptr; x -= shift_down(k_value * state_value, LATTICE_SHIFT); - state_ptr[1] = state_value + shift_down(k_value * x, LATTICE_SHIFT); + k_value *= x; + if ((int32_t)k_value != k_value) + return AVERROR_INVALIDDATA; + state_ptr[1] = state_value + shift_down(k_value, LATTICE_SHIFT); } // don't drift too far, to avoid overflows @@ -366,6 +369,8 @@ static int bonk_decode(AVCodecContext *avctx, AVFrame *frame, int64_t t64; for (int j = 0; j < s->down_sampling - 1; j++) { sample[0] = predictor_calc_error(s->k, state, s->n_taps, 0); + if (sample[0] == AVERROR_INVALIDDATA) + return sample[0]; sample++; } @@ -374,6 +379,8 @@ static int bonk_decode(AVCodecContext *avctx, AVFrame *frame, return AVERROR_INVALIDDATA; sample[0] = predictor_calc_error(s->k, state, s->n_taps, t64); + if (sample[0] == AVERROR_INVALIDDATA) + return sample[0]; sample++; }