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 79571446E1 for ; Wed, 21 Sep 2022 08:27:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27EB568BB83; Wed, 21 Sep 2022 11:27:54 +0300 (EEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A7F268BA12 for ; Wed, 21 Sep 2022 11:27:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663748872; x=1695284872; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=j/k6KnR2Cfszv7FMyg7Ad2Qa0CxaqAl4N0wIbm/18jo=; b=hoZDY7Oz7Pvsef/MPfFdD/4aSArVxktjtijpOVb0NJU5z46Ry95MhLT0 0NQd6P+VD/A9xdtC9DPG5et0cloAV20cnbXAeBiAPlhVWIeFRXdLW4XFh 9heJwNcO8ASoC6Mp7PZ/RK4gWuOfUycEz138fEBBXz0n0c/ZktyYezYS0 nSF6Vi2tJM18iAbc7qEdQ2n27NiYUeTjML6BWlecrFOCAvfgYrmt0/XJR qxW1ngUqGDb96ptcvSt/IVgZKZPKZvCplMLTlhjAD//x1lJmTgchXem9R CVh4NXb0v7prwtVNWEGi4fBKaOtxgzye36nihBUpRCEZ4YNaigIVbAfu9 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10476"; a="326250736" X-IronPort-AV: E=Sophos;i="5.93,332,1654585200"; d="scan'208";a="326250736" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2022 01:27:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,332,1654585200"; d="scan'208";a="621596167" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga007.fm.intel.com with ESMTP; 21 Sep 2022 01:27:32 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 21 Sep 2022 01:27:31 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 21 Sep 2022 01:27:31 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) 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.2375.31 via Frontend Transport; Wed, 21 Sep 2022 01:27:31 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Wed, 21 Sep 2022 01:27:31 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hT2kBz4qtk9mKn8SeSKi5o8zXmRuuiHSA7McNi01wItvCt7QudmtOGsNqboueahD3NdZUrQXB4wQARrtufGoUSHQ5+6GXrZREaw6+2jSHrg5LJZLGOLGWtMxqRewtoCPPVwP9TGVj7OjtGTQOnEtd/zSni8WIS15unnzXimjahXZJOqgZWhHHzEYnJ0G4F5Cv7Uv62VMKQbKueKR9JBmE9v6NXriy9kmPApjBqG/n45ECowDKnCovbpmAgriC6A2ZgtP/qMPry+46N7WuwhVj0eWDdGgTBv3U1L6IbtWJCy4N5CqFjQw/UxZVQ9bHdxIiQBFnYgk2+Fw3RUvxGaVOg== 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=j/k6KnR2Cfszv7FMyg7Ad2Qa0CxaqAl4N0wIbm/18jo=; b=In/wLIis6T+7zG95FCc4jBIV3YcObynSgbhYCvyS56IFy15Sp3Fmy+yXfBsAZCqrG+029B2eqnuMESTdzSPDrQOr36Wjgtcyvq5u6O9UAAp0EBcmH2mEcLWuN9ZGjdhcAywoHZZ7GBjtd93toCw3SsJzLsR5S65D3GIae0t/erTJOmGimrGcxyrTEy+WaeynOrI2vS/J1zlfXkEc8RBPC1C8TfyK6nj1JKHiTW9lDH42t6NjL6JpswInvehrp/J4IIQFm+d64qM5f08blaK1WVz3djDHTNlGumHjYqUOiX3Ap6XzTfy0z0o+wS46cYqcBfVHpggTtO+Unxsr2PSJeA== 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 DS7PR11MB6015.namprd11.prod.outlook.com (2603:10b6:8:74::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.18; Wed, 21 Sep 2022 08:27:29 +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.016; Wed, 21 Sep 2022 08:27:29 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v3] libavcodec/cbs_av1: Add size check before parse obu Thread-Index: AQHYseSPs3yG4WOjgke86EI7DSKHQq3pxC4A Date: Wed, 21 Sep 2022 08:27:29 +0000 Message-ID: References: <20220817025110.24169-1-wenbin.chen@intel.com> In-Reply-To: <20220817025110.24169-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_|DS7PR11MB6015:EE_ x-ms-office365-filtering-correlation-id: e1fa90eb-c7dd-4e67-7e0c-08da9bab1f85 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5lpKwgC/oFIo40WLrJt77imEZqQ2MyvNy/o4UC1pdxX/svGFAK5GZPK6fHIXbTkpnZaa9ZpnRtHsuBzivRMB/m6Txb4qz6uPXrJs9Po807vCY3qcVBpkhCVITz0f72DmfNA3C9i0AQt5oIWVcscF1UjCQ0HZBP1Z/AyBbOnEo9FnwidTz/uuGi/vLzUcqdpeXbs6cKv34TpF5ueZgmI5u4rFoDCBoz3hFYcpdQSS8JcGTCEiom9BJMecaXxrV34i/gRyg00VbBVBv2JOn6O3xzuGUtKsEvFrHLaJiJGygeEIxCJCwnfVstXorGM6EOpxNhQjLcB4OVwqjBHWj/BI/jS8dXoIzqJ7J5Mx+7qI0SSqdWSfIIiisvrgm1z2YyM/1lH6oa1s9DsSDpE36yODuLOY1Dk6R8xYjmV92CGEsf/PtqTBq+yYTAueVq6A3B+7azn4Q4QvS0CaSThgYBmk6W8rfPKpof8tSx7QvGfMaizAAlb2XkrXDuRdFjigVTZsIgCgqEJ7Oa9zgPH9XdPPTp1QZMgXew/CPaOF9t3H8dgc2bbBS35OgFcd3z2VFDKywQwSzOt5FoTbbbS5lWte2afzBOj8+pdcqTn8tg/UmDElUYh1GU//h22+7ySePKkdrPjv8SPG1CqFiuP04Q3NHYPw+R8leRNYyqybZT7HUAYYIgH18SdlP/ec8nvYtQcbhEz7oK5O+dYPOc8LyTgZqrWqJgJ0pVDvzsQUZzOatouC2LvFj0LeFOOZRFjaO7uTlsNRfbIX95ZJBblfG07uvCTIlSuNBXhNqJHeIg3oooQ= 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)(346002)(39860400002)(376002)(396003)(366004)(136003)(451199015)(8676002)(478600001)(186003)(66556008)(6916009)(66946007)(71200400001)(91956017)(36756003)(76116006)(6506007)(64756008)(86362001)(41300700001)(8936002)(26005)(66476007)(38070700005)(66446008)(6486002)(122000001)(83380400001)(38100700002)(5660300002)(82960400001)(6512007)(19627235002)(316002)(2906002)(2616005)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?aFNIanJMWk9VdC9NNEpiVWxoVmZZQjF1YU9DUnZ6WlhjbmdOL0tOMUZyWG9S?= =?utf-8?B?MjRCeFV2SkJhVkNXbSs0aGkyWXhuN096NGRuNFB2WVFySlFBNGhSQUFBUERk?= =?utf-8?B?RmY1RDZTcGIwWm4zSkJ0TFIybXBlTERQbWxaaXlQaGxEdkM2bmRjZmFIY3pC?= =?utf-8?B?TmlXcEltRThoS0s3czU2dGdaNUZMcVVpL0pJVXlVMHdodXBiV2xjemVqdWtl?= =?utf-8?B?UjFLa1JKR2RRWEdkUm92bXlsTEF1S0F4RUQ0bndTUmsrNnNzc05mWGprc3lQ?= =?utf-8?B?TkgxemdUYmZJWlZQeDBUVHUvSGJtWk1lcWdHMXZPY2FXTkNuY0hSb045cCtP?= =?utf-8?B?a1pBc1VhRXZuZXR4YTBtZWpJZFFLaS9xV1dSNlVkK3oyUzM2WENtTFByakVq?= =?utf-8?B?ZDhwVDVPV200VTUydE4wTW5nZmlyZUJxUDRGR3A3TERHNFlmbHRxRkdUZUZt?= =?utf-8?B?S04wOER2ZkhwVkErUTBEK1BPY0wrMnRtU1hWcWF4MGhzMzl4anBCdStSaTg1?= =?utf-8?B?NU41eW5zQmQ3dGxRemFxeU1DajhXTm01VWxwWDRkTnVKTzFoOVlJcEdXQmkw?= =?utf-8?B?RkZzZE51azROMmxBcXpoQ2I5MWloV0tUOHpIYUlra2NJQ2p0S0NGMjh2Yjdz?= =?utf-8?B?dTgxZGtDdDFNWVR1ZkdYWHo1cXZkazJpNlJ0V2U3MlI2K1ZpSjlXdG4vWWV2?= =?utf-8?B?bTF3K2tNVkxBaXJDY253RDRDZW5Gc1V0NUZGTWlPdFM4VGJsOHlYTWd1a2I3?= =?utf-8?B?ZkRJN25aTnE3alYyMVR5Qms1VldJR3d3aERYWW9vcWR2TGhxQW9CYk0ycSt3?= =?utf-8?B?ZmdDYzhZSTJaQ2dKUmNqNmZJcGhkUjU1UDlCR2JETUxpUVhsM3JqSDJBYlgr?= =?utf-8?B?WHhyMGUvSWNobis2M3BZd3BsL0FXTmI3dW1NdDY3UUp2OVJNbXN0d0tNNE5l?= =?utf-8?B?Q2g1aG95c0YraWtlMXdubTBBVWRKVmhEMm4wNEtlbSszL3lxV0lUbzZqazVo?= =?utf-8?B?d3BFVUNGU0libDAyVnp1QUFxaWhRYkJWZ3pDYjk4dXc1UUdVMEQyUDZDMGpY?= =?utf-8?B?Z083L0l3R21oVFFQUWJnOW1ubm1ibXdtcGdmSzZBODdMbGcxR2wwRzZNU0tE?= =?utf-8?B?cWdqM3F1TWRuUHdzdzZteDZTL25nUnlvY1ZqUjVOVmVibU5EcUxpNnBweXRw?= =?utf-8?B?NG8yNzhMZDcyZHd2TEFNNG5IOEszTU5WQXFVd1M0UHpNNDM5QWYxRVBRSmJU?= =?utf-8?B?YWhDOFB1SVV0YU5HeFpyb2gxNmxHTTdsYnhhRlJoMFR5RE5WdjRBREFaWnU2?= =?utf-8?B?N25nVG1jNHlMVzhKeEgwZUxUNnlOUWd0RXFZeVpLellaY25WZXFvU3lSK1Ew?= =?utf-8?B?bzZkaTN0Z3dTNlhYVkt6d2VHbjNIMTdGZjRGdTVrZzFIcXJVUXY2QjhmSTZX?= =?utf-8?B?TktJQkRTcTZrSWxWZEx5SnNHWWRqTmp0cVJCWUp6ZWppMlB5U25RVitVUDlT?= =?utf-8?B?YnFhK1pOSE1USjZ4NkM1a05wZ1kwbjZmME40MDNXK1hjYmpBYjRUNnVyOG1L?= =?utf-8?B?a3A1QmRlaE5WalF6K3FuMVVBdytoY0RjWGtRcDhONFAvMENyTWkzcVR0MEVj?= =?utf-8?B?M0ZLZEhkQzJaVTN0VHVycEdZV3B2R1h5aUNPc0pZSWtSRkVJZzE3M29mTzRT?= =?utf-8?B?NTMydUhDdDBMWU5BUTBWbkJnSXV5WEY1aUthVys3QVJjaTFrWi9BQzZUOXh5?= =?utf-8?B?L2FuaWRISW5sdittblhpbmZjYldhOUZzcEgwUUQ4dklXeVZPa2dXcUtCcWYv?= =?utf-8?B?ZFdwbmFlREt0MXExK2tVQUFFNDRsdXRGLzJXeW03YUc4cHVvdUJEUmZ6QUVU?= =?utf-8?B?UzlscWRkK2N5cVBEK3hkNG9YLzBZS1J4eHpUS0k1MEdIZ0JwWWptSlRQZFQ2?= =?utf-8?B?QTRaM0EyMWpDZWR3ZFBjK2gyb1Bic1JueldvbFpyTXAzUUNQbmxTaTZvTG9O?= =?utf-8?B?OFgzNmRHVnhmT29ZZTZpMmhIbXVPcERFSHVzejJqOVlxSEROQ2hvRWpuckpK?= =?utf-8?B?bWs4dW5HK1krNzd6QmFoN1FqZVkremRLdTBiRkRXeUtYRjB3dWI0Rkx5YnFP?= =?utf-8?B?MVNKRUM1WUI5YVJWbCtGd2hPR2xnbGZQcUVRcEIvdU1GZGR2Ump1ZDloc1Z5?= =?utf-8?B?bUE9PQ==?= Content-ID: <595A85221EE6EB4EAB8CBDBB57D3D748@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: e1fa90eb-c7dd-4e67-7e0c-08da9bab1f85 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Sep 2022 08:27:29.6588 (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: rlOH68+wfadId03gDPSVjGAOLtt0wDH/NOute03ef7CcL9MMMV4RazRwZzdOZnYzblxtr1ui3v2Pd9h4DJ16Pw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB6015 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v3] 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: > cbs_av1_write_unit() check pbc size after parsing obu frame, and return It is cbs_av1_write_obu(), not cbs_av1_write_unit(), right ? Thanks Haihao > 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); > _______________________________________________ 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".