projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f01aa63
)
rocker: add a check for NULL in rocker_probe_ports()
author
Dan Carpenter
<dan.carpenter@oracle.com>
Wed, 25 Feb 2015 13:35:32 +0000
(16:35 +0300)
committer
David S. Miller
<davem@davemloft.net>
Fri, 27 Feb 2015 20:53:43 +0000
(15:53 -0500)
Make sure kmalloc() succeeds.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/rocker/rocker.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/rocker/rocker.c
b/drivers/net/ethernet/rocker/rocker.c
index 34389b6aa67cbd26263366ca1bff769f1b27c68a..713a13cb8c144883ec9840d7050517c9deac26b6 100644
(file)
--- a/
drivers/net/ethernet/rocker/rocker.c
+++ b/
drivers/net/ethernet/rocker/rocker.c
@@
-4201,6
+4201,8
@@
static int rocker_probe_ports(struct rocker *rocker)
alloc_size = sizeof(struct rocker_port *) * rocker->port_count;
rocker->ports = kmalloc(alloc_size, GFP_KERNEL);
+ if (!rocker->ports)
+ return -ENOMEM;
for (i = 0; i < rocker->port_count; i++) {
err = rocker_probe_port(rocker, i);
if (err)