[PATCH] soc/fsl/guts: Add a NULL check for devm_kasprintf()

[PATCH] soc/fsl/guts: Add a NULL check for devm_kasprintf()

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@nxp.com>

devm_kasprintf() may fail, so we should better add a NULL check
and propagate an error on failure.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
 drivers/soc/fsl/guts.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index d89a6a8..82251b4 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -167,10 +167,16 @@ static int fsl_guts_probe(struct platform_device *pdev)
 	} else {
 		soc_dev_attr.family = devm_kasprintf(dev, GFP_KERNEL, "QorIQ");
 	}
+	if (!soc_dev_attr.family)
+		return -ENOMEM;
 	soc_dev_attr.soc_id = devm_kasprintf(dev, GFP_KERNEL,
 					     "svr:0x%08x", svr);
+	if (!soc_dev_attr.soc_id)
+		return -ENOMEM;
 	soc_dev_attr.revision = devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
 					       (svr >>  4) & 0xf, svr & 0xf);
+	if (!soc_dev_attr.revision)
+		return -ENOMEM;
 
 	soc_dev = soc_device_register(&soc_dev_attr);
 	if (IS_ERR(soc_dev))
-- 
2.7.4

RE: [PATCH] soc/fsl/guts: Add a NULL check for devm_kasprintf()

[Y.b. Lu]

PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBGYWJpbyBFc3RldmFtIFttYWls
dG86ZmVzdGV2YW1AZ21haWwuY29tXQ0KPiBTZW50OiAyMDE4xOox1MI2yNUgMjE6MjMNCj4gVG86
IExlbyBMaSA8bGVveWFuZy5saUBueHAuY29tPg0KPiBDYzogbGludXhwcGMtZGV2QGxpc3RzLm96
bGFicy5vcmc7IFkuYi4gTHUgPHlhbmdiby5sdUBueHAuY29tPjsgRmFiaW8NCj4gRXN0ZXZhbSA8
ZmFiaW8uZXN0ZXZhbUBueHAuY29tPg0KPiBTdWJqZWN0OiBbUEFUQ0hdIHNvYy9mc2wvZ3V0czog
QWRkIGEgTlVMTCBjaGVjayBmb3IgZGV2bV9rYXNwcmludGYoKQ0KPiANCj4gRnJvbTogRmFiaW8g
RXN0ZXZhbSA8ZmFiaW8uZXN0ZXZhbUBueHAuY29tPg0KPiANCj4gZGV2bV9rYXNwcmludGYoKSBt
YXkgZmFpbCwgc28gd2Ugc2hvdWxkIGJldHRlciBhZGQgYSBOVUxMIGNoZWNrIGFuZA0KPiBwcm9w
YWdhdGUgYW4gZXJyb3Igb24gZmFpbHVyZS4NCj4gDQo+IFNpZ25lZC1vZmYtYnk6IEZhYmlvIEVz
dGV2YW0gPGZhYmlvLmVzdGV2YW1AbnhwLmNvbT4NCg0KW1kuYi4gTHVdIEl0IG1ha2VzIHNlbnNl
LiANCkFja2VkLWJ5OiBZYW5nYm8gTHUgPHlhbmdiby5sdUBueHAuY29tPg0KDQo+IC0tLQ0KPiAg
ZHJpdmVycy9zb2MvZnNsL2d1dHMuYyB8IDYgKysrKysrDQo+ICAxIGZpbGUgY2hhbmdlZCwgNiBp
bnNlcnRpb25zKCspDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9zb2MvZnNsL2d1dHMuYyBi
L2RyaXZlcnMvc29jL2ZzbC9ndXRzLmMgaW5kZXgNCj4gZDg5YTZhOC4uODIyNTFiNCAxMDA2NDQN
Cj4gLS0tIGEvZHJpdmVycy9zb2MvZnNsL2d1dHMuYw0KPiArKysgYi9kcml2ZXJzL3NvYy9mc2wv
Z3V0cy5jDQo+IEBAIC0xNjcsMTAgKzE2NywxNiBAQCBzdGF0aWMgaW50IGZzbF9ndXRzX3Byb2Jl
KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UNCj4gKnBkZXYpDQo+ICAJfSBlbHNlIHsNCj4gIAkJc29j
X2Rldl9hdHRyLmZhbWlseSA9IGRldm1fa2FzcHJpbnRmKGRldiwgR0ZQX0tFUk5FTCwgIlFvcklR
Iik7DQo+ICAJfQ0KPiArCWlmICghc29jX2Rldl9hdHRyLmZhbWlseSkNCj4gKwkJcmV0dXJuIC1F
Tk9NRU07DQo+ICAJc29jX2Rldl9hdHRyLnNvY19pZCA9IGRldm1fa2FzcHJpbnRmKGRldiwgR0ZQ
X0tFUk5FTCwNCj4gIAkJCQkJICAgICAic3ZyOjB4JTA4eCIsIHN2cik7DQo+ICsJaWYgKCFzb2Nf
ZGV2X2F0dHIuc29jX2lkKQ0KPiArCQlyZXR1cm4gLUVOT01FTTsNCj4gIAlzb2NfZGV2X2F0dHIu
cmV2aXNpb24gPSBkZXZtX2thc3ByaW50ZihkZXYsIEdGUF9LRVJORUwsICIlZC4lZCIsDQo+ICAJ
CQkJCSAgICAgICAoc3ZyID4+ICA0KSAmIDB4Ziwgc3ZyICYgMHhmKTsNCj4gKwlpZiAoIXNvY19k
ZXZfYXR0ci5yZXZpc2lvbikNCj4gKwkJcmV0dXJuIC1FTk9NRU07DQo+IA0KPiAgCXNvY19kZXYg
PSBzb2NfZGV2aWNlX3JlZ2lzdGVyKCZzb2NfZGV2X2F0dHIpOw0KPiAgCWlmIChJU19FUlIoc29j
X2RldikpDQo+IC0tDQo+IDIuNy40DQoNCg==

