* [PATCH 1/1] net: i40e: avoid null pointer dereference
@ 2016-05-17 20:41 Heinrich Schuchardt
2016-05-19 18:26 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Heinrich Schuchardt @ 2016-05-17 20:41 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: intel-wired-lan, netdev, linux-kernel, Heinrich Schuchardt
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>
---
drivers/net/ethernet/intel/i40e/i40e_common.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 422b41d..d5cb570 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,
void *buffer, u16 buf_len)
{
struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;
- u16 len = le16_to_cpu(aq_desc->datalen);
+ u16 len;
u8 *buf = (u8 *)buffer;
u16 i = 0;
if ((!(mask & hw->debug_mask)) || (desc == NULL))
return;
+ len = le16_to_cpu(aq_desc->datalen);
+
i40e_debug(hw, mask,
"AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n",
le16_to_cpu(aq_desc->opcode),
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] net: i40e: avoid null pointer dereference
2016-05-17 20:41 [PATCH 1/1] net: i40e: avoid null pointer dereference Heinrich Schuchardt
@ 2016-05-19 18:26 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-05-19 18:26 UTC (permalink / raw)
To: xypron.glpk; +Cc: jeffrey.t.kirsher, intel-wired-lan, netdev, linux-kernel
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Tue, 17 May 2016 22:41:33 +0200
> 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>
I'll let Jeff pick this up.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-19 18:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-17 20:41 [PATCH 1/1] net: i40e: avoid null pointer dereference Heinrich Schuchardt
2016-05-19 18:26 ` David Miller
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).