From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D28BF40841 for ; Wed, 24 Jan 2024 06:29:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAE1768CBF7; Wed, 24 Jan 2024 08:29:29 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3019168BCDC for ; Wed, 24 Jan 2024 08:29:22 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706077768; x=1737613768; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=OG/GOuxWcB2rFPJpz4s1xPW3vDCpX+EzfZDI5hV2xsY=; b=c1fhV0TgdFhFHsS634lA5SAlrqmSzcd23u98fslZK/6p5Yi3SdOIMCuB bq4SODA3zbyvj0yDgHbChxAKmxaPF3lPHWtvshhUPeuLYOfbld+rkd0YN TGxsXrt48SLARp/sKh/L8kMpUQia3gODPiXwetwi8I7MqBGT3TTytl5eZ LjTry7pw5AcPvT/M+ci3TtY/1BmhrGNmmfG6tIaw9NQ/TxRWtyhw7K0Iq XnA1RHN43EUMkndmBHQDoHGPLDJ+f5z5Dwck0JBwzOHrnQcTD+IkE01qk fvM6hFMib9dlIM8PUPW5rpeFXTbUcx2xgaYy6f+I1LDzrB7ORyK7/eJ0I A==; X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="405506165" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="405506165" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2024 22:29:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="34669498" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orviesa001.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 23 Jan 2024 22:29:20 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 23 Jan 2024 22:29:19 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 23 Jan 2024 22:29:18 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Tue, 23 Jan 2024 22:29:18 -0800 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.41) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 23 Jan 2024 22:29:18 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KKAnSZjy8ampDaI89lorRBHXP16OE5bARz1aWjcyXA03y8Hxei2018fMWlCGT6/XKZS7fyWEsx5sn8K5zu5PTueddC7NFzPZyZbBrPol3E60YKROabTNjFjrxu8Uap6xzfzJk4kvGq9LwbF/bflAjuDrkZrJhMKfeAq7pcsgPrXrWuU/8jxolG1crhU8tvVTjkfAzkHGaeajrOEYJzvTu6KebNPFlweCQb6rasYdm05pGaQtm+VcHUIiDbfQJvFOLGFU2hQsJigF5DQNZ5GTL0bGdpFJq2GmLyKXfry4dvsXyVr+Ai5tvN2JnTdw0fbENI5S4jpFoS5rTdeZtzrZvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ms5/MFn3HkIU2pV/7Vyf1ZSKpatqtksGedh2KQJUyPs=; b=ItO9AqnMZE8X/Ag7FbByfawyjLYn2thqrxDfmuZQIrxAUAZfr3jdP3iqILLuRaimiqr0AHOnr8EeBNVgrHEimc0vSk8p7y22M77c7mn7o0KWpUvQaQxouZ3CE0/0QyCRXw3LuwrlaZE2QjDiC48g0KN3fLsRVrQTQgpnS6fnL6usveuBlq/N+IGmn0RCwcr4KNdxomUD1AA8iKovhGEZsRJJRlWoR3cn5/bCmAo0hahkhzugeMw9wUbGcEH38T23uFMMEHw8yV+PhYhO4d8eS39edaoA6yetCsP2JnAO5w7ix0k4Bnnq20zaY2iNP97YnZd9zmY9ZixW/fteu3+eQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from CH3PR11MB7937.namprd11.prod.outlook.com (2603:10b6:610:12c::15) by LV2PR11MB6023.namprd11.prod.outlook.com (2603:10b6:408:17b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.22; Wed, 24 Jan 2024 06:29:16 +0000 Received: from CH3PR11MB7937.namprd11.prod.outlook.com ([fe80::36df:9084:c6e3:6845]) by CH3PR11MB7937.namprd11.prod.outlook.com ([fe80::36df:9084:c6e3:6845%4]) with mapi id 15.20.7202.035; Wed, 24 Jan 2024 06:29:16 +0000 From: "Dai, Jianhui J" To: FFmpeg development discussions and patches Thread-Topic: [PATCH v5] avcodec/cbs_vp8: Use little endian in fixed() and improve the pos check Thread-Index: AdoxhcxeCzuJrmabQlqgxVGMPSzOTQdCL17Q Date: Wed, 24 Jan 2024 06:29:16 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH3PR11MB7937:EE_|LV2PR11MB6023:EE_ x-ms-office365-filtering-correlation-id: b3b208f5-cd9f-43b8-7d22-08dc1ca5ca3a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: V6RdTY8o/+h5JH2F76KQ/YbQdifVvxKpm6i5m9rt/E+8n4zN2SV2Hz6gisLGXU+ZPOZde+uqT3/XaWr6nY3oEULNFZPKQOcLRHxS39wTuFonyNep1J3619qxJfl9aok/V33TzDeEU6BTESAl5FGAfsOuvNOBkrRksxMxULQ2wqnvuJh7kVSPFNdDf5/imonoE0f4hA4v9+0ZoeJ5bjHP0G49Hu91W3nWw//mpNt7RTHoVoZevWRnNz6r0oGkry2QpZk4lUYUc11SVzNDuCzQ9EYNxGbucFpQzC3KgSAdqC3M+RuMwpqrZZ1rCFnlJRwYAwk+gT0r8pwZTAkZ5NkgUGt09O97j8C19vCrPb6p1EXe8mf9/0iFUKvgFjtlfJ9R8V1M3JPahtvhQnSZtBRy1BVyQ/FEErwBcJu/rx7WRrN4x992B8mxaozUZVpKzJnHl5xxcnMpDWgxCmo2DcOrd9q9ONfAdtLEEPDnb/QlmLNcPhJOvPbdn37DkwIDUL3YB6Wca5S3759Hsb3CqKUZC4urOhiNMWWxLDgp4lzRwR8rUt1prnOBblpEz3LKSVoaz6HgEMGuEBRO1HwouWsH7tzfeIWAE+132HC3AvHMjVE= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH3PR11MB7937.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376002)(396003)(366004)(346002)(39860400002)(136003)(230922051799003)(186009)(451199024)(64100799003)(1800799012)(5660300002)(2906002)(6916009)(64756008)(66556008)(66946007)(8936002)(8676002)(52536014)(19627235002)(55016003)(966005)(478600001)(71200400001)(7696005)(6506007)(76116006)(53546011)(9686003)(66899024)(41300700001)(83380400001)(26005)(316002)(66446008)(66476007)(86362001)(33656002)(38100700002)(38070700009)(122000001)(82960400001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WHKr0+GU4wizdzpxr0SRxuOCiApCcwYrb4QfR5DAQFGuPIoPGQ7e5Ww9bUfd?= =?us-ascii?Q?M8ORxf29OoMAuijFPLuth9PUqS9TgX9omiH19xU8WMXKlYXqTP85VKC+l7xD?= =?us-ascii?Q?Luz6PQk+AXeIgmwF2eDWLW3FiNgTxw/DEvKtVKitsa03q61YOqBxVjn0nTmt?= =?us-ascii?Q?rfqZ/4nv29FCsVXO0FwC7xT1uz1xiJXjeuq0157X3YqmFQx2alAcUrdPJDCj?= =?us-ascii?Q?2fAjqJkKR4/NaNti3ETcg+527DbrBhVCvWmzA6N+rLl7W7DPPUAajCJjgTqs?= =?us-ascii?Q?px7Qo3SlPqhHm/Tj63/1qY+bF5yik+ktVkcbYGBeiCbMW3fLELgTotprW910?= =?us-ascii?Q?Nai8m5X/XRPlQuqWP8VHSiSuhJecAzuRsQFR7Ifdxgb3iaxyPVOwcs+omuYU?= =?us-ascii?Q?LeBrGogczQYFr5hEisXsZWLsLouZJDB6zynjcew6F7zITihoWffmT73ZKrFR?= =?us-ascii?Q?olc5qX8Luisoht1F8ZPltGkjogbwzBtSr2WD02RafimFu4i9NHfIqfJ30q7b?= =?us-ascii?Q?BkFAaC41ENDZEXYAJgpPaPBPFIwbCNX2L7wpnkyiYnq5uW38GuVTRD3BIb/w?= =?us-ascii?Q?Zj2eyDFwHeq48jcaKi/KTY9DpFw+txkuIYias9ys0toC91E/NJZfAL8Pa9VM?= =?us-ascii?Q?3iRfW/2xBL9vbFbSyKYWsh1TplKNaRPZXIcyc/dPSDlM9+30SJ6MlKVpFid3?= =?us-ascii?Q?hRsvZJ/HCZYKZHVVHqjKGPuzBMwjsLultB/vDPrAEAK6j5ZHxNgt42NxV38f?= =?us-ascii?Q?UGeyNMC2gymUovtdQnHr/rThkh5tJmYeEKJU2QykX5JJZ/LqIFsfa1o/Uguj?= =?us-ascii?Q?ESsxKa3h2Okohz72hXLhBtKvxe9ZNFow0Hu5MhQC01ip11v3/+hKditPPAGS?= =?us-ascii?Q?iRhpydhMj7vafneo6qDCKZuIdSeqYe70FtO3YqeZ8Q9d2hGL6C6ZY0UVi4Ph?= =?us-ascii?Q?l+0fdZADn3sPc4BIMptzB42eOCLlVYtxTxv/eNXH+O1880tL0hHZ9w1CQOnT?= =?us-ascii?Q?DAlZ1XteQR4Zb205raP3LO1na8w1JUFxslRxX4beVyjkq9KJkxHxANkgIAvx?= =?us-ascii?Q?AFOC98RQafQhp/cXkP2eGexkC22Ljx/AiB6B64cj7e59OpnueRVvW8LCed3P?= =?us-ascii?Q?F/umrHBE2Op3LFSvpe3S9sPpcPmTmhUJN92hPOhATIxvmcCa6jv1asfMqMtF?= =?us-ascii?Q?hmpMnCRg476Dioa0zcQgTGvfax4qQo6es0ZUcUJV6O8gQ2izh7JS4H+OrNjK?= =?us-ascii?Q?7/9D2j0L7lLgjHU/iFPzvw8hPW5XCmSZhnFET8dWkcKz6+IxssQvbF6lihyJ?= =?us-ascii?Q?F4uxr8TWX+/cbFd0cWNolLLbIMOXW5uRChygeQSHoeq0zmQUtfjuJXkToeo5?= =?us-ascii?Q?bO42TTh+cb5EC1pdY/3ikAsj7qzooK0i1/QqGI/T/g0CvjMNFd1Bg8X3X+ys?= =?us-ascii?Q?eaeQJk44GRMHQ0xmYbT/LIBs6ReOTPmAOo5oR7S7y53NXkSBZD3ijdjJRfvw?= =?us-ascii?Q?+JLJRShQhpCUEu5/ekjugJLNlJu0qaDQ/lP6PiTivt6mtFhBJYyOqW56mWqe?= =?us-ascii?Q?1tFMy2lEknyiTa7dkM/9lxfe90E+pzBEk+l3etsp?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB7937.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3b208f5-cd9f-43b8-7d22-08dc1ca5ca3a X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2024 06:29:16.7725 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: dj3Ol6ZIQnFai4wzqqr+lXY8WIFfTKNBxEwJQWtoMrUH3ZTPD1upyXyXfq1Y/WiwgtP1QfRebk0Cc6F4gFfBcw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR11MB6023 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v5] avcodec/cbs_vp8: Use little endian in fixed() and improve the pos check 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Dai, > Jianhui J > Sent: Tuesday, January 23, 2024 10:58 AM > To: ffmpeg-devel@ffmpeg.org > Subject: [FFmpeg-devel] [PATCH v5] avcodec/cbs_vp8: Use little endian in > fixed() and improve the pos check > > This commit adds value range checks to cbs_vp8_read_unsigned_le, migrates > fixed() to use it, and enforces little-endian consistency for all read methods. > > The VP8 compressed header may not be byte-aligned due to boolean coding. > Use bitwise comparison to prevent the potential overread. > > TETS: ffmpeg -i fate-suite/vp8-test-vectors-r1/* -vcodec copy -bsf:v > trace_headers -f null - > > Signed-off-by: Jianhui Dai > --- > libavcodec/cbs_vp8.c | 53 +++++++++++++++++++++++++++++++------------- > 1 file changed, 37 insertions(+), 16 deletions(-) > > diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c index > 065156c248..338d56ed7f 100644 > --- a/libavcodec/cbs_vp8.c > +++ b/libavcodec/cbs_vp8.c > @@ -33,22 +33,22 @@ extern const uint8_t > ff_vp8_token_update_probs[4][8][3][11]; > typedef struct CBSVP8BoolDecoder { > GetBitContext *gbc; > > - uint8_t value; > uint8_t range; > > - uint8_t count; // Store the number of bits in the `value` buffer. > - > + uint8_t value; > + // Store the number of bits in the `value` buffer. > + uint8_t count; > } CBSVP8BoolDecoder; > > -static int cbs_vp8_bool_decoder_init(CBSVP8BoolDecoder *decoder, > GetBitContext *gbc) > +static int cbs_vp8_bool_decoder_init(CBSVP8BoolDecoder *decoder, > + GetBitContext *gbc) > { > av_assert0(decoder); > av_assert0(gbc); > > decoder->gbc = gbc; > - decoder->value = 0; > decoder->range = 255; > - > + decoder->value = 0; > decoder->count = 0; > > return 0; > @@ -60,7 +60,7 @@ static bool > cbs_vp8_bool_decoder_fill_value(CBSVP8BoolDecoder *decoder) > > av_assert0(decoder->count <= 8); > if (decoder->count == 8) { > - return true; > + return true; > } > > if (get_bits_left(decoder->gbc) >= bits) { @@ -141,7 +141,7 @@ static int > cbs_vp8_bool_decoder_read_unsigned( > } > > if (trace_enable) { > - CBS_TRACE_READ_END(); > + CBS_TRACE_READ_END(); > } > > *write_to = value; > @@ -181,9 +181,11 @@ static int cbs_vp8_bool_decoder_read_signed( > return 0; > } > > -static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, > GetBitContext *gbc, > - int width, const char *name, > - const int *subscripts, uint32_t *write_to) > +static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, > + GetBitContext *gbc, int width, > + const char *name, const int *subscripts, > + uint32_t *write_to, uint32_t range_min, > + uint32_t range_max) > { > int32_t value; > > @@ -200,6 +202,14 @@ static int > cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *g > > CBS_TRACE_READ_END(); > > + if (value < range_min || value > range_max) { > + av_log(ctx->log_ctx, AV_LOG_ERROR, > + "%s out of range: " > + "%" PRIu32 ", but must be in [%" PRIu32 ",%" PRIu32 "].\n", > + name, value, range_min, range_max); > + return AVERROR_INVALIDDATA; > + } > + > *write_to = value; > return 0; > } > @@ -246,15 +256,16 @@ static int > cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *g > do { \ > uint32_t value; \ > CHECK(cbs_vp8_read_unsigned_le(ctx, rw, width, #name, \ > - SUBSCRIPTS(subs, __VA_ARGS__), &value)); \ > + SUBSCRIPTS(subs, __VA_ARGS__), &value, \ > + 0, MAX_UINT_BITS(width))); \ > current->name = value; \ > } while (0) > > #define fixed(width, name, value) \ > do { \ > uint32_t fixed_value; \ > - CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, 0, &fixed_value, \ > - value, value)); \ > + CHECK(cbs_vp8_read_unsigned_le(ctx, rw, width, #name, 0, > &fixed_value, \ > + value, value)); \ > } while (0) > > #define bc_unsigned_subs(width, prob, enable_trace, name, subs, ...) \ @@ - > 277,6 +288,15 @@ static int > cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *g > > #include "cbs_vp8_syntax_template.c" > > +#undef READ > +#undef READWRITE > +#undef RWContext > +#undef CBSVP8BoolCodingRW > +#undef xf > +#undef fixed > +#undef bc_unsigned_subs > +#undef bc_signed_subs > + > static int cbs_vp8_split_fragment(CodedBitstreamContext *ctx, > CodedBitstreamFragment *frag, int header) { @@ -327,9 > +347,10 @@ static int cbs_vp8_read_unit(CodedBitstreamContext *ctx, > if (err < 0) > return err; > > + // Position may not be byte-aligned after compressed header; use bit-level > + // comparison. > pos = get_bits_count(&gbc); > - pos /= 8; > - av_assert0(pos <= unit->data_size); > + av_assert0(pos <= unit->data_size * 8); > > frame->data_ref = av_buffer_ref(unit->data_ref); > if (!frame->data_ref) > -- A ping to the reviewer to apply this fix. Thanks. > 2.25.1 > > _______________________________________________ > 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 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".