From patchwork Thu Feb 8 15:08:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46110 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:a586:b0:19e:8a94:b663 with SMTP id gd6csp325080pzc; Thu, 8 Feb 2024 07:07:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IFIigO10hT8Z83p+gSrmIDS12L8WYHBjK8rxAZFaIuZoCf/nFcG2W41avPmhMCUCFj55oiu X-Received: by 2002:a17:906:694f:b0:a37:7e9b:fb74 with SMTP id c15-20020a170906694f00b00a377e9bfb74mr6995552ejs.73.1707404832918; Thu, 08 Feb 2024 07:07:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWoNPwA3LQ4LtDSQsyvU+VAw5ex7YHdL37mbfvwa2HCbQrs+tA6yb8UDG0IQVRlvn/3ayCbGSQTEZgEZPxIt591wz6Areve3J19tV4CBlhigcMG9upxJbhxujMDs7pMn1NGYmArPSGyCZWNiI3QKvvEtQJDtCpnNhvUc1N5vmXomgXCwtC8aeIc+rUVrJQJm8uJ2Z4Z3XOF3LAqBYwCD3VDqOObsDePtVFrP1BHi6oTT0Zn3ON84kogZZBdiKGz5Bje5QO7ASiGzL9VBO+DJ8UpmwKvyPhMVt10MsXeUoktuZosom7hTRVHtc6hnhkrf+da3n/xD6P7Wv9LXWBJNN9KIdyXmiYn5kTWdj60FiPpWMCUv095rmjMmTdOs16EYN01TBqNBiQ0ZQ5ocEq1gb0gvjPrB6/h2Xh5OJ9NLHIBGyJAQo3sERUrQAiIqrgoZdzKO8e5BzGntXktSc+/ZCFEIIJl6DZKCOoKBiIO1NPGeDXs0sAcWssjQALJT+i5Pg/at/bP+GRJEcUBjqlkeEVvD/dQsYjzVVSN3cWRyiouNGJRdiQgVh02xcu7HivAVPbaCREwAf7NpHVGSp0yutKBNXfXrsh0jGpdROUetI0UKuBkBMwuv2z10tzbTdNn/wC8z1N2innaZK/LckIbEkyo4faYYn2GWf3B8oprYnlIODyqabIu/VYFFfk79ekI30MoUSUADQ76QEQK/R192NUpAxrXhge6Jgb+ZUURoTxOfCuUQFiq5ngt95kgiZ+YjHa4oKCXZgXFYQrUH1RlgNjSsWCmNNOu8F6pQy5gmFYK+mm2bKsDlU9nLZl9q57zbhdW3I9ZmxWFwcDC35mj9MF4DQG8+C6qAv8FbfV4Hxnqvh1oH7DYipZqIs2MrG6yLf/4eesYENc9Rs3URr9BuAY4BWwBQuPoEsulf/MIfrRB2D9DU5lIzOzS+TxloPzHSfdEPx Nc9QdWI5jkcfLsg8UVWk6txRsMAp9HsgDtko9yYHfmSwH42QKp/P1mt4FWqsE5JqIj0eQ2vosUxuU3nIVqlYu5SwtrjHQawrDHLaNYv5l9tw2+1i4I2Vx72TJSiSp+2Ui+7U1ujyk4MJyQZP8o7YqTkKmXxOs8MP+S22NAZs/uYy90gdY7sq7NXnTXIr8D13KLWO3BJdJY6DqkKLRBDrNh/S+6cB/L9ohdM+clm/yg+UWZExP3E3F1F62+nGwrc6MwMIw6400d5opZuFzY7Awn+yPWTbbEXcbp90VLzZq2oj7qs9ej0dhgJhjyAqfD4r1a3OPNZzpFwfvmYKMj+KGr0CAd8HQ0HZb9XVklhtnaIvOLL2561tgJ/XkSjKC60l+n9b86ll74nTCvhzaefQtMyRh6AEWy16rYlLJLG8F9FHc7GOf6dk5Mkg2GKXBlSEunFRb0CYF3FciwE/Hu/ZNYmLD5N6rren3ELBhTlqoTD5kkqNxWNkCoBLEs4JnANWU0cADVUSjxhXG4G1C+ckje6/kAUlkeximhRc2Kj2R1bY1bYIgXkBB/CXjkvaBbUq4k/08U9hHpo6De1qXK7vJUGULNSQV3GuT12oNeU60s7IMmqKC7IgWLmC0/7bfOImnL Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i26-20020a1709064eda00b00a381b5eb48asi123752ejv.672.2024.02.08.07.07.11; Thu, 08 Feb 2024 07:07:12 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=IaBrP647; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3040368D145; Thu, 8 Feb 2024 17:07:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2052.outbound.protection.outlook.com [40.92.90.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1834968CAAB for ; Thu, 8 Feb 2024 17:07:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VS0HY4JWKr4kNJItUWWrFQv0+/Uok2mGnNwfC/Sk94FrOmcpWhebFJsQ9ezLHnoVbVrqAMmzRd6oiEme7jWdiruQ9sN8tTuozpu/84pDkrHin5NjtUqa/lu6RmeNCmDGkvmKrIJxFxR0ff3NWGrDrZOhgigcVN01gr5kba9mzwlJADOQhXsPdsU+CazDlLAxfsrjiUUj4tqtBh6syYRBmXXv54erg2YPcZTZ6hgNFBt3RQgvSpPednwANi4Kd4oi+Pv9gcgz91aWjw1bbToDggrjI5HnUSo5F05m2eGFObRRI2HSfkxVLZuYcXf792kH4OkR6SCaGxU1QWpwqbgsug== 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=NjlXjSyTHZs0e6WODufi8L0fyTP9a+1PGyEWO4i+E+8=; b=XzIxI0HmvK9o1ZVqhf4F2exsAkozeie/BTFQTOPEDCIE6GJKZZTscqoCRZ45W3EJu5QM1mJawbINj+YJVQbsGWpDmft97gQX8TBEkTIghAE6R2FQmulxf+bI1YAJbTVzIMZRufEDyyyOlZ9fQ3/3i3zM0AxzzSoVS724M1N/sEi2Kdk8SEmwAUIExaOJajJ4OVw226KXby9uGnxksswPSxgp4woGGB61he6Om8id8IZ+jkconpm7D+qc0Di4YneRnOdzC+SNG2hH5SzfVhRcVIcR2AdFB9B93zhWLc6FW6E/bI2AhfzGShUPCCUQ3BGVXVabDQ6S6rEOXCjEMZ8puA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NjlXjSyTHZs0e6WODufi8L0fyTP9a+1PGyEWO4i+E+8=; b=IaBrP647k3yQnC1McIuk3XbaXpE+gA6YAFZrfb/RI0iKkeGauSPe6fpI3iyo6vTZVpzTev++ucDal5UPyJcwyKEE8R+kP0XCuvKz1PJiPaAUoWNrFZuwfk6WFPcGIzfYu5cQge+vnzUfyMzPlHKDLuxT+7vFoM3zgMVs5KOnVYyFGvIAjzlwyk/pw3amhgnn5bcA8h5s83SV4l+sTJZYvVA1pwGFGLDDI2dsAoYCIHC9g3/uSE/HOOtRVbtIwTiLkvn2KUnOtG9maJqRV7wvVJN9zr8SeQXcqRh3P0c2B7GLqBHj8OUZMgI8vSzUcL3s1xzYzHpQ9nwXPPN2AM1zWA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0282.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:371::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.39; Thu, 8 Feb 2024 15:07:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.039; Thu, 8 Feb 2024 15:07:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Feb 2024 16:08:45 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [UqukNRyqFCRSpYWxBd5YVWiW+AqD0M22AK77IxdjdBo=] X-ClientProxiedBy: FR3P281CA0116.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240208150847.477489-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0282:EE_ X-MS-Office365-Filtering-Correlation-Id: 04ceefd2-c93a-4ea8-32cc-08dc28b79967 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZFiUsipr9cNGvrltjHgzWshTJUH1eROlIRUpUhy9QgutQYxEsKOUfyR97hEA2UEGFy577iNsy2IFMSAOCbGf/rcLu4MWgyAupIxOCzzFzWkVRJfaSkmu4jlTdVLoa9Du2TX9hQnVX2Rasn2trQ8Tu1QtjIpnXBMgsfGSVTbNEKM4tOVgU6YOGDvtBfZtCx13dCzfW4B0Yz9Dt8pCiRJc1M9yHUIAJjSDTDx6BewWpXxjpVyzgJd/phBAHQM5GxzQftgm0DxWQ3w5xfd4lEVOHlCuAdDq0DPulOkWA/xSd81CaFGutjYdHTAlH8uyv5fcnbA12qdl11/WsiaOXcOCDjLDI7iv3xYWDsAVqIDLjel9ciFeftJEokgA1tnYPXHI71MVjhJkKBePpZUl8kAOoasfplfkgVBGUx+OJLsBDVhTSz8EF5ZxSV9I4RIjGm8cHF8RJqQG9b9eZrGoY6x7YU/05L9FQLKSXfPCO2OPHha52jITC3Cg1Pbdnlx2BanUJ0r7qUOTQKQ1IMDTH1XljnvB5Ixac5vV1L6d42/Og5X95IUngMHlgbYfmcA4Z0lrhtHQQta3PyJnCyWZm4OmHc3Lu51lem5OW4RASk1EseJ+33+53/qU8mHGNSk2yBjz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j6kDeTKXSuhH8Xk/+HZF+YCozEJoY+QUtjPsaDiLsaqor5PmaUgoy/yL0r54CMbciQ0OcMsmEjIksL4DWQTlIFi9/cVNUe+AMMZPW9fdtAWkJN9xB/cAGnEqjGvdv5uYzZ0fYxmtItcut4ZPk1JBAeqJTkSoh5538zpfhvDTdUij01v+eB0hxZDglYS/Ww8xDb/1DxuequUPbaYgwPJAhOqNsE4lnpWJD117xAtluP3Wgd8Xh+GFO7mqSEGmmaM44USyF3XjZh4oE6/TaZSu43gkErYCn7AFxUkZB4eOav042t2ZufLfKsTu02WGMau2743+l9l2q6tvDL/qIPLNiIqmNK65rTN7mB1+0CYJ8FbFLJL+OsOvAQO+Wh+6d43pqYbJrkSHBBI5Hi7WkALO1GISITDjM7PoaPAHqill8RKwb0s/2kXZ+md99/yCIodhApuZiQupxRn7omm3cEqF/MwzHnXDzRvQDRMLNffmlFqQ0iRxjzzFaywUt7oNyOHDnQbQnULYwVa7h584wGIdGY7crX/0EFaibc/bELQSZprFhuf/CiK6xIj2pf07yffLx6nL4aSevgNpOACY9Zj+u3z+MkzF/GfvW+MiRP/GAPSXSdsMqshr7dQQdDadtlm7wavCRERhcpLKOrBRwwC4CrUm3kvW/nZArNy1yb1P2vNqiX30BWNWc/hc7c5AcakW91hYcquoGNdN1fLmK57l4DKGyB5fyZBI/AT5lb7nRUaxozwrlXwfX5En+4cW0hKxf5QSL1euanfkaqnu1N0ey7vQdZm6wVRI4oPpmgqgDqMKTzwuQ007V6NPIlEFXQ74j5c5Xu8TRG2zHgDVg107eUOckOlhKnPmh0CcSNKuZ+DoD25AO+wrcjzytFnXu8pMmlWuYDdLprhhx5K+MavevoIID+8awLo12ZiXExwkIzmUEonagvcV942AoJsMi1sG2L+UX1LruVSwrwUtHSAgb0H3mrhu+w53lu7EE5YUl+60pNt/BghyF/ayjAtMlelsU5TErpDbfmCudRi1k1w1177MvWInF8UB3vWxCppKw4myv0D8vyLr/SsXOa5FE3cRsm1FyVWoOWhrqPrMmx+fAbf75L6iGY7YOp4ea7npK6daPG60Ch4LKNkSqOYNe74uVHjJ2ppYn6XMT49OXLfnGSYJdgcPNE+AnComrzgkINjT8Ux1cDsspRkQPHG0zIDTwwgj6gjTsyqDQqenqVnROlUOzZPC3UsWTBAwFkwY+RXVGtOQzwYc92UoPttxERdS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04ceefd2-c93a-4ea8-32cc-08dc28b79967 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2024 15:07:00.2349 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0282 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/rcwtenc: Fix potential out-of-bounds write 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KZLX5UL46M4C The rcwt muxer uses several counters for how much data it has already cached: One byte counter and one counter for how many complete blocks (of three bytes each). These counters can become inconsistent when the muxer is fed incomplete blocks as the muxer presumes that it is about to write a new block at the start of each write_packet call. E.g. sending 65535*3+1 1-byte packets (with data[0] e.g. 0x03) will trigger an out-of-bounds write. This patch fixes this by processing the data in complete blocks only. This also allows to simplify the code, e.g. to remove one of the counters. Signed-off-by: Andreas Rheinhardt --- libavformat/rcwtenc.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/libavformat/rcwtenc.c b/libavformat/rcwtenc.c index 839436ce84..d0e469ce65 100644 --- a/libavformat/rcwtenc.c +++ b/libavformat/rcwtenc.c @@ -65,7 +65,6 @@ #define RCWT_BLOCK_SIZE 3 typedef struct RCWTContext { - int cluster_nb_blocks; int cluster_pos; int64_t cluster_pts; uint8_t cluster_buf[RCWT_CLUSTER_MAX_BLOCKS * RCWT_BLOCK_SIZE]; @@ -75,7 +74,6 @@ static void rcwt_init_cluster(AVFormatContext *avf) { RCWTContext *rcwt = avf->priv_data; - rcwt->cluster_nb_blocks = 0; rcwt->cluster_pos = 0; rcwt->cluster_pts = AV_NOPTS_VALUE; memset(rcwt->cluster_buf, 0, sizeof(rcwt->cluster_buf)); @@ -85,10 +83,10 @@ static void rcwt_flush_cluster(AVFormatContext *avf) { RCWTContext *rcwt = avf->priv_data; - if (rcwt->cluster_nb_blocks > 0) { + if (rcwt->cluster_pos > 0) { avio_wl64(avf->pb, rcwt->cluster_pts); - avio_wl16(avf->pb, rcwt->cluster_nb_blocks); - avio_write(avf->pb, rcwt->cluster_buf, (rcwt->cluster_nb_blocks * RCWT_BLOCK_SIZE)); + avio_wl16(avf->pb, rcwt->cluster_pos / 3); + avio_write(avf->pb, rcwt->cluster_buf, rcwt->cluster_pos); } rcwt_init_cluster(avf); @@ -129,10 +127,7 @@ static int rcwt_write_packet(AVFormatContext *avf, AVPacket *pkt) { RCWTContext *rcwt = avf->priv_data; - int in_block = 0; - int nb_block_bytes = 0; - - if (pkt->size == 0) + if (pkt->size <= 2) return 0; /* new PTS, new cluster */ @@ -146,11 +141,11 @@ static int rcwt_write_packet(AVFormatContext *avf, AVPacket *pkt) return 0; } - for (int i = 0; i < pkt->size; i++) { + for (int i = 0; i < pkt->size - 2;) { uint8_t cc_valid; uint8_t cc_type; - if (rcwt->cluster_nb_blocks == RCWT_CLUSTER_MAX_BLOCKS) { + if (rcwt->cluster_pos == RCWT_CLUSTER_MAX_BLOCKS * RCWT_BLOCK_SIZE) { av_log(avf, AV_LOG_WARNING, "Starting new cluster due to size\n"); rcwt_flush_cluster(avf); } @@ -158,25 +153,14 @@ static int rcwt_write_packet(AVFormatContext *avf, AVPacket *pkt) cc_valid = (pkt->data[i] & 0x04) >> 2; cc_type = pkt->data[i] & 0x03; - if (!in_block && !(cc_valid || cc_type == 3)) - continue; - - memcpy(&rcwt->cluster_buf[rcwt->cluster_pos], &pkt->data[i], 1); - rcwt->cluster_pos++; - - if (!in_block) { - in_block = 1; - nb_block_bytes = 1; + if (!(cc_valid || cc_type == 3)) { + i++; continue; } - nb_block_bytes++; - - if (nb_block_bytes == RCWT_BLOCK_SIZE) { - in_block = 0; - nb_block_bytes = 0; - rcwt->cluster_nb_blocks++; - } + memcpy(&rcwt->cluster_buf[rcwt->cluster_pos], &pkt->data[i], 3); + rcwt->cluster_pos += 3; + i += 3; } return 0;