From patchwork Sat Oct 19 01:17:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 52390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp1286706vqi; Fri, 18 Oct 2024 18:17:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZG0k53hjThVN8VdsIbtEuCzbLgmZHkCP+scOQ8FsXW99VYjp0Bz4n9lbdiQCaJ2G2OVq8XszLAZkhQY9i8nJ/@gmail.com X-Google-Smtp-Source: AGHT+IGlGiXUGa65Xqj2J+FtQAsvUEKWtFKNUl+aVQ2sqb3lq+dGQ9PTHF5Fd+gIYMBhHv1rbuIz X-Received: by 2002:a05:6512:350e:b0:539:fc42:e5ee with SMTP id 2adb3069b0e04-53a15229cf4mr2368387e87.29.1729300656205; Fri, 18 Oct 2024 18:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729300656; cv=none; d=google.com; s=arc-20240605; b=fjuT/F1hyc1EXtZMubmp+rvjUGF8Pid6TvYk2k1h5GBH1TETjBXJkSSPDaqxgK4Ive +v9izeniCsvvAF7lC+jZO2k1xa13yTGw1bvK03WzeVv9jlmkqt+1NLEke8YyvKRSy9I+ iYtIQBIMtMwD7T706pb9ViZ0nUE91nKP3fxOJ2JGUh2mu8BGYMBu101N0isfXNd9lhnd h/kwiAKYkH8T+MQzN9ZYvyRq/giYlbEzQlMFnMftcXtc76LrstDLdsovG6CdmXGL2Xnq AP2kz56tT8CyC3eDSnvnbN6OT2wBh+ucf/9bng2slb9EiZUU/rlgeoNvvNNc9aySH57i HDbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=X6Vag0+HV3XV1YPplcVp4eHs2Vq8p3yzNFdtkwJakc8=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=SypyJ4BNWwTDVYe9CuJn449seCCmCyDOgrXltkl+G1ptbN+bjYt0Hp9oufRqJ2PS2h hAP49anf++HjlrZ1RN27Sk31AWqTnhPfkWYP5V7gHGtySyNHBsLuGUjrL7FGRSkwRyiG vIcpEe/0wKHf/2OkCPuxZkbigwigY8QbvcK8MlmHcDt99I/vFHOOcqoXQWzK7vab6pnQ o1DddiHrD1UkZR4QpRAaQCL/S7Dt8nobnmkrYhHD7F8hnTzFm1GYXMdvS0l5fwh+7H0P h0v3Uvet23V96cc7xKWH1Gu3WCew5QeNcqpK45e3o76lwI1/qQK7TXDU/qiUgu3EPoCq 3VJw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="LydM2i/L"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-53a1520696esi947747e87.356.2024.10.18.18.17.35; Fri, 18 Oct 2024 18:17:36 -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=@niedermayer.cc header.s=gm1 header.b="LydM2i/L"; 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 8FE5C68DDD5; Sat, 19 Oct 2024 04:17:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7013C68DB80 for ; Sat, 19 Oct 2024 04:17:24 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B701A40002 for ; Sat, 19 Oct 2024 01:17:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1729300643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Sfk7J9BhjM4/ghNACzW+mLEwVfQADTO2cqfk8Y15Y8M=; b=LydM2i/LBRj7N9lLqqnxlJdGsvHG9RcukuKY1Mfx9CfkJvxbhgOm3KIllVtjdFGKvOYNIC fJgczTiZZG4B1XHA98yGd+0GmX2vufUFd0vPVFiyfJoIp1ZMZBzV7rNOTWkeYYFl8kb5gg 077KZUzdPM9uZrfAxc4+iWjMWotazLQcfF4w8pko9cEBhFHEQyXrKft9IyGQZOUo8u7avf mK/5uZnQXcpR6NxlrKsWBLUutQ6uJjYR8bjEunt1lNVhJnwXtF5ZhUZXX+eXYA1Hc13KVa G9xFl58cHZ7i3qkKQv3cFC1JbStodtQfVXbUiD8tOuXZG9YboRMzqktK9hV+yA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 19 Oct 2024 03:17:21 +0200 Message-ID: <20241019011722.840224-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/2] swscale/slice: clear allocated memory in alloc_lines() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QAk7h0dbzmhh Fixes: use of uninitialized memory in hScale16To15_c() Fixes: 373924007/clusterfuzz-testcase-minimized-ffmpeg_SWS_fuzzer-5841199968092160 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libswscale/slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/slice.c b/libswscale/slice.c index 119bfbdb8d1..4f8e1cebe19 100644 --- a/libswscale/slice.c +++ b/libswscale/slice.c @@ -60,7 +60,7 @@ static int alloc_lines(SwsSlice *s, int size, int width) for (j = 0; j < n; ++j) { // chroma plane line U and V are expected to be contiguous in memory // by mmx vertical scaler code - s->plane[i].line[j] = av_malloc(size * 2 + 32); + s->plane[i].line[j] = av_mallocz(size * 2 + 32); if (!s->plane[i].line[j]) { free_lines(s); return AVERROR(ENOMEM); From patchwork Sat Oct 19 01:17:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 52391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp1286745vqi; Fri, 18 Oct 2024 18:17:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXP+dHosK5Xn53oVHrZVAVVZoGcfO/FA7YHuvYwhUGoH2FLYR0nrZqEeJOetnId0yGyiP34G8aS9k/vKZqLnwG9@gmail.com X-Google-Smtp-Source: AGHT+IFyaUpMlfxYq9FyYzjjbyqNEH+/VRZ3lUrNbg7NMzRV+95mGRjWSMFUcrwSarZ7UXjQ3ynE X-Received: by 2002:adf:e791:0:b0:37d:4744:9d1d with SMTP id ffacd0b85a97d-37ea21cf62dmr3207990f8f.35.1729300665479; Fri, 18 Oct 2024 18:17:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729300665; cv=none; d=google.com; s=arc-20240605; b=J4+lcm4R0SYQElvc3AWh6yexbNalJgyYkK/exuvJRraFn0ee231TxeI6mYwKOsorEc m6ipL6PP1YsXE0ue0k/4mY7rpassgk723Ms0i0rRcT3TscKDjsHSEmEt1KLaYrTKV2Lb paCwaPqF0BBVrkp00//u3gcW40C5t50MqTJZJYrgeE84Xx4AizHjDsqt5zlnmqbShCSm PmUh7A672rMGgkgmiD89QGff0APmSE0gAuItzfKDa3WeRtAm+Cne38L4i5wiDGD81n9Q r/s5DYXS1bJqJ9/tBGJysjWLBAF8mKW2xkCqQ9NhBkRAQWjGre/c4c+r2UHUCG6nEyvE w3+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=U3upy+EzfFRwwzMKAmnyREaN6FYrekYpvyOusKxsJ/0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=V5dct85qDdUOxIw0supdxHnlwYCpVwBnPMtjQbwsxG3i9KNczD/G9brzK/SzwwYLA0 C2vwnuG31vWtRrGLDBxzGkGyCvGCb3iZbnjpPVqM/3BZQ6pVhzYmi/PTkBbHGriwyRxi 030WfQFZUJohAEBSwLRNljVmrLVrP/gBwBFiJH+jYSPxhvQ8SVl5Ps5pr1dumthqdQya 16o1TvHJu7ut4Xx4q/QVGotaFpYjwSClMQEhytuYnPMocddVT7fs8WWD0PYRNbmN4g2O jfnVvbVfEtDy2NDLeUitvPg3GShDmvPzsulYP9wDTWSntb398zZPejOcdM2F1RYm1Q6+ rqBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=G6iHZLtN; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5ca0b11dcadsi2000592a12.597.2024.10.18.18.17.45; Fri, 18 Oct 2024 18:17:45 -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=@niedermayer.cc header.s=gm1 header.b=G6iHZLtN; 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 A16AA68DDE6; Sat, 19 Oct 2024 04:17:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3869868DB80 for ; Sat, 19 Oct 2024 04:17:25 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 86F7020003 for ; Sat, 19 Oct 2024 01:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1729300644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XR+4aE/PS/943nuLjG/CNNxne1XNDXHEGiK/6BEjj/I=; b=G6iHZLtNBNlRNGH5i5SxyvwLGSXuxjDXIjQ+eykqnF4dnQcYE+ULWrNVInZbI98dddY1gb y03jhAH47SfUe5V7tHTKUdqrvWOK5CFAJ5sWpz0+JHai4440lHEk/g3+XMr44j0mJnN4yH hm8muL739f7GbMB7JXzTALTbA5K4Q+XS99wY7icFbN36KZbBTVozTscdLyAQpJLc6DjCfW a7ex+R5aD7AZYudcFnnPECcO+FVh/+CzJTwnigsm+enRsbZcltWr7dYzD0M01n9yBfVhDl 0eTpDHeYYC+GDULnjL4yl3BxUaNIbeHassjap4SeJdr0uqsr0gezUAJB9bWPOQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 19 Oct 2024 03:17:22 +0200 Message-ID: <20241019011722.840224-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241019011722.840224-1-michael@niedermayer.cc> References: <20241019011722.840224-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dxa: check bpc 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Wi+IdizO098R Fixes: integer overflow: -2147483648 - 1 cannot be represented in type 'int' Fixes: 373971762/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-4880491112103936 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dxa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/dxa.c b/libavformat/dxa.c index 813e665a27a..56b19a7fca9 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -120,6 +120,8 @@ static int dxa_read_header(AVFormatContext *s) avio_skip(pb, fsize); } c->bpc = (fsize + (int64_t)c->frames - 1) / c->frames; + if (c->bpc < 0) + return AVERROR_INVALIDDATA; if(ast->codecpar->block_align) { if (c->bpc > INT_MAX - ast->codecpar->block_align + 1) return AVERROR_INVALIDDATA;