From patchwork Wed Aug 23 20:05:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kacper_Michaj=C5=82ow?= X-Patchwork-Id: 43292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a6:b0:149:dfde:5c0a with SMTP id m38csp870958pzd; Wed, 23 Aug 2023 13:06:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFizN7tg9LmFm8vvogZLXUZCrQ/UdLL9choJmexumLfvxC/oOCxm5Tz1rOknd2W0iHLLpc X-Received: by 2002:a17:907:775a:b0:994:536c:ab45 with SMTP id kx26-20020a170907775a00b00994536cab45mr10305874ejc.50.1692821212460; Wed, 23 Aug 2023 13:06:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692821212; cv=none; d=google.com; s=arc-20160816; b=L2kl8TRjOQ4Qr1Qyc3s0RX6f4kecdXVg1d5qK1V4oiltm7zpTS3lZFgBOzTCcGSkKf PJwju5yDBkqRgroX59Glk1UC9N+6nYIwlGqT6SYnigRcgQuR3/PoG6Xv4UhIYPB+rsnm fLTM1AhSlvxT4i/9sBxlpm2LR+offIA80lX962m1zUsCrCpH8IeG7WmbGe3SoS3cFjXj 1Tcb/fsnDye+J3ZJLvGynFgsIl2QBICDFnfZGmmLMpc2lCk6wP3AibdQYlMNXp3hUO1G qh2XZOOwpQ2zLCKrONn2X7JAaVgnzavHf7PrFKkv4jIQRq5YUrhIFejRySfA21ktBOFD b4Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=pOzwnQPGEY2uDf1CHA2xCq44MP2R83k9CgFW9Eyp+lI=; fh=UB+pzNLz6VE6Cj5QSbJNlsaieUrcp0qLbMgQXBHZSJg=; b=pdiobAhL62hGZM2wl3yiH1P+iC4fLm95Q4gWYTwnwApQuM7fuQ3+PKe97f/6MtSWEd 8eJylAt6ZEyT9OlSG4UC2mpgFuNChEA6BSNgSPC6Pmu7ddLzZm+aVWBZv++jJACMEVc7 7qdH8g2Xn533kzE3v7oWAi72VrINYKGWo8+d5+ryI8BXhqJ2Q8f+wEhi++OIWt4bqSoc xt3u3JgvrPcQQb0j9csICFY7q7N/gbkd+ljlIYSrCjwMq2LF27XEzC9rv6JpesOh23xt jUath1RJOgkeRBUIhdyPKAnzzZTew8QRCsCm5VIOebEAkG9hMIRM1Ose7f9HUTvlqGBy 8yAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=a71MztnD; 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 jw17-20020a17090776b100b00997bd26a560si10136836ejc.938.2023.08.23.13.06.41; Wed, 23 Aug 2023 13:06:52 -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=a71MztnD; 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 9A2D768C5CB; Wed, 23 Aug 2023 23:06:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A887068C5CB for ; Wed, 23 Aug 2023 23:06:23 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2b9a2033978so92868211fa.0 for ; Wed, 23 Aug 2023 13:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692821182; x=1693425982; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NnvjTYplQyBWwI9OZ2b1Uso7raGkO7QsyUABh7cSQ+M=; b=a71MztnDfgpnpQOnTiSnIW3Ev+UkrCTc8GGtDYHaL3YSwRw8iaz9gfHs9TuYV+tNf9 Cz3G5EnYgZJs54lO4DD8rgbLV1N7q59+EDH4pH9Vd1z8D6mxfdGSNFnWkCYLQ/FoGTW8 Z8ODoCtk2e+JXJXvckoQ7iTeOunSw263nZWbLX0mikz+q942/4Jhg9BqubgGCIRZucX2 P/bcBDn8ix+mM4qqFXlwY9qUIiwvJNdbs2bvP/c35vBh8XRcMBTTS9+CWy030aQTEmZ6 xYXeYZqdSPJnPT66VVZlc+MOXsJkxios1a3XzhqYLnCz10zADTsZXgKXVCQsJd3999PF TlBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692821182; x=1693425982; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NnvjTYplQyBWwI9OZ2b1Uso7raGkO7QsyUABh7cSQ+M=; b=Dm5r41MK3IBY9JGVkmUSpsvjHCpa+izKvpwtkBqS+wiQLZiGqb9MtxjcCyzLDk6t91 RJuUi7+/X0laTK0kVoZUaPjH6V83tPfrmgoAa/Nh7HwwkMNJhF3UMPU70XU5ASokxEb+ oCYskHQwt1isf2152x9e1SbKqkAfQhMeDx+e/Ovk+O4gcatun95acDbzoqv/pughynaC 54/TnuM2YgLALAg1Rcq4OusWTGFJ1FY4apiQoaTDgzg5gDUfA+VZsX5upwTGPws1XXRq 3s4Es3tEyEfJtipVSLDCspA5040/hllsBj46DasAN6Ev/9AOggcaPUQeOJegzXEw81OC oGEQ== X-Gm-Message-State: AOJu0YxTQ437sB8QwkOtN+bHgPLz0PoyUK3YGdbXFYPH7ZGo2MqO2TNW TF1uyl/el3zfmuzCHQs2RdlC+BFU/0s= X-Received: by 2002:a2e:9a91:0:b0:2bc:b29e:8ff7 with SMTP id p17-20020a2e9a91000000b002bcb29e8ff7mr9632117lji.20.1692821182456; Wed, 23 Aug 2023 13:06:22 -0700 (PDT) Received: from localhost.localdomain (89-74-109-154.dynamic.chello.pl. [89.74.109.154]) by smtp.gmail.com with ESMTPSA id x4-20020a2e9dc4000000b002b70a64d4desm692379ljj.46.2023.08.23.13.06.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 13:06:21 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Aug 2023 22:05:59 +0200 Message-Id: <20230823200600.1480-2-kasper93@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230823200600.1480-1-kasper93@gmail.com> References: <20230823200600.1480-1-kasper93@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/vulkan_decode: check specVersion to avoid using incompatible implementations 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 Cc: =?utf-8?q?Kacper_Michaj=C5=82ow?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tJEiy/FBLY/6 Fixes: VUID-VkVideoSessionCreateInfoKHR-pStdHeaderVersion-07190 VUID-VkVideoSessionCreateInfoKHR-pStdHeaderVersion-07191 As a bonus avoids crashing AMD video driver on Windows, which currently doesn't advertise support. Signed-off-by: Kacper Michajłow --- libavcodec/vulkan_decode.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 04350578f9..7607edf52e 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -881,6 +881,11 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ caps->flags & VK_VIDEO_CAPABILITY_SEPARATE_REFERENCE_IMAGES_BIT_KHR ? " separate_references" : ""); + if (dec_ext[avctx->codec_id]->specVersion > caps->stdHeaderVersion.specVersion || + strncmp(caps->stdHeaderVersion.extensionName, + dec_ext[avctx->codec_id]->extensionName, VK_MAX_EXTENSION_NAME_SIZE)) + return AVERROR(EINVAL); + /* Check if decoding is possible with the given parameters */ if (avctx->width < caps->minCodedExtent.width || avctx->height < caps->minCodedExtent.height ||