diff options
author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2016-05-17 16:41:33 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2016-07-22 03:07:02 -0400 |
commit | cd956722167ba4fdba9c1ce3eed251b04ea2e10f (patch) | |
tree | 0f11a3eca675b9921a2a31f8c7704224d202d04e | |
parent | d95a93a9b71677a43f967a1b7986decab84b7765 (diff) |
i40e: avoid null pointer dereference
In function i40e_debug_aq parameter desc is assumed to be
possibly NULL. Do not dereference it before checking the
value.
Fixes: f905dd62be88 ("i40e/i40evf: add max buf len to aq debug print helper")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_common.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c index e447dc435464..bb63df854ab4 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c | |||
@@ -297,13 +297,15 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, | |||
297 | void *buffer, u16 buf_len) | 297 | void *buffer, u16 buf_len) |
298 | { | 298 | { |
299 | struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc; | 299 | struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc; |
300 | u16 len = le16_to_cpu(aq_desc->datalen); | 300 | u16 len; |
301 | u8 *buf = (u8 *)buffer; | 301 | u8 *buf = (u8 *)buffer; |
302 | u16 i = 0; | 302 | u16 i = 0; |
303 | 303 | ||
304 | if ((!(mask & hw->debug_mask)) || (desc == NULL)) | 304 | if ((!(mask & hw->debug_mask)) || (desc == NULL)) |
305 | return; | 305 | return; |
306 | 306 | ||
307 | len = le16_to_cpu(aq_desc->datalen); | ||
308 | |||
307 | i40e_debug(hw, mask, | 309 | i40e_debug(hw, mask, |
308 | "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n", | 310 | "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n", |
309 | le16_to_cpu(aq_desc->opcode), | 311 | le16_to_cpu(aq_desc->opcode), |