[PATCH net v3 2/6] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_ethtool.c

[PATCH net v3 2/6] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_ethtool.c

[Dipendra Khadka]

Add error pointer check after calling otx2_mbox_get_rsp().

Fixes: 75f36270990c ("octeontx2-pf: Support to enable/disable pause frames via ethtool")
Fixes: d0cf9503e908 ("octeontx2-pf: ethtool fec mode support")
Signed-off-by: Dipendra Khadka <kdipendra88@gmail.com>
---
v3:
 - Included in the patch set
 - Changed the patch subject
 - Added Fixes: tag
v2: Skipped for consitency in the patch set
v1: https://lore.kernel.org/all/20240923113135.4366-1-kdipendra88@gmail.com/
 .../net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
index 0db62eb0dab3..09317860e738 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
@@ -343,6 +343,11 @@ static void otx2_get_pauseparam(struct net_device *netdev,
 	if (!otx2_sync_mbox_msg(&pfvf->mbox)) {
 		rsp = (struct cgx_pause_frm_cfg *)
 		       otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr);
+		if (IS_ERR(rsp)) {
+			mutex_unlock(&pfvf->mbox.lock);
+			return;
+		}
+
 		pause->rx_pause = rsp->rx_pause;
 		pause->tx_pause = rsp->tx_pause;
 	}
@@ -1074,6 +1079,11 @@ static int otx2_set_fecparam(struct net_device *netdev,

 	rsp = (struct fec_mode *)otx2_mbox_get_rsp(&pfvf->mbox.mbox,
 						   0, &req->hdr);
+	if (IS_ERR(rsp)) {
+		err = PTR_ERR(rsp);
+		goto end;
+	}
+
 	if (rsp->fec >= 0)
 		pfvf->linfo.fec = rsp->fec;
 	else
--
2.43.0

Re: [PATCH net v3 2/6] octeontx2-pf: handle otx2_mbox_get_rsp errors in otx2_ethtool.c

[Simon Horman]

On Sun, Oct 06, 2024 at 04:42:09PM +0000, Dipendra Khadka wrote:
> Add error pointer check after calling otx2_mbox_get_rsp().
> 
> Fixes: 75f36270990c ("octeontx2-pf: Support to enable/disable pause frames via ethtool")
> Fixes: d0cf9503e908 ("octeontx2-pf: ethtool fec mode support")
> Signed-off-by: Dipendra Khadka <kdipendra88@gmail.com>
> ---
> v3:
>  - Included in the patch set
>  - Changed the patch subject
>  - Added Fixes: tag
> v2: Skipped for consitency in the patch set
> v1: https://lore.kernel.org/all/20240923113135.4366-1-kdipendra88@gmail.com/
>  .../net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c  | 10 ++++++++++
>  1 file changed, 10 insertions(+)

Reviewed-by: Simon Horman <horms@kernel.org>

> diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
> index 0db62eb0dab3..09317860e738 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c
> @@ -343,6 +343,11 @@ static void otx2_get_pauseparam(struct net_device *netdev,
>  	if (!otx2_sync_mbox_msg(&pfvf->mbox)) {
>  		rsp = (struct cgx_pause_frm_cfg *)
>  		       otx2_mbox_get_rsp(&pfvf->mbox.mbox, 0, &req->hdr);
> +		if (IS_ERR(rsp)) {
> +			mutex_unlock(&pfvf->mbox.lock);
> +			return;
> +		}
> +

FWIIW, a goto label would ordinarily be preferred here.
However, I see that what you have done is consistent with
existing error handling within this function.
So I think the approach you have taken is ok.

>  		pause->rx_pause = rsp->rx_pause;
>  		pause->tx_pause = rsp->tx_pause;
>  	}

...