From patchwork Fri Jun 2 15:30:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41959 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp1333136pzb; Fri, 2 Jun 2023 08:31:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6F3YBF+Pfo+vuIpeZogdx1f1g/zMZxk1z3t4sDYipn/IiqPWrENM/71Fay2UneR6TJJ8VA X-Received: by 2002:a2e:a405:0:b0:2b1:b4d3:60f2 with SMTP id p5-20020a2ea405000000b002b1b4d360f2mr246968ljn.25.1685719862257; Fri, 02 Jun 2023 08:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685719862; cv=none; d=google.com; s=arc-20160816; b=QAYdezE0IymImYeYvukl6hxOfVmYhX/3hhtGCSltOH7oEN2b1OhqtVkJJfpE614TDp ZgVLPlByuyeI83ruquEjGzjuNy1Z+xxhXwBxE7GRnXdBvN+LAAyKq4gISkegQYiTYBsJ xi1AedA8XQFVKb3IdXr55YLv5VTBdhdThC8HBZaU1e2K856iOSkIj9Wzoo2pdOcSTAT9 /Eu6S38xeNXFwbPkEIgb0GGLXYkDGD3fGAAAcbajy13c9ysGFTpu6FO6CeZjOB42bo7j L+k3LwWp8amGBNzcvr8supWwaB7fbq/nDox0aCTkQqZsCnfrv3BpwGNGife+ZGyRnsLX SlNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=ay110Vxytovr5WOVfk+ex561bXncnad4EqL8VFrA/eM=; b=m7K5rKFzQb56/Tp30czEyCuBq65eo/64ugDt8YTrR6083NLS/Z1sOWdbSc9fan+oi/ D0po3gVXbotiCNu33N+enSNkVjuY0CvLI4HCJkQ/989c5exD4fqGPXGDdn3xwP/hglvX 3crssUnee7daYIwZE+/BkbJufqNCoRFntsbidZlLwyU4OSZfhN1roOWGZBA+8yeDRZj4 DAs5ZkMzSwYtapjUoEzLkuCqCUhdcezpmfnPE8+n1EaEiulrityBw7MVqhxqDliH6hOw PGhockbURiipnyHOXxV08kjOMRtx4l+r4vyREHcJeRthuffY5oO3RjuBRzD2TtxfLbX3 tF/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=kXL8uGCF; 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 de30-20020a1709069bde00b0096b48d52ff4si1002892ejc.608.2023.06.02.08.30.59; Fri, 02 Jun 2023 08:31:02 -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=20221208 header.b=kXL8uGCF; 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 890C068C30D; Fri, 2 Jun 2023 18:30:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1ADD68C1D7 for ; Fri, 2 Jun 2023 18:30:49 +0300 (EEST) Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-1a27ffe9dcdso1815362fac.2 for ; Fri, 02 Jun 2023 08:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685719847; x=1688311847; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Entgvd3yQXyY7PAFSD1S8Qk3Abx3VgC96pTsuneo2/A=; b=kXL8uGCF+4adwo//1HAjbiNRLa66mlSOcBgGVS1T/BRAVNC7lAN8h8J1FtfcoTBYTw X1ncYNaHYTWnA6VpAthKnmSk2gCB9rJTDEOls5ZTu6S9HZ5rVA4OQAFlXzoXUty7IMmw xRtUgd/AuFwOjjngHc21iaYsFVAHCxlXguD5nFYKWrMNmoFRvbsOf4uec1BMHzZoFFRs JFtLLabAW5zPmU3nc39f7oL1NBvlYiQqH/JGg54ED6k6bjPEyCUpUEuKsjfoMRCFZ3hY JnlV8/JumJJtN6Buhzz+5tzoOIBWHHJXsSJyQ1+/B/Uw7/fIWLO56wmP37hLEt6Hkn7W +ehA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685719847; x=1688311847; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Entgvd3yQXyY7PAFSD1S8Qk3Abx3VgC96pTsuneo2/A=; b=iNWcGGTIjEYxAnFSk6Qdazc7uqsdgn2jv27K7sE/UMnAQvSpUXBgJuy/9FT8tRLNiI ebBTZJ/n4XI9+aQ/AyistIP+ZgmogPninTv63J8Wm+DBNkUloWzokSNVjNTunP+PlV7/ APKH0cU/1ewNW++aooQZ+qy0uko/m//TuVGbcEVwxe+s81G4BNAvlRZYdulpxe05mM18 Kr2c6sOLfExn77FIwYe1CGwgHDufnxPiI5uvFs1nyw3sz9PTMrsqPKJdMSqeCuaKC4ss LbDaP3cy+nmfuCjoxVEktJFi5ZR2CikKxehbjVsnj634o/HdVWWAoDlJlsK82LtvdJSi VCtQ== X-Gm-Message-State: AC+VfDy7KJY4ULn0O/iCWEaeZhpwNm60klKsK6VQzTz32n6ZWPk9hBqB mUJXbNuDYqrzECqXe7gwW9UikSjxUL0= X-Received: by 2002:a05:6870:172c:b0:19d:6f68:c3f with SMTP id h44-20020a056870172c00b0019d6f680c3fmr2306041oae.33.1685719847511; Fri, 02 Jun 2023 08:30:47 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id w2-20020a4aa442000000b00552465a754esm558458ool.44.2023.06.02.08.30.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 08:30:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2023 12:30:35 -0300 Message-Id: <20230602153035.1877-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs: reset the fragment on reading failure 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: 7i5GZc3VdFgb Fixes: NULL pointer dereference Fixes: 59359/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AV1_fuzzer-6726080594313216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: James Almer --- libavcodec/cbs.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 504197e06d..ba134c1db2 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -249,8 +249,10 @@ static int cbs_read_data(CodedBitstreamContext *ctx, if (buf) { frag->data_ref = av_buffer_ref(buf); - if (!frag->data_ref) - return AVERROR(ENOMEM); + if (!frag->data_ref) { + err = AVERROR(ENOMEM); + goto end; + } frag->data = (uint8_t *)data; frag->data_size = size; @@ -258,14 +260,20 @@ static int cbs_read_data(CodedBitstreamContext *ctx, } else { err = cbs_fill_fragment_data(frag, data, size); if (err < 0) - return err; + goto end; } err = ctx->codec->split_fragment(ctx, frag, header); if (err < 0) - return err; + goto end; - return cbs_read_fragment_content(ctx, frag); + err = cbs_read_fragment_content(ctx, frag); + +end: + if (err < 0) + ff_cbs_fragment_reset(frag); + + return err; } int ff_cbs_read_extradata(CodedBitstreamContext *ctx,