Re: [PATCH v5 1/1] powerpc/pseries: Interface to represent PAPR firmware attributes

[Pratik Sampat]

On 20/07/21 12:39 am, Fabiano Rosas wrote:
> "Pratik R. Sampat" <psampat@xxxxxxxxxxxxx> writes:
>
> > +	pgs = kcalloc(num_attrs, sizeof(*pgs), GFP_KERNEL);
> > +	if (!pgs)
> > +		goto out;
> > +
> > +	papr_kobj = kobject_create_and_add("papr", firmware_kobj);
> > +	if (!papr_kobj) {
> > +		pr_warn("kobject_create_and_add papr failed\n");
> > +		goto out_pgs;
> > +	}
> > +
> > +	esi_kobj = kobject_create_and_add("energy_scale_info", papr_kobj);
> > +	if (!esi_kobj) {
> > +		pr_warn("kobject_create_and_add energy_scale_info failed\n");
> > +		goto out_kobj;
> > +	}
> > +
> > +	for (idx = 0; idx < num_attrs; idx++) {
> > +		bool show_val_desc = true;
> > +
> > +		pgs[idx].pg.attrs = kcalloc(MAX_ATTRS + 1,
> > +					    sizeof(*pgs[idx].pg.attrs),
> > +					    GFP_KERNEL);
> > +		if (!pgs[idx].pg.attrs) {
> > +			for (i = idx - 1; i >= 0; i--)
> > +				kfree(pgs[i].pg.attrs);
> What about the pg.name from the previous iterations?
>
> > +			goto out_ekobj;
> > +		}
> > +
> > +		pgs[idx].pg.name = kasprintf(GFP_KERNEL, "%lld",
> > +					     be64_to_cpu(esi_attrs[idx].id));
> > +		if (pgs[idx].pg.name == NULL) {
> > +			for (i = idx; i >= 0; i--)
> > +				kfree(pgs[i].pg.attrs);
> Here too.
>
> You could just 'goto out_pgattrs' in both cases.

Yeah, you're right. I may have over-complicated the free, in case of
failure in both the cases above I could just free from "out_pgattrs"
with no issues

> > +			goto out_ekobj;
> > +		}
> > +		/* Do not add the value description if it does not exist */
> > +		if (strnlen(esi_attrs[idx].value_desc,
> > +			    sizeof(esi_attrs[idx].value_desc)) == 0)
> > +			show_val_desc = false;
> > +
> > +		if (add_attr_group(be64_to_cpu(esi_attrs[idx].id), &pgs[idx],
> > +				   show_val_desc)) {
> > +			pr_warn("Failed to create papr attribute group %s\n",
> > +				pgs[idx].pg.name);
> > +			goto out_pgattrs;
> > +		}
> > +	}
> > +
> > +	kfree(esi_buf);
> > +	return 0;
> > +
> > +out_pgattrs:
> > +	for (i = 0; i < num_attrs ; i++) {
> > +		kfree(pgs[i].pg.attrs);
> > +		kfree(pgs[i].pg.name);
> > +	}
> > +out_ekobj:
> > +	kobject_put(esi_kobj);
> > +out_kobj:
> > +	kobject_put(papr_kobj);
> > +out_pgs:
> > +	kfree(pgs);
> > +out:
> > +	kfree(esi_buf);
> > +
> > +	return -ENOMEM;
> > +}
> > +
> > +machine_device_initcall(pseries, papr_init);