diff options
| author |   Thomas Falcon <tlfalcon@linux.vnet.ibm.com> | 2017-06-14 23:50:08 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-15 14:29:00 -0400 |
| commit | 1cf9cc72bd7024af69419b5adee42c39ad4caf6f (patch) | |
| tree | 2e4f85e0094e33f2b5705f89111af791894a6513 | |
| parent | ibmvnic: Sanitize entire SCRQ buffer on reset (diff) | |
| download | linux-dev-1cf9cc72bd7024af69419b5adee42c39ad4caf6f.tar.xz linux-dev-1cf9cc72bd7024af69419b5adee42c39ad4caf6f.zip | |
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>
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |