public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: Malaya Kumar Rout <mrout@redhat.com>, linux-kernel@vger.kernel.org
Cc: mrout@redhat.com, lyude@redhat.com, malayarout91@gmail.com,
	John Stultz <jstultz@google.com>, Stephen Boyd <sboyd@kernel.org>
Subject: Re: [PATCH] timekeeping: Fix resource leak in tk_aux_sysfs_init() error paths
Date: Fri, 14 Nov 2025 19:41:47 +0100	[thread overview]
Message-ID: <87ldk8bgno.ffs@tglx> (raw)
In-Reply-To: <20251110070054.9090-1-mrout@redhat.com>

On Mon, Nov 10 2025 at 12:30, Malaya Kumar Rout wrote:
> @@ -3060,29 +3060,37 @@ static const struct attribute_group aux_clock_enable_attr_group = {
>  static int __init tk_aux_sysfs_init(void)
>  {
>  	struct kobject *auxo, *tko = kobject_create_and_add("time", kernel_kobj);
> +	int ret;
>  
>  	if (!tko)
>  		return -ENOMEM;
>  
>  	auxo = kobject_create_and_add("aux_clocks", tko);
>  	if (!auxo) {
> -		kobject_put(tko);
> -		return -ENOMEM;
> +		ret = -ENOMEM;
> +		goto err_put_tko;

This ret variable is completely pointless as it is set to -ENOMEM in
every error path. Just make the error path do 'return -ENOMEM;', no?

>  	}
>  
>  	for (int i = 0; i < MAX_AUX_CLOCKS; i++) {
>  		char id[2] = { [0] = '0' + i, };
>  		struct kobject *clk = kobject_create_and_add(id, auxo);
>  
> -		if (!clk)
> -			return -ENOMEM;
> -
> -		int ret = sysfs_create_group(clk, &aux_clock_enable_attr_group);
> +		if (!clk) {
> +			ret = -ENOMEM;
> +			goto err_put_auxo;
> +		}
>  
> +		ret = sysfs_create_group(clk, &aux_clock_enable_attr_group);
>  		if (ret)
> -			return ret;
> +			goto err_put_auxo;
>  	}
>  	return 0;
> +
> +err_put_auxo:
> +	kobject_put(auxo);
> +err_put_tko:
> +	kobject_put(tko);
> +	return ret;

You can simplify that with _one_ error label:

err:
	kobject_put(auxo);
	kobject_put(tko);
	return -ENOMEM;
        
because kobject_put() is NULL pointer safe.

Thanks,

        tglx

  reply	other threads:[~2025-11-14 18:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-10  7:00 [PATCH] timekeeping: Fix resource leak in tk_aux_sysfs_init() error paths Malaya Kumar Rout
2025-11-14 18:41 ` Thomas Gleixner [this message]
2025-11-16 15:49   ` Malaya Kumar Rout
2025-11-16 17:14     ` Thomas Gleixner
2025-11-20 15:02       ` [PATCH v2] " Malaya Kumar Rout
2025-11-20 15:44         ` [tip: timers/urgent] " tip-bot2 for Malaya Kumar Rout

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=87ldk8bgno.ffs@tglx \
    --to=tglx@linutronix.de \
    --cc=jstultz@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lyude@redhat.com \
    --cc=malayarout91@gmail.com \
    --cc=mrout@redhat.com \
    --cc=sboyd@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