[PATCH 5.10 158/199] octeontx2-af: Fix missing check bugs in rvu_cgx.c

From: Greg Kroah-Hartman
Date: Mon Jan 25 2021 - 20:55:55 EST


From: Yingjie Wang <wangyingjie55@xxxxxxx>

commit b7ba6cfabc42fc846eb96e33f1edcd3ea6290a27 upstream.

In rvu_mbox_handler_cgx_mac_addr_get()
and rvu_mbox_handler_cgx_mac_addr_set(),
the msg is expected only from PFs that are mapped to CGX LMACs.
It should be checked before mapping,
so we add the is_cgx_config_permitted() in the functions.

Fixes: 96be2e0da85e ("octeontx2-af: Support for MAC address filters in CGX")
Signed-off-by: Yingjie Wang <wangyingjie55@xxxxxxx>
Reviewed-by: Geetha sowjanya<gakula@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/1610719804-35230-1-git-send-email-wangyingjie55@xxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 6 ++++++
1 file changed, 6 insertions(+)

--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
@@ -454,6 +454,9 @@ int rvu_mbox_handler_cgx_mac_addr_set(st
int pf = rvu_get_pf(req->hdr.pcifunc);
u8 cgx_id, lmac_id;

+ if (!is_cgx_config_permitted(rvu, req->hdr.pcifunc))
+ return -EPERM;
+
rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);

cgx_lmac_addr_set(cgx_id, lmac_id, req->mac_addr);
@@ -470,6 +473,9 @@ int rvu_mbox_handler_cgx_mac_addr_get(st
int rc = 0, i;
u64 cfg;

+ if (!is_cgx_config_permitted(rvu, req->hdr.pcifunc))
+ return -EPERM;
+
rvu_get_cgx_lmac_id(rvu->pf2cgxlmac_map[pf], &cgx_id, &lmac_id);

rsp->hdr.rc = rc;