| Message ID | 20200312113048.GB20562@mwanda |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | octeontx2-pf: unlock on error path in otx2_config_pause_frm() | expand |
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Thu, 12 Mar 2020 14:30:48 +0300 > We need to unlock before returning if this allocation fails. > > Fixes: 75f36270990c ("octeontx2-pf: Support to enable/disable pause frames via ethtool") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied to net-next. Dan, please indicate the appropriate target tree in your Subject lines in the future. I have to dance around my GIT trees to figure out where your patches apply and that eats up more time than necessary. Thanks.
On Thu, Mar 12, 2020 at 03:53:21PM -0700, David Miller wrote: > From: Dan Carpenter <dan.carpenter@oracle.com> > Date: Thu, 12 Mar 2020 14:30:48 +0300 > > > We need to unlock before returning if this allocation fails. > > > > Fixes: 75f36270990c ("octeontx2-pf: Support to enable/disable pause frames via ethtool") > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > Applied to net-next. > > Dan, please indicate the appropriate target tree in your Subject lines > in the future. I have to dance around my GIT trees to figure out where > your patches apply and that eats up more time than necessary. Sorry, I've been trying to do that but I forgot. I'm going to update my QC scripts so hopefully it doesn't happen again. regards, dan carpenter
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c index af4437d4dfcb..157735443473 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c @@ -227,14 +227,17 @@ int otx2_config_pause_frm(struct otx2_nic *pfvf) otx2_mbox_lock(&pfvf->mbox); req = otx2_mbox_alloc_msg_cgx_cfg_pause_frm(&pfvf->mbox); - if (!req) - return -ENOMEM; + if (!req) { + err = -ENOMEM; + goto unlock; + } req->rx_pause = !!(pfvf->flags & OTX2_FLAG_RX_PAUSE_ENABLED); req->tx_pause = !!(pfvf->flags & OTX2_FLAG_TX_PAUSE_ENABLED); req->set = 1; err = otx2_sync_mbox_msg(&pfvf->mbox); +unlock: otx2_mbox_unlock(&pfvf->mbox); return err; }
We need to unlock before returning if this allocation fails. Fixes: 75f36270990c ("octeontx2-pf: Support to enable/disable pause frames via ethtool") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)