* Re: [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data()
@ 2011-02-05 3:18 Ajit Khaparde
2011-02-06 1:58 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Ajit Khaparde @ 2011-02-05 3:18 UTC (permalink / raw)
To: netdev, jj; +Cc: linux-kernel
> From: Jesper Juhl [jj@chaosbits.net]
> ent: Thursday, February 03, 2011 3:27 PM
> To: netdev@vger.kernel.org
> Cc: linux-drivers; linux-kernel@vger.kernel.org; Khaparde, Ajit; Bandi, Sarveshwar; Seetharaman, Subramanian; Perla, Sathya
> Subject: [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data()
> wrb_from_mccq() may return null, so we may crash on a null deref in
> be_cmd_get_seeprom_data().
> This avoids that potential crash.
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Thanks Jesper.
But because we have acquired a lock, we need to release it.
I would suggest considering the following patch.
---
[PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data()
Found by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
---
drivers/net/benet/be_cmds.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 0c7811f..a179cc6 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1786,6 +1786,10 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
spin_lock_bh(&adapter->mcc_lock);
wrb = wrb_from_mccq(adapter);
+ if (!wrb) {
+ status = -EBUSY;
+ goto err;
+ }
req = nonemb_cmd->va;
sge = nonembedded_sgl(wrb);
@@ -1801,6 +1805,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
status = be_mcc_notify_wait(adapter);
+err:
spin_unlock_bh(&adapter->mcc_lock);
return status;
}
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data()
2011-02-05 3:18 [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data() Ajit Khaparde
@ 2011-02-06 1:58 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2011-02-06 1:58 UTC (permalink / raw)
To: ajit.khaparde; +Cc: netdev, jj, linux-kernel
From: Ajit Khaparde <ajit.khaparde@emulex.com>
Date: Fri, 4 Feb 2011 21:18:28 -0600
> [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data()
>
> Found by: Jesper Juhl <jj@chaosbits.net>
>
> Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data()
@ 2011-02-03 21:27 Jesper Juhl
0 siblings, 0 replies; 3+ messages in thread
From: Jesper Juhl @ 2011-02-03 21:27 UTC (permalink / raw)
To: netdev
Cc: linux-drivers, linux-kernel, Ajit Khaparde, Sarveshwar Bandi,
Subbu Seetharaman, Sathya Perla
wrb_from_mccq() may return null, so we may crash on a null deref in
be_cmd_get_seeprom_data().
This avoids that potential crash.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
---
be_cmds.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 0c7811f..ec4a21d 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1786,6 +1786,8 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,
spin_lock_bh(&adapter->mcc_lock);
wrb = wrb_from_mccq(adapter);
+ if (!wrb)
+ return -EBUSY;
req = nonemb_cmd->va;
sge = nonembedded_sgl(wrb);
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please.
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-06 1:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-05 3:18 [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data() Ajit Khaparde
2011-02-06 1:58 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-02-03 21:27 Jesper Juhl
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).