From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 439DF316192 for ; Mon, 17 Nov 2025 19:06:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406375; cv=none; b=Ey+YRNooEk+96Lf8MUUiZQyMEJmMXN6Vsav9Xbjcyxxl9uxBhLCaHFZHJ6Ux2KJh9FmtmuXFXITy/jjONqes4lmn799jL+JHs90GmzfoH+r+2n5C6P6JzMeYeiJBpvuVnY+fGWW4lrW/m7QBwwxhKE3gy3PD+6u9ve+55VJupBY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406375; c=relaxed/simple; bh=rFiMSmFEjPbJNpsQ4K9x1RL6OeK3koTlX7zcSoXg9Vo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=jT1gO2GRpYwxBScHyr/irT8m66DOwx5TdzVXv2b2XmBU/7FcWAMCNLEXfqcLWmL9/WOeafyXiBgTY4mO9vkEGqQE8Ki2LHB7C2kai0ZdfHBOPZRqBPTa+DWtZ7Z/c0nIQq3eugr/jS8U/QIR5DTAfNMaQ6KvwuqHuwgnRiOtMGc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hCGAy9ny; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net 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="hCGAy9ny" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7bc248dc16aso2439558b3a.0 for ; Mon, 17 Nov 2025 11:06:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763406372; x=1764011172; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:from:to:cc:subject:date:message-id:reply-to; bh=dlsZtfEc6JQRncrO9gv3FbbnoRQVjJvWvLbcLyrQNAE=; b=hCGAy9nyzQHJjoHBhLjQ/q9kJshzFAbDbS+tscLl1FFu5+2L44p/7JnAt57Uis4PRu EmrMxdFORC7qHkH5LRUKuNOlAQ/AAsF0JZP/ixogsxWckFDN9u5x/QKZuVaYLmxiDKmU TnSKOwZHY63RRa9C/+LunSDa0lY19O2VBZMqpCFjsPWNa12+foNuhQVXKzb722egdCtJ NfpAY9iNjX806unS7HKdPgEoAwoC9M7DoOS6hpFcRcO15wtAg8CCIqgOdoJwJbJPCtTL zIk8Fb5kksi0xEaPogQa7CgC+mL3BOeHfAPL87q7Mr1jOXdPJziHFD8CKfsYMwfACj9s 3seQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763406372; x=1764011172; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dlsZtfEc6JQRncrO9gv3FbbnoRQVjJvWvLbcLyrQNAE=; b=v/bOp+zj+ktnlIVDDnJPmR8PO9EUKRL3e5008onKsvMyNfdelg5UqQ87JE3DeVzxnA Pb0ePFN40f32/FJic+fprpLHMmYqNjGQDIDGCWBjLz3BdaqTfA0iIdq61S+uqulcZNbe HjAXTw/3tN9l0WfzQ23I3LRXB6COwf7/2SctNOyWsZ7ln5kYt11/L+fjAiQRYV073Z6h me+quY64Kzc0+iK47VjCA4eipfEzyatpiDN/C0nYmeoc4kvly6goDjxzXE0yoOkz4wvd HwUpbTi0mt2VhsAn8tQh5cWoengUmv0XGfYZU6dP7wNa0OAmRPmCdSXqQZY7O6RLNSyZ ZGFQ== X-Forwarded-Encrypted: i=1; AJvYcCX47Vg+S1WvNSStFu7nEL6U6s6nv7uBdIRDTmGP6yzDgpL8LeD+o1SEkCNcx6FvsPDA+3TOYemTXqXO4os=@vger.kernel.org X-Gm-Message-State: AOJu0YwsTk/q/bd4b+l2Lyt4TfRMU52vHlYvXffy1WemchqD4OSLmJju n4ieUkKXDikInOrcdg/Ncf89mCm1FXFDo6q8bcxcP7yAnwqcWBe71gakFRBEyw== X-Gm-Gg: ASbGnctfX+jadJPf+dW9oMVNOnsDzaGBoKyr2f5nKFi01F+hJQ5Jq7jsG+9tu9x+1TZ Wj8WoiGM5Q7VDI0COberS0iD3DaQfL3ZQD10uS52Q19fS33W4lWwWAbXrkBzz0kMl/1XtGbb2DL MpXa7dwWCqMDmb6xyxpraN6Z3M9Spslzk3JZjQZsVE+PV2tO/CulttwZabDXZ4GBkHrNlE7gjyc +T7rbtZz/HRBoMMsQ8twllkyp5MgJzrrskzC71x4F/b2jX/q22tUqhD6zrg75hwugPIOhGEuNsw Q63kuYSj6YhF5+jFoL5V6W8WLdFVatzDqao1yEBr0iuJLwHaUxiJp039N23QiQ0QC5GawJA2rei zHeIdcoFuiOHu9LpdR0DnwNMsPTffgP4vwwr30J8qbx4nHLN4aaiXYOL1dSmvZke3uEOsyewXoy AH2rtJxmNytaAv7UKGE3DCkozfow7GKiYFjgbKohKGQPgMoFFXyZNHzSyqD1g= X-Google-Smtp-Source: AGHT+IFd5uwvmhgTmz/z8E86sAkopCImCOPyZ6bzoN8PX6DF9/XnG2lTG7ZoLs+N4gvzqXcLpjvBbQ== X-Received: by 2002:a17:90b:1348:b0:340:bb64:c5e with SMTP id 98e67ed59e1d1-343f9ea41b3mr14489544a91.14.1763406372354; Mon, 17 Nov 2025 11:06:12 -0800 (PST) Received: from ?IPV6:2600:1700:e321:62f0:da43:aeff:fecc:bfd5? ([2600:1700:e321:62f0:da43:aeff:fecc:bfd5]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7b927151d38sm13965830b3a.40.2025.11.17.11.06.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Nov 2025 11:06:11 -0800 (PST) Sender: Guenter Roeck Message-ID: Date: Mon, 17 Nov 2025 11:06:10 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] watchdog: wdat_wdt: Fix ACPI table leak in probe function To: Haotian Zhang , wim@linux-watchdog.org Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org References: <20251113023032.547-1-vulab@iscas.ac.cn> Content-Language: en-US From: Guenter Roeck Autocrypt: addr=linux@roeck-us.net; keydata= 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 np3900V20aS7eD9K8GTU0TGC1pyz6IVJwIE= In-Reply-To: <20251113023032.547-1-vulab@iscas.ac.cn> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/12/25 18:30, Haotian Zhang wrote: > wdat_wdt_probe() calls acpi_get_table() to obtain the WDAT ACPI table but > never calls acpi_put_table() on any paths. This causes a permanent ACPI > table memory leak. > > Add a single cleanup path which calls acpi_put_table() to ensure > the ACPI table is always released. > > Fixes: 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") > Suggested-by: Guenter Roeck > Signed-off-by: Haotian Zhang Reviewed-by: Guenter Roeck > --- > Changes in v2: > -Remove unnecessary initialization. > -Correct the patch description, since the v1 patch already > free table on both error and success paths. > --- > drivers/watchdog/wdat_wdt.c | 64 +++++++++++++++++++++++++------------ > 1 file changed, 43 insertions(+), 21 deletions(-) > > diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c > index 650fdc7996e1..dd3c2d69c9df 100644 > --- a/drivers/watchdog/wdat_wdt.c > +++ b/drivers/watchdog/wdat_wdt.c > @@ -326,19 +326,27 @@ static int wdat_wdt_probe(struct platform_device *pdev) > return -ENODEV; > > wdat = devm_kzalloc(dev, sizeof(*wdat), GFP_KERNEL); > - if (!wdat) > - return -ENOMEM; > + if (!wdat) { > + ret = -ENOMEM; > + goto out_put_table; > + } > > regs = devm_kcalloc(dev, pdev->num_resources, sizeof(*regs), > GFP_KERNEL); > - if (!regs) > - return -ENOMEM; > + if (!regs) { > + ret = -ENOMEM; > + goto out_put_table; > + } > > /* WDAT specification wants to have >= 1ms period */ > - if (tbl->timer_period < 1) > - return -EINVAL; > - if (tbl->min_count > tbl->max_count) > - return -EINVAL; > + if (tbl->timer_period < 1) { > + ret = -EINVAL; > + goto out_put_table; > + } > + if (tbl->min_count > tbl->max_count) { > + ret = -EINVAL; > + goto out_put_table; > + } > > wdat->period = tbl->timer_period; > wdat->wdd.min_timeout = DIV_ROUND_UP(wdat->period * tbl->min_count, 1000); > @@ -355,15 +363,20 @@ static int wdat_wdt_probe(struct platform_device *pdev) > res = &pdev->resource[i]; > if (resource_type(res) == IORESOURCE_MEM) { > reg = devm_ioremap_resource(dev, res); > - if (IS_ERR(reg)) > - return PTR_ERR(reg); > + if (IS_ERR(reg)) { > + ret = PTR_ERR(reg); > + goto out_put_table; > + } > } else if (resource_type(res) == IORESOURCE_IO) { > reg = devm_ioport_map(dev, res->start, 1); > - if (!reg) > - return -ENOMEM; > + if (!reg) { > + ret = -ENOMEM; > + goto out_put_table; > + } > } else { > dev_err(dev, "Unsupported resource\n"); > - return -EINVAL; > + ret = -EINVAL; > + goto out_put_table; > } > > regs[i] = reg; > @@ -385,8 +398,10 @@ static int wdat_wdt_probe(struct platform_device *pdev) > } > > instr = devm_kzalloc(dev, sizeof(*instr), GFP_KERNEL); > - if (!instr) > - return -ENOMEM; > + if (!instr) { > + ret = -ENOMEM; > + goto out_put_table; > + } > > INIT_LIST_HEAD(&instr->node); > instr->entry = entries[i]; > @@ -417,7 +432,8 @@ static int wdat_wdt_probe(struct platform_device *pdev) > > if (!instr->reg) { > dev_err(dev, "I/O resource not found\n"); > - return -EINVAL; > + ret = -EINVAL; > + goto out_put_table; > } > > instructions = wdat->instructions[action]; > @@ -425,8 +441,10 @@ static int wdat_wdt_probe(struct platform_device *pdev) > instructions = devm_kzalloc(dev, > sizeof(*instructions), > GFP_KERNEL); > - if (!instructions) > - return -ENOMEM; > + if (!instructions) { > + ret = -ENOMEM; > + goto out_put_table; > + } > > INIT_LIST_HEAD(instructions); > wdat->instructions[action] = instructions; > @@ -443,7 +461,7 @@ static int wdat_wdt_probe(struct platform_device *pdev) > > ret = wdat_wdt_enable_reboot(wdat); > if (ret) > - return ret; > + goto out_put_table; > > platform_set_drvdata(pdev, wdat); > > @@ -460,12 +478,16 @@ static int wdat_wdt_probe(struct platform_device *pdev) > > ret = wdat_wdt_set_timeout(&wdat->wdd, timeout); > if (ret) > - return ret; > + goto out_put_table; > > 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 = devm_watchdog_register_device(dev, &wdat->wdd); > + > +out_put_table: > + acpi_put_table((struct acpi_table_header *)tbl); > + return ret; > } > > static int wdat_wdt_suspend_noirq(struct device *dev)