From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A22FE36D50D; Thu, 30 Jul 2026 15:11:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785424298; cv=none; b=nvxPjHuc5+TywW47jWupbwe0YZ65S9DvltRbJ0I2ZU3CO7hvKmi6szQ9NW6qp3ke6Q6k4MKAXvG3GFSYCOr9jRFXnlArYY2nMN7CrFAuXpli8BQIId4vMnZksFxKtunupILSFB/FmBPGhnwktZJ574ZBgNHAZoU3blahdlyPZyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785424298; c=relaxed/simple; bh=V+xR+TBRyrYKKA3BAo0iwLNv1mMgfgS5y2eo6/Sml0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sfDSpMeudBcuoIR4XWCPiarVFqpr3Xuo45mzeAwJV5rg8tf6qHb+hnzSoI+8EfaAaTp1ARddZMH0IPhWXvfAC1RQ1PUjbyxEX0kEDzx2jyj7Zn/nnFz7m5Xp+x8Gl+vEo92yJKp+eB/Fxglv4NqAcx5Y0psZwWLD+bhhSQsJQWI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Aw9F0GU8; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Aw9F0GU8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC3D81F000E9; Thu, 30 Jul 2026 15:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785424296; bh=uiCAljra8o/bqxedeXtt6ne0jWZufrTfcr3XL+pbvfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Aw9F0GU8QsnnEqQFNDsIMDB4cRsV1V1ONq/XJ30s091v6/CYtKT8Rf4M3VspEE3OF 3N1KAcrFcXytV1n+QfkuCb8Evm7A+zsGasp2ISPGISygedal+k6cremu0oq95Sweqr oR65fByXtkHvbjr10qqtDCECHURfs0LkNvYXHgWo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Liang , Danilo Krummrich Subject: [PATCH 6.18 343/675] drm/nouveau/acr: fix missing nvkm_done() in error path of nvkm_acr_oneinit() Date: Thu, 30 Jul 2026 16:11:13 +0200 Message-ID: <20260730141452.420895103@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141445.110192266@linuxfoundation.org> References: <20260730141445.110192266@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wentao Liang commit c3027973f692077a1b66a9fb26d6a7c46c0dc72c upstream. In nvkm_acr_oneinit(), nvkm_kmap(acr->wpr) is invoked unconditionally at line 309 to obtain a mapping reference. Additionally, when both acr->wpr_fw and acr->wpr_comp are present, a second nvkm_kmap() is called inside the conditional block. Both mappings are expected to be released by nvkm_done(acr->wpr) at line 320 before the function returns successfully. However, when a mismatch is detected during the loop within the conditional block, the function returns -EINVAL at line 318 without calling nvkm_done(). This results in a leak of the kmap reference(s) acquired earlier. Fix the issue by invoking nvkm_done(acr->wpr) prior to the early return to ensure proper release of the mapping references. Fixes: 22dcda45a3d1 ("drm/nouveau/acr: implement new subdev to replace "secure boot"") Cc: stable@vger.kernel.org Signed-off-by: Wentao Liang Link: https://patch.msgid.link/20260606155606.77593-1-vulab@iscas.ac.cn Signed-off-by: Danilo Krummrich Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c @@ -315,6 +315,7 @@ nvkm_acr_oneinit(struct nvkm_subdev *sub i, us, fw); } } + nvkm_done(acr->wpr); return -EINVAL; } nvkm_done(acr->wpr);