Patch "octeontx2-af: Add validation for lmac type" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    octeontx2-af: Add validation for lmac type

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     octeontx2-af-add-validation-for-lmac-type.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 13e3363f94c6b3abc9b2ddc554caa4b72648fa4d
Author: Hariprasad Kelam <hkelam@xxxxxxxxxxx>
Date:   Wed May 3 12:39:38 2023 +0530

    octeontx2-af: Add validation for lmac type
    
    [ Upstream commit cb5edce271764524b88b1a6866b3e626686d9a33 ]
    
    Upon physical link change, firmware reports to the kernel about the
    change along with the details like speed, lmac_type_id, etc.
    Kernel derives lmac_type based on lmac_type_id received from firmware.
    
    In a few scenarios, firmware returns an invalid lmac_type_id, which
    is resulting in below kernel panic. This patch adds the missing
    validation of the lmac_type_id field.
    
    Internal error: Oops: 96000005 [#1] PREEMPT SMP
    [   35.321595] Modules linked in:
    [   35.328982] CPU: 0 PID: 31 Comm: kworker/0:1 Not tainted
    5.4.210-g2e3169d8e1bc-dirty #17
    [   35.337014] Hardware name: Marvell CN103XX board (DT)
    [   35.344297] Workqueue: events work_for_cpu_fn
    [   35.352730] pstate: 40400089 (nZcv daIf +PAN -UAO)
    [   35.360267] pc : strncpy+0x10/0x30
    [   35.366595] lr : cgx_link_change_handler+0x90/0x180
    
    Fixes: 61071a871ea6 ("octeontx2-af: Forward CGX link notifications to PFs")
    Signed-off-by: Hariprasad Kelam <hkelam@xxxxxxxxxxx>
    Signed-off-by: Sunil Kovvuri Goutham <sgoutham@xxxxxxxxxxx>
    Signed-off-by: Sai Krishna <saikrishnag@xxxxxxxxxxx>
    Reviewed-by: Simon Horman <simon.horman@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
index 8fdd3afe59981..afdddfced7e69 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
@@ -1225,6 +1225,14 @@ static inline void link_status_user_format(u64 lstat,
 	linfo->an = FIELD_GET(RESP_LINKSTAT_AN, lstat);
 	linfo->fec = FIELD_GET(RESP_LINKSTAT_FEC, lstat);
 	linfo->lmac_type_id = cgx_get_lmac_type(cgx, lmac_id);
+
+	if (linfo->lmac_type_id >= LMAC_MODE_MAX) {
+		dev_err(&cgx->pdev->dev, "Unknown lmac_type_id %d reported by firmware on cgx port%d:%d",
+			linfo->lmac_type_id, cgx->cgx_id, lmac_id);
+		strncpy(linfo->lmac_type, "Unknown", LMACTYPE_STR_LEN - 1);
+		return;
+	}
+
 	lmac_string = cgx_lmactype_string[linfo->lmac_type_id];
 	strncpy(linfo->lmac_type, lmac_string, LMACTYPE_STR_LEN - 1);
 }