From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/qpeldsp: copy less for the mc0x cases
Date: Mon, 27 Jun 2022 07:57:06 +0200
Message-ID: <DB6PR0101MB22148DA559EE851AB03B5D9F8FB99@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com> (raw)
In-Reply-To: <20220626135146.13096-1-michael@niedermayer.cc>
Michael Niedermayer:
> Fixes: out of array access
> Fixes: 47936/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5745039940124672
>
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavcodec/qpeldsp.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/qpeldsp.c b/libavcodec/qpeldsp.c
> index 2b9146ceb1..5f937f9d9e 100644
> --- a/libavcodec/qpeldsp.c
> +++ b/libavcodec/qpeldsp.c
> @@ -199,7 +199,7 @@ static void OPNAME ## qpel8_mc01_c(uint8_t *dst, const uint8_t *src, \
> uint8_t full[16 * 9]; \
> uint8_t half[64]; \
> \
> - copy_block9(full, src, 16, stride, 9); \
> + copy_block8(full, src, 16, stride, 9); \
> put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16); \
> OPNAME ## pixels8_l2_8(dst, full, half, stride, 16, 8, 8); \
> } \
> @@ -209,7 +209,7 @@ static void OPNAME ## qpel8_mc02_c(uint8_t *dst, const uint8_t *src, \
> { \
> uint8_t full[16 * 9]; \
> \
> - copy_block9(full, src, 16, stride, 9); \
> + copy_block8(full, src, 16, stride, 9); \
> OPNAME ## mpeg4_qpel8_v_lowpass(dst, full, stride, 16); \
> } \
> \
> @@ -219,7 +219,7 @@ static void OPNAME ## qpel8_mc03_c(uint8_t *dst, const uint8_t *src, \
> uint8_t full[16 * 9]; \
> uint8_t half[64]; \
> \
> - copy_block9(full, src, 16, stride, 9); \
> + copy_block8(full, src, 16, stride, 9); \
> put ## RND ## mpeg4_qpel8_v_lowpass(half, full, 8, 16); \
> OPNAME ## pixels8_l2_8(dst, full + 16, half, stride, 16, 8, 8); \
> } \
> @@ -459,7 +459,7 @@ static void OPNAME ## qpel16_mc01_c(uint8_t *dst, const uint8_t *src, \
> uint8_t full[24 * 17]; \
> uint8_t half[256]; \
> \
> - copy_block17(full, src, 24, stride, 17); \
> + copy_block16(full, src, 24, stride, 17); \
> put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24); \
> OPNAME ## pixels16_l2_8(dst, full, half, stride, 24, 16, 16); \
> } \
> @@ -469,7 +469,7 @@ static void OPNAME ## qpel16_mc02_c(uint8_t *dst, const uint8_t *src, \
> { \
> uint8_t full[24 * 17]; \
> \
> - copy_block17(full, src, 24, stride, 17); \
> + copy_block16(full, src, 24, stride, 17); \
> OPNAME ## mpeg4_qpel16_v_lowpass(dst, full, stride, 24); \
> } \
> \
> @@ -479,7 +479,7 @@ static void OPNAME ## qpel16_mc03_c(uint8_t *dst, const uint8_t *src, \
> uint8_t full[24 * 17]; \
> uint8_t half[256]; \
> \
> - copy_block17(full, src, 24, stride, 17); \
> + copy_block16(full, src, 24, stride, 17); \
> put ## RND ## mpeg4_qpel16_v_lowpass(half, full, 16, 24); \
> OPNAME ## pixels16_l2_8(dst, full + 24, half, stride, 24, 16, 16); \
> } \
Are the arch-specific dsp functions affected by this, too?
Do you happen to know why copy_block9/17 has been used in this code?
(After all, using copy_block8/16 should result in a slight speedup, so I
using copy_block9/17 must have been intentional.)
- Andreas
_______________________________________________
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".
next prev parent reply other threads:[~2022-06-27 5:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-26 13:51 Michael Niedermayer
2022-06-27 5:57 ` Andreas Rheinhardt [this message]
2022-06-27 12:40 ` Michael Niedermayer
2022-07-12 18:13 ` Michael Niedermayer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DB6PR0101MB22148DA559EE851AB03B5D9F8FB99@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git