From patchwork Tue Feb 6 21:26:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a38a:b0:19e:8a94:b663 with SMTP id w10csp134194pzk; Tue, 6 Feb 2024 13:27:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IFForr4r/4pIfSt+lGVRTeYA8wIZUEUt2Cuw/kJ9/O/YxW20yhRQa2yKQnANLZP7NkBlzIr X-Received: by 2002:a17:906:714d:b0:a38:45ec:d128 with SMTP id z13-20020a170906714d00b00a3845ecd128mr1348796ejj.69.1707254823173; Tue, 06 Feb 2024 13:27:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707254823; cv=none; d=google.com; s=arc-20160816; b=xiMT9te2jRSUS1fGatOA5f/H9YV9VVLI0p89gwkvADHxTMpWKWMAyjhL0rQ/lPEDnU WP9rPBihkq3omYrWREomCaI/D7cuSAebyAZpwVlZNeeJQC51lbkNaEu2FPQGF5EenEX2 a84zZpSYBmkaQwlKDt9T3OVQ+mXyKVDfajAWc6MqKmEn/NGv4VE1/EPz/VX3FrcOF1pD aDa6Tnx+WLZBC5k4Ne6mYJXPaGMLsrVVo3M1tXb1Ks6UYjzWVuwMtrAAj5kKfFqVLJBT 66M9OMeLG8QrMmrovSO2Haj5cG1W3m+tzwJKTZ7YXgWnZqtH/ePINmGgaAEy1Po1wpQ1 ujyg== 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=DHsGMVcB6RzJJkAiucU05AHA/rDBeiHhNDMCOYy9ZJ8=; fh=7uHL2Bcr7TV0v7bAQsxpJnQZLWIL95lK9FUCY3yQ5O8=; b=0g8g65nOT45UghvZxJfTd2yxyIc3cdvdH4oIyJRlhsYB1G8xignH5FXdjCTn2t7doM PM2oqJK0Ca65M9PBS2sN6pQR8myt0TItj075gvswEl/L8kMcWIRahy9ZXpYCf5RMyta8 nOFyKjBrLKhvMFruqc2QBbQcE7ddtND8XDzxp7ZqFv88DXPzCEoIJNn0yVrBNG9nP7Q1 79mH20HmYY0cmQkPqVkXdFOA2bnqj+TXUR2HxcSYCC56zbR8kV5qlfCew8gP8AThTg4/ TntNC2VRUihz2IDfTEottWJpJMREZGrrVi64kO3T1KHxLjwBYXNbt2JCjy8B7I3PzoBa 9VzA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b="DnK/EFlx"; 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 X-Forwarded-Encrypted: i=0; AJvYcCXrX/CJxzJ1CqnjOOHDIaiRun6absJhZkIjwb0am3/q9hpRMlBjcft5/Qp1q4kFkyllNzHIYd3WcHnFsM1fDn+1REMG3gQ3YlhsWvX3dsIpgZhcobx3sFw0qdfBwIhW8RlkXP+JdkB4++fugdOzdikyyF1k/8Tk/SLZbHl8XCeZx9em4Qe0Zvlcen1PBbSbfgwDtfQnzBVwtXv5w0PXtQA9de3EsUpyGjjdF8JqGf6MarLv9R+WaVYy4Y8yIV/B4bRhVgvoZzFJhQdEd88WiuafgnNPUqQbqHrXDQk2MNBr+WroWdpepBNWpAvc91q4xCbsLchPU1bQrrFaZTLoSAMFTB6ZAjINf+Datop/3/GFJR0dIy3NZ4gcDSPG/eKZacqbdw8NwwR99WZAhtYov0AVdMNlGpA42VQObVm2on91XVnlKEVIKW4uHg+F8T/J6yOns+w42id3y85AqI822VrHCyHmd1ToUIDgWJ3em6/HdpVenXBaVQHKgFOBKfd6+5YMoFIcptDEEuWqReHMfLF7P8142vOedyP6s/Ko9IQdtE9OwIVdAPxKa7VS7L84Ug4tqeWsibsip+J9aJfUEVyjmPQhgtEUQLluWk/8NlEZ8Ms8Nkn1fW80oAMfjZySa590DD9TurpQzkSN38BHHT7h+n6syNYoCZ8VsSqw6fvLSp0vRv4CVMCJkjYA9JSyc23XgF2cam72NaOub3sJZAg6P7pv1EeylrsBOLGXEYSRLRDbmfswmMah0DvAb5WgtPq76JQ+0fSK0Dh3bjfJNkNX/Sv9FnvOXiThsoI0TIfSBbbewK07NNSwIimQTkBbPxanDr4zrGLpniN8TF32bVSSzdnwroRMbVTgk9cOx86nzM950u4Eb0d1qELf+kEoMzkkjAbRpbPXxER8QaFrBEyYwOntxVLKpTeCVg/E6nQOiZ/tblp67Wk8RcI1uCvt/WJsHI HGvQPXOTvZXA3INgo01hDmEOlWTrJTVPEhZCpoAws8dlxCYyaqOiafJWgWVHlvDsUi0Qq01GfCcA+3AnipbE2IV+spSQr3tk3OfCkesCcEDprvp2frzHPjHUsvdQJ7J+Vb4AKOR2gSlN5A7q+lDKxGAOPIBABGGF0Nc38rbWhNX2MuvhqY5erZX+KY8IbAM6hBU9Eyip4V7ClR8CGNChSwAG3wVsiu4U/qbt2pGg7Qb08A0mjTORBBFz1W71TgQ1qqBUe8W1NFI30HFT5TOG9ThhK+xN/xGY4Lo/QpWa6u85xXe4IBGbP14vxt0k+pKcQiMn5IqHXzQY0cW7CspolHg3emUH4baXDVbgYuUuzi6SrRuReRYk3BC/e79ptMTyLJKHSY9o3HPQjHb9hTTd+I9vUHym2xOkl8SmfG8QZ3t2+2k3c+nV/9vakva3BtOcocktlO3J/DFXG4/sWqzIc+rdLx6MocjASzMlgPsELFFia27H1G2nADxB4Z3v+90T+b/ixKK2OJnlsXO5cFM336JD96VbfqNqbnW3SRupFl2jmI0lE9IrBBh9yZQ9PIOojOwLtJfxnpzZJ3epo92w+l3cjdB1Aub853t4MLlIQXMGDtTCO5Acee3FNI1whXg2Vz1XI= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gu10-20020a170906f28a00b00a338fffc21fsi1582704ejb.670.2024.02.06.13.27.02; Tue, 06 Feb 2024 13:27:03 -0800 (PST) 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=20230601 header.b="DnK/EFlx"; 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 3909368D0D2; Tue, 6 Feb 2024 23:27:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3CDE968C7C2 for ; Tue, 6 Feb 2024 23:26:54 +0200 (EET) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6da9c834646so4879361b3a.3 for ; Tue, 06 Feb 2024 13:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707254811; x=1707859611; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=fauEtMUBn+nhXG8cEhrkour2Lpukc5qN5jInZoewyRg=; b=DnK/EFlxJ+/ijmJK6FmxFK3MJ836Z9ArIfvAK5FPGR28Ej5jzHrabkKhg2y+2/1acH ETg8Gaw+GTAa2StfRAtjvd+bU/coSEeLhwZFGU8KNmDiKQr/bWJjMLvcxJqUElF7cKe6 YUPnJYRTfP9/bJOVA4NOkRmWZcqBGF7CLB7KPBCeND/P/ltOGew+0Jom42u5VXpDLDRf SposDvGyxpB2MD19is1rjaHSvlSFygBWZPU4jmOMEKfdVEz6PcpUQJZ45fSFWsBvvn1Z 4jpi4TjCzOryTuB5Q0YOaa8VgHT/HOSYWvWsolhKkIqkXAokirctiBrOyeMsmtZ7dvaq 4RIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707254811; x=1707859611; 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=fauEtMUBn+nhXG8cEhrkour2Lpukc5qN5jInZoewyRg=; b=kAXt35u854FA29Z7DmgKzOgKrPpwjlxACPPMzVI2yC3h3pM/dEzWdO8ASzB/s9f60T 06SdUIQTicxA92fjGMmpeGRXOJ89+AaoLRh+BTx/2UREBJdOS/1eOPlQwdrTyUdBqMCb Uwjd9l+/QdcZO6YIcS6PWoH3dpYnmlx5RXXs9zGJfsWlDtW8VEBJiePTKcUX6UevHSuV 30SsU+cglm7EXXX0UQ8g4MkE0ofTXbD+sCcJGCpKyRlPWhzKJZ24mXyGi7k6dkzR8nCK Jb/0RNHf6Wj+ZDR1V4Pl0YuJfMG8v6ySXQv7FFkYCRB+1Mnp6wXS+fw+RzZCgT3v/wn6 6ZJw== X-Gm-Message-State: AOJu0YyeS4ixIJqX0JUBzJBgqpefill9EHD37RxMgPJMsw+jEmaosPWs Quj0ZBEZPXuLQi9cdkFg2ODiens4PM9LKuArxs5FBVnTD1HBS7NaP2Qzmhh6 X-Received: by 2002:a05:6a00:4595:b0:6e0:4ea7:ed3f with SMTP id it21-20020a056a00459500b006e04ea7ed3fmr603573pfb.9.1707254811310; Tue, 06 Feb 2024 13:26:51 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id a24-20020a62d418000000b006db9604bf8csm2528577pfh.131.2024.02.06.13.26.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 13:26:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 18:26:40 -0300 Message-ID: <20240206212640.9193-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/nvdec: don't attempt to free NVDECContext->bitstream on simple decode_slice hwaccels 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: OZtHA6oD2Kfr If FFHWAccel->end_frame() isn't called before FFHWAccel->uninit(), an attempt to free a stale pointer could take place. Signed-off-by: James Almer --- libavcodec/nvdec.c | 9 +++++++++ libavcodec/nvdec.h | 1 + libavcodec/nvdec_mjpeg.c | 2 +- libavcodec/nvdec_mpeg12.c | 4 ++-- libavcodec/nvdec_mpeg4.c | 2 +- libavcodec/nvdec_vc1.c | 4 ++-- libavcodec/nvdec_vp8.c | 2 +- libavcodec/nvdec_vp9.c | 2 +- 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 27be644356..8a7f5c0dac 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -274,6 +274,15 @@ int ff_nvdec_decode_uninit(AVCodecContext *avctx) return 0; } +int ff_nvdec_simple_decode_uninit(AVCodecContext *avctx) +{ + NVDECContext *ctx = avctx->internal->hwaccel_priv_data; + + ctx->bitstream = NULL; + + return ff_nvdec_decode_uninit(avctx); +} + static void nvdec_free_dummy(struct AVHWFramesContext *ctx) { av_buffer_pool_uninit(&ctx->pool); diff --git a/libavcodec/nvdec.h b/libavcodec/nvdec.h index 353e95bf42..83bc1de84c 100644 --- a/libavcodec/nvdec.h +++ b/libavcodec/nvdec.h @@ -73,6 +73,7 @@ int ff_nvdec_decode_uninit(AVCodecContext *avctx); int ff_nvdec_start_frame(AVCodecContext *avctx, AVFrame *frame); int ff_nvdec_start_frame_sep_ref(AVCodecContext *avctx, AVFrame *frame, int has_sep_ref); int ff_nvdec_end_frame(AVCodecContext *avctx); +int ff_nvdec_simple_decode_uninit(AVCodecContext *avctx); int ff_nvdec_simple_end_frame(AVCodecContext *avctx); int ff_nvdec_simple_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size); diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c index 850634bf1a..adef21b0f7 100644 --- a/libavcodec/nvdec_mjpeg.c +++ b/libavcodec/nvdec_mjpeg.c @@ -80,6 +80,6 @@ const FFHWAccel ff_mjpeg_nvdec_hwaccel = { .decode_slice = nvdec_mjpeg_decode_slice, .frame_params = nvdec_mjpeg_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; diff --git a/libavcodec/nvdec_mpeg12.c b/libavcodec/nvdec_mpeg12.c index a4603c7ea7..5d100a46ba 100644 --- a/libavcodec/nvdec_mpeg12.c +++ b/libavcodec/nvdec_mpeg12.c @@ -110,7 +110,7 @@ const FFHWAccel ff_mpeg2_nvdec_hwaccel = { .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_mpeg12_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; #endif @@ -126,7 +126,7 @@ const FFHWAccel ff_mpeg1_nvdec_hwaccel = { .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_mpeg12_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; #endif diff --git a/libavcodec/nvdec_mpeg4.c b/libavcodec/nvdec_mpeg4.c index 20a0499437..5a50f7d77f 100644 --- a/libavcodec/nvdec_mpeg4.c +++ b/libavcodec/nvdec_mpeg4.c @@ -120,6 +120,6 @@ const FFHWAccel ff_mpeg4_nvdec_hwaccel = { .decode_slice = nvdec_mpeg4_decode_slice, .frame_params = nvdec_mpeg4_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; diff --git a/libavcodec/nvdec_vc1.c b/libavcodec/nvdec_vc1.c index 5096d784df..e9ab16c63d 100644 --- a/libavcodec/nvdec_vc1.c +++ b/libavcodec/nvdec_vc1.c @@ -124,7 +124,7 @@ const FFHWAccel ff_vc1_nvdec_hwaccel = { .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_vc1_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; @@ -139,7 +139,7 @@ const FFHWAccel ff_wmv3_nvdec_hwaccel = { .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_vc1_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; #endif diff --git a/libavcodec/nvdec_vp8.c b/libavcodec/nvdec_vp8.c index ff3b3f259c..bbea6f1577 100644 --- a/libavcodec/nvdec_vp8.c +++ b/libavcodec/nvdec_vp8.c @@ -101,6 +101,6 @@ const FFHWAccel ff_vp8_nvdec_hwaccel = { .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_vp8_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; diff --git a/libavcodec/nvdec_vp9.c b/libavcodec/nvdec_vp9.c index e196391c6d..69b12657b6 100644 --- a/libavcodec/nvdec_vp9.c +++ b/libavcodec/nvdec_vp9.c @@ -180,6 +180,6 @@ const FFHWAccel ff_vp9_nvdec_hwaccel = { .decode_slice = ff_nvdec_simple_decode_slice, .frame_params = nvdec_vp9_frame_params, .init = ff_nvdec_decode_init, - .uninit = ff_nvdec_decode_uninit, + .uninit = ff_nvdec_simple_decode_uninit, .priv_data_size = sizeof(NVDECContext), };