Message ID | 20110205031828.GA12772@akhaparde-VBox |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }