From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59602 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932084AbdJWM4f (ORCPT ); Mon, 23 Oct 2017 08:56:35 -0400 Subject: Patch "can: af_can: can_pernet_init(): add missing error handling for kzalloc returning NULL" has been added to the 4.13-stable tree To: mkl@pengutronix.de, gregkh@linuxfoundation.org, socketcan@hartkopp.net Cc: , From: Date: Mon, 23 Oct 2017 14:56:31 +0200 Message-ID: <150876339191244@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled can: af_can: can_pernet_init(): add missing error handling for kzalloc returning NULL to the 4.13-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: can-af_can-can_pernet_init-add-missing-error-handling-for-kzalloc-returning-null.patch and it can be found in the queue-4.13 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 5a606223c6b5b7560da253ed52e62c67fa18e29b Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 29 Jul 2017 11:51:01 +0200 Subject: can: af_can: can_pernet_init(): add missing error handling for kzalloc returning NULL From: Marc Kleine-Budde commit 5a606223c6b5b7560da253ed52e62c67fa18e29b upstream. This patch adds the missing check and error handling for out-of-memory situations, when kzalloc cannot allocate memory. Fixes: cb5635a36776 ("can: complete initial namespace support") Acked-by: Oliver Hartkopp Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- net/can/af_can.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -875,9 +875,14 @@ static int can_pernet_init(struct net *n 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 *n } 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) Patches currently in stable-queue which might be from mkl@pengutronix.de are queue-4.13/can-flexcan-rename-legacy-error-state-quirk.patch queue-4.13/can-af_can-can_pernet_init-add-missing-error-handling-for-kzalloc-returning-null.patch queue-4.13/can-flexcan-implement-error-passive-state-quirk.patch queue-4.13/can-flexcan-fix-i.mx28-state-transition-issue.patch queue-4.13/can-flexcan-fix-state-transition-regression.patch queue-4.13/can-flexcan-fix-i.mx6-state-transition-issue.patch queue-4.13/can-flexcan-fix-p1010-state-transition-issue.patch queue-4.13/can-esd_usb2-fix-can_dlc-value-for-received-rtr-frames.patch queue-4.13/can-gs_usb-fix-busy-loop-if-no-more-tx-context-is-available.patch