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 C4A0244846 for ; Mon, 26 Sep 2022 08:30:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1888968B919; Mon, 26 Sep 2022 11:30:27 +0300 (EEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E33D68B5C8 for ; Mon, 26 Sep 2022 11:30:19 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664181025; x=1695717025; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=xGZ5gAhYkFzvcNEjeCr5UGmcAKSvXEFV5VzMFaTmRGU=; b=NM6Xzg1ZihRpFP839TsyS4R6whLV/Wj8M5CdnssejboYZbcU/1fYbjzf gAmCyeaK9rYYoCYN2s9+QTb5HSSs8GlMtooLRzgiR8vRt7diivygw9OpU hyGXGN/8XzwzouUH03pUGbQ7vVRRt11O3z+w4/IfSrwU+/xpZc5GfBitj 6Eol6t0Ol2UjrD3cq4HuJBqkLjxZ9qnMyxJ/4QBYPtTmapaB96o91V/3B 9LFbGDJmJCIOzaKkmZdDTmFQ4tD4ZQL8CkTedXUJWh00EhRwbWEt6Zs40 sqJV081/Mbqx0WeVzZTBO4jktbFnGLkl88Ut+Kj7B/nF3QQ+nugw8uvLh A==; X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="301874113" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="301874113" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2022 01:30:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10481"; a="746537887" X-IronPort-AV: E=Sophos;i="5.93,345,1654585200"; d="scan'208";a="746537887" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga004.jf.intel.com with ESMTP; 26 Sep 2022 01:30:17 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) 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; Mon, 26 Sep 2022 01:30:16 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX609.amr.corp.intel.com (10.22.229.22) 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 01:30:16 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) 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 via Frontend Transport; Mon, 26 Sep 2022 01:30:16 -0700 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (104.47.56.47) 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 01:30:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PlO6EdBpN8YaqZ6qKWIGI93toN1xxcK1Pkj9L40HjKZ/Dh58Iw8x6/3qxunElYe+J6mNC8Q4NpBKPewpkLjL3mU6CgXp9htFlRAInVqru4IoWQXuVk3sPxdxh1APSSl8DvKI+vZ6YiAAtlhP96qGrdD1duKpjGYls09rU5tsFY3C9/3JJQko0Pt1RxxqGWyp/v4Puv4IkzWhQp+nmIgWkAgZdtjA6zU+cm7g65PXG9/9MCmuAgGAhnCg7pwmg29doKntvv5bbzLdm9Dz+WMsMDWMHC0OtdQPp6bIUgxnHyeTFvzYbmcLLqCnDzfA/UVeF9YGXx41GfD7D4n/h8QBxA== 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=NZ//8FBdbbsqqUsy/0mhaYy+RlACMA475JfwS2ryt3c=; b=c4HsejZWClkJcLI25NWTeqnT9/D6TlxoKsKId/gjBhzmCjRJQOwDwQooAHVg6thT/xcY8dHcbNrIBfdYNvkx25VcVDzq7Jm2rOFrbRUZ8BjHz/MhH7OxdwDJUovbVBCDv/8diYj/Nk/caZDddHxw9ijteQwPk5gRoWdBhdLoytL8LVEJCJAS0d1So5X7v88bCSOfsudBPJXiRTfvqmusXzQCoH93GE2MLr0lgH5kyvXp82CM+nCpjatviPYrXkJNUpc7JRt40LJ8PHWWelsoY/MsbSwSGerTETcXNp58Z/fPQaw2steUaTsXpHsH7ltNymToK7ESW83o6av9hSVrpA== 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 CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) 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 08:30:14 +0000 Received: from IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::e4be:d3c5:44a9:4e02]) by IA1PR11MB6396.namprd11.prod.outlook.com ([fe80::e4be:d3c5:44a9:4e02%5]) with mapi id 15.20.5654.025; Mon, 26 Sep 2022 08:30:14 +0000 From: "Chen, Wenbin" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v4] libavcodec/cbs_av1: Add size check before parse obu Thread-Index: AQHYzZ6hZVoGQCnB4EyyLtsrK6msfa3xWNAAgAAPZzA= Date: Mon, 26 Sep 2022 08:30:14 +0000 Message-ID: References: <20220921094124.1749099-1-wenbin.chen@intel.com> <79fc2f4d10bb3fe41c64aa8c17919ea4bc989033.camel@intel.com> In-Reply-To: <79fc2f4d10bb3fe41c64aa8c17919ea4bc989033.camel@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-traffictypediagnostic: IA1PR11MB6396:EE_|CO1PR11MB4867:EE_ x-ms-office365-filtering-correlation-id: 5dfe048a-6e4f-4386-d8c6-08da9f9955b2 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2reodj/89ePmsDVQh/iPNwEzZZV+cRc/jGQyiJaRAuG0bkFQe+qTE6duba8WWxzHiBmsEBJwR5hM/enbkUeHUI7YEkDhz7yUYZY+bXpUSE1Os3/JRmEqVwzWV99ty6QERtN57pCPQbathRWu6eNQLT7q3zydzkuWC49OFadSuRMkOE/GPRMDtWd9B1O8cnqtnN86OAbtMN0xe2Z+fSzp6KtKufx//wYpPB371Y5H4FbRcGomhIpNKctgy0ySV8gqbpiNRm0pzHbVYcK/j8Sedciutjj0WwsUE8LwFBekOgNrAInLrtF27tDvY4HN71XF/DeiPEmm9pzQcWxyVEkM9MK7Fk067NEXseO2V29h7vgg4vDoVsWab87pXNiVgp0CJy+cNhTaSFi8xIhbZ0wxJVOkg9zcRnYLwGs5CNE8SxefDAjlbM/edYHU+jsTBb6dhdcz8JfDC/W5drF3aSHJJHXPcJFlrsQz3wzpKSxeUoY3IUME7yWp37yaA+zli95mH4t2X74ZBiObI7j+b+p4/DI3OrYYgH7ocny2rFVqbWOlWq0NraIL5MAaYe2GYMfAgCaLYLRV4FQG6kVvcyqypo+UivVf0TEMnwQC/VQUFO8L8PD1MWB6Ue2dJ8+UecS56s4I2l3aqRPAqTKhPpY1DAINvwb5VnVb22j7OQyd+BubpPHvamkn3OLw8/k5MmbymPupklYRAaHNxqL1VxDmNR+YQ5b7WGNXRXDGfcqSFlxI/k+g20a4a0A1HG6fonBQHZIxrEwhpgF6fsTks6BB/ZsOg3J+N8AkRKYAMNTpp04= 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:(13230022)(396003)(366004)(39860400002)(136003)(346002)(376002)(451199015)(41300700001)(38070700005)(5660300002)(6506007)(7696005)(8936002)(52536014)(26005)(9686003)(83380400001)(38100700002)(122000001)(2906002)(186003)(33656002)(82960400001)(966005)(478600001)(19627235002)(6916009)(316002)(76116006)(8676002)(55016003)(66946007)(66556008)(66476007)(66446008)(64756008)(71200400001)(86362001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?2cab4kXwKFqrqqvCeMTq5qjqUl9ZnOAciYf0Q6ac9pjpAMx3W68YT7XWQX46?= =?us-ascii?Q?BCUMrA/qxF6PX0Cb949BcwA5qB6UUJjwp3yDB5u9HLWPK7HiA1k9jaSbSxA6?= =?us-ascii?Q?eqHl7HdGIqrMpTjuTrS7oeExiZOYj5MW+8cvvqJh4jShD8rLsuj57w5K3ab1?= =?us-ascii?Q?zK1js3Lla5haCDLuroEA3Z7yEC/DPsBWqgCKRikBSVjJxwyNA5gf6oTI3/j9?= =?us-ascii?Q?8+7pIx+Yp+rX5K3Z4KrNeR4v49ZukcImPOfQBcxXfqa30NnCDxow3wCDKkwN?= =?us-ascii?Q?sax8mPbdS9fKCtMNSIi2NQ+VU0DRV0ARGabKcEmAc9PJHGzSpUeHk1UhrTTa?= =?us-ascii?Q?JLEBBRDVNMhRmaOqZUlAehM27t/pJe/ml9hsBdsJRrmysYUUItOuIsxT/btl?= =?us-ascii?Q?jIev6Sla8V2T2zzLnBsEN4PJzjo3+oH2Tde/uvcxv7R3nHn5m6HWTr6lh3xZ?= =?us-ascii?Q?OtwmcfC4+d2GClGvAVschj22H28BXXRyN//Hw7A38tKgpClULQ7ixS6A8wnZ?= =?us-ascii?Q?L+J1QGyFnXsJbHfZzq9di3z8v45zXp4ltNH64YaZW7/pUFZJ1qEUgIPpNXZ0?= =?us-ascii?Q?uw9j3ZZ8G8/6nELNRCAEQth8nVsJzyNxU0JyK3ANKmwf+6LC/CjFDYb48eO/?= =?us-ascii?Q?sUyXq42uJNMP1uHFz93mNhCj39MjcHxXAAXcd21dyXMPWH/DyfzHgWbdkTMk?= =?us-ascii?Q?PAMhrcnDoDpQ2SiACCfr+sUwZO1Og3ERUyLdu8Bv5u3kdJGlQFp+LmSaZ7gZ?= =?us-ascii?Q?9oWDMU2qJRqLUz35RcEyxxkY4XNYSs2ECEWLKLix73D57d7EbAy8EF8fqhS+?= =?us-ascii?Q?NyLoHNxHs+sG0QGUe3b4QKH0IzMOKG/68S99dSepDFv7Z+D0MekcU/mJ6VDP?= =?us-ascii?Q?WT6mE4KtMvqYhJazr8s0y092PuJ3fo2bLGn6zjvSCX4j+b7DJ6uwDKE/AGJC?= =?us-ascii?Q?VsvMuE4Gq4ekVNdBM/BFWLsE9DFm+wLJ4pOtrm1O0/OTi46pwj0BxoFuTAuX?= =?us-ascii?Q?REPGUzES2hzsItS/JqaYilfqpBwbOIdupEWxSNw0wfNjnj4v7lzKHRAPcTLZ?= =?us-ascii?Q?T5t7O04d0YtGRFAW6Sffyks9hl0NJpQKVd0E0qCdH0TDLmpi06ZnINO3Aqg2?= =?us-ascii?Q?96JLoeXc//GTqIju4dTZovz+vZI9qpjfLt/0H4rbjT/LBixiIdf6186XGDS8?= =?us-ascii?Q?mby/HP1T3rOfJHAGKfpM/uNv1jzoD5aYPYUI0vJDEPx9/5xnCopUtlYeirsJ?= =?us-ascii?Q?15ylScQBlLw0W20Lj3kBXfPp6hrCF88d1yeMyoGfKBlO0gq4Ys7LHYUlD2Mx?= =?us-ascii?Q?PT2oDV39up9ySNqhCZW6P6ib0kT7XGwRhSy/0ob2u3KxN72BGPX37LouDogT?= =?us-ascii?Q?tXYkPSd5Xb2myjOuiz6XrZFGPn1h5/Q7mx/ZNGgQlPUpLL+/d04YP2ZTzZCj?= =?us-ascii?Q?o8W65cfBymVp66sgBLDL7dT61PlsZK3lGadlPgsa2vT+FZTjN305Xl1WFX58?= =?us-ascii?Q?5mOUQffR6tNVZeWrtzZg5qwBiVCDfcOAMPZHbi4mVF86NQMZFAB1Ea6fsnOe?= =?us-ascii?Q?5/f+VVD23XXyIRYv/yJ7nYM56t8yIhJfxjIzHKz3?= 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: 5dfe048a-6e4f-4386-d8c6-08da9f9955b2 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Sep 2022 08:30:14.2631 (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: Q/RFs6+PecXUORS5GL2qAC9+qawNnh3D3d+6wRA29zexD/qwCZGnJ7bm5JflqzWOSUxGM4f1H3bnIFAAY+3/VA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4867 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.7561 > 74-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 Yes, I will. Thank you for helping me on this issue. > > _______________________________________________ > 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".