From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 9C1984C55E for ; Wed, 25 Jun 2025 02:26:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BC2CB68CF6C; Wed, 25 Jun 2025 05:26:34 +0300 (EEST) Date: Wed, 25 Jun 2025 10:26:16 +0800 To: ffmpeg-devel@ffmpeg.org MIME-Version: 1.0 Message-ID: List-Id: FFmpeg development discussions and patches List-Post: From: Tim Blechmann via ffmpeg-devel Precedence: list Cc: Tim Blechmann X-Mailman-Version: 2.1.29 X-BeenThere: ffmpeg-devel@ffmpeg.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: FFmpeg development discussions and patches List-Help: Subject: [FFmpeg-devel] [PATCH] libavutil: fix memory leak of drmVersion Content-Type: multipart/mixed; boundary="===============3255613932859043272==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============3255613932859043272== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11021089.outbound.protection.outlook.com [52.101.65.89]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 58DB568CC78 for ; Wed, 25 Jun 2025 05:26:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IMKEjKwrCKpJWZXYvjVKFM4eXwq7xWYjildedToxWA9KDBSqBMOMPqwx9j0Oo1ikPbU9WlIMuc6zXpczfRPBG0ZGQq9uu31liX6A2UOcr2gRpcZPXdUbqnyNJc6sP4ZxZHmVCeWQ4nZ+Kue7M2OAKgJgoseEWTxZsbhN8ilOwh1kzrSm7IGI/4jrHcCLFKqsoHg22BHUPXaOwi1oEftJ5tcV5Mi4lF6194o/f4Yv1fkN1dtC7uGkvhIQSrE9BlUYy0+M1jxKgv0FhrePgT0gCntl+OQkHhA0dhiqQIBFULYdYkySYN9fVtlzT9qlSNozf1maGkgVHjDPhwE9bFrLHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=JQi96XWxF8mqOqY2Kz4/AVvYSPmrA52FgwmodZ4QOGI=; b=dMe46hu+dpzr7hdrfBLep1d0RYWopXkn/C4tY9Diinlu9F7j6cSBnpAS2FkK5j0UsANXMrkyVrBEYObocQ1HDivP+TqdlyX5s4Cn8IDu4GwfB8k4wfd03DTfJ0szaH1HQjpT972ijyLNCqBqmsS+ezLtAcl/3UljLC5gNRzdjeJ6X2Fv7d7xzF4lHhRJWQA46nuFmbM1n11f7ohRuf9KZybB+jSp1JhadhcrcM5zxJA/M8r0uo3UA5sibuaOIe+nGBC4xwGNpsS6CFZZJCpgGMooXuLobmV+woDD2HRs8Q2t30/cz3uzt6rNYMi98KB8GeMBX8J7Gz2wb67+OiWK+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=qt.io; dmarc=pass action=none header.from=qt.io; dkim=pass header.d=qt.io; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qt.io; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JQi96XWxF8mqOqY2Kz4/AVvYSPmrA52FgwmodZ4QOGI=; b=g9lyq148Xgc0psmm/UwpNEc5Ee+2CkVt52V5fOpHLMAW0YNQijfR+BtBmXTOeN2KrPtSWtEZfUzzBmFQigcvVVLev6867On8Dw+FoGWK/wgI3bxMzvxs5pp5laLBB3QhNGtLRhudfwI6gxyF/C8WCqhOonIQDOqh4CK0vq/5zKQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=qt.io; Received: from PA4PR02MB7119.eurprd02.prod.outlook.com (2603:10a6:102:107::23) by DBBPR02MB10823.eurprd02.prod.outlook.com (2603:10a6:10:537::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.29; Wed, 25 Jun 2025 02:26:23 +0000 Received: from PA4PR02MB7119.eurprd02.prod.outlook.com ([fe80::d0e:bda:56c0:e951]) by PA4PR02MB7119.eurprd02.prod.outlook.com ([fe80::d0e:bda:56c0:e951%4]) with mapi id 15.20.8857.026; Wed, 25 Jun 2025 02:26:22 +0000 Message-ID: <283506b9-e603-4753-bba4-9b1b27a5916a@qt.io> Date: Wed, 25 Jun 2025 10:26:16 +0800 User-Agent: Mozilla Thunderbird From: Tim Blechmann Subject: [PATCH] libavutil: fix memory leak of drmVersion To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: BLAP220CA0011.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:32c::16) To PA4PR02MB7119.eurprd02.prod.outlook.com (2603:10a6:102:107::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR02MB7119:EE_|DBBPR02MB10823:EE_ X-MS-Office365-Filtering-Correlation-Id: 627bac25-c198-494e-b922-08ddb38face6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?NWxDTGZXL2gxWW5mbDJPSTRHR0g3aFlvTzR3SENWZko4V1B3MWsvQW96V0hC?= =?utf-8?B?V003UHBXZmxpbGFUT21zLzA5aXNORVE2cEM0VVR4N0FlNCtVYUpiMW1QMTBF?= =?utf-8?B?MGJ2dmRRWFJlTVlXajZ4bzgzS0VBOGxhSUZhTk53MVFCNC9nMjdUK1I5eFNk?= =?utf-8?B?U2FSblllRHlndmhSblRYT2c4WnJyMWtDRDN1YkRCSTFkVVJJT3lFVTlzWUw0?= =?utf-8?B?eUlWVU1abGttWjlQaUFyUFN4bXM3dXpBc2FSMCtoa3A5SzFTV2ZQSUxJcWpB?= =?utf-8?B?cGJONUxadjQ1Zjhmenp1T0lNaWlWOERPYWVKbmNWY2dlNHZBWUlUY3RGSllO?= =?utf-8?B?M0h2NGJ0bzgyUk0rU3ZXVHFvM1lSb0FweFRzNTZVeFYzaTlwb2ZzeWtncmtM?= =?utf-8?B?NUVHMTFmSnMwZmdZYnJzbG41YVlFWDVERzVLa252M05DM1hmMngvbDdETGcx?= =?utf-8?B?QnYrZnFVZDRrNFdEUlpGNnU0WitIRm1WMStONlk3amtHY2k5RGtKRTZkcXNG?= =?utf-8?B?dWVwbjdqRFo1QjNoemlpYWFTWVk2clErcVBrYjF5Tnl3MWl0eFdDZnVZbGFa?= =?utf-8?B?ZFFadmg1NTBUOUN1T0YxWi9sTUt6cDhLSTArektJSm1vazBSODJSUTEzNEZT?= =?utf-8?B?eldmL1ZDWUg3bzJsNlhMbTRMdUJ1djJoTkl6N1Z1Y3dQVnduVVhmSm5vK3p6?= =?utf-8?B?cnV6dXgvdWRPOWY4THAyWUVXZ1E3dlhuYy9YRVNxWVZFSHBld0VrK1gxb3lo?= =?utf-8?B?Ykg0c2tlK3gvM3JSaHAzN2V2clJxNUVYVzI4Yk1ISGJRRXJSQ3hPNHlQWnFZ?= =?utf-8?B?UitNbVBBY3BHZ0NSUVFacFdvem5WSGszNDBrU0pYclVrL0dvOUp6WHdxdC91?= =?utf-8?B?YTlocUxjM3RLQzU5cVliMFBqd0J1eDIxM3lCK0RUQy9xcHlrK1dJZDlZajBa?= =?utf-8?B?elpIdnY5NVFoYmJEUzh1N09GVXRKTmFCU3ZUZjUrY2dJSmtKYlNGczRUdkZx?= =?utf-8?B?TTd2dzFMVmJnYWFzVVoxN3BpaEhUN092NC85WHZMcW12MGVoWkdtUlFNR0I4?= =?utf-8?B?bEJ5TE1tNlRiR05pZEErMGVPbDMwRkFKSWJuaWdPNWkxdDUwYUw3ZFo4aTY0?= =?utf-8?B?ZmMydk9WNEJVWm1memF1VkRPU1AySXM5dFpVaUxHdTB6OWV4ZTRya0N1NklS?= =?utf-8?B?STFKOHVUT2JRRXRpUTI4a1JmWUdkQlMyMkkvVmpOQkNtVmduR2xNb1lsL250?= =?utf-8?B?SVUvaXJ0MEtibDBiUnRTZUhGdnNad2xVUnNvMnJYTFlqeWE1Y2NOMW9FWkh4?= =?utf-8?B?NVdxOHhhSUVwRlhFOFdwSytGMExSR1BjR3ViS1cxRHdIcEt6R2svWUlIYktx?= =?utf-8?B?VG1oc0pTejJKTGlaZEcyZXhzd2VtSXMrNHl2eWtEK3EyWkprdGVlNTMvL0E5?= =?utf-8?B?aFRJbVVvUVJ5Q2h5RExPOTFudEZWUjVObXFMRUdOY2grc2Rkd25ZYU05WURn?= =?utf-8?B?ZmNPdlQweHVDalBmVTlQZkZVV3Y0RHJaT01kaFczeGNRQUtLazR5dGhxMGhN?= =?utf-8?B?OWxYUXNYaENjTGFXZlE3M3B4VFQrSWNEUjdha2hRZElsZmp1STRIYlBBMWUz?= =?utf-8?B?b05kMHA2dnQ3M2F5MXNBUXdUWUV0WEpGL0lFdDVCVUhCRGd1TUlUMk9ia3Bi?= =?utf-8?B?SFpUK0NGcGZNMHVGZ1JxNlRSWmpyOG1rZ2VSQTljM2RhSTU1V3Bab25PeFc0?= =?utf-8?B?SGhNdVRScmI1N0JqM0VjQlgvcnpEU1hiSU9iOGc4VnhxRjFUTHh4QytsbnMy?= =?utf-8?B?aHliazdNVjNCOWk2SFRNRkIwM1M0cll2aTc1T0N2clR4eUw2K0ZRQ1BIdzZS?= =?utf-8?B?K214em9qQmIycTNDMkJSNGN3RkwrelQvNTJ1c2pnMjV1czJyVWlFeXM4WitX?= =?utf-8?Q?LFNj9PsaiFU=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR02MB7119.eurprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(10070799003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dTU4THNSOENhUlBxeGtHSTRTT3Vmbk8yMnZOellTYkV1dlh5d3pPTFR6d2RY?= =?utf-8?B?bWg3SGpCdk9TaUxDSk9VaVdQQzROT25CeWl2dStsaUEvYUxyYXNTdjI2UEdS?= =?utf-8?B?RTl5M2RTaDBVOXFpSFkvSlprSkJ2OS9tNHNDSU5VRisxSElDaUN0L0VNZDl6?= =?utf-8?B?Y01HbFBqNDhRcFM3OE5sbGNoQXBQZmJvd2ZpQjZBblFLbmN4QUtrYkV3RlJ3?= =?utf-8?B?YjdJeUtmQkRlb0h0Vmc5Rkl6SXJ3eVdlU1BSWnlTRXAwTmxrMVdJMUdNNnNp?= =?utf-8?B?WVQvYlNoN1JQZlVMbkJ2WW5LL2ZXZ0hReWZDVjRZZnpabFZjUGNxOHZ2TGNK?= =?utf-8?B?b0JJUis2VTVYam5oRkhOYitrbmZMb002Rm1mZS90d0dVWUJKTVpRblpCUlh1?= =?utf-8?B?R1ZHVzZ3V25EWnU3UGZRTG5MSHJkZ3VxbUxzaE5ZZUFFeEEzOFZEL1hhT210?= =?utf-8?B?dXVwRkM5b2MzN0dMTHhNUk5WY2U5N3dMRTczUTVJeHNmajNVdzV0MFlMVTBU?= =?utf-8?B?V0pLaG9UMXRSYUI0dThEL3MvK095V216VG8weXc0LzRxWHZIaVkrcmlFMzBG?= =?utf-8?B?RFduNmhvM2J2UDA1ZW8vZHFGL1V3dE55dXdDc1ZBNXcxM0RYbDAwcjl0YjVQ?= =?utf-8?B?dUF3cGRTdTJvY2t2ZE50U0E2ZWhKVE9iUDdxT1FGVVJ5OUxHdmRGY3R1SjhQ?= =?utf-8?B?cGtJbzR0RVdvbWxoL3QwVkZPRVc2bmV1YVl5cXBYWFFaWkNlbDZncHBIdnR6?= =?utf-8?B?U28wTVo4NVNGWCsvVWtINXN4b0pkMDdvOWRrRHpiUU5PY3VmSDBjMERyakRC?= =?utf-8?B?QlhRcktSY3lCa1B6dEYrUDVCdFhIeEMzSkJIYWNRLzJRc1F6QjZKb3p1cG9M?= =?utf-8?B?dVhHR0oxM1NEcWpiVlZpYmZkNWNoQVBMNlIvejJUcE05UDhpOGRLVkVJTXJy?= =?utf-8?B?MWJBYWJUdHY5WUdOR3NMM1V0Y0lYdWV6SDBuZ0lTQ0ZlUHFJR1J5VThmeElO?= =?utf-8?B?Z0xDK083dmJrT0pxVDJlZUVua0c5V09XRVU1aFVhS2s1ckFIVmZhd0dqUTZz?= =?utf-8?B?ZUVkTTdtZEl1TkZtMWs5ZHp2QXZ5N3oyZXNJU2c2a25jdngwbjNPSEhpR2dP?= =?utf-8?B?Q2FvY1F4NFFFcjR1bGVJWTFNbWNZTldhYWtGVHpycHczVCtjSmc1TkNjL1ZI?= =?utf-8?B?MWdrUTRTKy9FR2JEanpJOXY2cFFxakhhd0JpZzBkSzZ5UUE4QVBuQ0YwTVJW?= =?utf-8?B?aWwzLzBGUFdYVDY0cmdZL1EwR2piRmJuMUZiUEh3TURpN2xza2lKYmkrenNv?= =?utf-8?B?TTlpMWU5emFhM2dwdWRXL05mWDdjdW1iNzRlYkR6ZzhTcEprWHlYVUpzQWZi?= =?utf-8?B?MytJazRaNXZmeEdsVk1EYVRwRzhGMmh6bStUNi96T3ZnU3R0MGlaWFM1QnRP?= =?utf-8?B?UUc1Ymx3dXB0akZ4MmlrcW9YSFYyekZNYkJPb000NzFoZnhrWGRDZk5uaER1?= =?utf-8?B?Z1hEanFDeG93K3grY2RPODhLT3JjYmhNNEdPckhDdTFrb1N1ZFFVYUs4bmhp?= =?utf-8?B?VGwxdi9XYnFIUy9ycmFtbGtXRU9vOVUyMVNLM1M0QTVRQ0Y0eGJOZ0ZMUkND?= =?utf-8?B?Y091YldyQndhemZESldkYUFVVlpxZE8yaVBaYTF3Y2lYSTBJaXIvSWhINmNI?= =?utf-8?B?dmxtMUcrZ0FWejhlMmNCbFhLL09OcnRlVC9HMVFhL0htSTIxQVExTVZhNkJN?= =?utf-8?B?SGVtRFpWY0ZvbVpRcW9mY2xEL083Wm9lVHVDOTNuOFh5NFhyWTJ6enh6bmNj?= =?utf-8?B?YzQ2bWZRbmsvWnVYU2xnOEF1SzZXSDBZRlEzWXBTOU5VdzlwMXJUOUQzWFFR?= =?utf-8?B?ZGQ1bzhpVndDMmViUm1oMlk2VzNkOHcyRmRNNFR0K0dtOFpQa1dqUk5vMWVN?= =?utf-8?B?ckw1WDR3UnVFZEpvOGlMdWpOc1kzcDN2ZU5uNmIvM2VEa3ZlSFdpajQ5WTBh?= =?utf-8?B?b0s2cEIxamdxWi9DajVtb3BRRXNHZ1NYWGhzV1ZiaG5aSWR4RVgwd1ZIT0hJ?= =?utf-8?B?aVdmb3haaUM3K3FUOU5LNENRc0tPY0hRNXVBWkxuVkpUeVRQVkZRNHRyQkZ3?= =?utf-8?B?b2tEKzJKam5KR1ArUllZRkZoSWxlUjFUUlY4TzVxa2xUVDgzd3FoWjcyTVpI?= =?utf-8?Q?h0EUk8tobP1IGUPZuA1owYeADJO1F1w15N8Ww24c6N8Y?= X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-Network-Message-Id: 627bac25-c198-494e-b922-08ddb38face6 X-MS-Exchange-CrossTenant-AuthSource: PA4PR02MB7119.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2025 02:26:22.3541 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 20d0b167-794d-448a-9d01-aaeccc1124ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XmIvmDTQyDqcmp2rpFm9LkRdRF++IXDPk+VVMybMGFk32yZ1hr8R45v2rOFimewMec6z5nE7xErdq6HG+MuAKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR02MB10823 address sanitizer showed some leaks of drmVersion structs. `vaapi_device_create` did not call drmFreeVersion in all possible code paths. Signed-off-by: Tim Blechmann --- libavutil/hwcontext_vaapi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 95aa38d9d2..92b704891e 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1810,30 +1810,33 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, char drm_vendor[8]; if (drmGetDevice(priv->drm_fd, &device)) { av_log(ctx, AV_LOG_VERBOSE, "Failed to get DRM device info for device %d.\n", n); close(priv->drm_fd); priv->drm_fd = -1; + drmFreeVersion(info); continue; } snprintf(drm_vendor, sizeof(drm_vendor), "0x%x", device->deviceinfo.pci->vendor_id); if (strcmp(vendor_id->value, drm_vendor)) { av_log(ctx, AV_LOG_VERBOSE, "Ignoring device %d " "with non-matching vendor id (%s).\n", n, vendor_id->value); drmFreeDevice(&device); close(priv->drm_fd); priv->drm_fd = -1; + drmFreeVersion(info); continue; } av_log(ctx, AV_LOG_VERBOSE, "Trying to use " "DRM render node for device %d, " "with matching vendor id (%s).\n", n, vendor_id->value); drmFreeDevice(&device); + drmFreeVersion(info); break; } drmFreeVersion(info); #endif av_log(ctx, AV_LOG_VERBOSE, "Trying to use " "DRM render node for device %d.\n", n); -- 2.48.1 --===============3255613932859043272== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============3255613932859043272==--