ibmvnic: Remove VNIC_CLOSING check from pending_scrq

Fix a kernel panic resulting from data access of a NULL
pointer during device close. The pending_scrq routine is
meant to determine whether there is a valid sub-CRQ message
awaiting processing. When the device is closing, however,
there is a possibility that NULL messages can be processed
because pending_scrq will always return 1 even if there
no valid message in the queue.

It's not clear what this closing state check was originally
meant to accomplish, so just remove it.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 03ddf6e1b5b3390e929ffc5ba020c04f352810b3..ebe443fe51dbdfabd5d2c25e310aa75eaa5eef13 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -2275,8 +2275,7 @@ static int pending_scrq(struct ibmvnic_adapter *adapter,
 {
        union sub_crq *entry = &scrq->msgs[scrq->cur];
 
-       if (entry->generic.first & IBMVNIC_CRQ_CMD_RSP ||
-           adapter->state == VNIC_CLOSING)
+       if (entry->generic.first & IBMVNIC_CRQ_CMD_RSP)
                return 1;
        else
                return 0;