From patchwork Sun May 26 23:52:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49279 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2958684vqf; Sun, 26 May 2024 16:53:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXfAUpPjK/8CB42Jezq+M15oJvuACl9GiLdEuvaGdCVSxV6t38Z2/57cTk2/6s6Phlgti4V+9bEci7V0Jvqgkcn/Y81Rit+Id7v3A== X-Google-Smtp-Source: AGHT+IGanMCE+301gNiqEnysob3+JDYI9lwi748yQZ2GfhBWTEGYZ/VgWLN6uA1sSfyJeJsMhmCf X-Received: by 2002:a2e:90d9:0:b0:2df:c2b:8c84 with SMTP id 38308e7fff4ca-2e95b09452fmr48344061fa.1.1716767602960; Sun, 26 May 2024 16:53:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716767602; cv=none; d=google.com; s=arc-20160816; b=dA+XqWvPRZ27ECUWHAaEtV5wurzXIMkioCA30PCb4MlP3pzbvMvrSCkY2dVPrq4G+d XBFnxoICrw9iXp/Cw2809ZYDaGAQaaZcnjwnPBmzT4bmcX8YCqjeVCe3uRNMluXWiMUX R7/N/BYjX8FSkQjr/nyVwTJXyVDOdGuHKs3xNCzcsW5lV0HaotJy4YHD3ihwFhsAbaDn loAZJRnKUN49eM6J55IR5nQsV+MLDggIyJ1+4tXGH41OOmLBfWTz/t8QLcyHbq8nPYQd 0JuefUO/PWSfwMCNqwbiQoayZ8unfOL9nQoYc6Ew/U8HRQPV/bN2fnqc3GioVLkqWup7 oEfQ== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=jb0eSeNa7Al528JQksfjahdpt84/ozkN/jDF1aUWvQE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=DopcR/p/QrVRbylh4ZUJNe3vUG2Zf3qIkNlaWMZ5AxeYJ8uW5ir83jvuI0zgFjuXfd ve/ZBA5N/DDstKJSjdZTUwy5yyqyCM0X0Mzuk+t++XK5g7csfquIxvVoLgIm7Lwpp4Sf u6oY4WqnwLEJrpjGiYjgV5gflZbD0DZdFGwKJx4Ed8CNkCVbuDxYpaWJBMKsXbahACeg 3e8rdGk6Eagf+XMKqioigZN/mwq/LcuNzRqZ4O34klXn71Jn4PwVrCQhyiXmJBU6mp/5 Ymo6OUwe2iRHIy58xM/7HBkfH7mLNBUrEGUTccDv1F8uDwXpj3hnakUAeUgKhAU9x4n0 RGAw==; 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=eHPknPiw; 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 38308e7fff4ca-2e95bccc345si18799171fa.42.2024.05.26.16.53.22; Sun, 26 May 2024 16:53:22 -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=eHPknPiw; 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 CAD0968D56D; Mon, 27 May 2024 02:52:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAB6C68D4F6 for ; Mon, 27 May 2024 02:52:35 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2EB04240004 for ; Sun, 26 May 2024 23:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716767555; 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=HGqEOMTsFMUAPHUj6eChjqMt2x36GtH4JJ9IAgKgg1A=; b=eHPknPiwjSuNHWFnFH5EnuGQbHkqUfUO3CbyVYZ/eZqepm/NPhHbcjiJxygfkB+kKS9U/P SW/yzmAs6CMQR0kEVBcQ5lJr3ckE4N3KJg9RZgjFjkvYMljUFcXLwBiOWEL2neG99d0AKG lUikzcXwjG+bqY6UjEru4FBc82e5cJ3vaGUNowTDPpnbVKJYa7gc/SuciDtQxWl8PRnLk5 9h1f0KSYgyBVNb9sl697yOjV+Cx6JohxEv/y8yxcJVCg0cXoCwJh9p8y6AM3/5vHkclUai B7inMWLm/pbz2+WL+uSJAtsE1rXxby/I9XBnx+N+AnwSslU0MB3DuYEFDDyMjg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 May 2024 01:52:17 +0200 Message-ID: <20240526235230.2876318-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240526235230.2876318-1-michael@niedermayer.cc> References: <20240526235230.2876318-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 05/17] avcodec/dxva2_*: Initialize dxva_data_ptr 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: yvZaRIPWNIYO Fixes: CID1591888 Uninitialized scalar variable Fixes: CID1591925 Uninitialized pointer read Fixes: CID1591933 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/dxva2_av1.c | 4 ++-- libavcodec/dxva2_hevc.c | 5 ++++- libavcodec/dxva2_mpeg2.c | 5 ++++- libavcodec/dxva2_vc1.c | 5 ++++- libavcodec/dxva2_vp9.c | 4 ++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/libavcodec/dxva2_av1.c b/libavcodec/dxva2_av1.c index 1b555106599..ea97fcb87e5 100644 --- a/libavcodec/dxva2_av1.c +++ b/libavcodec/dxva2_av1.c @@ -354,7 +354,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const AV1DecContext *h = avctx->priv_data; AVDXVAContext *ctx = DXVA_CONTEXT(avctx); struct av1_dxva2_picture_context *ctx_pic = h->cur_frame.hwaccel_picture_private; - void *dxva_data_ptr; + void *dxva_data_ptr = NULL; uint8_t *dxva_data; unsigned dxva_size; unsigned padding; @@ -382,7 +382,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, dxva_data = dxva_data_ptr; - if (ctx_pic->bitstream_size > dxva_size) { + if (!dxva_data || ctx_pic->bitstream_size > dxva_size) { av_log(avctx, AV_LOG_ERROR, "Bitstream size exceeds hardware buffer"); return -1; } diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c index 31d74a7164d..5eb166c3075 100644 --- a/libavcodec/dxva2_hevc.c +++ b/libavcodec/dxva2_hevc.c @@ -248,7 +248,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const HEVCFrame *current_picture = h->ref; struct hevc_dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; DXVA_Slice_HEVC_Short *slice = NULL; - void *dxva_data_ptr; + void *dxva_data_ptr = NULL; uint8_t *dxva_data, *current, *end; unsigned dxva_size; void *slice_data; @@ -278,6 +278,9 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, } #endif + if (!dxva_data_ptr) + return -1; + dxva_data = dxva_data_ptr; current = dxva_data; end = dxva_data + dxva_size; diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index d31a8bb8724..5de062e5308 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -160,7 +160,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, s->current_picture_ptr->hwaccel_picture_private; const int is_field = s->picture_structure != PICT_FRAME; const unsigned mb_count = s->mb_width * (s->mb_height >> is_field); - void *dxva_data_ptr; + void *dxva_data_ptr = NULL; uint8_t *dxva_data, *current, *end; unsigned dxva_size; unsigned i; @@ -186,6 +186,9 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, } #endif + if (!dxva_data_ptr) + return -1; + dxva_data = dxva_data_ptr; current = dxva_data; end = dxva_data + dxva_size; diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index f7513b2b153..04f26ddff66 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -197,7 +197,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const unsigned start_code_size = avctx->codec_id == AV_CODEC_ID_VC1 ? sizeof(start_code) : 0; const unsigned mb_count = s->mb_width * (s->mb_height >> v->field_mode); DXVA_SliceInfo *slice = NULL; - void *dxva_data_ptr; + void *dxva_data_ptr = NULL; uint8_t *dxva_data, *current, *end; unsigned dxva_size; unsigned padding; @@ -224,6 +224,9 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, } #endif + if (!dxva_data_ptr) + return -1; + dxva_data = dxva_data_ptr; current = dxva_data; end = dxva_data + dxva_size; diff --git a/libavcodec/dxva2_vp9.c b/libavcodec/dxva2_vp9.c index ca8b3b136da..f4ab91c580b 100644 --- a/libavcodec/dxva2_vp9.c +++ b/libavcodec/dxva2_vp9.c @@ -172,7 +172,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const VP9SharedContext *h = avctx->priv_data; AVDXVAContext *ctx = DXVA_CONTEXT(avctx); struct vp9_dxva2_picture_context *ctx_pic = h->frames[CUR_FRAME].hwaccel_picture_private; - void *dxva_data_ptr; + void *dxva_data_ptr = NULL; uint8_t *dxva_data; unsigned dxva_size; unsigned padding; @@ -200,7 +200,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, dxva_data = dxva_data_ptr; - if (ctx_pic->slice.SliceBytesInBuffer > dxva_size) { + if (!dxva_data || ctx_pic->slice.SliceBytesInBuffer > dxva_size) { av_log(avctx, AV_LOG_ERROR, "Failed to build bitstream"); return -1; }