* [PATCH] net: mscc: ocelot: null check devm_kcalloc
@ 2019-07-25 1:56 Navid Emamdoost
2019-07-26 0:20 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Navid Emamdoost @ 2019-07-25 1:56 UTC (permalink / raw)
Cc: emamd001, kjlu, smccaman, secalert, Navid Emamdoost,
Alexandre Belloni, Microchip Linux Driver Support,
David S. Miller, netdev, linux-kernel
devm_kcalloc may fail and return NULL. Added the null check.
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
---
drivers/net/ethernet/mscc/ocelot_board.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c
index 58bde1a9eacb..52377cfdc31a 100644
--- a/drivers/net/ethernet/mscc/ocelot_board.c
+++ b/drivers/net/ethernet/mscc/ocelot_board.c
@@ -257,6 +257,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
ocelot->ports = devm_kcalloc(&pdev->dev, ocelot->num_phys_ports,
sizeof(struct ocelot_port *), GFP_KERNEL);
+ if (!ocelot->ports)
+ return -ENOMEM;
INIT_LIST_HEAD(&ocelot->multicast);
ocelot_init(ocelot);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: mscc: ocelot: null check devm_kcalloc
2019-07-25 1:56 [PATCH] net: mscc: ocelot: null check devm_kcalloc Navid Emamdoost
@ 2019-07-26 0:20 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-07-26 0:20 UTC (permalink / raw)
To: navid.emamdoost
Cc: emamd001, kjlu, smccaman, secalert, alexandre.belloni,
UNGLinuxDriver, netdev, linux-kernel
From: Navid Emamdoost <navid.emamdoost@gmail.com>
Date: Wed, 24 Jul 2019 20:56:09 -0500
> devm_kcalloc may fail and return NULL. Added the null check.
>
> Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
> ---
> drivers/net/ethernet/mscc/ocelot_board.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot_board.c b/drivers/net/ethernet/mscc/ocelot_board.c
> index 58bde1a9eacb..52377cfdc31a 100644
> --- a/drivers/net/ethernet/mscc/ocelot_board.c
> +++ b/drivers/net/ethernet/mscc/ocelot_board.c
> @@ -257,6 +257,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev)
>
> ocelot->ports = devm_kcalloc(&pdev->dev, ocelot->num_phys_ports,
> sizeof(struct ocelot_port *), GFP_KERNEL);
> + if (!ocelot->ports)
> + return -ENOMEM;
>
At the very least this leaks a reference to 'ports'. I didn't check what other
resources obtained by this function are leaked as well by this change, please
audit before resubmitting.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-26 0:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-25 1:56 [PATCH] net: mscc: ocelot: null check devm_kcalloc Navid Emamdoost
2019-07-26 0:20 ` David Miller
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).