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 04EC244840 for ; Mon, 26 Sep 2022 07:32:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2831768B9CA; Mon, 26 Sep 2022 10:32:13 +0300 (EEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AFFA68B856 for ; Mon, 26 Sep 2022 10:32:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664177531; x=1695713531; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=36crbrrGK77SGqials72MbFYaWlOBP+nh9SXxA9gSGc=; b=St9J/LwL21U33CCuVj92OKA4N0RlL4vgIaragG2sLDTh0dbiBq/fA/te 89KEPYpTfPIuQhokwxEz/01CUxL3AZHGv71tB1LEFHdzHY3+A6jQ8hewg 5q3HV7wCl/egbrlKjaUGe09rX+jKOGZMllH/qsRmPqE7GBU1dKGy0Odb9 17/a/4fqQ4JjO4sIc9r0Y3HjFNMxpT2hTCeZnJ/BBGH9+415B9azMtjrS IwlJbX5j4Nbo7OcyoyGJRzUgiYTHmB9r1UoQgKRSQvN7kFz1EI+o4Coj0 YpdnDbY0gYNaC8yeTg6IYiR39LRVaVHuKkQmzYkidVCx3wG4SqhyKfNSx g==; X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="299686703" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="299686703" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2022 00:31:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="796231679" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="796231679" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga005.jf.intel.com with ESMTP; 26 Sep 2022 00:31:47 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 26 Sep 2022 00:31:46 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 26 Sep 2022 00:31:46 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 26 Sep 2022 00:31:46 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.170) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 26 Sep 2022 00:31:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AhePEXWNgBtYuLakoINIk5lDDAsGdEmn3XgktEgrJEsdsUmEdbdhBl0gV7c11zXADEfj1dEjrwXAq67nQudRB7tUmywI47mFvyPTa3NGvQ6lAmODS3bSvQkPKgg1Z9g8KI0RJOw/SPg+tSy/Lot7rvh7eC5GV7UG3t7CYDfxTrzOuw8C60kqFhXOZqSq/Pih2bGHluO8t/OGdzYwef/jCR0HWznlkjHofimO9QzpQG2M3+jPYB+Fx02YPGcLqd6gRMb43KFmdG1On0RXm68CH7sBaCHT3oFpW8DFwKYxzZfvO+u0yTSBa1wbT1+IeFZn4+qHX/0vk/pMDDV7MRHEew== 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=36crbrrGK77SGqials72MbFYaWlOBP+nh9SXxA9gSGc=; b=MpqYH32/QG1ov7nLkQlRBywiWBgb34GQdVWrmdpxyDjuxFTyoC7lOFaxOotVGGU18lNTK+g2a+KoLfWJWTQAC3w4AOOaHQGwefbk/UEfF8jhuRRSoWvp518ejUj3PiVs8g4qfQVBgxWhUnvJu8i1CjaR66sTC8kNdsTVZk1BPTgnv6/jpjvWzPJtyXYZ5Xv+IE9RFaiJxNwRYuBiZDyFE0LLnTctm1/U2QWuCX4ylF/Q4qyCqNBOaQiloHkWcp7FqZmQwyiFlcKKxxnIxEomPJHAR2shvN07t4QAY4GMrdH7mV3Tonlvkz+5OyQm51iCW0j+od0tJYry+iUMdu4rDQ== 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 BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by DM4PR11MB6455.namprd11.prod.outlook.com (2603:10b6:8:ba::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Mon, 26 Sep 2022 07:31:44 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::3804:a5ab:68a9:9304]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::3804:a5ab:68a9:9304%6]) with mapi id 15.20.5654.025; Mon, 26 Sep 2022 07:31:44 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v4] libavcodec/cbs_av1: Add size check before parse obu Thread-Index: AQHYzZ6rsDiZlUl+BUKBxhBv2ZZJGa3xWM+A Date: Mon, 26 Sep 2022 07:31:44 +0000 Message-ID: <79fc2f4d10bb3fe41c64aa8c17919ea4bc989033.camel@intel.com> References: <20220921094124.1749099-1-wenbin.chen@intel.com> In-Reply-To: <20220921094124.1749099-1-wenbin.chen@intel.com> Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 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: BN9PR11MB5515:EE_|DM4PR11MB6455:EE_ x-ms-office365-filtering-correlation-id: 08d5733b-bac2-4884-22fa-08da9f9129c0 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: dDEGrhZ0R1Xqms58yb+ybJu0lnbd1og3FdsRf5jSILyQjrFJghztY+wGP7kKb94vSbG2GapfmNvvqx8GPMxbxnSj7PqKbHU9FgjP4Zfi/5+IYHrXP3tcgACitK4oL2phmut+uvxxvjk3YD2CEwjbPM1geGHm2Kj/LVA0PSAq+SqqlnYXJt9tiSsmmd9/WDCN3SDDkiw5yodQCVjIs/qZcjapGAILxW79eQg88g0PS1hGwkV8rQunkTOEkOECR9viXEpaY0ePowb3ZOUe5pwDVypxfo6hqb6hLowWJuuEQ44dclk6gmGu8Nitf54qU7piEs3T/WkxxWVdz3iIG5vq6XsWxxzsLDw9LqqAqpU1bj4wXmKBUqWLujuolmWwoZS+rTRN5FNYG+S6K+2AB+x9EfqxNjIYstmqy0SFOVGfMw1aIXCVJhuIIFAMZ9g2Um+MnABTOec/jWC1iCdtP5rl0eva8gGPF+8LOmZIFZ35IoKZGu1tK529h0EiONEVSHy2Quq6shxnIHKdPPvIflKfx0F74Yf7Mc4OYq28NCeCPfIM8TZLSKpuE0o/SelmIb4w9FPWgUIOIvrLPkUZ1AAHScknAVYcb/8cs3ox4V3Ds5NAG9CgerfBVeQlUJ+SRDU242/qtpzfF8UAwVz7ooQoarDHam1trmtHIEUYC60pn9vc40xQUpSAR1RkfFRums7W9O5r64TB1DIQ7Jku5nHb/nyAjAxSpC8VHfStq6UdylV6g4HvM5eTiDEX687JTVvDbFy+GBPFNq/WrkFRvjfxazi9NErJWm35wKyrYMCKCExpo91xqljzBGhecAKQIoiK x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(366004)(346002)(376002)(39860400002)(136003)(396003)(451199015)(71200400001)(6506007)(478600001)(966005)(6486002)(41300700001)(83380400001)(26005)(6512007)(186003)(2616005)(2906002)(5660300002)(19627235002)(316002)(6916009)(76116006)(8936002)(66476007)(66946007)(66556008)(91956017)(64756008)(66446008)(8676002)(82960400001)(38100700002)(86362001)(122000001)(38070700005)(36756003)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?QVg4T0ZreW1wMXlvZ3B2c1FNclNVdlAvM3dSU0lsdGNFUFloSkcvTjB3bUgy?= =?utf-8?B?ZVlyV3l5Y0NxYTFwcFgvUmh0S2R1bmM0bmdvNGJvTk9uOS9uWTVRK0syUGd2?= =?utf-8?B?NldmWXRlTFk1S01IMlozQTRGSkZGVzR5OHI0MTdoYnRaVVZaV2tQa1dMLzJv?= =?utf-8?B?RjI1MXFaRUNMTCtiU2FuUFhreE5LaFZRZmZYYkZKSE01UDJGaUVtL2ZSWWVG?= =?utf-8?B?aHlKdkwvSXRIVmpqaXJycXNYR3B2Q0d1RGJ4Smc1L1VGV1l6emV4N2NsS0NF?= =?utf-8?B?d2VKdndrZ1NWWU9JL051Z01JYmE4eFJ4MGdiM1VTZ01OTXcwdjE0ZGdzTVBK?= =?utf-8?B?MUJuRFFNaHA1ZFpnbXdXazdGZFV0Mkl1dlJhZzU3UEM0VmRoYVRJdWJRQTJx?= =?utf-8?B?VXRwM2FtS2NybksrcktLRkxQRm5TdDlzelowT0RNWE9WNWJaNWdLU1JUc2ZI?= =?utf-8?B?TFlLVXV2T0xCRG13bDhjTnpmUGRnb2xORW9PdGZBV2hQaUk2SjNLT3hPVnBY?= =?utf-8?B?ZkJCdWxkdEFZT1JkNVhmQmpyTFNQd3dIN2R3OXhydGlJNlBMbnF4bFg2ZGtR?= =?utf-8?B?dVZ4Mzk2ZFRLYTh4SmV1WjdZSTRqSFM4VTFmRElha1pJdmIwMVVMWXVpQmhK?= =?utf-8?B?cWNTN3JkV1I3OGtDTHIvOVUxdzMxendyVm4xYVVCdjRIUC9lN2JXQWVWZzFJ?= =?utf-8?B?Y0pLNjh2VWNXY2U3VjNIZ1B3MUJRUlMwYmpyVGwzODl5MGlvN3Vxd2hxT1Vs?= =?utf-8?B?L0JoSUFPRmNva0w5Y3hPbFlBejZIOTN2ZVRBbXZpRUQ5QU02UXRLZkp5UDFM?= =?utf-8?B?a053VFpRNDlLSEY2MXpoYXJJbFRjbEd1Rm4yOGlEU1d2VEhuWFRPSmc1dGRt?= =?utf-8?B?ZjJLTUE1NWdPV2s0OGYxaEpucXlWVVJ3bEY1WFdlQTdYWHRNelcvcEs4QWt2?= =?utf-8?B?WWh5dTNyM1FOYnN1M2s2UzE3R2UzdUJpb3pXNTNETW9FUUtWVVdwNWNrQXNL?= =?utf-8?B?aHRQWUpsZ0J2cURNajF4MXRwK0VXN2lNcHFRaTJLMFVyMVZ3QmNTdUZzQWx6?= =?utf-8?B?SS9LeWcxNzQ2dkJoMzVoY1dlelJsc1VJbmlkQzVSekJIejJtdkFTRW9ISW9j?= =?utf-8?B?cnNIdnIzaHM2V1o5TU93SnBHUTluWVhMaWhXdFNxc1N0QmsreTYzdzBmdGhx?= =?utf-8?B?dzE3YzRibElmQk9xYm1LSkNaL3NjdGNjdkg3UCsxQlMraGFzNkE5bmJrZVRt?= =?utf-8?B?dEM2ZnVDRkNJcHowYkhXS01ybzIraGZnVlNaRG5VRFpRa3JEL2N1QlFMTCtY?= =?utf-8?B?WXBNc3FYcTFRSHVDVHBSS3dkMWtiTi8zMWZzMGRmT0JaNkRjOEw2dkN2UjVq?= =?utf-8?B?TmR0SkxLMUxzSGJlYTdFNVJ3T2hwOTVOWjl0LzIxU09kZ0RCSWt2QVg5cnkz?= =?utf-8?B?NmlMYmRJbE1CRVZUNGJ6ZFpvdGtsTENHOVM5Zk9HMFdCODAxMFNEbm9Cc3Fw?= =?utf-8?B?anlaU1pBMFpzNFpMU2ROUEg4UDMzc3VBWmE4eEJnejVlYTd4TXlpbDF5NGhJ?= =?utf-8?B?dWVTNG1WNnBmWDlRWFRzdk1QbEFJTVl1YXU2UEdBS2tTbkhydy8rU2Jod3p0?= =?utf-8?B?SGEwcjRsWURZdVdQRDhiR1REUzJpV0hqVjk2T3dVemQzZ1dRY3EwOFI2b0tC?= =?utf-8?B?OEJRSDBJWWd0NFpoTU9lNFk0RmljTGJ2dW9STFp4aUh3R296SFhKQjl0ZTkz?= =?utf-8?B?RDE1ZkF5U0ZDVXJLRGhuWEl0QklNcnU5VHpZYi9PZWZSUnRXYnY1OS9SN1Ni?= =?utf-8?B?bU5Zc2YvaGZyUkpsdHV1bjMzZ1NaVmJ2LzJtSzBBM0FVZndzYjdQcGpLWXZI?= =?utf-8?B?RFZreDNuRW9YQ1oweUZzaHRJdXFieVVXczh3bDZSRmZIbytBelcvTWZMUWFT?= =?utf-8?B?YTdJMXdYNWZJZjM5enhicTJlTG82bWZjZ1RoRC94YlRydnA0aTRPS2dPQTNo?= =?utf-8?B?WGUvZ0UxK0k2MkFZNUI4anpIMWgwZDFDLzlVbm5YZnV3UHFzSWl3Z1Y0RnRK?= =?utf-8?B?K0JiMDFBM1BKUDNzMzZyQmRaYlN3RW93ZytGQkQ3T0hFRm4xSkpCTFN0UHVj?= =?utf-8?B?K2hLa0FnMGZ5ZzJ4L0UwTUE1czg0R3lsT09JcmpTWnpRcCsyR1JSSWNxNFRR?= =?utf-8?B?K0E9PQ==?= Content-ID: <1163F72F908C594C8F6E55763F28C14D@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08d5733b-bac2-4884-22fa-08da9f9129c0 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Sep 2022 07:31:44.5565 (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: FOEa3Z6pe9iulmJcJ/Jd+xFddT5w4qALh8NOGEEpOGFxlWDqpunReVi7bVL3Ay7Mfrkx++HTahQAx7osMuSBNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6455 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v4] libavcodec/cbs_av1: Add size check before parse obu 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: On Wed, 2022-09-21 at 17:41 +0800, Wenbin Chen wrote: > cbs_av1_write_obu() check pbc size after parsing obu frame, and return > AVERROR(ENOSPC) if pbc is small. pbc will be reallocated and this obu > frame will be parsed again, but this may cause error because > CodedBitstreamAV1Context has already been updated, for example > ref_order_hint is updated and will not match the same obu frame. Now size > check is added before parsing obu frame to avoid this error. > > Signed-off-by: Wenbin Chen > --- > libavcodec/cbs_av1.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c > index 154d9156cf..9c51a8c7c8 100644 > --- a/libavcodec/cbs_av1.c > +++ b/libavcodec/cbs_av1.c > @@ -1075,6 +1075,9 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, > put_bits32(pbc, 0); > } > > + if (8 * (unit->data_size + obu->obu_size) > put_bits_left(pbc)) > + return AVERROR(ENOSPC); > + > td = NULL; > start_pos = put_bits_count(pbc); > According to the comment in https://patchwork.ffmpeg.org/project/ffmpeg/patch/20220329082921.756174-1-wenbin.chen@intel.com/ , the error might still occur. I sent out https://ffmpeg.org/pipermail/ffmpeg-devel/2022-September/302127.html to restore CodedBitstreamAV1Context before returning AVERROR(ENOSPC). Could you have a look ? Thanks Haihao _______________________________________________ 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".