From: Thomas Falcon Date: Thu, 15 Jun 2017 04:50:08 +0000 (-0500) Subject: ibmvnic: Remove VNIC_CLOSING check from pending_scrq X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1cf9cc72bd7024af69419b5adee42c39ad4caf6f;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 03ddf6e1b5b3..ebe443fe51db 100644 --- 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;