Re: [PATCH] soc/fsl/guts: Add a NULL check for devm_kasprintf()

[Li Yang]

On Sun, Jan 7, 2018 at 9:06 PM, Y.b. Lu <yangbo.lu@nxp.com> wrote:
>> -----Original Message-----
>> From: Fabio Estevam [mailto:festevam@gmail.com]
>> Sent: 2018=E5=B9=B41=E6=9C=886=E6=97=A5 21:23
>> To: Leo Li <leoyang.li@nxp.com>
>> Cc: linuxppc-dev@lists.ozlabs.org; Y.b. Lu <yangbo.lu@nxp.com>; Fabio
>> Estevam <fabio.estevam@nxp.com>
>> Subject: [PATCH] soc/fsl/guts: Add a NULL check for devm_kasprintf()
>>
>> From: Fabio Estevam <fabio.estevam@nxp.com>
>>
>> devm_kasprintf() may fail, so we should better add a NULL check and
>> propagate an error on failure.
>>
>> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
>
> [Y.b. Lu] It makes sense.
> Acked-by: Yangbo Lu <yangbo.lu@nxp.com>

Merged.  Thanks.

>
>> ---
>>  drivers/soc/fsl/guts.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index
>> d89a6a8..82251b4 100644
>> --- a/drivers/soc/fsl/guts.c
>> +++ b/drivers/soc/fsl/guts.c
>> @@ -167,10 +167,16 @@ static int fsl_guts_probe(struct platform_device
>> *pdev)
>>       } else {
>>               soc_dev_attr.family =3D devm_kasprintf(dev, GFP_KERNEL, "Q=
orIQ");
>>       }
>> +     if (!soc_dev_attr.family)
>> +             return -ENOMEM;
>>       soc_dev_attr.soc_id =3D devm_kasprintf(dev, GFP_KERNEL,
>>                                            "svr:0x%08x", svr);
>> +     if (!soc_dev_attr.soc_id)
>> +             return -ENOMEM;
>>       soc_dev_attr.revision =3D devm_kasprintf(dev, GFP_KERNEL, "%d.%d",
>>                                              (svr >>  4) & 0xf, svr & 0x=
f);
>> +     if (!soc_dev_attr.revision)
>> +             return -ENOMEM;
>>
>>       soc_dev =3D soc_device_register(&soc_dev_attr);
>>       if (IS_ERR(soc_dev))
>> --
>> 2.7.4
>