From patchwork Thu Aug 26 14:40:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: YE Chengfeng X-Patchwork-Id: 29791 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp550363iov; Thu, 26 Aug 2021 07:41:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAx5F8NaF94e6zZPql04y7lv9NNOR2rNnlpMeRTsxS0dpWj2lpz4CBc8vYRzqJ4vVBCQFr X-Received: by 2002:aa7:c88e:: with SMTP id p14mr4665252eds.174.1629988873631; Thu, 26 Aug 2021 07:41:13 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb43si3197471ejc.53.2021.08.26.07.41.12; Thu, 26 Aug 2021 07:41:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@connect.ust.hk header.s=selector2 header.b="pOS/bsfX"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A0AE68A13C; Thu, 26 Aug 2021 17:41:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-TY1-obe.outbound.protection.outlook.com (unknown [40.107.140.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D347F68924E for ; Thu, 26 Aug 2021 17:41:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=djW5qOvws0OUPaFqq27RVAcQxjQqEkUqO+uAiZ8fX4fQvov18eS57ziLBsryHQVmK44GodY0kupB0fy//UbNKRyy9yCb8xVD0wUvu5LoIO4TGPg3VjVc9c06II+6bBckEEtuKSUYnR7OxfwBJo4EW0H60KnsgKp0qWc/bKzy4OpPv0TKsyvkWVOvfmfVZi8T/OpxtKsGscwju2HCpoXnWNeEuzJNDsFJiRfKCGqMhCkSKugxLJq8CxaOWhEbl6tpj632vWCVtIqCDRmkhnPNQJ62V5/XT5dJUKcsDKiQgkkBfBWwmstGZ1fBFKitiC8nBcBVV2uM010qv88cJZ0fOA== 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-SenderADCheck; bh=m2UBjbUfvXUe7dJNpFV1mBGroCjBuVZ6Bu5kwWNDIw8=; b=MSvc8MkY2w4HHRLzDx5v3CoBx2FAgKsqePwp60rmRV3pjvhKbN7NoWir52j9cinhv2IplV+D0AlqFkQrt2DbhXMYCCrcTivA+TwnBffatAkuGhkvpulJNZCXDNiFDJmkWsvl/137snUXnVmw78leNg4VcHaMiOirpTuxFOm42I0RhyY3ZDFRRI6tvZdjpHFTmMmzrdblqGrO6wAJLO/GFgiCCQRbXFR7tTfwqLwUEBjVV7vnNMPv/ufeYbnArdV9qP8LHOtdJ4neVSXYWFpItHIdtN+xgGznU2JyNFVuEZHvGfZTQyv6pvZxwYgo3X0pVgux/bKMnpp+Hb4rK0V7dA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=connect.ust.hk; dmarc=pass action=none header.from=connect.ust.hk; dkim=pass header.d=connect.ust.hk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=connect.ust.hk; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m2UBjbUfvXUe7dJNpFV1mBGroCjBuVZ6Bu5kwWNDIw8=; b=pOS/bsfXEYYRr4PoGUZVbsLT87fyXde2zRGB06Um+9m9cJb0pvSc18zCIE9mQm5YsLogj6bOepVulTyEiubaXoWIqTPwU18629R+UDEOPNH5MiKax0f5vM1Upv7Sym4ttwJ7eqQvkPMPHRmxevOMqQocwsHkZnHt2WV31tYxcls= Authentication-Results: ffmpeg.org; dkim=none (message not signed) header.d=none;ffmpeg.org; dmarc=none action=none header.from=connect.ust.hk; Received: from TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:b7::8) by TYBP286MB0174.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:8024::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Thu, 26 Aug 2021 14:41:01 +0000 Received: from TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM ([fe80::b9cf:11ff:5f5a:32c1]) by TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM ([fe80::b9cf:11ff:5f5a:32c1%6]) with mapi id 15.20.4436.027; Thu, 26 Aug 2021 14:41:01 +0000 From: Chengfeng Ye To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Aug 2021 07:40:46 -0700 Message-Id: <20210826144046.95851-1-cyeaa@connect.ust.hk> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: HK2PR0302CA0016.apcprd03.prod.outlook.com (2603:1096:202::26) To TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:b7::8) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ubuntu.localdomain (218.253.253.162) by HK2PR0302CA0016.apcprd03.prod.outlook.com (2603:1096:202::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Thu, 26 Aug 2021 14:41:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0011180-c5fd-422b-b935-08d9689f8614 X-MS-TrafficTypeDiagnostic: TYBP286MB0174: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:418; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dlqyKf2N3IbhetNj/cZhIocFc0YQrq2ueYJt90UtgBLtAuwpi2Lt2yvmp2ygsrs/HKcWf6JkGlrwrqKINq9m8vvFsFqhfxGwPpsGgZdk4p9+7LurXlXNvPsjBKl29c7XF8mQbjjqRh1jXwv8jtTh4Uk+P2m+sjiH6CCQYj+5u9sspznXKbbzCGZfd+yl7Z6De02mjUU31rB95NGIhjCGI2kqEhr+y/+8LykwugN3WJzdfQgbV5IW+Va9MhYDTlcgttvNtfI/GjSk+boUMVk7tKM5iC9D6C+4cE50pG+1Fwx8/kOtz2pXkI8bJYUb6jBV1tzaaqidHr5oH6wydIvhEX82WPb543fwOi1zaQDkFpEXzm7uifOzQZv6oYkbNPC3uhh3347dQ1Shz+IazXkVNJxrGVkN12e7660Bv6O9tbH3x5H0HEPVLRBSbk23rqlLvzkQS7lyA1aKkKVkVIkSmlTrbojMb2nKX85cK1nP1fuVNN/qaw/7WVY0pEBDp2d/ZeJXd4rmoJLLeS5iPko2RDtzlaw5K7zJK1aq16/hcPJEBKnqPQMgAuc3g5rHAq3bq9dHB1oPLUpox72sONJcxrOeJkTwR1EPuQXxHZkQNgabeA+d8AHtI9LmD4Iq0s++ohmORuvaU8aWcNPE5YmUQpSpU3YnlbcvF0xsJugaL6SloJ/x3IuU7YBLHuLWBhKd4BqH9Z1g31OK41bkGRT6TUaPCXa/44QloVDFNrCrZ5zvqZa1hvmfBLNspENOtiHCaLi05p41vn/QhAj1vqUAQA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(39850400004)(396003)(136003)(366004)(346002)(376002)(1076003)(6506007)(186003)(26005)(83380400001)(4326008)(107886003)(6916009)(316002)(66476007)(8676002)(86362001)(6486002)(956004)(2616005)(786003)(8936002)(66556008)(66946007)(6512007)(2906002)(6666004)(36756003)(966005)(5660300002)(478600001)(52116002)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qbDDjtJ4s37J/gtMQMqQPhxxj6kEt9jxvdg+j5g+A4EYvyVnOenCcEuI/+3dQ8CwXBekWE0VA8m7A/dyPKDUhkQThHKgPU8utRD5iyf92k0A/BA95s2lbtz4KleJ2MG65kBGWAi+mjAVYsfs27IR2xv7mlw8Pov7huL+sTgRPmwj7GIA2+SKwMLEsJ5smNfXr85OrmIXK+goT7MenxNlZGsQgE/O6PTzOuuG4chpNDuwyHSthQD3d+OJfqnbeMM31WLrLop+2LtvilS8Fvsi+EptvxiPUGEJ+DxO5NZCHfoEIiPf6v8YRe/HtG9cof7Fgm/eEC0ow6F1xqaLUCgrPRnAwN3EjfWiwb93tEQnU/6J9XploLacLULcmoZPbp8QpTOezKGafVqWfD1WdcI1c19INBl7JNUJG/qya7HVOqaJekmRjD63eLIDu0glTkJjqox7XksxW3+z8MJNRXjm3EnXMBrpzWWnYplezgLypfweBKIlmb5NmVuSFBlGDPVnog3g/GaXeGn7FloQ76DH4z4wfnafRxygXx+AcRpRQak+y044Idb0BxIg6Ge4hXQsU9aKBKggLTBs7CYCgnILS8VN8Mx7YzK2gq54k8uhbGAUqGdDK+kQRqFKnC2Hbus/YvEOEShmzHfBlfnCGm2HBJEve+wDuU3wdbiqgd97Cszq+f6IXFjLlQsO5h4JTtDK1MEgZiWSnx9awWo22yz1962gWkm1Za6eND6IV89g5wspq79TG4GdsWrAnkSaRvTt8Cp8wKVScjyKQmTF8Y2ZoWyRHL2v94RhFzO++lKCO80pQWFDEAo/M8NVnwNaSRd6jLGEidFEFfjoZ+Ifd7EDutWAoUb1p3x+2HA1JBqrmIyBs8jBWP8nMlTp7Zfsm4mIJ5GREeqrZNyrvW6ehTrFXwtE4043SuZiU6I1a0ZQ9pzNQrpcmi12z94azja2Nbti1OJHtT2Mb/LGlTCNTcCgxRp6sZjCIJRb79QmlEIyad4SwqVxwX600xH/m3xA79SVB2gwLFqJch6UZZWDfxLjSLg3oGicXrZzWhgqkYmitjcJFJ7dTOJt070PPM27CGz5w2kYP+Qz7YvMGkqMCjP9kbJ0gvby/rGPcO7kC081akpAP0XKCjnUffIOhM9z1ilol3xb7qFuhwHVdKfRPIc8FS4BXBu9+Gkwf5A5/LWipGDSfpKRs8jfTOq8wpeigKbCXByIpzD6yNCDuPJjPA01oMKxMtqSqZFeTDnJid90AdHgTM4jaAbk4801BpAmB6afRtdzSZ0dFKXXwAvwXZn2Ni8t8m8DCjASbGVxMPss0jXRB5qiiGwfWGPQS9tSoFOr X-OriginatorOrg: connect.ust.hk X-MS-Exchange-CrossTenant-Network-Message-Id: c0011180-c5fd-422b-b935-08d9689f8614 X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2021 14:41:01.1555 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6c1d4152-39d0-44ca-88d9-b8d6ddca0708 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: f+Nm/RWSwo758TtC5hN5QRNIrwAudB/Gs1vXKeg1mO5D7/MNsIM6oOsvdJ1o+9fsbC1YL1H4C8toV1znMLzB+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYBP286MB0174 Subject: [FFmpeg-devel] [PATCH 2/2] libavdevice/avfoundation.m: fix potential unreleased lock issue 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 Cc: Chengfeng Ye Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: K3371GOhKEJw The problem here is that the lock ctx->frame_lock will become an unreleased lock if the program returns at patched lines. Depends-on: series-0001 Cc: cyeaa@connect.ust.hk Bug tracker link: https://trac.ffmpeg.org/ticket/9386\#ticket Signed-off-by: Chengfeng Ye --- libavdevice/avfoundation.m | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 8ce3d064c5..0cd6e646d5 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -1067,10 +1067,12 @@ static int avf_read_packet(AVFormatContext *s, AVPacket *pkt) } else if (block_buffer != nil) { length = (int)CMBlockBufferGetDataLength(block_buffer); } else { + unlock_frames(ctx); return AVERROR(EINVAL); } if (av_new_packet(pkt, length) < 0) { + unlock_frames(ctx); return AVERROR(EIO); } @@ -1097,21 +1099,26 @@ static int avf_read_packet(AVFormatContext *s, AVPacket *pkt) CFRelease(ctx->current_frame); ctx->current_frame = nil; - if (status < 0) + if (status < 0) { + unlock_frames(ctx); return status; + } } else if (ctx->current_audio_frame != nil) { CMBlockBufferRef block_buffer = CMSampleBufferGetDataBuffer(ctx->current_audio_frame); int block_buffer_size = CMBlockBufferGetDataLength(block_buffer); if (!block_buffer || !block_buffer_size) { + unlock_frames(ctx); return AVERROR(EIO); } if (ctx->audio_non_interleaved && block_buffer_size > ctx->audio_buffer_size) { + unlock_frames(ctx); return AVERROR_BUFFER_TOO_SMALL; } if (av_new_packet(pkt, block_buffer_size) < 0) { + unlock_frames(ctx); return AVERROR(EIO); } @@ -1131,6 +1138,7 @@ static int avf_read_packet(AVFormatContext *s, AVPacket *pkt) OSStatus ret = CMBlockBufferCopyDataBytes(block_buffer, 0, pkt->size, ctx->audio_buffer); if (ret != kCMBlockBufferNoErr) { + unlock_frames(ctx); return AVERROR(EIO); } @@ -1142,7 +1150,11 @@ static int avf_read_packet(AVFormatContext *s, AVPacket *pkt) int##bps##_t **src; \ int##bps##_t *dest; \ src = av_malloc(ctx->audio_channels * sizeof(int##bps##_t*)); \ - if (!src) return AVERROR(EIO); \ + if (!src) { \ + unlock_frames(ctx); \ + return AVERROR(EIO); \ + } \ + \ for (c = 0; c < ctx->audio_channels; c++) { \ src[c] = ((int##bps##_t*)ctx->audio_buffer) + c * num_samples; \ } \ @@ -1162,6 +1174,7 @@ static int avf_read_packet(AVFormatContext *s, AVPacket *pkt) } else { OSStatus ret = CMBlockBufferCopyDataBytes(block_buffer, 0, pkt->size, pkt->data); if (ret != kCMBlockBufferNoErr) { + unlock_frames(ctx); return AVERROR(EIO); } }