From patchwork Wed Aug 4 00:27:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29220 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp2920515ioh; Tue, 3 Aug 2021 17:28:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNzGJa6WLRvUR1emelbA6/DSX3+TEisiw+2xxlNEGxPVCPdvywRNoqpcW4dgK0A2UuiPBR X-Received: by 2002:a05:6402:1a35:: with SMTP id be21mr28163230edb.332.1628036900507; Tue, 03 Aug 2021 17:28:20 -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 mp33si496910ejc.40.2021.08.03.17.28.19; Tue, 03 Aug 2021 17:28:20 -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=@outlook.com header.s=selector1 header.b=ERMZcOWs; 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 E7F5968A16A; Wed, 4 Aug 2021 03:28:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2089.outbound.protection.outlook.com [40.92.90.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC229688178 for ; Wed, 4 Aug 2021 03:28:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MQVZCllw3tdynHPQyX/UYlILdG6dxmREIjDddAmUzPwibeLx7Q9LAGQfi5EwGmDPRwT9LOAYjN6eFv3TL5luqV7lZKA5CGdr6kmVQu69SUScuOasprzUun+xYd04+fFQ++Ta3GfoLv1t+qBNfB0qTnEiaXwEFuMQ3hOK9a8bnsvDfzH3c31h48zLu16IjAPxfUT0hNb+RL4ozZmvVpvZh0e0G6/wem+CM2TsNs0oXpPKspPNfJDuPXMgx/T0MIOD7nG4lgLhY2va2DR6d8L7tnEKj+jGNpm0opMB7xqNdsV3DYSGMro2BW+3V2QxkqR+OIk0BetySwzJG68puPgZ3w== 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=L4odrvC6G62yw/19rgWfkM5L8qbvBkDcaId9d4oaLeI=; b=PRvjlwk7c4Aen1i0Qwofjqoo4pOPz3itl5B/4s9uj4qBn8W/ES9RG19drsmM+nHCX85uE0TrVIdPAW4VpvZoLxhz5x7GgFrhyrDhOYwExYEezxjxtjrQ6ngrhbQrpY2+eNLsTkchHydMzBE10zWMvI1Af3jdjQYD5dE8JwrMOrzzEIKgVNTW3px7e8l/7ZPnkGwzi/CTV2gA8hGOZZColC6lVyJvVURgDC6TmZHQZriefzLLkd1xOldxo9BBXlVtksOJNlNCLnzGqVUHzDynuZc5e+aRq8IgQXyAI9v4CD3oDt5jlQt8IxBZ9MfZaMAx765Zk0rA0KPnIcW9BvnP2w== 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=L4odrvC6G62yw/19rgWfkM5L8qbvBkDcaId9d4oaLeI=; b=ERMZcOWsZF0f3/ANJXixLDfU8uz/lWaxTmNxeVzLeq26r6aivopmVyJX0MhJVh80zKWOV78rJJRUECy7CkoVIXxSw1mIFuUo2vUwiiIjOYxvcPUY6rNiAu3++/vVaqM/KLXWy3YBZbDVQUJzU0DijMv+awSfGXSa9etP/n0D/Wsat0coth3kf9+PQQCCERoG7RsN6CD2b1ARWocceSzQHNMJbTaPCrtTbG5KYuVxM54puXpNrb6YvvWcDnNRDn+rCzzpCRqUB0aSpFCmsgeDELOyhw7/abgYBbgHK8XEvm6hadIIX8YQT1pHa5r4E9124wCfxFPainSROBUDTyPhGw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4822.eurprd03.prod.outlook.com (2603:10a6:20b:81::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.25; Wed, 4 Aug 2021 00:28:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Wed, 4 Aug 2021 00:28:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Aug 2021 02:27:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [JtgCcQdFkU27n623PiswqBE9AktPtvmu] X-ClientProxiedBy: AM4PR0302CA0008.eurprd03.prod.outlook.com (2603:10a6:205:2::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210804002756.1595041-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM4PR0302CA0008.eurprd03.prod.outlook.com (2603:10a6:205:2::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Wed, 4 Aug 2021 00:28:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d91d99e9-cf68-4963-f621-08d956deb9fd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQcfd3+6+hrRH8FtMaXoDIfb3EqxU5Hdz/MVAWY+KAWHqz+A444Fd7jjjcGMB9aiyQBIut9Nob5KYxvthsEItatRpVtDnbPrb4KR2wKV35kZjGL0bsovk3jdHaKKWG5NPQ6lmd3H1+IimMBavMKWKk/MDd3rwyn6nwrIF0zkKbp1Rvi4pdSSsun4SRf8mv5VDnk3Vj8NcM6xJvurFOZhIZwcgyp5IctNPQ8X5Od52pjo9iUp6Np1m21VPu14fluRrP+ssWL9HvWseMFxthLz5Ns7NLfcfjwm7z0IvjciE1sDkJen0XtA6cxvzPL+FzwvG+X3rdTt7qjpJzHrum3s0LsSVDI888QZaFwVmHjYEPuwyNV1V1Z+JD4RUyOjErq6iP2cxS1siE8112BN5/K/hS8zmiy9ernTWA2bN46G7Htva3iE6fb2wbBDTlIvLGD0FwanY5IAfZ8a6k6OewlXRD1n8GtLVHe8wPP2+sdijvHzJ1QU58vwgNJTNxZ6GWbB3YIjxZOlR4nQM4ON0nCX1vw7sNxlbfv+1CgtsJqKUzaRLlONt6km0wIzUuvT0+Dz/b33M6QHq3PBnegiOxVkMgRXC1qoiopSAikea1fluVE1Mh5WVvza29jpLnNcS5EuWUt/77YHE4QR/h2U/s2inKURCzThkU7IsUtiO42/hef7NuL89cLp1cX/7gGX398vI/X9iXAYArnRbns+TPQiUSqvNqF1yywcVRX5wvV1rjICVBTnmpPZtqDO2VXSdIlJ1g= X-MS-TrafficTypeDiagnostic: AM6PR03MB4822: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uSUFDa6PJDWlUNJr8GuPws/NtZ+1Vn4Px3ygRDet4/u/NUDikFPBHGcc9FyizP0ortcT/ZjUOZqBUyJJC9NFCKzLgtdWm+dmAyUkaFJrKrBQOyyJlzaPsXdlVzRhO4C4eoxpnFPmXOyaubkNrvLkUskqRk3vkneQDbjgijEVIwzbmbxMoMA/we5w81rSkunZ7Sb9Uca2sc92VqrnPfFpVBC0EQN+qTQ3P13urXV3zFee9SXvBVz2xYFIgffFIOa4Yw216DcbCZcQGZ7EG1BDz3cwyaRp+TImVLtV8n8ivOCW7jlm8Ed6tjPc2OyS3i1QKY+kAorUjtl5Yr3zSsykrInKjV5zZHzQB3J9kfdkFpDMCr2YwIC/sMwThrJ1oJkgeF7gNDp2GMmhNOB4TAgrd4A9jS81prIYiT8ee1IYv+9xXAuNumhtQt/XvYjLIaZj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FpYpMHPlHYR1tAI6/wv49KolqbOEXI0a/a0rtFK2ywW3MxQk6Jy2/ufCcHVyRlu/hzmAn3CRMyDkjawJeh6TSTRFIygtEfKwdokk1+js3+CMQyU0S1AuJ/EOaVAV2GmKF44k/pzFmOov1GaKkB39HA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d91d99e9-cf68-4963-f621-08d956deb9fd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2021 00:28:05.7104 (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: AM6PR03MB4822 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_vpp_qsv: Don't overrun stack array 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: mxgngZbmNiVV 8b83dad82512a6948b63408f964463b063ad24c9 added another potentially used video enhancement filter without increasing a define for the number of such options which is used as the size of stack array. This can lead to a buffer overrun if all filters are used simultaneously. So increase said number. Fixes Coverity ticket #1489775. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_vpp_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index f2309ed9d9..70bd5310c3 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -42,7 +42,7 @@ #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM) /* number of video enhancement filters */ -#define ENH_FILTERS_COUNT (7) +#define ENH_FILTERS_COUNT (8) #define QSV_HAVE_ROTATION QSV_VERSION_ATLEAST(1, 17) #define QSV_HAVE_MIRRORING QSV_VERSION_ATLEAST(1, 19) #define QSV_HAVE_SCALING_CONFIG QSV_VERSION_ATLEAST(1, 19)