From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCF4E3A7F5E for ; Sat, 11 Apr 2026 16:23:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775924622; cv=none; b=pYdsz+bUY9Mx210EFGkhovNiO75+h+WHnV908SQAjOsn6UUk4LUiMpGK7wcQXm0MLkMnb7vV1QM8vCVnMa3aGDCXKW94hPbfVKu6OJ4M91GivcNEChD6Cxv/yzoDa3mm08RWqCp1vhGMNK17+2LU0vCtS6eHqQRaG3Yzw3mxF2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775924622; c=relaxed/simple; bh=as/Y6rgrCLbxvFJK4woRt4WCiXpZGU5Bmcl75dpz1Ic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FHFup8ToOKL1jeX1muquYc6MCoPYmu4ljkvA7t1jAM7VMRI/m/qH86yy5nihFfgf60mcFrDzyXHB2OIbIrBkJmFroPJc1g+TNwU2Lqxhflqu3o/FCLzkVoLLHzO+3M9J/og+KyyFXO3IB1ogk6xYdCnlkcH4Wr+mGkHTpNMfzJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nhA+C8EK; arc=none smtp.client-ip=74.125.82.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nhA+C8EK" Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-2d7bdb5ffffso718439eec.1 for ; Sat, 11 Apr 2026 09:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775924619; x=1776529419; darn=vger.kernel.org; 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=6Epvlpqxnk7CA+C9ymJCfGqy8SHrtqDJZ4fsM6TY9RM=; b=nhA+C8EK63vA/lCT3ei+/e4Iojle5HzxgZoPE9+317fXrJyyVzVVDNsfj1V+ROVftI FYpmeRbjVWaU+2fXDGfcEdHYzAGHcQDNuHApB0Iy7hXvTqQT2fWOdp7Y2kjk+8iM3Gun ng45l3ssKI2dKiZTx0bhKHD+cOuQloaYdZaOh7amDnB3SYlx1nHdAVL9mynfieWFfvDt QWwF/bWR0Aw1z+gkUqI3B1pF5q2IwoteVS86yoDE+nrUVplOB/i6MMbLtnYTqG3SnItl cWVjRSH/zGd5YCGOOKDCKaqOZMU3PKdTJ5M7Br7UALiv+F66mroK/DeoSUGTdRx4GPAU Gy0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775924619; x=1776529419; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6Epvlpqxnk7CA+C9ymJCfGqy8SHrtqDJZ4fsM6TY9RM=; b=YpISq+uitg0nNheTqPbtEbW9VWHOkMyh0fSv5fz4dcESH61y4kck8Zyrc0pmsQyPv4 zTc5UrNXCZ/TWlcQy74ZE37XH9GL8Xgw7OSrWyVNOEwBozG66Ss1xAcBoOLtYDjbrwV/ ykjy1CvtZt6hWu+aHEtW5ITR8OloPEDPkCWHIopvHA1L34L26jUAZbzD9b7Vl8l4cjg9 rH0O5wtDl0F0nkUZLWn+/P5blPXcCN0Spc75GPr19UooAkq7dj29MKpNVzpmZE/Kr19/ XLMgLaMT2juc7NPAD7e0zHOO9bS1cevVOOZtbGqTlo9NG1ojKBL6qf+rUDYR4Fah84F1 A06Q== X-Forwarded-Encrypted: i=1; AJvYcCW6jqjUtBPa8rcONodTpXxxt883RmXVHw06MBP5oXj6Ove/Eeqnj0AD1dlCMl2mb7Pqn6PYQGB/502hGw8=@vger.kernel.org X-Gm-Message-State: AOJu0YwQOrkfU/P+04h6QfDnooGJsIhvNT6IkZCvHQVI9vQyfdxHcn5c Lwf8h1xmKK3QZUwxrheEfE8cIH4UMUJEQOe+DgutGwAmwI2ucr0h+w15 X-Gm-Gg: AeBDieuQJCEqLdYMxRtjWD4rO26/y+oSDtC4fdNE68Fz3yTrW5JZDYLdiKBFTTljS7Y CF7Av+tRX3H81Nvxj/a3nZPHZErY7hWGm4VofNZ9TJlwrY8Wusz8TPA+3J+0GFmiEPh/I3it3OQ Cc1kzUfhsliQ/6otxKBdjGlhQh32JQuBg2/Eb9khpCA7z2xZ+7yzcxJXzMNN0i8pKXUyKQS7G5l uLs30a43AhEvoQiP3lfQZ22KzyWGq+P0vAShXKrXh15SmuEnALXZFvrlijrTT5JUORfWSJhHcUZ HsElt92fKYK+g0IJsHg7wzfCeUcLydUps851vMLzsVgdsBCGQasQWoJXoKApmDeD9EwM1Xk3GAn FiVcVRetJuMrxf3+9FKSb4o1qi3eI242i2BjRzXOmz64ULmcGK/2RBHrsUdNaRKeo6+tnVKxBI3 P7g0UPihujbk6Dkqu1S/zBYT7I9xKxoIeAbRZe3lFmxx9LdDRUoxTeMLW/x6IsrRlmG5roJH+cT sv9lMjcAY3HXlA= X-Received: by 2002:a05:7300:8c9e:b0:2d3:d3f:2429 with SMTP id 5a478bee46e88-2d583ed5c11mr4689989eec.0.1775924618851; Sat, 11 Apr 2026 09:23:38 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2d55ce46a65sm9358907eec.0.2026.04.11.09.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2026 09:23:38 -0700 (PDT) From: "Derek J. Clark" To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: Mark Pearson , Armin Wolf , Jonathan Corbet , Rong Zhang , Kurt Borja , "Derek J . Clark" , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v9 01/16] platform/x86: lenovo-wmi-helpers: Fix memory leak in lwmi_dev_evaluate_int() Date: Sat, 11 Apr 2026 16:23:19 +0000 Message-ID: <20260411162334.25682-2-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260411162334.25682-1-derekjohn.clark@gmail.com> References: <20260411162334.25682-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Rong Zhang lwmi_dev_evaluate_int() leaks output.pointer when retval == NULL (found by sashiko.dev [1]). Fix it by moving `ret_obj = output.pointer' outside of the `if (retval)' block so that it is always freed by the __free cleanup callback. No functional change intended. Reviewed-by: Mark Pearson Fixes: e521d16e76cd ("platform/x86: Add lenovo-wmi-helpers") Cc: stable@vger.kernel.org Link: https://sashiko.dev/#/patchset/20260331181208.421552-1-derekjohn.clark%40gmail.com [1] Signed-off-by: Rong Zhang Signed-off-by: Derek J. Clark --- drivers/platform/x86/lenovo/wmi-helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/lenovo/wmi-helpers.c b/drivers/platform/x86/lenovo/wmi-helpers.c index 7379defac500..018d7642e2bd 100644 --- a/drivers/platform/x86/lenovo/wmi-helpers.c +++ b/drivers/platform/x86/lenovo/wmi-helpers.c @@ -46,7 +46,6 @@ int lwmi_dev_evaluate_int(struct wmi_device *wdev, u8 instance, u32 method_id, unsigned char *buf, size_t size, u32 *retval) { struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; - union acpi_object *ret_obj __free(kfree) = NULL; struct acpi_buffer input = { size, buf }; acpi_status status; @@ -55,8 +54,9 @@ int lwmi_dev_evaluate_int(struct wmi_device *wdev, u8 instance, u32 method_id, if (ACPI_FAILURE(status)) return -EIO; + union acpi_object *ret_obj __free(kfree) = output.pointer; + if (retval) { - ret_obj = output.pointer; if (!ret_obj) return -ENODATA; -- 2.53.0