redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

can: af_can: can_pernet_init(): add missing error handling for kzalloc returning NULL 

This patch adds the missing check and error handling for out-of-memory
situations, when kzalloc cannot allocate memory.

Fixes: cb5635a367 ("can: complete initial namespace support")
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
hifive-unleashed-5.1
Marc Kleine-Budde 2017-07-29 11:51:01 +02:00
parent cae1d5b78f
commit 5a606223c6
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/can/af_can.c
View File

@ -875,9 +875,14 @@ static int can_pernet_init(struct net *net)
spin_lock_init(&net->can.can_rcvlists_lock);
net->can.can_rx_alldev_list =
kzalloc(sizeof(struct dev_rcv_lists), GFP_KERNEL);
if (!net->can.can_rx_alldev_list)
goto out;
net->can.can_stats = kzalloc(sizeof(struct s_stats), GFP_KERNEL);
if (!net->can.can_stats)
goto out_free_alldev_list;
net->can.can_pstats = kzalloc(sizeof(struct s_pstats), GFP_KERNEL);
if (!net->can.can_pstats)
goto out_free_can_stats;
if (IS_ENABLED(CONFIG_PROC_FS)) {
/* the statistics are updated every second (timer triggered) */
@ -892,6 +897,13 @@ static int can_pernet_init(struct net *net)
}
return 0;
out_free_can_stats:
kfree(net->can.can_stats);
out_free_alldev_list:
kfree(net->can.can_rx_alldev_list);
out:
return -ENOMEM;
}
static void can_pernet_exit(struct net *net)