[FFmpeg-devel] [PATCH 0/6] Minor fixes and for fuzzing targets

[FFmpeg-devel] [PATCH 0/6] Minor fixes and for fuzzing targets

[Kacper Michajłow]

Minor fixes and for fuzzing targets. Mostly motivated to reduce spam in
the build log. While at it, tiff/tdsc check was fixed, which was real bug.

Kacper Michajłow (6):
  tools/Makefile: add identifier macros for specific fuzzing targets
  tools/target_dec_fuzzer: fix tiff/tdsc check
  tools/target_dec_fuzzer: suppress Wdeclaration-after-statement
  tools/target_dec_fuzzer: suppress Wunused-function
  tools/target_dem_fuzzer: make fuzz data pointer constant
  tools/target_dem_fuzzer: remove unused fuzz_tag

 tools/Makefile            |  8 +++----
 tools/target_dec_fuzzer.c | 46 ++++++++++++++++++++++++---------------
 tools/target_dem_fuzzer.c |  5 +----
 3 files changed, 33 insertions(+), 26 deletions(-)

--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 1/6] tools/Makefile: add identifier macros for specific fuzzing targets

[Kacper Michajłow]

This will allow to add conditional code per target codec.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 tools/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 7ae6e3cb75..3f99b337e5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,16 +3,16 @@ TOOLS-$(CONFIG_LIBMYSOFA) += sofa2wavs
 TOOLS-$(CONFIG_ZLIB) += cws2fws
 
 tools/target_dec_%_fuzzer.o: tools/target_dec_fuzzer.c
-	$(COMPILE_C) -DFFMPEG_DECODER=$*
+	$(COMPILE_C) -DFFMPEG_DECODER=$* -DFFMPEG_DECODER_$*
 
 tools/target_enc_%_fuzzer.o: tools/target_enc_fuzzer.c
-	$(COMPILE_C) -DFFMPEG_ENCODER=$*
+	$(COMPILE_C) -DFFMPEG_ENCODER=$* -DFFMPEG_ENCODER_$*
 
 tools/target_bsf_%_fuzzer.o: tools/target_bsf_fuzzer.c
-	$(COMPILE_C) -DFFMPEG_BSF=$*
+	$(COMPILE_C) -DFFMPEG_BSF=$* -DFFMPEG_BSF_$*
 
 tools/target_dem_%_fuzzer.o: tools/target_dem_fuzzer.c
-	$(COMPILE_C) -DFFMPEG_DEMUXER=$* -DIO_FLAT=0
+	$(COMPILE_C) -DFFMPEG_DEMUXER=$* -DFFMPEG_DEMUXER_$* -DIO_FLAT=0
 
 tools/target_dem_fuzzer.o: tools/target_dem_fuzzer.c
 	$(COMPILE_C) -DIO_FLAT=1
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/6] tools/target_dec_fuzzer: fix tiff/tdsc check

[Kacper Michajłow]

Comparing `FFMPEG_DECODER == tiff` never worked because tiff is not
defined. Original commit expected string compare, but C preprocesor
doesn't work this way.

Fixes: 3371d0611fcd31e0bc72553d88774512a58bd2ef
Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 tools/target_dec_fuzzer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index b3be69f94d..de0419430f 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -193,7 +193,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         extern FFCodec DECODER_SYMBOL(FFMPEG_DECODER);
         codec_list[0] = &DECODER_SYMBOL(FFMPEG_DECODER);
 
-#if FFMPEG_DECODER == tiff || FFMPEG_DECODER == tdsc
+#if defined(FFMPEG_DECODER_tiff) || defined(FFMPEG_DECODER_tdsc)
         extern FFCodec DECODER_SYMBOL(mjpeg);
         codec_list[1] = &DECODER_SYMBOL(mjpeg);
 #endif
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/6] tools/target_dec_fuzzer: suppress Wdeclaration-after-statement

[Kacper Michajłow]

To avoid spam in log, each fuzzer is built separately so it's amplified
a lot.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 tools/target_dec_fuzzer.c | 41 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index de0419430f..a15f1a3f9c 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -166,6 +166,12 @@ static int fuzz_get_buffer2(AVCodecContext *ctx, AVFrame *frame, int flags)
     }
 }
 
+#define DECODER_SYMBOL0(CODEC) ff_##CODEC##_decoder
+#define DECODER_SYMBOL(CODEC) DECODER_SYMBOL0(CODEC)
+
+extern FFCodec DECODER_SYMBOL(FFMPEG_DECODER);
+extern FFCodec DECODER_SYMBOL(mjpeg);
+
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     uint64_t maxpixels_per_frame = 4096 * 4096;
     uint64_t maxpixels;
@@ -185,16 +191,19 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     uint64_t keyframes = 0;
     uint64_t flushpattern = -1;
     AVDictionary *opts = NULL;
