LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: YueHaibing <yuehaibing@huawei.com> To: <davem@davemloft.net>, <socketcan@hartkopp.net>, <mkl@pengutronix.de> Cc: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>, <linux-can@vger.kernel.org>, YueHaibing <yuehaibing@huawei.com> Subject: [PATCH] can: Fix error path of can_init Date: Thu, 16 May 2019 22:36:26 +0800 [thread overview] Message-ID: <20190516143626.27636-1-yuehaibing@huawei.com> (raw) This patch add error path for can_init to avoid possible crash if some error occurs. Fixes: 0d66548a10cb ("[CAN]: Add PF_CAN core module") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- net/can/af_can.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/net/can/af_can.c b/net/can/af_can.c index 1684ba5..a1781ea 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -958,6 +958,8 @@ static void can_pernet_exit(struct net *net) static __init int can_init(void) { + int rc; + /* check for correct padding to be able to use the structs similarly */ BUILD_BUG_ON(offsetof(struct can_frame, can_dlc) != offsetof(struct canfd_frame, len) || @@ -971,15 +973,31 @@ static __init int can_init(void) if (!rcv_cache) return -ENOMEM; - register_pernet_subsys(&can_pernet_ops); + rc = register_pernet_subsys(&can_pernet_ops); + if (rc) + goto out_pernet; /* protocol register */ - sock_register(&can_family_ops); - register_netdevice_notifier(&can_netdev_notifier); + rc = sock_register(&can_family_ops); + if (rc) + goto out_sock; + rc = register_netdevice_notifier(&can_netdev_notifier); + if (rc) + goto out_notifier; + dev_add_pack(&can_packet); dev_add_pack(&canfd_packet); return 0; + +out_notifier: + sock_unregister(PF_CAN); +out_sock: + unregister_pernet_subsys(&can_pernet_ops); +out_pernet: + kmem_cache_destroy(rcv_cache); + + return rc; } static __exit void can_exit(void) -- 1.8.3.1
next reply other threads:[~2019-05-16 14:44 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-16 14:36 YueHaibing [this message] 2019-05-16 16:25 ` [PATCH] can: Fix error path of can_init Oliver Hartkopp
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190516143626.27636-1-yuehaibing@huawei.com \ --to=yuehaibing@huawei.com \ --cc=davem@davemloft.net \ --cc=linux-can@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mkl@pengutronix.de \ --cc=netdev@vger.kernel.org \ --cc=socketcan@hartkopp.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).