From patchwork Sat Sep 30 22:30:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44070 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp599091pzf; Sat, 30 Sep 2023 15:32:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHT7ix78Wrn42lNBM9HTc/tE+1xKOSYcHBsFNxmw+HG7L6LZ+a4dhBM0P9PhhTeOeVjkJZp X-Received: by 2002:a17:907:7712:b0:9a5:7759:19c0 with SMTP id kw18-20020a170907771200b009a5775919c0mr7057183ejc.64.1696113134136; Sat, 30 Sep 2023 15:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696113134; cv=none; d=google.com; s=arc-20160816; b=voW2cLmtT2rehFnPBcsq6N+Py4hpous0tGLUYloID3MpefpacjXmWtGIzDEEWoN/W2 kF94J5UXuwGJJ+eGX9M+ecZmbGUDaebWQXhTtsXwrUloNth5JErifnVXDeuLftD8jT5B 3t0g055c3vekOAEur0ZAzMJ/kl3b8dafJ/27N5oMvkAcSE1m9wr6KuhnaEYJwjt6/ODl 0XF0hIQqfV73GfGu9Yg+dvmWHWO2VTVKjdbqDn23SJ4TVk5oQFWfRSQyF/IEwT7Qze4v FWbLuACN+SrmrTnhhOUVp9XJHIgACtttq2+5yQ5TmPzTKYFieViUGfInlUQUwFfGDPHr bhow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=UZAMoU7Zy9q/0E8IOfMKjdMn8T3yduWtcrgKhcFCWaA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=itg1DtMdLwXzPgKJHHuKx60es/NAUgizdQ4cW2IETrGN3QGn2F1PZirvLhV80KhoLH FSZUW1IABG6WNy4Xgm0IyBD021HBLKCLZ9AlCAe5lXxvq3SbeKvFbTHSIXY5OkYjdTCu 2yUmXmWp6kIMAPAiXm+Z+WHRzOnJ+r6/hobYxH3sWZMdgEu9wXJOSQSS1AkGK8Lf4z95 /KYKrMFcF0L8KwZWaJ+s+7ObmOjwJm39uDVxsnfAbjQ041h/QPAG6yiEWBFVBHKvZjSi QXDt814u0LZDCp1kx8YUflFFn6CYBSUh9RS+TNcuWgVPe0gYOCpIYomFnPhAr7K3S2+0 V5kA== ARC-Authentication-Results: i=1; mx.google.com; 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 kf16-20020a17090776d000b009b2e3afd8aasi1216775ejc.605.2023.09.30.15.32.13; Sat, 30 Sep 2023 15:32:14 -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; 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 B95B868CD84; Sun, 1 Oct 2023 01:31:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B6A168CD5E for ; Sun, 1 Oct 2023 01:30:59 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id DCAA7C0007 for ; Sat, 30 Sep 2023 22:30:58 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 1 Oct 2023 00:30:44 +0200 Message-Id: <20230930223046.22896-13-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230930223046.22896-1-michael@niedermayer.cc> References: <20230930223046.22896-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 13/15] avformat/xwma: sanity check bits_per_coded_sample 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Yxbihy7jdHjd Fixes: signed integer overflow: 65312 * 524296 cannot be represented in type 'int' Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_XWMA_fuzzer-6595971445555200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/xwma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 12689f37fd7..b830f9ed75f 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -151,7 +151,7 @@ static int xwma_read_header(AVFormatContext *s) st->codecpar->ch_layout.nb_channels); return AVERROR_INVALIDDATA; } - if (!st->codecpar->bits_per_coded_sample) { + if (!st->codecpar->bits_per_coded_sample || st->codecpar->bits_per_coded_sample > 64) { av_log(s, AV_LOG_WARNING, "Invalid bits_per_coded_sample: %d\n", st->codecpar->bits_per_coded_sample); return AVERROR_INVALIDDATA;