| Message ID | 20201123235757.6466-4-drt@linux.ibm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ibmvnic: assorted bug fixes | expand |
On Mon, 23 Nov 2020 18:57:51 -0500 Dany Madden wrote: > scrq->msgs could be NULL during device reset, causing Linux to crash. > So, check before memset scrq->msgs. > > Fixes: c8b2ad0a4a901 ("ibmvnic: Sanitize entire SCRQ buffer on reset") > > Signed-off-by: Dany Madden <drt@linux.ibm.com> Thanks for the Fixes tags! Please remove the empty lines between the Fixes tags and sign-offs, and make sure the Fixes lines are not wrapped (e.g. in patch 9). > Signed-off-by: Lijun Pan <ljp@linux.ibm.com> > diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c > index d5a927bb4954..e84255c2fc72 100644 > --- a/drivers/net/ethernet/ibm/ibmvnic.c > +++ b/drivers/net/ethernet/ibm/ibmvnic.c > @@ -2844,16 +2844,26 @@ static int reset_one_sub_crq_queue(struct ibmvnic_adapter *adapter, > struct ibmvnic_sub_crq_queue *scrq) > { > int rc; > + if (!scrq) { Looks like a missing new line between variable declaration and code. Not sure why checkpatch doesn't catch this.
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index d5a927bb4954..e84255c2fc72 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2844,16 +2844,26 @@ static int reset_one_sub_crq_queue(struct ibmvnic_adapter *adapter, struct ibmvnic_sub_crq_queue *scrq) { int rc; + if (!scrq) { + netdev_dbg(adapter->netdev, + "Invalid scrq reset. irq (%d) or msgs (%p).\n", + scrq->irq, scrq->msgs); + return -EINVAL; + } if (scrq->irq) { free_irq(scrq->irq, scrq); irq_dispose_mapping(scrq->irq); scrq->irq = 0; } - - memset(scrq->msgs, 0, 4 * PAGE_SIZE); - atomic_set(&scrq->used, 0); - scrq->cur = 0; + if (scrq->msgs) { + memset(scrq->msgs, 0, 4 * PAGE_SIZE); + atomic_set(&scrq->used, 0); + scrq->cur = 0; + } else { + netdev_dbg(adapter->netdev, "Invalid scrq reset\n"); + return -EINVAL; + } rc = h_reg_sub_crq(adapter->vdev->unit_address, scrq->msg_token, 4 * PAGE_SIZE, &scrq->crq_num, &scrq->hw_irq);
scrq->msgs could be NULL during device reset, causing Linux to crash. So, check before memset scrq->msgs. Fixes: c8b2ad0a4a901 ("ibmvnic: Sanitize entire SCRQ buffer on reset") Signed-off-by: Dany Madden <drt@linux.ibm.com> Signed-off-by: Lijun Pan <ljp@linux.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)