Netdev Archive on lore.kernel.org
 help / color / Atom feed
From: Olof Johansson <olof@lixom.net>
To: Michael Chan <michael.chan@broadcom.com>,
	"David S . Miller" <davem@davemloft.net>
Cc: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	Olof Johansson <olof@lixom.net>
Subject: [PATCH] net: bnxt_en: Fix array overrun in bnxt_fill_l2_rewrite_fields()
Date: Sun, 10 Nov 2019 18:08:55 -0800
Message-ID: <20191111020855.20775-1-olof@lixom.net> (raw)

This is caused by what seems to be a fragile typing approach by
the Broadcom firmware/driver:

/* FW expects smac to be in u16 array format */

So the driver uses eth_addr and eth_addr_mask as u16[6] instead of u8[12],
so the math in bnxt_fill_l2_rewrite_fields does a [6] deref of the u16
pointer, it goes out of bounds on the array.

Just a few lines below, they use ETH_ALEN/2, so this must have been
overlooked. I'm surprised original developers didn't notice the compiler
warnings?!

Fixes: 90f906243bf6 ("bnxt_en: Add support for L2 rewrite")
Signed-off-by: Olof Johansson <olof@lixom.net>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
index 174412a55e53c..cde2b81f6fe54 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c
@@ -149,29 +149,32 @@ static void bnxt_set_l2_key_mask(u32 part_key, u32 part_mask,
 
 static int
 bnxt_fill_l2_rewrite_fields(struct bnxt_tc_actions *actions,
-			    u16 *eth_addr, u16 *eth_addr_mask)
+			    u8 *eth_addr, u8 *eth_addr_mask)
 {
 	u16 *p;
+	u8 *am;
 	int j;
 
 	if (unlikely(bnxt_eth_addr_key_mask_invalid(eth_addr, eth_addr_mask)))
 		return -EINVAL;
 
-	if (!is_wildcard(&eth_addr_mask[0], ETH_ALEN)) {
-		if (!is_exactmatch(&eth_addr_mask[0], ETH_ALEN))
+	am = eth_addr_mask;
+	if (!is_wildcard(am, ETH_ALEN)) {
+		if (!is_exactmatch(am, ETH_ALEN))
 			return -EINVAL;
 		/* FW expects dmac to be in u16 array format */
-		p = eth_addr;
-		for (j = 0; j < 3; j++)
+		p = (u16 *)am;
+		for (j = 0; j < ETH_ALEN / 2; j++)
 			actions->l2_rewrite_dmac[j] = cpu_to_be16(*(p + j));
 	}
 
-	if (!is_wildcard(&eth_addr_mask[ETH_ALEN], ETH_ALEN)) {
-		if (!is_exactmatch(&eth_addr_mask[ETH_ALEN], ETH_ALEN))
+	am = eth_addr_mask + ETH_ALEN;
+	if (!is_wildcard(am, ETH_ALEN)) {
+		if (!is_exactmatch(am, ETH_ALEN))
 			return -EINVAL;
 		/* FW expects smac to be in u16 array format */
-		p = &eth_addr[ETH_ALEN / 2];
-		for (j = 0; j < 3; j++)
+		p = (u16 *)am;
+		for (j = 0; j < ETH_ALEN / 2; j++)
 			actions->l2_rewrite_smac[j] = cpu_to_be16(*(p + j));
 	}
 
@@ -285,12 +288,12 @@ static int bnxt_tc_parse_actions(struct bnxt *bp,
 	 * smac (6 bytes) if rewrite of both is specified, otherwise either
 	 * dmac or smac
 	 */
-	u16 eth_addr_mask[ETH_ALEN] = { 0 };
+	u8 eth_addr_mask[ETH_ALEN * 2] = { 0 };
 	/* Used to store the L2 rewrite key for dmac (6 bytes) followed by
 	 * smac (6 bytes) if rewrite of both is specified, otherwise either
 	 * dmac or smac
 	 */
-	u16 eth_addr[ETH_ALEN] = { 0 };
+	u8 eth_addr[ETH_ALEN * 2] = { 0 };
 	struct flow_action_entry *act;
 	int i, rc;
 
-- 
2.11.0


             reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-11  2:08 Olof Johansson [this message]
2019-11-11 15:44 ` Simon Horman
2019-11-11 17:50 ` Michael Chan

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191111020855.20775-1-olof@lixom.net \
    --to=olof@lixom.net \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.chan@broadcom.com \
    --cc=netdev@vger.kernel.org \
    --cc=venkatkumar.duvvuru@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Netdev Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/netdev/0 netdev/git/0.git
	git clone --mirror https://lore.kernel.org/netdev/1 netdev/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 netdev netdev/ https://lore.kernel.org/netdev \
		netdev@vger.kernel.org
	public-inbox-index netdev

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.netdev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git