+    AVCodecContext* ctx;
+    AVCodecContext* parser_avctx;
+    AVFrame *frame;
+    AVPacket *avpkt;
+    AVPacket *parsepkt;
+    int res;
+    int got_frame;
 
     if (!c) {
 #ifdef FFMPEG_DECODER
-#define DECODER_SYMBOL0(CODEC) ff_##CODEC##_decoder
-#define DECODER_SYMBOL(CODEC) DECODER_SYMBOL0(CODEC)
-        extern FFCodec DECODER_SYMBOL(FFMPEG_DECODER);
         codec_list[0] = &DECODER_SYMBOL(FFMPEG_DECODER);
 
 #if defined(FFMPEG_DECODER_tiff) || defined(FFMPEG_DECODER_tdsc)
-        extern FFCodec DECODER_SYMBOL(mjpeg);
         codec_list[1] = &DECODER_SYMBOL(mjpeg);
 #endif
 
@@ -341,8 +350,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     maxsamples_per_frame = FFMIN(maxsamples_per_frame, maxsamples);
     maxpixels_per_frame  = FFMIN(maxpixels_per_frame , maxpixels);
 
-    AVCodecContext* ctx = avcodec_alloc_context3(&c->p);
-    AVCodecContext* parser_avctx = avcodec_alloc_context3(NULL);
+    ctx = avcodec_alloc_context3(&c->p);
+    parser_avctx = avcodec_alloc_context3(NULL);
     if (!ctx || !parser_avctx)
         error("Failed memory allocation");
 
@@ -472,7 +481,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
             ctx->width = ctx->height = 0;
     }
 
-    int res = avcodec_open2(ctx, &c->p, &opts);
+    res = avcodec_open2(ctx, &c->p, &opts);
     if (res < 0) {
         avcodec_free_context(&ctx);
         av_free(parser_avctx);
@@ -484,11 +493,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     parser_avctx->extradata_size = ctx->extradata_size;
     parser_avctx->extradata      = ctx->extradata ? av_memdup(ctx->extradata, ctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE) : NULL;
 
-
-    int got_frame;
-    AVFrame *frame = av_frame_alloc();
-    AVPacket *avpkt = av_packet_alloc();
-    AVPacket *parsepkt = av_packet_alloc();
+    frame = av_frame_alloc();
+    avpkt = av_packet_alloc();
+    parsepkt = av_packet_alloc();
     if (!frame || !avpkt || !parsepkt)
         error("Failed memory allocation");
 
@@ -563,7 +570,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
           // Iterate through all data
           while (decode_more && it++ < maxiteration) {
             av_frame_unref(frame);
-            int ret = decode_handler(ctx, frame, &got_frame, avpkt);
+            res = decode_handler(ctx, frame, &got_frame, avpkt);
 
             ec_pixels += (ctx->width + 32LL) * (ctx->height + 32LL);
             if (it > 20 || ec_pixels > 4 * ctx->max_pixels) {
@@ -582,15 +589,15 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
             if (nb_samples > maxsamples)
                 goto maximums_reached;
 
-            if (ret <= 0 || ret > avpkt->size)
+            if (res <= 0 || res > avpkt->size)
                break;
 
             if (ctx->codec_type == AVMEDIA_TYPE_SUBTITLE) {
-                avpkt->data += ret;
-                avpkt->size -= ret;
+                avpkt->data += res;
+                avpkt->size -= res;
                 decode_more = avpkt->size > 0;
             } else
-                decode_more = ret >= 0;
+                decode_more = res >= 0;
           }
           av_packet_unref(avpkt);
         }
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/6] tools/target_dec_fuzzer: suppress Wunused-function

[Kacper Michajłow]

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 tools/target_dec_fuzzer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index a15f1a3f9c..7bbf1375d0 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -72,6 +72,8 @@ static void error(const char *err)
 }
 
 static const FFCodec *c = NULL;
+
+#ifndef FFMPEG_DECODER
 static const FFCodec *AVCodecInitialize(enum AVCodecID codec_id)
 {
     const AVCodec *res;
@@ -81,6 +83,7 @@ static const FFCodec *AVCodecInitialize(enum AVCodecID codec_id)
         error("Failed to find decoder");
     return ffcodec(res);
 }
+#endif
 
 static int subtitle_handler(AVCodecContext *avctx, AVFrame *unused,
                             int *got_sub_ptr, const AVPacket *avpkt)
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 5/6] tools/target_dem_fuzzer: make fuzz data pointer constant

[Kacper Michajłow]

Mostly to avoid warnings.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 tools/target_dem_fuzzer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/target_dem_fuzzer.c b/tools/target_dem_fuzzer.c
index 8e96fad7f8..19bc1f09c1 100644
--- a/tools/target_dem_fuzzer.c
+++ b/tools/target_dem_fuzzer.c
@@ -29,7 +29,7 @@
 typedef struct IOContext {
     int64_t pos;
     int64_t filesize;
-    uint8_t *fuzz;
+    const uint8_t *fuzz;
     int fuzz_size;
 } IOContext;
 
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 6/6] tools/target_dem_fuzzer: remove unused fuzz_tag

[Kacper Michajłow]

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 tools/target_dem_fuzzer.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/target_dem_fuzzer.c b/tools/target_dem_fuzzer.c
index 19bc1f09c1..e169438ceb 100644
--- a/tools/target_dem_fuzzer.c
+++ b/tools/target_dem_fuzzer.c
@@ -98,10 +98,7 @@ static int64_t io_seek(void *opaque, int64_t offset, int whence)
 const uint32_t maxiteration = 8096;
 const int maxblocks= 50000;
 
-static const uint64_t FUZZ_TAG = 0x4741542D5A5A5546ULL;
-
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-    const uint64_t fuzz_tag = FUZZ_TAG;
     uint32_t it = 0;
     AVFormatContext *avfmt = avformat_alloc_context();
     AVPacket *pkt;
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".