diff mbox series

rtc: sysfs: fix NULL check in rtc_add_groups()

Message ID 20180827092234.mj44ruwkglbor3e5@kili.mountain
State Accepted
Headers show
Series rtc: sysfs: fix NULL check in rtc_add_groups() | expand

Commit Message

Dan Carpenter Aug. 27, 2018, 9:22 a.m. UTC 
devm_kcalloc() returns NULL, it never returns error pointers.  In the
current code we would return PTR_ERR(NULL) which is success, instead of
returning the -ENOMEM error code.

Fixes: a0a1a1ba3032 ("rtc: sysfs: facilitate attribute add to rtc device")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Alexandre Belloni Aug. 27, 2018, 9:05 p.m. UTC | #1 
On 27/08/2018 12:22:34+0300, Dan Carpenter wrote:
> devm_kcalloc() returns NULL, it never returns error pointers.  In the
> current code we would return PTR_ERR(NULL) which is success, instead of
> returning the -ENOMEM error code.
> 
> Fixes: a0a1a1ba3032 ("rtc: sysfs: facilitate attribute add to rtc device")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
Applied, thanks.
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index f1ff30ade534..9746c32eee2e 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -338,8 +338,8 @@  int rtc_add_groups(struct rtc_device *rtc, const struct attribute_group **grps)
 
 	new_cnt = old_cnt + add_cnt + 1;
 	groups = devm_kcalloc(&rtc->dev, new_cnt, sizeof(*groups), GFP_KERNEL);
-	if (IS_ERR_OR_NULL(groups))
-		return PTR_ERR(groups);
+	if (!groups)
+		return -ENOMEM;
 	memcpy(groups, rtc->dev.groups, old_cnt * sizeof(*groups));
 	memcpy(groups + old_cnt, grps, add_cnt * sizeof(*groups));
 	groups[old_cnt + add_cnt] = NULL;