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 D69BD482C3 for ; Tue, 21 Nov 2023 06:02:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1509068B9BF; Tue, 21 Nov 2023 08:02:28 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77B9A68A9DB for ; Tue, 21 Nov 2023 08:02:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700546546; x=1732082546; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=MuSR3pzlC2fq1eWaQTNlyDtboCXrs4/Vy+IusDa9AcE=; b=mhIpMqIXrdy0RdrMRfBUdSGdDp7RVUqCYtionxXJ2jgL2+aL+2gOd+oS G9nTYn4562YoI0mkAyMYRjyvOutWHkbm5xhrluOB2nTW0dpDaf1Wnrdlu 8eomLL9RFg0/KyN0KNLewckgyWInDBpwEzc0FPJXGh8UTy4MMnjYxs6qs kuVJ9ProvSYfOHgAtvgWKpT6kep1Xlg+0bkowC5JEg1iqmIeFr9Gx97VN wyB0M0Cpf00DMPB/wtPKJXHHsihrX03ya5xL/5UEY+mzioUX0e9ffdZDt UlVuaWWWhM8KxKwUsGzEnMRT2m1gVcL/dDYIiq3JmjCgAnnIOaE2eAAM2 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="422869987" X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="422869987" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 22:02:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="742935227" X-IronPort-AV: E=Sophos;i="6.04,215,1695711600"; d="scan'208";a="742935227" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga006.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 20 Nov 2023 22:02:18 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Mon, 20 Nov 2023 22:02:18 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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.2507.34; Mon, 20 Nov 2023 22:02:18 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Mon, 20 Nov 2023 22:02:18 -0800 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.41) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Mon, 20 Nov 2023 22:02:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aQa7uXU7rVyoRppNUiCkae6EMZ2/kvJa9ni61EfWGMoawYzM39aMEok5VMqux3KTLZxKunHLj0gNujosknNiEGNJXy4ALBs/54CJ79qS4JhcJIzb4UE31KOROtzH2oM+YINHyfSTc+i2AYdYqd8ZtuGuZWj0YxYMTS4Joy+4g9J4MDzu16bLlzqISkpL4HbRsVdue9GeXgkDr9l6ml7XalLwvkGoo39zurrHvnKETjx32/Tk6P5aWdVqQ9k6wAFiko2uyzki0tD6uiHTHIEN5FwYg79ZeAOVuZRdIkTvEiM9kc1XAVRqB95ksA9vnb6DYwuShS7/DUlksLYC3JRx/Q== 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=MuSR3pzlC2fq1eWaQTNlyDtboCXrs4/Vy+IusDa9AcE=; b=G1UVlp7BfHht8wpL6M/hrSPStkBnpRtwQxLsa1kVEwKTZDgJ2+2KIn7dUT95ETZ5W8oPbFXJlLhiEibaRgvlm9Z4gVf3oaDevAci9inmp2z5TPhAzH0Sh4KwFUy3Oiw5T79L1TGqlEngDezRQqKGcKeJNoCtL4uXgJokpd6J6cfpaphe2k+QWPVWPU4QQ8Z/0waCsJuZUB26lOGe5g61HcTXXg7tmiyfyPEJPTHSE8XF82wXH6Fs/iusKKHpByXZZgWkwVap3bmnZaUsDtLRSyv53usDQvaJdTGyn12g2hDjRc55EBcoGDfowQLP8YJAGYpSfqdYmXV4sJa8vVulXA== 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 BL1PR11MB5447.namprd11.prod.outlook.com (2603:10b6:208:315::17) by CH0PR11MB5410.namprd11.prod.outlook.com (2603:10b6:610:d1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7002.27; Tue, 21 Nov 2023 06:02:16 +0000 Received: from BL1PR11MB5447.namprd11.prod.outlook.com ([fe80::448f:80b:8ef:b6e1]) by BL1PR11MB5447.namprd11.prod.outlook.com ([fe80::448f:80b:8ef:b6e1%3]) with mapi id 15.20.7002.028; Tue, 21 Nov 2023 06:02:15 +0000 From: "Rogozhkin, Dmitry V" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v4] avcodec/decode: validate hw_frames_ctx when AVHWAccel.free_frame_priv is used Thread-Index: AQHaHDoHBuNL4KXJskiEGNNRE3hxnLCER/0A Date: Tue, 21 Nov 2023 06:02:14 +0000 Message-ID: References: <1699986151-24741-1-git-send-email-dmitry.v.rogozhkin@intel.com> <1700541472-12254-1-git-send-email-dmitry.v.rogozhkin@intel.com-NjkA62m----9> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5 (3.28.5-10.el7) 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: BL1PR11MB5447:EE_|CH0PR11MB5410:EE_ x-ms-office365-filtering-correlation-id: 87165d31-a05f-4fc0-983e-08dbea5768c0 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: SkqkW3q55/bqQ+Ky575Prpli6Vi6XI+/iIxlPvf3HEqgUqyjGpQ8rx7uIbbckUb4HnxqrUDJ8HJCdPVdHWE3w3ZVUGDoBsFHwpI9j8fNeQ3Ug0lYsHBRIwiuuscrpKjy4xS6JL2JWqPm56D6gMYxzLlfiextbOsiRZBE0OmfXo4qttVuKe/e75CvapbkQOC2C/DYv2y40gcb2AtXkeyvK5irPs7UhuagfKhoJGrQrpvWCGCSPNgNfbp5XMQneqsg9aFhraTePR2dlQ6cSIhNiovJFOLOegZVrHuhvxgb9wJte0El9AIB1qjdC3rfEZwUNTdFuwgyrcR5B0nbkSPsR/nyV3ZZwDT3udtP/MHffUIW80TUS2Xa/d9+HpJSCjiJ7wC55xFVRl4jmsCK1FnX2RimvY0d1w9V5skGwm46i91Ndf2/8aGTvp05UccB9AV8H5qsPyTLrG8gUCttw2ejJggNU9Y76Njd1MZbqHA+9mAOpYUPmy6Sx9YOht05QQl9MJJI67tI9iSOg2ZckfMjOhXrA+ULJjEHdX9BMdSR4vU41fUoGTMNhtaj/iTGbAymMfkoz279cXU753polUdZT84jItFg1UC4PYqCZpKpOxoAcI2AN40f0mrdCvwvO6eJ x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL1PR11MB5447.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(346002)(39860400002)(376002)(366004)(396003)(136003)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(76116006)(66899024)(66556008)(66446008)(66476007)(66946007)(91956017)(64756008)(6916009)(316002)(71200400001)(6506007)(6512007)(36756003)(38070700009)(2616005)(26005)(478600001)(6486002)(966005)(38100700002)(82960400001)(122000001)(83380400001)(86362001)(5660300002)(4001150100001)(15650500001)(2906002)(41300700001)(8676002)(8936002)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?U2RpVkR0NWk0cTliSWZUU0J3MDFVNGZ3dVNCVUU2YkZzOVlTL3k4TFR4eHRH?= =?utf-8?B?WitVdXA3MHJFMmZYTUtGR1p4RHZMaGV3Y1VXanBJcGZtYzlSWjJvVjJMZTVr?= =?utf-8?B?N28rV3d6Y29nQkwwYnZ3cWtiSFdoemE0a2xTdXFXZW80V3UzTlVGUmFXS2Rr?= =?utf-8?B?MDRuM09EQzlRUVNFTWtaUFRFSzFYQ1huUmVSbWMyZDFma21NeUxyMVFBSnF3?= =?utf-8?B?dHY5ZkpFLzBCYVdaSG41VytFYmpCSTVXRmtwZ2ErVzZyV1BLWE1hZlZGYWps?= =?utf-8?B?RWxTYlZNUitwSnJnZkVJbDhsVWpnbzRzNHBWWmlhRmJCRmtzL0JiemhDTGdp?= =?utf-8?B?Z1RXSTVMWXVnb1Vxc1ZXZ1JnaFdGU2d5d2MzNUljRVJZNmVqempKRnlleG5B?= =?utf-8?B?V0pmWGI4MzA4UjEyTkV4TS9PemNnSHROVnI5OU9XRzlKQ0lobGt1LzNZcy8r?= =?utf-8?B?cWc3SzNjYVlvbU4rSVN2TGFDYTNrcE9ObWI5YVRyc3oweVFPWU8rSmxTVldo?= =?utf-8?B?Uy9OQkVNMmlqVUZQa095cVBtdUk3Z3N6U3VpakVSVFJqdkhuUmtPT2Q0ZExn?= =?utf-8?B?L2NNWm94L1Y0ckxhenJsU2RXOVkwNHFSV3pJdmdYY3UremlwRTZGNTdpSW90?= =?utf-8?B?eVVVQ0syb0RqNGN3aUlBNm9EN3hMQXNQcU4rY2R1M2RMZzR2eStTVURIZVYw?= =?utf-8?B?SlJTY28wTHpVTEQ1bW9LOE95NmsrSGRvY3dUSzZNYVNzcjhYcENUUCtCbDRN?= =?utf-8?B?b0pxRVpYcVJtaUxtTVhhTldzZzY1THk4Rit6ZWRYMFo5dVZqZlkrYVZvNVZC?= =?utf-8?B?S3RQQWIwWUMzNk95aTRsUUszYXJ0cEl3L3BOZDBzVmx6MjNGY0RDOU5jb2xh?= =?utf-8?B?N1dYUzc5SHMyRE02OFRGTi9tNzloV1djcGtmSHJINDBWQ2ZWd3BtTTJDZUpQ?= =?utf-8?B?elNOSkdPMHlVNGpJTUF2OTdCdjhSbjl5SG5DY1RQWFEySjRiN2M4ZDhZc0Ni?= =?utf-8?B?dnEyazJ0R0VmWFlxOFVOajhRVDQzSzFNSk0wR3B0N3Jqdkp0WkhZekZaWTdB?= =?utf-8?B?SmV6bjRhT2R5bEorN0pIbjk3amprWjZ3RUlsY0hETWZRV3RZeTZLUENrNjFJ?= =?utf-8?B?Tm5GNkdoOG5kUWtHbHVVYTR3QmJ6YnpmdHBBYXRlZTA4Wm1HdUROVkJmUk1Y?= =?utf-8?B?cG5vcEFibDhiazRVY1EvOUZkVkRHbG9rREl2RFpMWmhHZUZMOGhDelhrdytC?= =?utf-8?B?bEduK3V0N0ZwandIRkJkZUl4TmhVV2ZFS3BwM3RxN2J3NEFSVmJkVm9rUlFB?= =?utf-8?B?YW83azVFVU4xSEJEaHZCbXR2ZGtpWHBQQzNsQ0RmV3ZhTXJwSkZpK2crMXM5?= =?utf-8?B?Y1pML1VERmduVlZFbllDTEZUZDhIbkRvaEtteE1sKzhqQUQ4ZklnLzdmY3JQ?= =?utf-8?B?Z0RMNnp2N3F4WEtTZlB1eU96dDlSRXVlZjRLeHhXTlExK2w3emVCSFJlUHJw?= =?utf-8?B?VzI2Z1p6N1NkSXRPS242ZkpzQUs0bnU4MGphZjBQQUwxRUFQYWN0MUczZFJN?= =?utf-8?B?NW5UTnBFM2hEOGVKTS9SdVFSL1gxTUlhWjhyQzJ4Sk0xWk93TnpMMGdkOW9T?= =?utf-8?B?WXdFamQ3R0ZlSzFVdVlVRXVmaWNsMG00VjM5V0dORHdGczZHd0pUU3JFelNI?= =?utf-8?B?Mm5ZWUxld0dnRXBoZmlNVU03cFlNanIrR3JWSDlGSTg5ZTlFRUlxWjJSbkpp?= =?utf-8?B?WXhQZlN0SU5tR2RtbHpQSzQ4cjlISm81Ymd2YkJ3RXpBd2tOSmFDZExHR0pn?= =?utf-8?B?cXZVRS9tNmRrTy9MZmVBRGtQZ0NjdDBqampvUGZocDlML0R6UExUckl2b1NE?= =?utf-8?B?dkNjMU9jMlVPV3ZjZ2NvTDRzb1RDKzBiTzFseU5NQmhhY0diTnVoRWZpeVVr?= =?utf-8?B?MVRCYmdvSGRNYjB1UUMrUG16WUxvWG9WcVJxTE9uMlNjMExFTWRGNnY4cVJH?= =?utf-8?B?NXMzaEQ2NkJDUy94VnJFcFdCNlRoa2c2cFhid3J1NGtSbTkwUnlMYkFJY1R0?= =?utf-8?B?RExxd08yZ29uR2tGMVZNVFRKVVBmNTduNkFSWlh4d01xSU5aQ0FHUG8zTUo3?= =?utf-8?B?QWhjNWkzR1phYkRwa1BDZjlMZ1NLZ2wzOUFCS2VTeDkya0hLV293Q1hNMXZw?= =?utf-8?Q?JnPpxevy66TSWG2/XPvf40I=3D?= Content-ID: <96029B659F979B418DB5DC70D86A78CE@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5447.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87165d31-a05f-4fc0-983e-08dbea5768c0 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2023 06:02:14.3346 (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: RV0NkkLmpznO3Mh3J8xM513zX2aZHHcEz0TUi4WHbggQz1Cf+xN+dG4exwcrvH1gOFjzfa8CaXPx18OsV/6+w5AKbFafnH/JXm0wHWLs4s4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5410 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v4] avcodec/decode: validate hw_frames_ctx when AVHWAccel.free_frame_priv is used 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 Tue, 2023-11-21 at 06:17 +0100, Lynne wrote: > Nov 21, 2023, 05:38 by dmitry.v.rogozhkin-at-intel.com@ffmpeg.org: > > > Validate that a hw_frames_ctx is available before using it for > > the AVHWAccel.free_frame_priv callback, and don't require it to > > be present when the callback is not in use by the HWAccel. > > > > v2: check for free_frame_priv (Hendrik) > > v3: return EINVAL (Christoph Reiter) > > v4: better commit message (Hendrik) > > > > See[1]: https://github.com/msys2/MINGW-packages/pull/19050 > > Fixes: be07145109 ("avcodec: add AVHWAccel.free_frame_priv > > callback") > > CC: Lynne > > CC: Christoph Reiter > > Signed-off-by: Dmitry Rogozhkin > > --- > > libavcodec/decode.c | 18 +++++++++++++----- > > 1 file changed, 13 insertions(+), 5 deletions(-) > > > > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > > index ad39021..50c3995 100644 > > --- a/libavcodec/decode.c > > +++ b/libavcodec/decode.c > > @@ -1838,17 +1838,25 @@ int ff_copy_palette(void *dst, const > > AVPacket *src, void *logctx) > > int ff_hwaccel_frame_priv_alloc(AVCodecContext *avctx, void > > **hwaccel_picture_private) > > { > > const FFHWAccel *hwaccel = ffhwaccel(avctx->hwaccel); > > - AVHWFramesContext *frames_ctx; > > > > if (!hwaccel || !hwaccel->frame_priv_data_size) > > return 0; > > > > av_assert0(!*hwaccel_picture_private); > > > > - frames_ctx = (AVHWFramesContext *)avctx->hw_frames_ctx->data; > > - *hwaccel_picture_private = ff_refstruct_alloc_ext(hwaccel- > > >frame_priv_data_size, 0, > > - frames_ctx- > > >device_ctx, > > - hwaccel- > > >free_frame_priv); > > + if (hwaccel->free_frame_priv) { > > + AVHWFramesContext *frames_ctx; > > + > > + if (!avctx->hw_frames_ctx) > > + return AVERROR(EINVAL); > > + > > + *hwaccel_picture_private = ff_refstruct_alloc_ext(hwaccel- > > >frame_priv_data_size, 0, > > + frames_c > > tx->device_ctx, > > + hwaccel- > > >free_frame_priv); > > + } else { > > + *hwaccel_picture_private = ff_refstruct_allocz(hwaccel- > > >frame_priv_data_size); > > + } > > + > > if (!*hwaccel_picture_private) > > return AVERROR(ENOMEM); > > > > You never set frames_ctx in this patch. Thank you for the catch. Yep, I did a type doing v3. Fixed now. See v5. > _______________________________________________ > 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".