Commit ff918912 authored Aug 28, 2016 by Colin Ian King Committed by Jeff Kirsher Sep 22, 2016

i40e: avoid potential null pointer dereference when assigning len

There is a sanitcy check for desc being null in the first line of
function i40evf_debug_aq. However, before that, aq_desc is cast from
desc, and aq_desc is being dereferenced on the assignment of len, so
this could be a potential null pointer deference. Fix this by moving
the initialization of len to the code block where len is being used
and hence at this point we know it is OK to dereference aq_desc.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent b3f5c7bc

drivers/net/ethernet/intel/i40evf/i40e_common.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -302,7 +302,6 @@ void i40evf_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);
		u8 buf = (u8 )buffer;
		u16 i = 0;

		@@ -326,6 +325,8 @@ void i40evf_debug_aq(struct i40e_hw hw, enum i40e_debug_mask mask, void desc,
		le32_to_cpu(aq_desc->params.external.addr_low));

		if ((buffer != NULL) && (aq_desc->datalen != 0)) {
		u16 len = le16_to_cpu(aq_desc->datalen);

		i40e_debug(hw, mask, "AQ CMD Buffer:\n");
		if (buf_len < len)
		len = buf_len;