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 0281940523 for ; Wed, 24 Aug 2022 05:18:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 89F8668B990; Wed, 24 Aug 2022 08:18:39 +0300 (EEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3288A68B737 for ; Wed, 24 Aug 2022 08:18:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661318317; x=1692854317; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=HQMAnv4GnqqiRMa1qvU8mXYsVH0XiFxzDF5VPwhgTHo=; b=idShTqyxruFSGHqM6LCHd+r0hJiQG/mDgZhSZkg6aRC8pXu35B6rUeJB FfCwHjPlRk7yZcwbpVVlRXgHNnMAUCn78utrHivUr64cEorPBxBolmdkx VgxuVLfT1SSNxsQuCFU6HVaOcx0st4HMtF+C3pTfU83UOFz0q9ZjOwJ+I Rs7ynYe8PwLKJAYP83Svb60ilDkZqaJJbNfKlUVYclSqjOuXUXTHOJZIh xK7R6wUHjm+yoQ8OnBwitYNzp6c0ymr7TJAAbMY23ofSU01NtOu4vHFTC Kya8EihtXJsQXVlWJJSVB9NnGgU0t+dxW3OzvUZWEb1tz+tpTKxONTMv4 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10448"; a="274257485" X-IronPort-AV: E=Sophos;i="5.93,259,1654585200"; d="scan'208";a="274257485" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2022 22:18:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,259,1654585200"; d="scan'208";a="712893340" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga002.fm.intel.com with ESMTP; 23 Aug 2022 22:18:29 -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; Tue, 23 Aug 2022 22:18:29 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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; Tue, 23 Aug 2022 22:18:29 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) 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.2375.31 via Frontend Transport; Tue, 23 Aug 2022 22:18:29 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.102) 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; Tue, 23 Aug 2022 22:18:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YDE/VYxxN5fozKZYgRMKyOpv3ZZtp+lARJ4+looXCE60e/arweLLEYn8QMHiU/myl2IHZhzTBIGSQsenm3P3SmF1v+vVy1yrhPMGI8RISjrdBTlWfo0gdvMU8hZzGqkIsZIwh36SFnvttjZV9TSQOswTZFpI7kwNZxOTxsG3RoIhUv9oyKyjHFEbxRoRAsRq/bH9vKiRAADSaBw+PbKhZu2J/Y4ElHaZf9LkBFSPNTV6r7hkjiA6N+uHjOqB5BzdLUSHIjiJ6YwuGUWwroT0zq0JUBBA0orkBDxm40yhp/a/MAoSgCA2o2TZo05Rm3SNgcl9sgJiYuF5W3Yk34Mplg== 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=ZOlrI6dYXwr5GE+8ITdRbBwSgFG4yvdGGvDJ6hNS/W0=; b=fQO99XHrYCJ2WVOdBBt/gFWF6bSOoQPZ/Y3PCu5JF3Ag43inx3n5hVQiU4ALxp2siqmoMyisgmlxgjEwU8RJDu9RO+J17K7WuKE+T26jtAz2G1HUQxKrgjrTlLVDJLymGWXgTX3FbzKSf67DP9uk9CgiGRz7csZ0B7E/gXrzX+12o74zHDaWqauAYsQXipg93wPu+aocjKQrxJ60IM9RHKtrjJFCzsEX+CSY4YuFwarhBrzmk52ZlxBvyw5ui85iu25h9Vv7wdChNL+boK0CN3eJn/iwxy999UkLWxWGdVt9rVVB5P5P9ZvmwMv3c+1VOX11nGwhkws//x0aCa1I1w== 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 IA1PR11MB6396.namprd11.prod.outlook.com (2603:10b6:208:3ab::10) by BN6PR11MB4147.namprd11.prod.outlook.com (2603:10b6:405:80::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.21; Wed, 24 Aug 2022 05:18:27 +0000 Received: from IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::68dc:7fed:85f0:6201]) by IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::68dc:7fed:85f0:6201%2]) with mapi id 15.20.5566.014; Wed, 24 Aug 2022 05:18:27 +0000 From: "Chen, Wenbin" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v3] libavcodec/cbs_av1: Add size check before parse obu Thread-Index: AQHYseSL44eUOgmBMEen287nCfs2Ea29jBBQ Date: Wed, 24 Aug 2022 05:18:27 +0000 Message-ID: References: <20220817025110.24169-1-wenbin.chen@intel.com> In-Reply-To: <20220817025110.24169-1-wenbin.chen@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.500.17 dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 02450375-dc9b-4a04-150d-08da85901363 x-ms-traffictypediagnostic: BN6PR11MB4147:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OU/kjhl0jHeG7Jc9xi723m83sASs450iB6tz+rVlgS+DaL4p+dv4cIfXsYRIplFHJ3wpJni+e5y/3xFQiwck2u6rkoKL03do5FzhmGR2hpvfAJRGe7ZGJrIfgFkq7vOhWuclMWDEo/WguagtLs/G4/XANepdDxMUbWPvGc/w2l9lhutVO/SMTU6vl0Xx3dIlKrUBpyRNxquSxcg++br+gkwPXrS4p70RMQ1+gKDH+CudzqL83RDtnZKk3uc/b5Voz1xa+BofbHm8k019Nb8pvv+Jge5O3bsR+y8vSV+TR4DO7zT0M4OAebJ6VdV7vvg008kFlLahkd2gWc87uCfjbgHlLsDfuVT4CVSPpz3VUrt6ATuucAkQo382k2V4uEH8dE5e8+xvCsGtpCJtxgpZJAvDZuyVbxTPqykgelfg1IGD1iqMVmNddrCNYNzfTIM+b4hG1HFk0dbKg8WEO3nKoAHnyWlshWdaHaJTYhc+jYzMwP59szUyuQYHrhK2EzR3fWfekkeEffvSqsyopMsp5A8ZinnCNzpxwqIP1uI6BlzD4hK1Z4JgAQkrk0MyhNekS7h2r5QC4xnQj70m7Ny8wjNdxL/iiy0bktH0tDzz8HocDw0ElH40GCE870ILg8St6Nte350cS2eF8H/4qux1DTs0jdRK/sEGgThWDUxCkiX9DGNU+VVvl3OJM/lGZXmel4mIllzE/ZFwTOZxbRzhrE1BV6T4iR7ZCrBbI9ArZSYLOk4yERNe4IpfQxkEr7lALkV0uRutx5Shl6yBreyIRFeaCUM/69owvWkxz3aNk6U= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:IA1PR11MB6396.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(346002)(136003)(366004)(396003)(376002)(39860400002)(71200400001)(478600001)(52536014)(86362001)(82960400001)(8936002)(186003)(966005)(6506007)(26005)(9686003)(2906002)(76116006)(66946007)(7696005)(66556008)(66476007)(8676002)(64756008)(66446008)(83380400001)(38100700002)(41300700001)(55016003)(122000001)(5660300002)(19627235002)(38070700005)(6916009)(316002)(33656002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?5GynqkgkQVp8cfcF+4j5k0v+Rom1VCYbNS5ppLeRAO1EbQwv11iaIcFtPyMZ?= =?us-ascii?Q?+UCR3251eBbuHSnS6LPlUixevLo9Mpi04dlrLz80tIVej+sMm08JiSBigGhU?= =?us-ascii?Q?R+poJnbVQkh7G9XOUrfb9CoE97rWGoIrky4cDF/afdk9oEyc0VmqixMDgyXG?= =?us-ascii?Q?0NbRn/qq2Impknc+s+ifKva6amAXMNu5AFQ/9rX9CbazNVp14xmoEfEJ/ENH?= =?us-ascii?Q?hVWyB0oaZVIOO6YtSf8l333dKesF3GXzEoG9BYDL9SQ1W3E3zNZ3zS7uB6EH?= =?us-ascii?Q?KkP8qgBz8I1tzxRTrmTAzyHA/jGoq/ltA/Zvg96VueZQiFNOK8syBLJR1UAW?= =?us-ascii?Q?Eyisn1N1gQawwQVAOfUtt1QDpADvfZ7a73FzxnC6Y3a4+xX+xN52LLbcg+Uk?= =?us-ascii?Q?UExfVS7liAGNKkMaXr96tfh0lzoapqOhutNdGZECcZ+1odFNngtiKKye05qK?= =?us-ascii?Q?K5MD5fWNU+GrxFi/qi+9Ef/Cx3LJUangBDxucm6zuBQBoeLZ4DDICrrBmGQP?= =?us-ascii?Q?x4rz8fB85hPQYyEcHT7YgO2XXM4xrkmPpOhb4V907uZdewjicDmf4+2EV4yt?= =?us-ascii?Q?jIovl7hgLmUbF6iYVJT4qUzoZaIfCQpq5GiPt9hF77WKUvf3A438JZtyffNG?= =?us-ascii?Q?pmHX7HnkTvN5w7GweMMwjkcOJN5p9Z2x3hNlrh6zQAzygxV/0xEB28wsSx0u?= =?us-ascii?Q?ynDMuDwiRqPELrDPQ5CCmvlvb5BIPNpHQ8bPtzLjjuCRt8QHk0RYMjJRG8El?= =?us-ascii?Q?C/OahCfDt/Rrk+fWeG6zOj47k9QuUigQQ6jvlDen8Tv2YgCEiEf1UeHfq9k/?= =?us-ascii?Q?xJchKuIT8jqqINyDVC3DN4d6CNhITeckO6dLTcY54tWjEvvJHQsXMONHVK0A?= =?us-ascii?Q?WpkrzBTOT0+Kl9r8raWQCxUCppiT9h72znzu6IF2mmW8Lkbxr/nVW+pO+awa?= =?us-ascii?Q?DXcyrbrCOZ/4MJUcanX13zZZuNQ/MIyAzg+OebNzr5Gf/ra2KvOzseq5VPVb?= =?us-ascii?Q?8UXqozTB5P1tbXc0/8Dnrc5Z/RaHfjkbsSmv/qLJ+4eCkwZ9Kr0CoHl0YlUN?= =?us-ascii?Q?NvXdAxpcxNijfsWhfJCAusYu3L7Hfnc41baHMTm+jSdbIMgWN/R1Zmfxul1z?= =?us-ascii?Q?5hm0wtbHwGkxPv6yKdRjggFLk1RddZc3arVgbNwXSIH3YYRoce3l8KyFVD4O?= =?us-ascii?Q?03so1mzHwbNKUnjcK65Hauz6RY689XT4F2BXmDFoUmSYehaea48J2J0i1zk8?= =?us-ascii?Q?u2qK7dql/RPoTTTO5iLKg99GOnIUITm0l05zYtKPQ1MnNv1Oa2rlgyd3ridi?= =?us-ascii?Q?BmBt0M2/LZR9aqRxu9L5t2giZMCwvoVFU6M6QZ9B7y2SPskfbMNG4qOFhbH3?= =?us-ascii?Q?emUuLtEBxWPnC2ogug9H+8I+AC6aeeL7lZvOWWQBbuuF8hMHCYFTMRHIIEOr?= =?us-ascii?Q?ONlPJMgrVTsJbLYaNMvl9EpQ8GMJEe8YZdm7F7aapFHjXnoh1ajCs05rHWrW?= =?us-ascii?Q?b7xsi7Jz21y7jg5/CUBgMneUjcj6QD+wk9xCr9sUFR/Fv/I02Kfh7xiyLCiH?= =?us-ascii?Q?QEcLrXUVxukHVn7LBaDF/E3ez+LCydLgmBHTnDEp?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: IA1PR11MB6396.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02450375-dc9b-4a04-150d-08da85901363 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Aug 2022 05:18:27.3079 (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: 6KOZFw3jixiJeJ4idefvlncqTOxGVerrKEzcN/Q61UZs6+az3smCmqFJLVGUSvHBovIyspIQeI7Whj3ufXGHoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB4147 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 > 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); > > -- > 2.32.0 Ping > > _______________________________________________ > 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".