From patchwork Sun Nov 15 01:29:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23636 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AA09844A696 for ; Sun, 15 Nov 2020 03:30:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 855E068B96A; Sun, 15 Nov 2020 03:30:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFF1B68AF5D for ; Sun, 15 Nov 2020 03:30:05 +0200 (EET) Received: by mail-qv1-f65.google.com with SMTP id y11so6983401qvu.10 for ; Sat, 14 Nov 2020 17:30:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=6fwFkNH6tQL+KywS2oPT6rKalIkXho1E5MwlxvxOGbA=; b=TlFEh4l0HTy31G4Psl2q9FIKut8pchYiFXm3ZGf/HSRHfg4ymClzO6wj1ZstIU9UYa HpGnnPE1p5ajN7dr5tAot9FCjSRTuRE4eXxQm9Z+o9sYU6sI3xUk9shz/yaYW6RGCH5O m5/BrDCRRoG8c79dib/agpkLLWJORiXI5Ys3SjxGhA+LRYRSXgM6b4tv8a2QndT1aUSF GuWZJ35V+xjdAe6Z5rZsJsviJnNzd6f9XPHpbBAAnEaINe0RxDemsFoScPKW3W+GT0U0 rsWQ5ae0ymFANKbTedYIyErIEmds6ajSEyjIhF30Moq4++Tn66tSI55+nmudAYbfBlds iCEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=6fwFkNH6tQL+KywS2oPT6rKalIkXho1E5MwlxvxOGbA=; b=gw8M4x5wCs5p4EIGuGGECf1SWNtU8RIkFAHeAmyZD9EtWnZosmZ+73k0qrfucaV1gU NNh8BEUAq60REfl/0989pVc3AVZed2VmEL6c/IJsSSdc79ENV8Vkmj1qZGx9gPP7Ai6i HYO30XWYeZGLyc2YLk1X9XPBN5xGDF/yQ+7akCPD4CFIrBufa37pAf/RM7j30yFkpGc3 JcniFIRUJ+mSabz1BbKlHCnI4vV5Bes2jGHEMH0chCJl1E6PxaDo03K37ewarSuq6l2R yC70JzrqxX9UMB/gF8339usPzK042ORMMl7Bu55q/iowHnbxOkL2QpNZB6Clvc6w4MNR 9Mhw== X-Gm-Message-State: AOAM532/o8F0Dmoh2IJ2mvtQMQsqDAuykMW/+1CdV8RDVkqiGLDafJaQ lquAZwE2aK67lYem05QzXKgxP1RihbU= X-Google-Smtp-Source: ABdhPJxnZDWWlvaiq7nS2lbxg8j/BmhwE8P5PszOHsKAtALUzBLQWeQAardvgY7yzpXqKqrriWkAkA== X-Received: by 2002:a0c:b996:: with SMTP id v22mr7373818qvf.60.1605403804243; Sat, 14 Nov 2020 17:30:04 -0800 (PST) Received: from localhost.localdomain ([181.23.74.184]) by smtp.gmail.com with ESMTPSA id f202sm9186015qke.112.2020.11.14.17.30.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2020 17:30:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 22:29:46 -0300 Message-Id: <20201115012948.1201-1-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] tools/target_dec_fuzzer: Call avcodec_flush_buffers() in a fuzzer choosen pattern X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Michael Niedermayer This should increase coverage Signed-off-by: Michael Niedermayer Signed-off-by: James Almer --- tools/target_dec_fuzzer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 4eb59bd296..11530cbf79 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -110,6 +110,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { const AVPacket *avpkt) = NULL; AVCodecParserContext *parser = NULL; uint64_t keyframes = 0; + uint64_t flushpattern = -1; AVDictionary *opts = NULL; if (!c) { @@ -239,6 +240,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { ctx->request_channel_layout = bytestream2_get_le64(&gbc); ctx->idct_algo = bytestream2_get_byte(&gbc) % 25; + flushpattern = bytestream2_get_le64(&gbc); if (flags & 0x20) { switch (ctx->codec_id) { @@ -332,6 +334,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { av_packet_move_ref(&avpkt, &parsepkt); } + if (!(flushpattern & 7)) + avcodec_flush_buffers(ctx); + flushpattern = (flushpattern >> 3) + (flushpattern << 61); + // Iterate through all data while (avpkt.size > 0 && it++ < maxiteration) { av_frame_unref(frame); From patchwork Sun Nov 15 01:29:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23637 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8F33344A696 for ; Sun, 15 Nov 2020 03:30:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 745AE68B989; Sun, 15 Nov 2020 03:30:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4057168AF5D for ; Sun, 15 Nov 2020 03:30:07 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id 199so13421270qkg.9 for ; Sat, 14 Nov 2020 17:30:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6K+89X9PhWbYjGvFmuXh3dZUlZjRvDJgCMN3dbgIiPk=; b=vNIscmP9MgIPJs7XrwUSczHkwp9zQU+3SBBrrPwtkn0WkoikPLAfLgZGfi9sefCQS9 C9DLzAy4+aQpgw9bBZ8k72Oo0N8pWruOWDrW7+7kEHf0LS+48SKKd7pmCsimH5lSvhgN RNyTjOxFk5jxDxWtWIdrNEbw6HMuJYTjUaUyK+vecgJd/XxH1/u3M9IzA+UZdWGwrmA2 ZdR0jY2UcdfNps2AzxmlAtCBXF4Ov5r8ffjopKSu5YHzblbGrcEEwS8hcJSr/WLv2ZBr 1TSwEqQIYVzANI0Bvl1/rj4OkiTjzbt/u1H6IWwYWeuJyR1TtIpNbcKtcMZBqnWZZXy/ 6yXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6K+89X9PhWbYjGvFmuXh3dZUlZjRvDJgCMN3dbgIiPk=; b=mcR0Oykr6vqwd1B/KOJ5FN2RfI8NpLhaBC7Skge0zq52D8RcZkivORB2BjxQj/JQQV 60t4G2oRUzt/mde/QH1JIb4p1lvumKwoa3/RnolokIyRUphY7VXVCXwhLPJdeBbF9D6x 9T5q573BML607R9Oe0bF1oEKDhUKsENcLtS77PGQWcy3oM+Io9gkyQ6OKtgIQU262f9d P9SECet2Gx4CTQLqsBEJ3p40e77Duxk/V9BvS+/kBgbPd/eRvs9TwEJuQ4dfBXC1bQqL CC6ddxrZXohlPP63FbfyLTVNFHUJbMlVXUnbfPwU+uai8MmF6coX4RSyo7cRYtmrxAAt Dm4Q== X-Gm-Message-State: AOAM5301iwIY/p8vHpGXvD5uPZ6etOOeVVw078jauocvaCbc2NE6vANI ftLnMXpPL1ARGCFo8fCM92HwjvoDux0= X-Google-Smtp-Source: ABdhPJz0nEWrhe4P8FWOfnuZvPeMFs6WgaJj7Dhpi68iSBG8+Ttf8PJo6H4CWpzDhzn6n6MtEXkQ+g== X-Received: by 2002:a37:8d81:: with SMTP id p123mr8640541qkd.316.1605403805662; Sat, 14 Nov 2020 17:30:05 -0800 (PST) Received: from localhost.localdomain ([181.23.74.184]) by smtp.gmail.com with ESMTPSA id f202sm9186015qke.112.2020.11.14.17.30.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2020 17:30:05 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 22:29:47 -0300 Message-Id: <20201115012948.1201-2-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201115012948.1201-1-jamrial@gmail.com> References: <20201115012948.1201-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] tools/target_bsf_fuzzer: Call av_bsf_flush() in a fuzzer choosen pattern X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This should increase coverage. Based on a commit by Michael Niedermayer Signed-off-by: James Almer --- tools/target_bsf_fuzzer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c index 5d9f90075d..da8d62dd0b 100644 --- a/tools/target_bsf_fuzzer.c +++ b/tools/target_bsf_fuzzer.c @@ -43,6 +43,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { AVBSFContext *bsf = NULL; AVPacket in, out; uint64_t keyframes = 0; + uint64_t flushpattern = -1; int res; if (!f) { @@ -86,6 +87,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { bsf->par_in->channels = (unsigned)bytestream2_get_le32(&gbc) % FF_SANE_NB_CHANNELS; bsf->par_in->block_align = bytestream2_get_le32(&gbc); keyframes = bytestream2_get_le64(&gbc); + flushpattern = bytestream2_get_le64(&gbc); if (extradata_size < size) { bsf->par_in->extradata = av_mallocz(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); @@ -128,6 +130,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { data += sizeof(fuzz_tag); last = data; + if (!(flushpattern & 7)) + av_bsf_flush(bsf); + flushpattern = (flushpattern >> 3) + (flushpattern << 61); + while (in.size) { res = av_bsf_send_packet(bsf, &in); if (res < 0 && res != AVERROR(EAGAIN)) From patchwork Sun Nov 15 01:29:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23638 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C9C1444A696 for ; Sun, 15 Nov 2020 03:30:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B24AB68B9B0; Sun, 15 Nov 2020 03:30:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5E3168B98D for ; Sun, 15 Nov 2020 03:30:08 +0200 (EET) Received: by mail-qv1-f65.google.com with SMTP id r12so6969781qvq.13 for ; Sat, 14 Nov 2020 17:30:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Aq/4VB4CDNxiZ3m/ls7h/fYDToyAQbOWFTnoyRBhbe4=; b=nZPLQ1VaLrR0ueTzyC1CwitX4RQfJ6OSyAah0c3j237chaZM+ktRID+EZKwh/Wpesb g0/mWJQu8QA6DGlyg76y3mXmkM7ZuEmoK4TOu1P/2owOjW+tPeVyRyuBNyqrUhciwFdI Ks/HLx56A+Dsl2R3StXKhO1x7sL9eV5gWwmgCJiT71412vL2icIEYRJDssut44IR/mAg vjyB5siFAxZeeMpkfumQooYj92jlgcVOJfAzMyTbBp6xuTRDWw7JkRoa2EV3r2EeozFA mqp3ckZMT8PY23ppf2/fAo3JmZ+45ZTqhhUMfcNiDn0Z+yPZE2qIj29CUOa9T7+rOz5l 6zrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Aq/4VB4CDNxiZ3m/ls7h/fYDToyAQbOWFTnoyRBhbe4=; b=anDgE6vJD2w2hPhCEJnmqOarckMGO/k2ttgpKZo2+pTFPuGK/OENoRScfech+KOaGC 4fv4/hQFnBj7QJen87DP6kURNzmR0M+moV5PQ60fHYMLYQqfORgGAYSrKP3Gv6x8nFUS EX4QI9nJv/2af4BIQk1CsU0xw33x+ieFlxBtux2Cq872h1zXnmnjw00TEzs4ZfdIHJw3 VsqBipMXJ69KIdCtQiw1AcDopF6MwUsftcSpNL9er+7TJ2kowYgF4LIejD2ADvjOsyQK EV4jcNJg2VHayvhQAEcQ94OkkNzfi5Whjol065f5GonD8gGpf2Y+m7RRQUkQXiSramrq KV+A== X-Gm-Message-State: AOAM531wsBZ3U4NIO4nhrHGtEHnGzW9ABCW2ol1SldpgmSfmP0qvF/hA YOUMPE0nml7BvyhHKlXR6ml/w2xfLYM= X-Google-Smtp-Source: ABdhPJy82UZTsk4xdCBAfhxurdwRc31xJ82L5Y7PJXo7ykG0HL12VMU2/c/oMrtYCx3pRrcSFXsznw== X-Received: by 2002:ad4:44b3:: with SMTP id n19mr9479099qvt.56.1605403807218; Sat, 14 Nov 2020 17:30:07 -0800 (PST) Received: from localhost.localdomain ([181.23.74.184]) by smtp.gmail.com with ESMTPSA id f202sm9186015qke.112.2020.11.14.17.30.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2020 17:30:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 22:29:48 -0300 Message-Id: <20201115012948.1201-3-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201115012948.1201-1-jamrial@gmail.com> References: <20201115012948.1201-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] tools/target_bsf_fuzzer: set bitstream filter options X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Should increase coverage with some bitstream filters Signed-off-by: James Almer --- tools/target_bsf_fuzzer.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/target_bsf_fuzzer.c b/tools/target_bsf_fuzzer.c index da8d62dd0b..16300037ca 100644 --- a/tools/target_bsf_fuzzer.c +++ b/tools/target_bsf_fuzzer.c @@ -18,6 +18,7 @@ #include "config.h" #include "libavutil/imgutils.h" +#include "libavutil/opt.h" #include "libavcodec/avcodec.h" #include "libavcodec/bsf_internal.h" @@ -66,6 +67,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { if (size > 1024) { GetByteContext gbc; int extradata_size; + int flags; size -= 1024; bytestream2_init(&gbc, data + size, 1024); bsf->par_in->width = bytestream2_get_le32(&gbc); @@ -88,6 +90,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { bsf->par_in->block_align = bytestream2_get_le32(&gbc); keyframes = bytestream2_get_le64(&gbc); flushpattern = bytestream2_get_le64(&gbc); + flags = bytestream2_get_byte(&gbc); + + if (flags & 0x20) { + if (!strcmp(f->name, "av1_metadata")) + av_opt_set_int(bsf->priv_data, "td", bytestream2_get_byte(&gbc) & 3, 0); + else if (!strcmp(f->name, "h264_metadata")) + av_opt_set_int(bsf->priv_data, "aud", bytestream2_get_byte(&gbc) & 3, 0); + else if (!strcmp(f->name, "extract_extradata")) + av_opt_set_int(bsf->priv_data, "remove", bytestream2_get_byte(&gbc) & 1, 0); + } if (extradata_size < size) { bsf->par_in->extradata = av_mallocz(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);