From patchwork Sun Mar 20 23:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1218690nkc; Sun, 20 Mar 2022 16:31:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYPvNOWGscgCJEv56tSkMfqeNPtkGhZ9+PED6e4YU2hDrWIihg+Cw9G5OKjiaA5p+w7t+M X-Received: by 2002:a17:906:c344:b0:6b4:c768:4a9a with SMTP id ci4-20020a170906c34400b006b4c7684a9amr18597791ejb.151.1647819088559; Sun, 20 Mar 2022 16:31:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819088; cv=none; d=google.com; s=arc-20160816; b=RuVDwmrVpO6gCFfgjRVnd0KRVkqGBlhPCXQ04kbxfQTnh/BgzBr8eSb2bn20dbQujs 6FiuahyRRymMvFTTFMyhvYTOXNIW4rHj2iBGc6gd7T9J8/N63Vf9IMIFAgDJtp69BpLb KnP3pAggEnonPD8MSOsPFCKSUlXlVfJAnLMyCU5DRhsMRBJ+G8sjVmClgLSjziMcOV3w 2o4QE657Bqzyj4pR1g8ZyUoz/BdaTQX1OVdv/FsY+HSEXK8HoTXmkWV5ruhq6RNyd0BX LIsT996K8TaYnBWJkNsOndOZzMHn0eXA7mU9VtJ7ZYpMf6z9IbnQBOMvjs02EWFMo7AC PF+g== 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:message-id:date:to:from:delivered-to; bh=+0vRS7/3BH5TvnGNkyXdU94sh+SpN1DTVkbncxQVbgQ=; b=hEh52RM1dbqi7qHVqQ+xwcYs3sb0x0P+Xr10i4hewbZi/BZyoAPp5RaDXgu0QE4o0L wTmhraojdjzFqN9Sl+id2Qcu81A8VWm5xxKb9XB4po2/KEjDMXYVIMWIVdFk2AvoXE9i yrDz0qxFxkppGPSnBL9DqXFbOkpOaGAPZvkDrwbbU3QXi2rbnmNcNx885w+cLL/CVjzt cLI+6fIqLYmtZo5w/cd5+ajxKLD3QnhYhyG5vnM3x9cTGzPkdRg6uYMhYxx/adrtyOmT NzshbmxRoqYCZHZuEF+KSqH1jrdBNP+I/pXuh2GTjBIV6S7PrmXa4ptFxTPA/uvk2y9R flPg== 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 b18-20020a50ccd2000000b00418c2b5bf94si8313119edj.630.2022.03.20.16.31.28; Sun, 20 Mar 2022 16:31:28 -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 3BF9F68B193; Mon, 21 Mar 2022 01:31:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FEAE68B11B for ; Mon, 21 Mar 2022 01:31:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW50x-00091V-DB for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:31:11 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W50xnGLiDSgGFW50xnIvZ0; Mon, 21 Mar 2022 00:31:11 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50inPQX4OPqFW50inIvAr; Mon, 21 Mar 2022 00:30:56 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=5lYka-Aup5kaivsopTAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:52 +0100 Message-Id: <20220320233056.18169-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfFmN5NFcFlNOVI/iafCepqzTo732y/7H578Iy7ouBAg35DOGU9O3DCW36lvEZE+V/Wx3/PUeGe9AvSeOAT1/RstlNmO4GqyY1PfhWeOpv6N1YejkAlDF rWbwET7B3775nMC3WH8oA5SCT9GEQ9mNJDUk0MbwGMyBUDzf+cgx9+31JMjNuJHnpQ4TMLVqFHuVQA== Subject: [FFmpeg-devel] [PATCH 1/5] avformat/hls: Check target_duration 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: rxEis/7E695p Fixes: signed integer overflow: 77777777777777 * 1000000 cannot be represented in type 'long long' Fixes: 45545/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-6438101247983616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/hls.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index cf6ef9dfb6..a58c558ffe 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -819,10 +819,16 @@ static int parse_playlist(HLSContext *c, const char *url, &info); new_rendition(c, &info, url); } else if (av_strstart(line, "#EXT-X-TARGETDURATION:", &ptr)) { + int64_t t; ret = ensure_playlist(c, &pls, url); if (ret < 0) goto fail; - pls->target_duration = strtoll(ptr, NULL, 10) * AV_TIME_BASE; + t = strtoll(ptr, NULL, 10); + if (t < 0 || t >= INT64_MAX / AV_TIME_BASE) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + pls->target_duration = t * AV_TIME_BASE; } else if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) { uint64_t seq_no; ret = ensure_playlist(c, &pls, url); From patchwork Sun Mar 20 23:30:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1218614nkc; Sun, 20 Mar 2022 16:31:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyofAv1GYFjVimOpMWWeGzclONgxcQNks8Oa8zsPe3ftTfGFzprav+UlNRF14NALQ4R5EYO X-Received: by 2002:a17:906:3acd:b0:6df:f6da:fbbb with SMTP id z13-20020a1709063acd00b006dff6dafbbbmr4785637ejd.189.1647819081013; Sun, 20 Mar 2022 16:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819081; cv=none; d=google.com; s=arc-20160816; b=0PBa50R8iTOotWAX6dkAo77+lxsLbd/I5tsdunsczkJJBa072WKc4VoBPhmNK+qzBi WYerTXh/NZA8uG7Ck4umhlc4DlUvNoN/umAmDx9jV/tTtvpz9aouhTDFHe1HvUTQ1m0B fj+3LLZ9YIgRCcVRe2inmi9txsBLvguM6/RNX0WMpN5pFOOSs1kvVdv3axJd4hJ1KWNy h4PpBHP530UtBPBMWbwa1WKDilRoxGGP2wMc1a+706HOq/hT6OuhBnj3yKanBMzKF9Ty BdDQQfOG7uuxFq35+7CiySYe8c9l0zPThu/28FvB6mHhgdpp1G9iLXuZ3ikBaf5bDqSZ 99Mw== 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=QVty06hPgM3RQbTuJpw4WEInD73o8D/zWiUrsDxzx34=; b=pWgGdVTVoqMaSAsA5O3+TUkm9e72jrBeRdxDqHMgIv+MXbvqkFKyQp0FA06qeE8PUV VVbgN8lmYsnc9+ZDo7R332iipkFS022iJJtA4VJ0MlZ8BLQ4FW/Pxv8vwfxw+iva0oHx pradCbBXRve4yD1kdvrMvVta51CXHc7TD4Ku3KgtVgWpC3USmJ21fWpcTX8JkXilWgyD 01vOMU6kYv/ddsrKgdkyVKn7/FHu75GOaZSJIpm4dqqMb91Vc1PXKLfr9pIw/Y2Rlsm8 VZCIFJFKjXdGCt2P3oxUeer5VmzA2PnU43NcO5ZVtOAW0zy/gJjiBaNUez04OwtTcpuG AzOg== 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 i3-20020a50d743000000b00418c2b5be9bsi9571837edj.381.2022.03.20.16.31.20; Sun, 20 Mar 2022 16:31:21 -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 4AC8768B18A; Mon, 21 Mar 2022 01:31:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DD3468B0F6 for ; Mon, 21 Mar 2022 01:31:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW50x-00097N-DE for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:31:11 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W4wrnGGxXSgGFW50xnIvYz; Mon, 21 Mar 2022 00:31:11 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50inPQXLOPqFW50inIvAx; Mon, 21 Mar 2022 00:30:56 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=lNa9Xz6_rgQ0qIf7voQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:53 +0100 Message-Id: <20220320233056.18169-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfFmN5NFcFlNOVI/iafCepqzTo732y/7H578Iy7ouBAg35DOGU9O3DCW36lvEZE+V/Wx3/PUeGe9AvSeOAT1/RstlNmO4GqyY1PfhWeOpv6N1YejkAlDF rWbwET7B3775nMC3WH8oA5SCT9GEQ9mNJDUk0MbwGMyBUDzf+cgx9+31JMjNuJHnpQ4TMLVqFHuVQA== Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/mlpdec: Use 64bit for channel layout 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: 5PvB1ZAbF/JN Fixes: shift exponent 33 is too large for 32-bit type 'int' Fixes: 45645/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-5651350182035456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index c51e0fbed7..2f5de9254a 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -207,7 +207,7 @@ static enum AVChannel thd_channel_layout_extract_channel(uint64_t channel_layout return AV_CHAN_NONE; for (i = 0; i < FF_ARRAY_ELEMS(thd_channel_order); i++) - if (channel_layout & (1 << thd_channel_order[i]) && !index--) + if (channel_layout & (1LL << thd_channel_order[i]) && !index--) return thd_channel_order[i]; return AV_CHAN_NONE; } From patchwork Sun Mar 20 23:30:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34873 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1218737nkc; Sun, 20 Mar 2022 16:31:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqPy82eX+qo3Wn41ocBLUAOy7+X25z8VmX8hTU/ZlAcVTDCqGlGOUYxkts077mPS7TIJjg X-Received: by 2002:a17:907:8c87:b0:6df:fc27:c82c with SMTP id td7-20020a1709078c8700b006dffc27c82cmr3769947ejc.378.1647819097124; Sun, 20 Mar 2022 16:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819097; cv=none; d=google.com; s=arc-20160816; b=v6v+DzQa890JwzxhS2dBpH3Ych+/M4OBUev3C8xUmMrNwxcl4AlynHYd8sSh7tDQ0I XsZ52A8B5k9Z+Yj7N+JuSUgOcMP8psAPfAIEfTx0WcrL2YftQS2AaJrhtlvj/Orql1QX Olf/ytOLVx5a3VAShBUQOcVGUG9NCuM1Bmhy6avfTnDXvQVENrY6wSKyrtDcuZXjmXdd tQRfeJSDbgZPYzibTK2o4VskTeuXIiRMYWcX9+GAsuPoEdvfwdUooiJXRbHk3VMg14YA 7NsVrFqMj9pp3eBNbP5t2roZEWbrqhEK0Cz7puMcohwPxhtQxoVsNdvdchXojdgJ8TwF DFVw== 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=m+gA9azDDkUsdVb4WFYAjZhxY5XYLYO6Fxm68uoJ2F8=; b=RSXsmltoC8x4ZAG7q6jfEofgZ2cD6gJ28bKfir7a93d0BUo+A2YV/GnkPkTayXoiX6 hGssPEoAcN5SGfaBL9+uD2cknsCISev/5nlptaFpdQPtYXfFt0y47dRqjV/56bsKG0yX WBiVVB2WFp7AYbOBLddZepIarK5jAN/Oc+dAYIGvfzVrtpOUI0Hc00Qba5V5zfz8sDV7 wN+gguqLKEgTSSw8cg1eA4jDg2VlVmO3tIXG9RP76WSXlFUezZ4nRIh5jRDFUnpcTTP4 vIKWzPK0BkJYX7J7j6535OEonKp+qZD0Nu/s/fXl2mgh+CbtB3885FgJj27xBsKecRoF pgkg== 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 i23-20020a508717000000b0041900b5abe6si7900959edb.472.2022.03.20.16.31.36; Sun, 20 Mar 2022 16:31:37 -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 4434368B195; Mon, 21 Mar 2022 01:31:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6EE0168B0F6 for ; Mon, 21 Mar 2022 01:31:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW50y-00FjuP-17 for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:31:12 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W50xnGLiDSgGFW50ynIvZ9; Mon, 21 Mar 2022 00:31:12 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50inPQXROPqFW50inIvAy; Mon, 21 Mar 2022 00:30:57 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93f a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=Wn7x23jaqpC7BXwcrosA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:54 +0100 Message-Id: <20220320233056.18169-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDQdwTMeYboiCfH13ug4Is+sldLtNyLIZqT1hmg90JuhHN8qokINYH4JUWlgdlPzXhcF8bb5sjVBOGkuH6DUhsaowLQOXT819IgUGnsGGPU8SfX7PuRd T+VNddJEB4jug5cxVQCwj0F5B8pBVIJRtJaSA7USfqzvOOtyb06Ahfq8o2HKJRm34Cu9gKwqmEsQ8g== Subject: [FFmpeg-devel] [PATCH 3/5] avformat/asfdec_f: Check packet_frag_timestamp 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: vOPuplwP4oVs Fixes: signed integer overflow: -9223372036854775808 - 4607 cannot be represented in type 'long' Fixes: 45685/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5280102802391040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_f.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index a8f36ed286..b45118e5d1 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -1216,10 +1216,12 @@ static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) if ((ret = av_new_packet(&asf_st->pkt, asf_st->packet_obj_size)) < 0) return ret; asf_st->seq = asf->packet_seq; - if (asf->ts_is_pts) { - asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll; - } else - asf_st->pkt.dts = asf->packet_frag_timestamp - asf->hdr.preroll; + if (asf->packet_frag_timestamp != AV_NOPTS_VALUE) { + if (asf->ts_is_pts) { + asf_st->pkt.pts = asf->packet_frag_timestamp - asf->hdr.preroll; + } else + asf_st->pkt.dts = asf->packet_frag_timestamp - asf->hdr.preroll; + } asf_st->pkt.stream_index = asf->stream_index; asf_st->pkt.pos = asf_st->packet_pos = asf->packet_pos; asf_st->pkt_clean = 0; From patchwork Sun Mar 20 23:30:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34874 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1219082nkc; Sun, 20 Mar 2022 16:32:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0WnHmfGXSiFRv8fA3xBJZ10FHu9WUGtqFHMwxnsdlI2oNbdRYgIYkkc0aE8P9Clc1UEc1 X-Received: by 2002:a17:906:2695:b0:6ce:f9c:b476 with SMTP id t21-20020a170906269500b006ce0f9cb476mr18531271ejc.235.1647819136729; Sun, 20 Mar 2022 16:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819136; cv=none; d=google.com; s=arc-20160816; b=dgf4LqkdxnVQcrsjYonmQ/HBmshafNGrlVc49cKgIz1WfFtdQi5fEfTRG1eHNa/KqI g2lHgz/EJVmxsqIgTWFoFLqUdmR7s3bcaxT5NrC6T21gjAStSXSQI+uZXLma7uQIy9ef s7Zew5m4nR8UWtjeq/oYdIXlcPzQx50PqX9EoidV36OzPrmLHaVSbt3OJZYPsIyNrUqU 863TPFWOFgjEQJOfiNYkk7pEuPpDyAi4VOHvLvt9XGlJf+74XcjWzxCmzZZ5widTXzoD G7E/914/q7QcvfebLrYL3omLR1fcYAynzLngzVNKMv7UfaQuPRHQ5iSrNYjelBLQjs9N P/8Q== 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=y0XasZNmUP+95WaEBYbhcla2GkvHypy/LWTg/zZa8Vo=; b=bLl5DOw75uqgkOSqJLCGEYckWVdmvehUEslseh/K6gyo6yTlmMxO8wPHY1ic1aRi22 1PGQgveaPmKdpMa1O/ZL4ykPG/HJkqMaUJUem1m7mf/OfU6QjqOLV6jFSFL64NrbIYf9 PhTnOvdXgA3HV9EoZTCJKQVrkzK1d99ZDcDfnqX+gcFXx7xl2i3U/NVzO8WIR7IVd9qg iw162jOcbV9nBbsAYw2RfOFE5YdjJr6ILXvT0eLoqIG3e+YKQdy2E1tSZKg/A5j0S1U6 SDjkvIxRouBLdIjuF5YflQfg9dq7DTrSSiKcXpdrYu7LjwS04RQw4GoDKp4iC3n9fNPb d2bw== 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 q5-20020a50cc85000000b00418c2b5bf2esi8964660edi.528.2022.03.20.16.32.16; Sun, 20 Mar 2022 16:32:16 -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 59E6368B180; Mon, 21 Mar 2022 01:32:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC90C68B14F for ; Mon, 21 Mar 2022 01:32:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW51w-00FjuP-0L for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:32:12 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W4wrnGGxXSgGFW50ynIvZ8; Mon, 21 Mar 2022 00:31:12 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50jnPQXUOPqFW50jnIvAz; Mon, 21 Mar 2022 00:30:57 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93f a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=IUFDKc1Ko4O-RTg0YHEA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:55 +0100 Message-Id: <20220320233056.18169-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfDQdwTMeYboiCfH13ug4Is+sldLtNyLIZqT1hmg90JuhHN8qokINYH4JUWlgdlPzXhcF8bb5sjVBOGkuH6DUhsaowLQOXT819IgUGnsGGPU8SfX7PuRd T+VNddJEB4jug5cxVQCwj0F5B8pBVIJRtJaSA7USfqzvOOtyb06Ahfq8o2HKJRm34Cu9gKwqmEsQ8g== Subject: [FFmpeg-devel] [PATCH 4/5] avformat/bfi: Check offsets better 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: Lv4qriCJAFxI Fixes: signed integer overflow: -2145378272 - 538976288 cannot be represented in type 'int' Fixes: 45690/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5015496544616448 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/bfi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/bfi.c b/libavformat/bfi.c index a42b78b8c0..dcbe21dcae 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -139,12 +139,12 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt) audio_offset = avio_rl32(pb); avio_rl32(pb); video_offset = avio_rl32(pb); - audio_size = video_offset - audio_offset; - bfi->video_size = chunk_size - video_offset; - if (audio_size < 0 || bfi->video_size < 0) { + if (audio_offset < 0 || video_offset < audio_offset || chunk_size < video_offset) { av_log(s, AV_LOG_ERROR, "Invalid audio/video offsets or chunk size\n"); return AVERROR_INVALIDDATA; } + audio_size = video_offset - audio_offset; + bfi->video_size = chunk_size - video_offset; //Tossing an audio packet at the audio decoder. ret = av_get_packet(pb, pkt, audio_size); From patchwork Sun Mar 20 23:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34875 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1219175nkc; Sun, 20 Mar 2022 16:32:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuVMvTy1no25vQfFr2FcSu85fmG7DQoRlkH3wapNj52bOxwXzWUw3Vj8Gv8c6px0RTaVMJ X-Received: by 2002:a17:906:9b89:b0:6da:ac6b:e785 with SMTP id dd9-20020a1709069b8900b006daac6be785mr18611667ejc.295.1647819143957; Sun, 20 Mar 2022 16:32:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819143; cv=none; d=google.com; s=arc-20160816; b=kVh0nrkZHfkUkTSQ/6AMphqC6/1h2Q3dgePxR9yejCW+415V3c3ULuTgZUp+t6dGtl 7CVmZ84uXSYUjZSKFjHGtiy2aIXwThrWOkSC98m+7q1BpakCUfUeBklghz4P2k/4H9Pj np3Mdg78HXKRSmjhXdjIbwg48RN4mW9bv8af/M3s3hZxRn3hNvUz6mJvuvEhDee4anpv tiK9vsOk039YOeuRX8XiFbX6GooGxJBNbY0twZNWFhvaiDWmRxgwf3sucER0I3RcsXdP 5C3ONYDvtjZZ6Vg5DNr9DFGBsCIbhzG1IN51mrcU29kWbXgjrMNnnTEaWDvtLPP1tKAK w6Ng== 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=DJJ8NbPnyOwDgvM9pjhzA8+FviBqfEXXXUnp0mtMl5Q=; b=LgKcIYp3LsOGLAjfPd+CLibYq6O9uDtt1wIl2Q/Udm7bYDbnsofdRC96S23Ivir225 J55dr/D1p8JCa9v3aJ55WP9NlfycrAnHI5DWmEj03I5n9XTH82CaAX/3nyfrbOYK1a7W rR9hGsAM5Kku6zKLmuvStTi+FEfCzzVxOQVMXpxoqdFKVCCkgc1BrcY+UDbZftjCxNbC jQyPviBxvESZFdJY0qn0Njo4IhLfslvVVfxrs5qgmJNkygGpyn1GgclC4Rlo0p7kbvCf 9T/Q4QbtLnuIsWrz5bZxb8boDX0JKdneJK2y1dmT4Jo2Am/HUNXQvLO0NxZYBx5ROMvh W30w== 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 hr39-20020a1709073fa700b006df76385d16si6380634ejc.438.2022.03.20.16.32.23; Sun, 20 Mar 2022 16:32:23 -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 6251A68B1AE; Mon, 21 Mar 2022 01:32:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD29768B180 for ; Mon, 21 Mar 2022 01:32:12 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nW51w-00FjuP-AS for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:32:12 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W50jnGLSSSgGFW51wnIvbw; Mon, 21 Mar 2022 00:32:12 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id W50jncmy08eSWW50jnwqUz; Mon, 21 Mar 2022 00:30:57 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6237b940 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=rdUlEgyfh3Q47DYJCNIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:56 +0100 Message-Id: <20220320233056.18169-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMVjhG9FiuDD+u/Oue7wdoGVIXWWbT9krJbVvbKzZSyz4hBJxwFqibMVHQj6phZMpjD1FXwg4d5etkUSNrB0KXaWQfIyBM3mYUjiOLUfVI3g4xrMp358 Pl2526W4mJdhEAaCnQHvBxu6MOicUz/AgZ0M/0uI0xv0dKBjhcRvuI/aWqmRe8vZTxzvvhob5ViYfg== Subject: [FFmpeg-devel] [PATCH 5/5] avformat/aviobuf: Check buf_size in ffio_ensure_seekback() 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: 9wyqLqgzRWb7 buffer_size is an int Fixes: signed integer overflow: 9223372036854775754 + 32767 cannot be represented in type 'long' Fixes: 45691/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5263458831040512 Signed-off-by: Michael Niedermayer --- libavformat/aviobuf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 29d4bd7510..33bc3c2e20 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1062,6 +1062,9 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size) if (buf_size <= s->buf_end - s->buf_ptr) return 0; + if (buf_size > INT_MAX - max_buffer_size) + return AVERROR(EINVAL); + buf_size += max_buffer_size - 1; if (buf_size + s->buf_ptr - s->buffer <= s->buffer_size || s->seekable || !s->read_packet)