Skip to contentSkip to conversation

net: fm10k: fix a potential NULL pointer dereference

PATCH In review Kangjie Lu 4 participants 5 messages Mar 11, 2019 – Mar 26, 2019

Subsystems (3)
lore
Share & tools
lore

Kangjie Lu

author
#0 lore raw

PATCH 1/1 net: fm10k: fix a potential NULL pointer dereference

In case alloc_workqueue fails, the fix returns -ENOMEM to avoid potential NULL pointer dereference.

---
 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/fm10k/fm10k_main.c +2 -0
index 5a0419421511..215f232674f1 100644
@@ -41,6 +41,8 @@ static int __init fm10k_init_module(void)
 	/* create driver workqueue */
 	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
 					  fm10k_driver_name);
+	if (unlikely(!fm10k_workqueue))
+		return -ENOMEM;
 
 	fm10k_dbg_init();
 
Signature · 1 line
2.17.1
author
#2 lore raw
In reply to Kangjie Lu
Quoted 17 lines · Kangjie Lu

In case alloc_workqueue fails, the fix returns -ENOMEM to avoid potential NULL pointer dereference.

---
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++

1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/fm10k/fm10k_main.c +0 -0
index 5a0419421511..215f232674f1 100644

drivers/net/ethernet/intel/fm10k/fm10k_main.c static int __init fm10k_init_module(void) · line 46

Quoted 6 lines
drivers/net/ethernet/intel/fm10k/fm10k_main.c +2 -0
@@ -41,6 +41,8 @@ static int __init fm10k_init_module(void)
 	/* create driver workqueue */
 	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
 					  fm10k_driver_name);
+	if (unlikely(!fm10k_workqueue))
+		return -ENOMEM;
 

Jeff, can you review this patch?

Thanks.

Quoted 5 lines
drivers/net/ethernet/intel/fm10k/fm10k_main.c +0 -0
 	fm10k_dbg_init();
 
Signature · 1 line
2.17.1
#3 lore raw
Quoted 10 lines · Kangjie Lu
Quoted 10 lines · Kangjie Lu

In case alloc_workqueue fails, the fix returns -ENOMEM to avoid potential NULL pointer dereference.

---
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++

1 file changed, 2 insertions(+)
Quoted 14 lines

drivers/net/ethernet/intel/fm10k/fm10k_main.c static int __init fm10k_init_module(void) · line 46

Quoted 12 lines
drivers/net/ethernet/intel/fm10k/fm10k_main.c +2 -0
index 5a0419421511..215f232674f1 100644
@@ -41,6 +41,8 @@ static int __init fm10k_init_module(void)
 	/* create driver workqueue */
 	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
 					  fm10k_driver_name);
+	if (unlikely(!fm10k_workqueue))
+		return -ENOMEM;
 

Jeff, can you review this patch?

Yep, sorry for the delay in getting back to you. I already had this change in my tree queued up from Yue Haibing. I am actually preparing to push this fix and few others to Dave in a couple of hours.

Quoted 6 lines
Quoted 6 lines
drivers/net/ethernet/intel/fm10k/fm10k_main.c +0 -0
 	fm10k_dbg_init();
 
Signature · 1 line
2.17.1
#4 lore raw

PATCH 1/1 net: fm10k: fix a potential NULL pointer dereference

In reply to Kangjie Lu
Quoted 13 lines · Kangjie Lu

In case alloc_workqueue fails, the fix returns -ENOMEM to avoid potential NULL pointer dereference.

---
  drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/fm10k/fm10k_main.c +0 -0
index 5a0419421511..215f232674f1 100644

drivers/net/ethernet/intel/fm10k/fm10k_main.c static int __init fm10k_init_module(void) · line 48

Quoted 8 lines
drivers/net/ethernet/intel/fm10k/fm10k_main.c +2 -0
@@ -41,6 +41,8 @@ static int __init fm10k_init_module(void)
  	/* create driver workqueue */
  	fm10k_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
  					  fm10k_driver_name);
+	if (unlikely(!fm10k_workqueue))
+		return -ENOMEM;
 
  	fm10k_dbg_init();
 

Reviewed-by: Mukesh Ojha <mojha at codeaurora.org
<mailto:[email protected]>>

Thanks.
Mukesh

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20190323/fbcf97ef/attachment.html>