Re: [PATCH] Loongarch64: pci: fix memleak in pci_acpi_scan_root

[WangYuli]

On 2024/8/31 15:18, Huacai Chen wrote:
> Hi, Wentao,
>
> On Sat, Aug 31, 2024 at 1:24 PM Wentao Guan <guanwentao@xxxxxxxxxxxxx> wrote:
> > Add kfree(root_ops) in this case to avoid memleak root_ops,
> > leaks when pci_find_bus() != 0.
> > Also delay assign root_ops when used for making code read clean.
> > Found by code review
> >
> > Signed-off-by: Wangyuli <wangyuli@xxxxxxxxxxxxx>
> This should be Yuli Wang <wangyuli@xxxxxxxxxxxxx>

While I maintain a preference for the traditional Chinese naming order, 
not particularly like putting my Chinese name in the English surname order,

I acknowledge that flexibility in this matter is often necessary.

It is sufficient for everybody to be aware that both 'WangYuli' and 
'Yuli Wang' refer to me.

> > Signed-off-by: Wentao Guan <guanwentao@xxxxxxxxxxxxx>
> > ---
> >   arch/loongarch/pci/acpi.c | 9 +++++----
> >   1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/loongarch/pci/acpi.c b/arch/loongarch/pci/acpi.c
> > index 3eb61b8cd5e3..7f3539f5fa23 100644
> > --- a/arch/loongarch/pci/acpi.c
> > +++ b/arch/loongarch/pci/acpi.c
> > @@ -219,17 +219,18 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
> >                  return NULL;
> >          }
> >
> > -       root_ops->release_info = acpi_release_root_info;
> > -       root_ops->prepare_resources = acpi_prepare_root_resources;
> > -       root_ops->pci_ops = (struct pci_ops *)&info->cfg->ops->pci_ops;
> > -
> >          bus = pci_find_bus(domain, busnum);
> >          if (bus) {
> >                  memcpy(bus->sysdata, info->cfg, sizeof(struct pci_config_window));
> >                  kfree(info);
> > +               kfree(root_ops);
> Add kfree() is fine, but move root_ops assignment is unnecessary.
>
> Huacai
>
> >          } else {
> >                  struct pci_bus *child;
> >
> > +               root_ops->release_info = acpi_release_root_info;
> > +               root_ops->prepare_resources = acpi_prepare_root_resources;
> > +               root_ops->pci_ops = (struct pci_ops *)&info->cfg->ops->pci_ops;
> > +
> >                  bus = acpi_pci_root_create(root, root_ops,
> >                                             &info->common, info->cfg);
> >                  if (!bus) {
> > --
> > 2.20.1
--
WangYuli