diff mbox series

net: fm10k: fix a potential NULL pointer dereference

Message ID 20190311061732.19064-1-kjlu@umn.edu
State Superseded
Delegated to: Jeff Kirsher
Headers show
Series net: fm10k: fix a potential NULL pointer dereference | expand

Commit Message

Kangjie Lu March 11, 2019, 6:17 a.m. UTC
In case alloc_workqueue fails, the fix returns -ENOMEM to avoid
potential NULL pointer dereference.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
---
 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

David Miller March 11, 2019, 8:38 p.m. UTC | #1
From: Kangjie Lu <kjlu@umn.edu>
Date: Mon, 11 Mar 2019 01:17:32 -0500

> In case alloc_workqueue fails, the fix returns -ENOMEM to avoid
> potential NULL pointer dereference.
> 
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>

Jeff, I assume you will pick this up.

Thank you.
Kangjie Lu March 23, 2019, 3:26 a.m. UTC | #2
> On Mar 11, 2019, at 1:17 AM, Kangjie Lu <kjlu@umn.edu> wrote:
> 
> In case alloc_workqueue fails, the fix returns -ENOMEM to avoid
> potential NULL pointer dereference.
> 
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
> drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++
> 1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> index 5a0419421511..215f232674f1 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> @@ -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.

> 	fm10k_dbg_init();
> 
> -- 
> 2.17.1
>
Mukesh Ojha March 23, 2019, 10:08 a.m. UTC | #3
On 3/11/2019 11:47 AM, Kangjie Lu wrote:
> In case alloc_workqueue fails, the fix returns -ENOMEM to avoid
> potential NULL pointer dereference.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
>   drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> index 5a0419421511..215f232674f1 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> @@ -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@codeaurora.org 
<mailto:mojha@codeaurora.org>>

Thanks.
Mukesh
<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <p><br>
    </p>
    <div class="moz-cite-prefix">On 3/11/2019 11:47 AM, Kangjie Lu
      wrote:<br>
    </div>
    <blockquote type="cite"
      cite="mid:20190311061732.19064-1-kjlu@umn.edu">
      <pre class="moz-quote-pre" wrap="">In case alloc_workqueue fails, the fix returns -ENOMEM to avoid
potential NULL pointer dereference.

Signed-off-by: Kangjie Lu <a class="moz-txt-link-rfc2396E" href="mailto:kjlu@umn.edu">&lt;kjlu@umn.edu&gt;</a>
---
 drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 5a0419421511..215f232674f1 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -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();
 </pre>
    </blockquote>
    <p><br>
    </p>
    <p>
      Reviewed-by: Mukesh Ojha &lt;<a href="mailto:mojha@codeaurora.org"
        title="mojha@codeaurora.org" class="mailto">mojha@codeaurora.org</a>&gt;
    </p>
    <p>
      Thanks.<br>
      Mukesh
    </p>
    <blockquote type="cite"
      cite="mid:20190311061732.19064-1-kjlu@umn.edu">
      <pre class="moz-quote-pre" wrap="">
</pre>
    </blockquote>
  </body>
</html>
Kirsher, Jeffrey T March 26, 2019, 10:21 p.m. UTC | #4
On Fri, 2019-03-22 at 22:26 -0500, Kangjie Lu wrote:
> > On Mar 11, 2019, at 1:17 AM, Kangjie Lu <kjlu@umn.edu> wrote:
> > 
> > In case alloc_workqueue fails, the fix returns -ENOMEM to avoid
> > potential NULL pointer dereference.
> > 
> > Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> > ---
> > drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 ++
> > 1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> > b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> > index 5a0419421511..215f232674f1 100644
> > --- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> > +++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
> > @@ -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.

> 
> > 	fm10k_dbg_init();
> > 
> > -- 
> > 2.17.1
> >
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
index 5a0419421511..215f232674f1 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -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();