mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Kent Gibson <warthog618@gmail.com>
To: Adrian Ambrozewicz <aambrozewicz@nvidia.com>
Cc: Bartosz Golaszewski <brgl@kernel.org>,
	Linus Walleij <linusw@kernel.org>,
	Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>,
	"Paul E. McKenney" <paulmck@kernel.org>,
	Herve Codina <herve.codina@bootlin.com>,
	Jia Jia <physicalmtea@gmail.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org
Subject: Re: [PATCH v7 5/8] gpiolib: cdev: don't leak the IRQ name when the chip is removed
Date: Sat, 21 Nov 2026 12:52:24 +0800	[thread overview]
Message-ID: <20261121045224.GB17013@rigel> (raw)
In-Reply-To: <20261120-gpiolib-chip-removal-v7-5-aambrozewicz@nvidia.com>

On Fri, Nov 20, 2026 at 10:13:57AM +0200, Adrian Ambrozewicz wrote:
> The character device requests line IRQs with a copy of the consumer
> label as the name, and frees the name that free_irq() returns. When
> gpiochip_remove() frees the IRQ first, it drops that name and the copy
> leaks:
> 
>   unreferenced object (size 8):
>     comm "gpio-hold"
>     backtrace (crc dc8eac94):
>       kstrdup
>       kstrdup_and_replace
>       edge_detector_setup
>       linereq_create
>       gpio_ioctl
> 
> Keep the name with the line or v1 line event, and free it there,
> whoever freed the IRQ.
> 
> Reproduced with gpio-sim: remove the chip under an open request with
> edge detection and a consumer label. kmemleak reports up to 23 such
> objects after 30 cycles; with this change, none after 100.
> 
> Fixes: ec8b6f55b981 ("gpio: free irqs that are still requested when the chip is being removed")
> Cc: stable@vger.kernel.org
> Reviewed-by: Kent Gibson <warthog618@gmail.com>
> Signed-off-by: Adrian Ambrozewicz <aambrozewicz@nvidia.com>
> ---
>  drivers/gpio/gpiolib-cdev.c | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
> index f2da4f2646bc..fdcd315e776b 100644
> --- a/drivers/gpio/gpiolib-cdev.c
> +++ b/drivers/gpio/gpiolib-cdev.c
> @@ -400,6 +400,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
>   * @desc: the GPIO descriptor for this line.
>   * @req: the corresponding line request
>   * @irq: the interrupt triggered in response to events on this GPIO
> + * @irq_label: the name @irq was requested with
>   * @edflags: the edge flags, GPIO_V2_LINE_FLAG_EDGE_RISING and/or
>   * GPIO_V2_LINE_FLAG_EDGE_FALLING, indicating the edge detection applied
>   * @timestamp_ns: cache for the timestamp storing it between hardirq and
> @@ -423,6 +424,7 @@ struct line {
>  	 */
>  	struct linereq *req;
>  	unsigned int irq;
> +	char *irq_label;
>  	/*
>  	 * The flags for the active edge detector configuration.
>  	 *
> @@ -602,16 +604,18 @@ static inline void free_irq_label(const char *label)
>  /*
>   * gpiochip_remove() frees the interrupts still requested on the lines of the
>   * chip being removed, so once the chip is going away the IRQ may no longer be
> - * ours to free.
> + * ours to free. The label is kept by the caller as free_irq() is then not the
> + * one returning it.
>   */
> -static void free_line_irq(unsigned int irq, void *dev_id)
> +static void free_line_irq(unsigned int irq, void *dev_id, char **label)
>  {
> -	const char *name = NULL;
> +	const char *name = *label;
>  
>  	if (irq && irq_has_action(irq))
> -		name = free_irq(irq, dev_id);
> +		free_irq(irq, dev_id);
>  
>  	free_irq_label(name);
> +	*label = NULL;
>  }
>  

The function you are modifying was added in patch 3, so note that this patch is
dependent on patch 3 in the description[1].

>  #ifdef CONFIG_HTE
> @@ -939,6 +943,7 @@ static int debounce_setup(struct line *line, unsigned int debounce_period_us)
>  				return ret;
>  			}
>  			line->irq = irq;
> +			line->irq_label = label;
>  		} else {
>  			ret = hte_edge_setup(line, GPIO_V2_LINE_FLAG_EDGE_BOTH);
>  			if (ret)
> @@ -981,7 +986,7 @@ static u32 gpio_v2_line_config_debounce_period(struct gpio_v2_line_config *lc,
>  
>  static void edge_detector_stop(struct line *line)
>  {
> -	free_line_irq(line->irq, line);
> +	free_line_irq(line->irq, line, &line->irq_label);
>  	line->irq = 0;
>  
Similarly - but you only need to note the dependency once.

Cheers,
Kent.
[1] https://www.kernel.org/doc/html/latest/process/submitting-patches.html#separate-your-changes 

  reply	other threads:[~2026-11-21  4:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-20  8:13 [PATCH v7 0/8] gpiolib: fix chip removal with lines still requested from user space Adrian Ambrozewicz
2026-11-20  8:13 ` [PATCH v7 1/8] gpiolib: wait for pending label frees before cleaning up desc_srcu Adrian Ambrozewicz
2026-11-20  8:13 ` [PATCH v7 2/8] gpiolib: free the label of lines released after their chip was removed Adrian Ambrozewicz
2026-11-20  8:13 ` [PATCH v7 3/8] gpiolib: cdev: do not free line IRQs again after the chip is removed Adrian Ambrozewicz
2026-11-20  8:13 ` [PATCH v7 4/8] gpiolib: cdev: don't sleep in the SRCU read section in read() Adrian Ambrozewicz
2026-11-20  8:13 ` [PATCH v7 5/8] gpiolib: cdev: don't leak the IRQ name when the chip is removed Adrian Ambrozewicz
2026-11-21  4:52   ` Kent Gibson [this message]
2026-11-20  8:13 ` [PATCH v7 6/8] gpiolib: cdev: don't report a failed line read as an edge Adrian Ambrozewicz
2026-11-20  8:13 ` [PATCH v7 7/8] gpiolib: let the character device free its IRQs first on chip removal Adrian Ambrozewicz
2026-11-21  4:46   ` Kent Gibson
2026-11-21  5:19     ` Adrian Ambrozewicz
2026-11-21  5:26       ` Kent Gibson
2026-11-20  8:14 ` [PATCH v7 8/8] gpiolib: remove the shared GPIO proxies before freeing the remaining IRQs Adrian Ambrozewicz
2026-11-21  5:08   ` Kent Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261121045224.GB17013@rigel \
    --to=warthog618@gmail.com \
    --cc=aambrozewicz@nvidia.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=bartosz.golaszewski@oss.qualcomm.com \
    --cc=brgl@kernel.org \
    --cc=herve.codina@bootlin.com \
    --cc=linusw@kernel.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paulmck@kernel.org \
    --cc=physicalmtea@gmail.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®