Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <2023051610-stove-condense-9a77@gregkh>
In-Reply-To: <2023051610-stove-condense-9a77@gregkh>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Wed, 17 May 2023 12:41:38 +0200
Message-ID: <CAJZ5v0h-jjoS7evdVS5HkO0A0v5mFwPnEQgoA4X+pmoeopRc=w@mail.gmail.com>
Subject: Re: [PATCH] driver core: class: properly reference count class_dev_iter()
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
        syzbot+e7afd76ad060fa0d2605@syzkaller.appspotmail.com,
        Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        Alan Stern <stern@rowland.harvard.edu>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

On Tue, May 16, 2023 at 9:20 PM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> When class_dev_iter is initialized, the reference count for the subsys
> private structure is incremented, but never decremented, causing a
> memory leak over time.  To resolve this, save off a pointer to the
> internal structure into the class_dev_iter structure and then when the
> iterator is finished, drop the reference count.
>
> Reported-and-tested-by: syzbot+e7afd76ad060fa0d2605@syzkaller.appspotmail.com
> Reported-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Rafael J. Wysocki <rafael@kernel.org>

> ---
>  drivers/base/class.c         | 2 ++
>  include/linux/device/class.h | 1 +
>  2 files changed, 3 insertions(+)
>
> diff --git a/drivers/base/class.c b/drivers/base/class.c
> index ac1808d1a2e8..05d9df90f621 100644
> --- a/drivers/base/class.c
> +++ b/drivers/base/class.c
> @@ -320,6 +320,7 @@ void class_dev_iter_init(struct class_dev_iter *iter, const struct class *class,
>                 start_knode = &start->p->knode_class;
>         klist_iter_init_node(&sp->klist_devices, &iter->ki, start_knode);
>         iter->type = type;
> +       iter->sp = sp;
>  }
>  EXPORT_SYMBOL_GPL(class_dev_iter_init);
>
> @@ -361,6 +362,7 @@ EXPORT_SYMBOL_GPL(class_dev_iter_next);
>  void class_dev_iter_exit(struct class_dev_iter *iter)
>  {
>         klist_iter_exit(&iter->ki);
> +       subsys_put(iter->sp);
>  }
>  EXPORT_SYMBOL_GPL(class_dev_iter_exit);
>
> diff --git a/include/linux/device/class.h b/include/linux/device/class.h
> index 9deeaeb457bb..abf3d3bfb6fe 100644
> --- a/include/linux/device/class.h
> +++ b/include/linux/device/class.h
> @@ -74,6 +74,7 @@ struct class {
>  struct class_dev_iter {
>         struct klist_iter               ki;
>         const struct device_type        *type;
> +       struct subsys_private           *sp;
>  };
>
>  int __must_check class_register(const struct class *class);
> --
> 2.40.1
>