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 2AC8617DFFA; Sat, 12 Sep 2026 09:54:46 +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=1789206887; cv=none; b=SAHxGYQt4d/LlpVllWyn7Y+rqQxc0imXvZdUUFirtkAQ/xSFRYJbPCYcZ74pZQokY/hhywg/1xvU5kx+mCCcMXcW7iNLA2+em+D/qboVyw5s1HlyMDsjJ/oAc1qizaATsblQWho6V0YLujR51gSexDUm+YjvpWg961A6zfGnTJ4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789206887; c=relaxed/simple; bh=rV1fpHePZc2eQt8wd0nCPLu6uNV0VISE7xXcvXPhutM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=W9e1YkBrATW8ml068HxNOwEokb1YiOternuz9uleJdnqa6EBocSc0vyMzwAgy5WOt81UFlIB3nz0GG0PdNjcZa0TCkncxGFKbglc+HEUu8OON5YfyakVAQaeDo+PPrqNnzPai48xmLu1Bte0TUmzLJnBwKVKSepfs8xajulx6Ig= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FBq2zQSI; 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="FBq2zQSI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D84DA1F000FF; Sat, 12 Sep 2026 09:54:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789206886; bh=vC2T50dUwlev0RGYzurwL9jQCPimXhXrhbDGkU1I9Ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FBq2zQSIW6MylfSkg5OxdlOHz0FquclRp3K8KRgxysbhVVLFIr5lLaXgH90/UDPp6 z0zVyaARA6bJIfLqOlJZ0WhkbCi9WG2Eedw6rsUHpRrcHeTbsETP2E20HIpLlsk1Xi PVWJ9ZkpNAEmPPYj1lW/Vt4xeYYEpQfJd6yeuRdY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Armin Wolf , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.18 0299/1518] platform/x86: dell-wmi-base: Fix resource leak on module load failure Date: Sat, 12 Sep 2026 08:41:08 +0200 Message-ID: <20260912065630.243689834@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Armin Wolf [ Upstream commit 072841e02cf9c00a7e8a9c567a14239e02ca47ad ] We need to properly clean up the SMBIOS request and the privacy driver when the module load fails. Fixes: 8af9fa37b8a3 ("platform/x86: dell-privacy: Add support for Dell hardware privacy") Signed-off-by: Armin Wolf Link: https://patch.msgid.link/20260612173451.467629-3-W_Armin@gmx.de Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- drivers/platform/x86/dell/dell-wmi-base.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/dell/dell-wmi-base.c b/drivers/platform/x86/dell/dell-wmi-base.c index 907f1da01c8db..ba6c88e2a5ec0 100644 --- a/drivers/platform/x86/dell/dell-wmi-base.c +++ b/drivers/platform/x86/dell/dell-wmi-base.c @@ -851,9 +851,22 @@ static int __init dell_wmi_init(void) err = dell_privacy_register_driver(); if (err) - return err; + goto out_smbios; - return wmi_driver_register(&dell_wmi_driver); + err = wmi_driver_register(&dell_wmi_driver); + if (err) + goto out_privacy; + + return 0; + +out_privacy: + dell_privacy_unregister_driver(); + +out_smbios: + if (wmi_requires_smbios_request) + dell_wmi_events_set_enabled(false); + + return err; } late_initcall(dell_wmi_init); -- 2.53.0