From patchwork Thu Oct 6 20:37:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp379171pzd; Thu, 6 Oct 2022 13:38:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5W9uaJHY9KWmzSCJFCCyzYyWzsU3x+NB7mVdiBA9W0vSymeiPVwArHCJHNPS5EpNNfse9v X-Received: by 2002:a50:fe85:0:b0:458:5562:bf1e with SMTP id d5-20020a50fe85000000b004585562bf1emr1465529edt.167.1665088690202; Thu, 06 Oct 2022 13:38:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665088690; cv=none; d=google.com; s=arc-20160816; b=RbO0Op2SVd03zu53O46+xA8KzFNLvO7H5/JxYrgoimYO6cbSwqc4fOo+TvELwAYowT c2n4pzmvw0TJvPdRvREvgxsDwnGP1qaB98TeLGGpFeD6dAN8CGg20kno/4XbSC6J3RWZ FYRZoBjJtMqUC5NX4SLSxhYSDOI2RbAn44a0JjZuz3I4pF+BVDbRM2IaFpgxfaYuO/1q J87QGaVv13JlWcghIW9pLXPoM+VACB0ytRQHuEj1EbDgDIbkZo4rL7G1eLq4KjP4bonf KKIiaRMWqVfAF3KUS0zt6+wm3YYqYygD4l/Szg13mTAwGSmsaBBgmX1epTtLZpfri5Dp FLbg== 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=JuLRCjlgCk1u5/qtSa8E9xY09fsFvojWdLAfiF0SXO4=; b=VEq+jtcOirLhqxp9PbUQCIVtzqx9ApMS1wOgZrWUke5HJg14DscfjW3+ddrNQLJWkp /Z01Nluo9bnRHSw9MC696rauJdrqqbFiHnPwvBfWbL7yYMOse01WyWEwX7tkCnLNsCpi FCO6y1aRHuSUxM1hYoDhYoVpGDK5eEg3622ik2d2DUxqcGwrfxlCrRpmsXuwExSRyVV3 M3HH1AAtaC+c1+sE5N5f4TKuGRnssVkGhbfT8EztV6SwdDAwjKj2xEWCx4W/kn2PXgOi Xbiv0jXT+BW647wBC9Tli4goaXG/AnhdsDs4Dj59K2CmAZ53jZ2qUBHV3lWIRwV3+ozW qmAg== 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 k18-20020aa7c052000000b00458111fe384si216070edo.165.2022.10.06.13.37.45; Thu, 06 Oct 2022 13:38:10 -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 C313D68BB41; Thu, 6 Oct 2022 23:37:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C801F68BA9C for ; Thu, 6 Oct 2022 23:37:12 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ogXcF-00ATjV-8t for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:37:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXc7oWRDf8s8UgXcEogS42; Thu, 06 Oct 2022 22:37:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id gXcDoBvIybZLDgXcEoh44N; Thu, 06 Oct 2022 22:37:10 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=633f3c76 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Ou-dB1wDnAJ2Pr8qICMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:06 +0200 Message-Id: <20221006203709.8398-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfMmhGhszfE/rX300yfZvshp2ddiyimF9go0XzWKF+cCxcUKzK1gaT3AlLkyHBhXSbu8QInQCJHlaSp/OLOVPvyuhLTBCfyi2w7Vqtk0D46rpMiiQ2Vsm 7WJra8VmISvHnBYetCu4/pwNFVVCTxPk0RGH8XRaV2RgBh4tT7cLakRHIMUPBZn2CUItadGHNmTrwQ== Subject: [FFmpeg-devel] [PATCH 1/4] avformat/asfdec_o: Check offset before adding index entry 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: IfGuWcUKmFtq Fixes: signed integer overflow: 9223372036854550860 + 530259564 cannot be represented in type 'long' Fixes: 49093/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-4697179192688640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_o.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index e837ca62e7f..2b407c016f2 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -888,6 +888,8 @@ static int asf_read_simple_index(AVFormatContext *s, const GUIDParseTable *g) av_log(s, AV_LOG_ERROR, "Skipping failed in asf_read_simple_index.\n"); return offset; } + if (asf->first_packet_offset > INT64_MAX - asf->packet_size * pkt_num) + return AVERROR_INVALIDDATA; if (prev_pkt_num != pkt_num) { av_add_index_entry(st, asf->first_packet_offset + asf->packet_size * pkt_num, av_rescale(interval, i, 10000), From patchwork Thu Oct 6 20:37:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38591 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp379242pzd; Thu, 6 Oct 2022 13:38:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7j2bhHjE0PIjFVXj9VvbWq7cR31IGkHXSIgXr+YpMjxuPUmDbZsC+nSqieP+7FEEifnQPT X-Received: by 2002:a05:6402:5485:b0:459:147a:d902 with SMTP id fg5-20020a056402548500b00459147ad902mr1541266edb.263.1665088704498; Thu, 06 Oct 2022 13:38:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665088704; cv=none; d=google.com; s=arc-20160816; b=bbeoLKDOGCf46XNwkWt1I7g9aLyMC9sAKK+xfq/lqsZO2aq6LYvSSpmaE0LHIXpqnl /D+nnp/m8+MWXcGay82aUhdwEaL/TY/8yCVAD5LrsvTpMTTiYNr3EeXxZI58eMxZfyZ6 d8M6hclAbOoi9xSLsZ+Ant3tuEBSOYr4Fu4WIOFiab2Mxv25joqHaxMHvSVBFTrZbnF/ UvHP38GyoFzbP1Tg4wuW4XBbZP6oczZyGzEwi0EhiWm/I57CxlUsmfz3V22upC/KbA6U hYs7zW2h4hSej4XGu76MWzwh43mjG45eCo2JC9ikJlwTBJqMbZ1HcQa3piHIeM2O9mho ErOw== 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=CE3BnIosQ6BwMwFIy1qCHy2fGDUpNNQv4XB7vTuyXwk=; b=Qqog/DL2TO7i3RZQTbIE9Z/MFHzPhwMCtYjWgOyeh3ZaI/M/VxNxQJ9YLw3Ufh/vc6 X8KBNFqfnSNIkxigZTVXau22Cny2MKVEUx4QzfvMPKjz246zxEMuUg2npD5HUtCUm/OG RYBuJED4R8oZ2H28m1i4X8SAZAzrXOyu0hll+wPFCXJHElsWYvG+YEMR9svTXB53YKfR g3hzqzVlWtLnwXHlJwYCzNvT8I6l7bHobkQ7z/BhpINP5/13fmxgAfoIyqk2UQdhwY1R iQgYD/Ry2+B8x1BEg4/JmNqqww8V+OpX/vOYLxTfTmxFr74EbNzfkdyME/x4Ntkgo4O4 akcQ== 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 hu9-20020a170907a08900b0077fb99b8cfcsi422396ejc.301.2022.10.06.13.38.19; Thu, 06 Oct 2022 13:38:24 -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 DDD3568B28D; Thu, 6 Oct 2022 23:38:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D9DA68B28D for ; Thu, 6 Oct 2022 23:38:11 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ogXdC-00B8NB-3G for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:38:10 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXdCoWSJN8s8UgXdCogSAl; Thu, 06 Oct 2022 22:38:10 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id gXcEoTQ47OG5ZgXcEoJZ6l; Thu, 06 Oct 2022 22:37:10 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KJo5sHJo c=1 sm=1 tr=0 ts=633f3c76 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=OK22HhqQUKf8rs4aKIwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:07 +0200 Message-Id: <20221006203709.8398-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221006203709.8398-1-michael@niedermayer.cc> References: <20221006203709.8398-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfFT+UgnA98OmMSYCu40YSlo0IJrnb9WMI5unwT/5ZUppbFXK+Bg3RmmD72JpvdkAKbWGzH+ZcG8sKKg87FqO3+rbVnNUnYI/Godnas+nliVvMEMEolES UlCVeuLP9T9Zfp4bRC0KyBhpTqfOIcTEiAj1iC5Nog6yAGo0se/7453y+cI03g9DUuyJPQqnPl/VIw== Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/ffv1dec: Fail earlier if prior context is corrupted 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: JBMzE0TXRXFT Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d4bc60a7da8..958b3cd3c05 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -303,8 +303,11 @@ static int decode_slice(AVCodecContext *c, void *arg) } if ((ret = ff_ffv1_init_slice_state(f, fs)) < 0) return ret; - if (f->cur->key_frame || fs->slice_reset_contexts) + if (f->cur->key_frame || fs->slice_reset_contexts) { ff_ffv1_clear_slice_state(f, fs); + } else if (fs->slice_damaged) { + return AVERROR_INVALIDDATA; + } width = fs->slice_width; height = fs->slice_height; From patchwork Thu Oct 6 20:37:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp379261pzd; Thu, 6 Oct 2022 13:38:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4sjSzVC7GpJqT8QOetZWMxX1Vku96yfhh4PoeFJIzMGpdNKbuQtuoBnvn1sf3hXGodQisD X-Received: by 2002:a17:907:7f07:b0:779:7f94:d259 with SMTP id qf7-20020a1709077f0700b007797f94d259mr1349995ejc.525.1665088707563; Thu, 06 Oct 2022 13:38:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665088707; cv=none; d=google.com; s=arc-20160816; b=FxfWTHTHQuxuzHtyN7/UzCj7HfxFbIbs+OxJIfFc1Lx/ZyJrlLgVbGHjD6nj6f3QtP HPVbkbJgsxRgHrRj9CD8iEpOw5vv48xKwx4wHVb3utvdz7w3i20dBGYRThVEs14NGHK7 NMekcyMyHpKnbnVkj5//ByEaWUQ9WrJKkszAS7TgAIM5HAi4BOlnhbLOYR+M6YEVoc18 Vke1HJziZ84dN9gqrcAV14pPOM2FfclrR2CjwOFKapZhE6WKk1EypzTA4Ajt957zJ/qH z3y1KRjAdAUIGEf8xlJmDNdN1EJXBKcB4Rd76S8pH8Wg7kMka+xuPIogDWeSgBS3O64A HWIg== 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=psvKs73sEny9nEvTlPQqlgmk8X6qAlwWhsfaGo2lWyY=; b=O7rxBiq7SW9IHV8flyWl48ber0ukNHnpVsEaCYo7IRgB+bIKuVoqaePIWeOIQV8trs O7kFDzupdfYimERZ1Gg+BfebwXnUtKnWvsWGGKN3ZUFDd9glZIXhbS17WJV1qwfcWQVe axXy+oV9TbnoUZ5Piu0qG0iLYMoLnXP7fV9Zw1Tib62lT2AGR9x3wnaQ1fKSd4ene+ft OC8SyrEQTXSGnCKk4kbKSwtBwOQBv6yv9Xuw1/wXoG9vPdNJcfqyBlKgtB11nlr+zmOP hWgewBSrVDwCvIrum5GXbGRn+800CBRWTckBXNeTQyPz9sQMhdlkgUuzQzoqWqmMQZBq q+Wg== 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 g3-20020a056402180300b00458cbb6b6easi231629edy.167.2022.10.06.13.38.27; Thu, 06 Oct 2022 13:38:27 -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 C9B8468BB63; Thu, 6 Oct 2022 23:38:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A512F68B28D for ; Thu, 6 Oct 2022 23:38:11 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ogXdD-00B8YU-7Z for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:38:11 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXdCoWSJN8s8UgXdDogSAn; Thu, 06 Oct 2022 22:38:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id gXcEoTQ4BOG5ZgXcEoJZ6m; Thu, 06 Oct 2022 22:37:11 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KJo5sHJo c=1 sm=1 tr=0 ts=633f3c77 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=EfaNEuAiC44ZH2k_WtwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:08 +0200 Message-Id: <20221006203709.8398-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221006203709.8398-1-michael@niedermayer.cc> References: <20221006203709.8398-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMt/L8ulRPKyfaV1SuN65caWF4XrbcrDpuZ9+j6DYtTtBRsNTkttOiKYmMd0V+qnFHSJ7dGUS0CaWMPllJwMWgvvFQmYLw9rRV5DhIWzDI02E1a0se3N SbLjqFqU9CPWQ/2Dv4oEHB+Xm+SJBgM+ax8hWCGpWFL/o4VueQWecH5eYz7TRTM834/+HClLhYa/Gg== Subject: [FFmpeg-devel] [PATCH 3/4] tools/target_dec_fuzzer: Adjust threshold for FFV1 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: 06JCdhPO3LMG Fixes: Timeout Fixes: 49446/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-5085639783088128 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 3d4521887a2..e64a362fb6e 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -226,6 +226,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_DVB_SUBTITLE: av_dict_set_int(&opts, "compute_clut", -2, 0); break; case AV_CODEC_ID_DXA: maxpixels /= 32; break; case AV_CODEC_ID_DXV: maxpixels /= 32; break; + case AV_CODEC_ID_FFV1: maxpixels /= 32; break; case AV_CODEC_ID_FFWAVESYNTH: maxsamples /= 16384; break; case AV_CODEC_ID_FLAC: maxsamples /= 1024; break; case AV_CODEC_ID_FLIC: maxpixels /= 1024; break; From patchwork Thu Oct 6 20:37:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 38590 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp379186pzd; Thu, 6 Oct 2022 13:38:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM53OTolYh7cbdK1Ge9RlEfHQPe2PkmdqW4ZYRpSg7F468Pgd4Eyzmi1ZJD/J4mlZZztPtvB X-Received: by 2002:a17:907:94d6:b0:782:b10a:7e91 with SMTP id dn22-20020a17090794d600b00782b10a7e91mr1445114ejc.220.1665088693375; Thu, 06 Oct 2022 13:38:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665088693; cv=none; d=google.com; s=arc-20160816; b=enJG6RrWsL0aKgjrx8u5sPpDMXIUzYJbQtyUhDlaJrr9O31pgEJc5YMjfE0j9/qhSG rTTvbDH5l9SMre8Umj5RHcc0CaO5NAAo+cM5rzt0xmmJBZo/10qPjHHv8hNXuZoEoHBi FziYelg3OU+9P3ertMMoTkfObDvB1hjVnmPm/lR3biAFQRJ+jsBAHrmRubHDvo5+PxoN a6R7Dva9DQj/rVxC0xbiof58W8TXN+jLh2OjKMKeJj9ZhvwOmzyYBxYKjXsHb/P9LHe1 8h+aA6Ny8bDs2zVbFiAInI6L1iXmba842ZEgzNvD8jhPCgW//3fveIrUgE75cDhZyFUA UVwQ== 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=xVPVa4E1fq/ExTWWFQ/lRivQdLNztw9CAcOZkujNuXQ=; b=CQiGTXX7kXn5+s7+vLck8JVbTofPTFFT+kneUTZyNX2ma3zNvg6YW9lTjTGFEqsKj7 YA79qrsA+Gh/8pxJfY/tuuTAMNmCfj/D3gYUtXTe3p8n+NZ30V2pHFmCSHP4LG+hNDBJ 0t7KWXTK922P7kGsSBTS8fi2on550fCpqcr5NGsYwIpFsoF4kOJbbAnKjSft5D2sq3Kb ECCRtU+IuXtTyAK8sNtdpxP93rrwRfBca6NA97baC8c8WKOWeNabitxos7nEUaksAQdk aQCpJxJIOoJMZd1v9Ak7vPbI5mDlJtKmDJolhA3Iy++JInFGISfVIHBjTrzdxBlGh181 nhDA== 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 ht12-20020a170907608c00b0078cc4a8a956si390350ejc.881.2022.10.06.13.37.52; Thu, 06 Oct 2022 13:38:13 -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 B8F3168BB2E; Thu, 6 Oct 2022 23:37:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C528568BA96 for ; Thu, 6 Oct 2022 23:37:12 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ogXcF-00ATUp-E3 for ffmpeg-devel@ffmpeg.org; Thu, 06 Oct 2022 22:37:11 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gXc7oWRDf8s8UgXcFogS44; Thu, 06 Oct 2022 22:37:11 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id gXcFoBvJJbZLDgXcFoh44T; Thu, 06 Oct 2022 22:37:11 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=633f3c77 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=g15dB-8DGuoNj2nd:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=4MpObu1hbx339PFoaQ4A:9 a=GdR-FnjLSxcwICsfAHBS:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 6 Oct 2022 22:37:09 +0200 Message-Id: <20221006203709.8398-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221006203709.8398-1-michael@niedermayer.cc> References: <20221006203709.8398-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMmhGhszfE/rX300yfZvshp2ddiyimF9go0XzWKF+cCxcUKzK1gaT3AlLkyHBhXSbu8QInQCJHlaSp/OLOVPvyuhLTBCfyi2w7Vqtk0D46rpMiiQ2Vsm 7WJra8VmISvHnBYetCu4/pwNFVVCTxPk0RGH8XRaV2RgBh4tT7cLakRHIMUPBZn2CUItadGHNmTrwQ== Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/speedhq: Check buf_size to be big enough for DC 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: /c6QBqO4EaOD Fixes: Timeout Fixes: 51919/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEDHQ_fuzzer-6023716480090112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speedhq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 6dbba02776a..04ba4dd19c5 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -500,6 +500,8 @@ static int speedhq_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (buf_size < 4 || avctx->width < 8 || avctx->width % 8 != 0) return AVERROR_INVALIDDATA; + if (buf_size < avctx->width*avctx->height / 64 / 4) + return AVERROR_INVALIDDATA; quality = buf[0]; if (quality >= 100) {