From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 8493F4D100
for <ffmpegdev@gitmailbox.com>; Wed, 19 Mar 2025 15:34:01 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 662BB687AE4;
Wed, 19 Mar 2025 17:33:58 +0200 (EET)
Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com
[209.85.221.47])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E74A9687A50
for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Mar 2025 17:33:52 +0200 (EET)
Received: by mail-wr1-f47.google.com with SMTP id
ffacd0b85a97d-390e3b3d3f4so4324382f8f.2
for <ffmpeg-devel@ffmpeg.org>; Wed, 19 Mar 2025 08:33:52 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742398432; x=1743003232; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=FrRUK+L/lXihyZLqb084L/adXalifWZZwfY9V1187H0=;
b=kFlAUZlHUzqjCVo6dZ7KvGo6cK+5qcPOIO2MtMQh8r2nr3oO0eqmg71XnA/QTXP108
6UdpU35cFbrh1VqEkvd2m4qmiNOrVqtt9A2rkP0KsM2Y3ZSa3Q2v6WSiDClsM/A3/Ija
whyaxSLpCnQIUb4apDWid3x3RhcNWKm+EoV/hTug9UgPBOYUNHMqZGr8LahbvUG/zO5f
0keZ39pKVnXJwbQgGM1Fxskqzx4vmm705NxJud27xAEBcls47W4olt02e9hmvNzxdKKY
RnlbV1oq7rCX+irWbabDUTmsW4MSSDuLlCZcsf5msyhXqk7kEbj2VRu9IDNd26xvBRZD
BYbQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742398432; x=1743003232;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=FrRUK+L/lXihyZLqb084L/adXalifWZZwfY9V1187H0=;
b=SHOyS4exg4TO0CsPD5JOpSSmKLCiQCNUQawZT2lJDemFlrO5hdPR18qz+FnAqpsFoN
PY6gd8Yrvrvlt2hjsPom+ts7tTGj8faMkD+dOv3zVb7Y4q0WrjuSTk09vD7AjIc8YNur
9Kzrw8sxCsGY+h3pjVk7ZPaDQ5fww/PDpsqW/wNMe951ofOO2xistmYMxcXroUUlPT5j
iDvf3GXLu4J5DqC0SldT4jszr+etQHO6C4JuJ+80reXHPieV/ciUGoXIInsXvJqdaR8N
ELH7tvFL6AEoVWcR/00ZzMX/r3nXr9GuwxM0keWl9doQft/gsxCrdUhYw+Pi68ZZs+sC
aJCw==
X-Gm-Message-State: AOJu0YxK2UOP0zsVDAlJLpYbFlQvjj6BTRReuq4h96DSQpJr/JE2x34p
O6iSZL6osObbtR3+IL4F0cqSiNaUF9O72GkMDlXcegTgcIaC4NQIVQq7dNo60IU=
X-Gm-Gg: ASbGncuelAtYhm63sRvnlZrcfV7PmMVPmUgB7ygcWLAn6p7N5/7mFLBBX65goyuzwzJ
suGSyzXhIIjW0v+/6k6n0SxC4v37DoaoIU4uLoLAKm9fcYakESPmwIqPX37uYlI8i96nVaCXrwJ
UxuydebikoaS65fNSSlycmJ3Y3IruMp3ROyUYUQ5p1sSBEvWVmfd1aZ1vFDaanmZ8pjxU9AR7f7
jh6as5kbpLWMC0RgGZZOmaPJnqLAy/MBc9NXK9l2IPfN10DE0R2Di+0SCNCjcwVAUFxl5kAg9u3
GQpMhYpxIVe6GhoWAkJrZt9ldCHL4vwLwIEjYshdAYXLBbp/hG8HHGBAxdgrwmgqiZTevQq3geq
JliW2IQ==
X-Google-Smtp-Source: AGHT+IFFWgjHlArhHR+FVUAnoETam+6yEMeC2KrvZoFfPPdTqXwsV9wu4t+poYUtLnhS2+yiYhiUrQ==
X-Received: by 2002:a5d:47c6:0:b0:391:481a:5e75 with SMTP id
ffacd0b85a97d-399739d79e0mr2869575f8f.22.1742398431658;
Wed, 19 Mar 2025 08:33:51 -0700 (PDT)
Received: from localhost.localdomain ([87.116.182.236])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-395c7df33aasm20933152f8f.2.2025.03.19.08.33.50
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 19 Mar 2025 08:33:51 -0700 (PDT)
From: Dmitrii Ovchinnikov <ovchinnikov.dmitrii@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 19 Mar 2025 16:33:36 +0100
Message-ID: <20250319153336.1268-1-ovchinnikov.dmitrii@gmail.com>
X-Mailer: git-send-email 2.47.1.windows.1
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH] libavutil/hwcontext_amf: add format
validation in transfer_data functions
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Dmitrii Ovchinnikov <ovchinnikov.dmitrii@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250319153336.1268-1-ovchinnikov.dmitrii@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavutil/hwcontext_amf.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavutil/hwcontext_amf.c b/libavutil/hwcontext_amf.c
index b751a3c1ad..24731c20ec 100644
--- a/libavutil/hwcontext_amf.c
+++ b/libavutil/hwcontext_amf.c
@@ -277,6 +277,9 @@ static int amf_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
int w = FFMIN(dst->width, src->width);
int h = FFMIN(dst->height, src->height);
+ if (dst->hw_frames_ctx->data != (uint8_t *)ctx || src->format != ctx->sw_format)
+ return AVERROR(EINVAL);
+
if (!surface) {
AVHWDeviceContext *hwdev_ctx = ctx->device_ctx;
AVAMFDeviceContext *amf_device_ctx = (AVAMFDeviceContext *)hwdev_ctx->hwctx;
@@ -319,6 +322,9 @@ static int amf_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
int h = FFMIN(dst->height, src->height);
int ret;
+ if (src->hw_frames_ctx->data != (uint8_t *)ctx || dst->format != ctx->sw_format)
+ return AVERROR(EINVAL);
+
ret = surface->pVtbl->Convert(surface, AMF_MEMORY_HOST);
AMF_RETURN_IF_FALSE(ctx, ret == AMF_OK, AVERROR_UNKNOWN, "Convert(amf::AMF_MEMORY_HOST) failed with error %d\n", AVERROR_UNKNOWN);
--
2.47.1.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".