From patchwork Thu Jun 27 00:40:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kacper Michajlow X-Patchwork-Id: 50184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp164603vqy; Wed, 26 Jun 2024 17:57:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWChQkgQU0Mvg0+RFWQwpQgDwau0FlL/gCGTXDHC9pYy4iJkOfIEb0ZYhWTh70cl30EkVABhPSqBGUeojSonlxhQdWx221ommnrQA== X-Google-Smtp-Source: AGHT+IHTb7wiRk21RT0UrhgD1fR+eFquAb+8IMk1u0tYKMioTktxVg9sEK+3FetSd+HyfPKrSa6F X-Received: by 2002:a05:651c:104f:b0:2ec:1dfc:45cd with SMTP id 38308e7fff4ca-2ec593100a0mr92693751fa.4.1719449871591; Wed, 26 Jun 2024 17:57:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719449871; cv=none; d=google.com; s=arc-20160816; b=fFtBMufINHJhar1gUwqE2GRsiUuETFLsqeqChO9/leANCXEeBYDK/3lFxmJZhQadJm d8sg0BlIOn0+j4WvOl3PbkNRh3m7s+trbuDYq+57jU5yIGqOZOQoIqCt/TANBGYYYtws P/9Dci9BnfV2XSbbga6Rg+fPSfLwk2DVpyg12XwPYo3ZjiC6ExCV/L45PGTExHfOyVOd O/pvHxQHlJGsDdHr/J4dN6+IxP1R336EUhz9S1mhL9lsoxKfr2XHcgY06QnPTpHeG+4w FWoPbUgMnFMlDuEzlTHpLTClYsdd1avawG9s4SqJarTJWyggKr+Ge4mO9dRT9PT+r8EK ko0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=HXA7oIWfS+33v8FbOCL8McWJOfQAO5SMI2ysnl4pBbk=; fh=VehHF75ibtIiOcMFupA+RvAd8F/HWiWMZFlcjyRnn54=; b=Zbm05CVgekEBEHGJR8GU9PgVP3xYxAZjRtXJXRaYQjDi8MrftJXgyzAo8gxF5SoE/6 2009XaNlSVMN3dGOtgseinOl+7UiS4SlCkjg0Cw8Q709zTcnrVYwvvZ0FrhrqmRBsjN2 uBBoXdf9Ttg749DRLN/YopNMBb8Pq3bj742htNQzJ1I+tUGv1HvkoX4cNuT5KxG+uqhk tath1wnqAZ1zEV220PCXJKUg2XNz0QxPhPRmFM+iaQKv7GoL/BWWUWt+Eod1VsajaGiM /g3s9o1ISeADmFRs9rjvXjaPN1B2uBSf4G4Uw2FQnmHKzHdArdFSRi5F9Nl0aggUGlEC zmuw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=cmq8MnnI; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ee4a493ca1si729871fa.209.2024.06.26.17.57.51; Wed, 26 Jun 2024 17:57:51 -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=@gmail.com header.s=20230601 header.b=cmq8MnnI; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 544F968D6F4; Thu, 27 Jun 2024 03:41:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9470E68D67F for ; Thu, 27 Jun 2024 03:41:34 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-52cdf4bc083so7546729e87.2 for ; Wed, 26 Jun 2024 17:41:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719448893; x=1720053693; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QIyF6ATce3faPcbqVSIwM4umk4JfKD+1t3N35ARpoa8=; b=cmq8MnnIvsfrC3ciThLiP7B9mzO81+0Z5FTlFTXDrJK0WhfSqdUi2OfTMJb3Cs+GYh ZgcP7wn7ONRvE/bDhIuBvp6kuMon9zg/vEPHbMo8la+LpPFFLCxXTm9mf/eeJqMEnTQq D/LIoV/7sCx3vg570nlT8p0iJPYMuZvk7uTsrzyC0LkUKJBwNqc0MX+XyX21NkCvCY+W L63Xrjlu2jlz+NhjO7fCJCqnd6ZC29PTJO/Cpqz08baMlNA6G/z+rzQWFrh62nnyU00U NaEVFa+nHynIuhUwDovZ84fLwPcfrvQurE282GCdSRYknCbhpIyDstzVeG/FJ1L8cEaX 1MFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719448893; x=1720053693; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QIyF6ATce3faPcbqVSIwM4umk4JfKD+1t3N35ARpoa8=; b=ct71CSBM+QzFQPXLH167jd/7xVmF4zqt1V6HtMmb6+BQLUNEfdJli3e2VQKZ5+qbSf lYT1vsZ8eT9Gl/2mnCxwATn6dEX+nA0JAurIcTr7IvAhGywQUMOZyL2P4q7RlLP+ScGW wfkRv4uNaGlYiPmuJyO9jvjFen3V9XT7L29u3M794jCSZLj5QEs2iPwTVB11mTTBt1KI 96olNGuKPix4BQeVzdO0AQedDx2klKUfD6nkjHcE8r/Zdlikm0Uy8VbrgJ42DJPl9HpU ued4J5jGamBhSZ48rb8j7M9RFsrXldHnXSTRTFNUaotmJ2nzV/yEEcNMVf2LB1ihM1Ut AeaA== X-Gm-Message-State: AOJu0YxcednPFpiT8YlgxkSlUFzsyuSUh7wLH7YzPxUSuV+EiwaiRbXq 5Zgj+Dvb/zLuUvcn6K0nrVrKyzfEFaXv725x1ZSSK7Aahm3QMoMQABFboA== X-Received: by 2002:a19:f004:0:b0:52c:1298:7304 with SMTP id 2adb3069b0e04-52ce061b107mr8247036e87.26.1719448893393; Wed, 26 Jun 2024 17:41:33 -0700 (PDT) Received: from localhost.localdomain (89-74-12-251.dynamic.chello.pl. [89.74.12.251]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52e71313206sm18547e87.188.2024.06.26.17.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jun 2024 17:41:33 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jun 2024 02:40:36 +0200 Message-ID: <20240627004037.1336-3-kasper93@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240627004037.1336-1-kasper93@gmail.com> References: <20240627004037.1336-1-kasper93@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/img2dec: ensure input padding is zeroed 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: =?utf-8?q?Kacper_Michaj=C5=82ow?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SI6pb+Ua4k3y Fixes use of uninitialized value, reported by MSAN. Specifically in jpegxl parser. Found by OSS-Fuzz. Signed-off-by: Kacper Michajłow --- libavformat/img2dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index ba52353074..c667d8574c 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -549,6 +549,8 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) } } + memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + if (ret[0] <= 0 || ret[1] < 0 || ret[2] < 0) { if (ret[0] < 0) { res = ret[0];