netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jacob Keller <jacob.e.keller@intel.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 07/16] fm10k: prevent null pointer dereference of msix_entries table
Date: Tue,  5 Apr 2016 01:01:19 -0700	[thread overview]
Message-ID: <1459843288-40623-8-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1459843288-40623-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Jacob Keller <jacob.e.keller@intel.com>

According to the C standard dereferencing a variable before it is
checked invokes undefined behavior, and thus compilers are free to
assume the check for NULL isn't necessary. Prevent this by re-ordering
the NULL check of msix_entries in fm10k_free_mbx_irq.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 6190a81..8c23fb3d 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -1143,14 +1143,16 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data)
 
 void fm10k_mbx_free_irq(struct fm10k_intfc *interface)
 {
-	struct msix_entry *entry = &interface->msix_entries[FM10K_MBX_VECTOR];
 	struct fm10k_hw *hw = &interface->hw;
+	struct msix_entry *entry;
 	int itr_reg;
 
 	/* no mailbox IRQ to free if MSI-X is not enabled */
 	if (!interface->msix_entries)
 		return;
 
+	entry = &interface->msix_entries[FM10K_MBX_VECTOR];
+
 	/* disconnect the mailbox */
 	hw->mbx.ops.disconnect(hw, &hw->mbx);
 
-- 
2.5.5

  parent reply	other threads:[~2016-04-05  8:01 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-05  8:01 [net-next 00/16][pull request] 100GbE Intel Wired LAN Driver Updates 2016-04-05 Jeff Kirsher
2016-04-05  8:01 ` [net-next 01/16] fm10k: Move constants to the right of binary operators Jeff Kirsher
2016-04-05  8:01 ` [net-next 02/16] fm10k: cleanup remaining right-bit-shifted 1 Jeff Kirsher
2016-04-05  8:01 ` [net-next 03/16] fm10k: Avoid crashing the kernel Jeff Kirsher
2016-04-05  8:13   ` Joe Perches
2016-04-05 16:12   ` David Miller
2016-04-06 23:24     ` Keller, Jacob E
2016-04-05  8:01 ` [net-next 04/16] fm10k: demote BUG_ON() to WARN_ON() where appropriate Jeff Kirsher
2016-04-05  8:01 ` [net-next 05/16] fm10k: cleanup SPACE_BEFORE_TAB checkpatch warning Jeff Kirsher
2016-04-05  8:01 ` [net-next 06/16] fm10k: use ether_addr_copy to copy MAC address Jeff Kirsher
2016-04-05  8:01 ` Jeff Kirsher [this message]
2016-04-05  8:01 ` [net-next 08/16] fm10k: don't initialize service task until later in probe Jeff Kirsher
2016-04-05  8:01 ` [net-next 09/16] fm10k: base queue scheme covered by RSS Jeff Kirsher
2016-04-05  8:01 ` [net-next 10/16] fm10k: print error message when stop_hw fails Jeff Kirsher
2016-04-05  8:01 ` [net-next 11/16] fm10k: free MBX IRQ before clearing interrupt scheme Jeff Kirsher
2016-04-05  8:01 ` [net-next 12/16] fm10k: add helper functions to set strings and data for ethtool stats Jeff Kirsher
2016-04-05  8:01 ` [net-next 13/16] fm10k: prevent possibly uninitialized variable Jeff Kirsher
2016-04-05  8:01 ` [net-next 14/16] fm10k: correctly clean up when init_queueing_scheme fails Jeff Kirsher
2016-04-05  8:01 ` [net-next 15/16] fm10k: fix a minor typo in some comments Jeff Kirsher
2016-04-05  8:01 ` [net-next 16/16] fm10k: use ethtool_rxfh_indir_default for default redirection table Jeff Kirsher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459843288-40623-8-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=jacob.e.keller@intel.com \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).