[PATCH v2] af/rvu_cgx: Fix missing check bugs in rvu_cgx.c

From: Yingjie Wang <redacted>

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: 289e20bc1ab5 ("af/rvu_cgx: Fix missing check bugs in rvu_cgx.c")
Signed-off-by: Yingjie Wang <redacted>
---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
index d298b9357177..6c6b411e78fd 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c

@@ -469,6 +469,9 @@ int rvu_mbox_handler_cgx_mac_addr_set(struct rvu *rvu,
 	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);

@@ -485,6 +488,9 @@ int rvu_mbox_handler_cgx_mac_addr_get(struct rvu *rvu,
 	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;

-- 
2.7.4

On Mon, 11 Jan 2021 18:09:49 -0800 wangyingjie55@126.com wrote:

From: Yingjie Wang <redacted>

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: 289e20bc1ab5 ("af/rvu_cgx: Fix missing check bugs in rvu_cgx.c")
Signed-off-by: Yingjie Wang <redacted>

Fixes tag: Fixes: 289e20bc1ab5 ("af/rvu_cgx: Fix missing check bugs in rvu_cgx.c")
Has these problem(s):
	- Target SHA1 does not exist

Where is that commit from? You're not referring to this commit itself
in your tree? The subject is suspiciously similar :S

Thanks for your reply.  I commit this change on linux-next/stable branch, and I use "git log --pretty=fixes" command to get the Fixes tag. I want to know if I need to make a change on any other branch and commit it?
At 2021-01-13 10:13:28, "Jakub Kicinski" [off-list ref] wrote:

On Mon, 11 Jan 2021 18:09:49 -0800 wangyingjie55@126.com wrote:

quoted

From: Yingjie Wang <redacted>

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: 289e20bc1ab5 ("af/rvu_cgx: Fix missing check bugs in rvu_cgx.c")
Signed-off-by: Yingjie Wang <redacted>

Fixes tag: Fixes: 289e20bc1ab5 ("af/rvu_cgx: Fix missing check bugs in rvu_cgx.c")
Has these problem(s):
- Target SHA1 does not exist

Where is that commit from? You're not referring to this commit itself
in your tree? The subject is suspiciously similar :S

On Wed, 13 Jan 2021 21:27:35 +0800 (CST) Yingjie Wang wrote:

Thanks for your reply.  I commit this change on linux-next/stable
branch, and I use "git log --pretty=fixes" command to get the Fixes
tag. I want to know if I need to make a change on any other branch
and commit it?

For networking fixes net/master would be best, but my comment
wasn't about the tree, but about which commit is quoted in the Fixes
tag.

Maybe the maintainers will help us identify the right fixes tag.
CCing them now. Please make sure to always CC maintainers
(scripts/get_maintainer.pl should help you).

Marvell folks, FWIW this is the thread in the archive for context:
https://lore.kernel.org/lkml/1610417389-9051-1-git-send-email-wangyingjie55@126.com/