From nobody Tue Nov 11 11:27:40 2025 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA79633B6C8; Tue, 11 Nov 2025 03:29:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762831783; cv=none; b=tBgIeg8BFKq6m0waBPRuXAhgfaKOZaBaLCkGdD+smofg92RYX86ssNdhRZVlp8zyA6Bd0RbohVZHtNkOaqqdi0E8lT5loW2XNT4yTocIEcH4r7wt5rsiL3cllcK2DnLDxxLSgI02Ih5nZwJNa7xmK0nuhHp8A2zB2gphzAYaq44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762831783; c=relaxed/simple; bh=pB6VyIn2ISz7+hyAjKBphHnsEcbljCtFxrEDnr/zy8I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=b641krbI0aUCEm2/uZOm8iXfQJcM2pi//2C9rP5FtEvFfjc1GqL2ck/RThaAtIjHkR/YufgC9vyjnXacIZvC/7sU8kAq50/mI231J8pGYKJGcPU9A3S0920ERaZK9qjxFh5SPxhEnxR0gLbE+LQmUEGewChnSoS19x+LvrMLFCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from DESKTOP-L0HPE2S (unknown [124.16.141.245]) by APP-05 (Coremail) with SMTP id zQCowABXXG2ZrRJphq9PAA--.15902S2; Tue, 11 Nov 2025 11:29:31 +0800 (CST) From: Haotian Zhang To: wim@linux-watchdog.org, linux@roeck-us.net Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Haotian Zhang Subject: [PATCH] platform/x86: wdat_wdt: Fix ACPI table leak on probe errors Date: Tue, 11 Nov 2025 11:28:32 +0800 Message-ID: <20251111032832.1985-1-vulab@iscas.ac.cn> X-Mailer: git-send-email 2.50.1.windows.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: zQCowABXXG2ZrRJphq9PAA--.15902S2 X-Coremail-Antispam: 1UD129KBjvJXoWxWr15ur1kKFyUCFyrAF1rXrb_yoWrCF1xpF WfCayYqrWjqr4Uur1xtw4DZFW3Ka1Iqayjqry8Cw1Sva45Kr1Yqa4FyryjqFs5GrWkGFW5 WF1UtF4UuFWjvF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkl14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY1x0262kKe7AKxVWU AVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14 v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkG c2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI 0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4U MIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7VUjuHq7UUUU U== X-CM-SenderInfo: pyxotu46lvutnvoduhdfq/1tbiBwoDA2kSglW-0QAAsP Content-Type: text/plain; charset="utf-8" wdat_wdt_probe() calls acpi_get_table() to obtain the WDAT ACPI table but returns early on multiple error paths without calling acpi_put_table(). This causes a permanent ACPI table memory leak if the driver probe fails. Add a single cleanup path which calls acpi_put_table() and redirect all error returns to it, ensuring the ACPI table is always released. Fixes: 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchd= og") Signed-off-by: Haotian Zhang --- drivers/watchdog/wdat_wdt.c | 66 ++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c index 650fdc7996e1..f827844a0c69 100644 --- a/drivers/watchdog/wdat_wdt.c +++ b/drivers/watchdog/wdat_wdt.c @@ -318,7 +318,7 @@ static int wdat_wdt_probe(struct platform_device *pdev) struct resource *res; void __iomem **regs; acpi_status status; - int i, ret; + int i, ret =3D 0; =20 status =3D acpi_get_table(ACPI_SIG_WDAT, 0, (struct acpi_table_header **)&tbl); @@ -326,19 +326,27 @@ static int wdat_wdt_probe(struct platform_device *pde= v) return -ENODEV; =20 wdat =3D devm_kzalloc(dev, sizeof(*wdat), GFP_KERNEL); - if (!wdat) - return -ENOMEM; + if (!wdat) { + ret =3D -ENOMEM; + goto out_put_table; + } =20 regs =3D devm_kcalloc(dev, pdev->num_resources, sizeof(*regs), GFP_KERNEL); - if (!regs) - return -ENOMEM; + if (!regs) { + ret =3D -ENOMEM; + goto out_put_table; + } =20 /* WDAT specification wants to have >=3D 1ms period */ - if (tbl->timer_period < 1) - return -EINVAL; - if (tbl->min_count > tbl->max_count) - return -EINVAL; + if (tbl->timer_period < 1) { + ret =3D -EINVAL; + goto out_put_table; + } + if (tbl->min_count > tbl->max_count) { + ret =3D -EINVAL; + goto out_put_table; + } =20 wdat->period =3D tbl->timer_period; wdat->wdd.min_timeout =3D DIV_ROUND_UP(wdat->period * tbl->min_count, 100= 0); @@ -355,15 +363,20 @@ static int wdat_wdt_probe(struct platform_device *pde= v) res =3D &pdev->resource[i]; if (resource_type(res) =3D=3D IORESOURCE_MEM) { reg =3D devm_ioremap_resource(dev, res); - if (IS_ERR(reg)) - return PTR_ERR(reg); + if (IS_ERR(reg)) { + ret =3D PTR_ERR(reg); + goto out_put_table; + } } else if (resource_type(res) =3D=3D IORESOURCE_IO) { reg =3D devm_ioport_map(dev, res->start, 1); - if (!reg) - return -ENOMEM; + if (!reg) { + ret =3D -ENOMEM; + goto out_put_table; + } } else { dev_err(dev, "Unsupported resource\n"); - return -EINVAL; + ret =3D -EINVAL; + goto out_put_table; } =20 regs[i] =3D reg; @@ -385,8 +398,10 @@ static int wdat_wdt_probe(struct platform_device *pdev) } =20 instr =3D devm_kzalloc(dev, sizeof(*instr), GFP_KERNEL); - if (!instr) - return -ENOMEM; + if (!instr) { + ret =3D -ENOMEM; + goto out_put_table; + } =20 INIT_LIST_HEAD(&instr->node); instr->entry =3D entries[i]; @@ -417,7 +432,8 @@ static int wdat_wdt_probe(struct platform_device *pdev) =20 if (!instr->reg) { dev_err(dev, "I/O resource not found\n"); - return -EINVAL; + ret =3D -EINVAL; + goto out_put_table; } =20 instructions =3D wdat->instructions[action]; @@ -425,8 +441,10 @@ static int wdat_wdt_probe(struct platform_device *pdev) instructions =3D devm_kzalloc(dev, sizeof(*instructions), GFP_KERNEL); - if (!instructions) - return -ENOMEM; + if (!instructions) { + ret =3D -ENOMEM; + goto out_put_table; + } =20 INIT_LIST_HEAD(instructions); wdat->instructions[action] =3D instructions; @@ -443,7 +461,7 @@ static int wdat_wdt_probe(struct platform_device *pdev) =20 ret =3D wdat_wdt_enable_reboot(wdat); if (ret) - return ret; + goto out_put_table; =20 platform_set_drvdata(pdev, wdat); =20 @@ -460,12 +478,16 @@ static int wdat_wdt_probe(struct platform_device *pde= v) =20 ret =3D wdat_wdt_set_timeout(&wdat->wdd, timeout); if (ret) - return ret; + goto out_put_table; =20 watchdog_set_nowayout(&wdat->wdd, nowayout); watchdog_stop_on_reboot(&wdat->wdd); watchdog_stop_on_unregister(&wdat->wdd); - return devm_watchdog_register_device(dev, &wdat->wdd); + ret =3D devm_watchdog_register_device(dev, &wdat->wdd); + +out_put_table: + acpi_put_table((struct acpi_table_header *)tbl); + return ret; } =20 static int wdat_wdt_suspend_noirq(struct device *dev) --=20 2.50.1.windows.1