From: Simon Horman <horms@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: Michael Chan <michael.chan@broadcom.com>, netdev@vger.kernel.org
Subject: [PATCH net-next 2/3] bnxt_en: check for irq name truncation
Date: Fri, 05 Jul 2024 12:26:48 +0100 [thread overview]
Message-ID: <20240705-bnxt-str-v1-2-bafc769ed89e@kernel.org> (raw)
In-Reply-To: <20240705-bnxt-str-v1-0-bafc769ed89e@kernel.org>
Given the sizes of the buffers involved, it is theoretically
possible for irq names to be truncated. Detect this and
propagate an error if this occurs.
Flagged by gcc-14:
.../bnxt.c: In function 'bnxt_setup_int_mode':
.../bnxt.c:10584:48: warning: '%s' directive output may be truncated writing 4 bytes into a region of size between 2 and 17 [-Wformat-truncation=]
10584 | snprintf(bp->irq_tbl[0].name, len, "%s-%s-%d", bp->dev->name, "TxRx",
| ^~ ~~~~~~
In function 'bnxt_setup_inta',
inlined from 'bnxt_setup_int_mode' at .../bnxt.c:10604:3:
.../bnxt.c:10584:9: note: 'snprintf' output between 8 and 23 bytes into a destination of size 18
10584 | snprintf(bp->irq_tbl[0].name, len, "%s-%s-%d", bp->dev->name, "TxRx",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10585 | 0);
| ~~
.../bnxt.c: In function 'bnxt_setup_int_mode':
.../bnxt.c:10569:62: warning: '%s' directive output may be truncated writing between 2 and 4 bytes into a region of size between 2 and 17 [-Wformat-truncation=]
10569 | snprintf(bp->irq_tbl[map_idx].name, len, "%s-%s-%d", dev->name,
| ^~
In function 'bnxt_setup_msix',
inlined from 'bnxt_setup_int_mode' at .../bnxt.c:10602:3:
.../bnxt.c:10569:58: note: directive argument in the range [-2147483643, 2147483646]
10569 | snprintf(bp->irq_tbl[map_idx].name, len, "%s-%s-%d", dev->name,
| ^~~~~~~~~~
.../bnxt.c:10569:17: note: 'snprintf' output between 6 and 33 bytes into a destination of size 18
10569 | snprintf(bp->irq_tbl[map_idx].name, len, "%s-%s-%d", dev->name,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10570 | attr, i);
| ~~~~~~~~
Compile tested only.
Signed-off-by: Simon Horman <horms@kernel.org>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 220d05e2f6fa..15e68c8e599d 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -10538,7 +10538,7 @@ static int bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,
return __bnxt_trim_rings(bp, rx, tx, max, sh);
}
-static void bnxt_setup_msix(struct bnxt *bp)
+static int bnxt_setup_msix(struct bnxt *bp)
{
const int len = sizeof(bp->irq_tbl[0].name);
struct net_device *dev = bp->dev;
@@ -10558,6 +10558,7 @@ static void bnxt_setup_msix(struct bnxt *bp)
for (i = 0; i < bp->cp_nr_rings; i++) {
int map_idx = bnxt_cp_num_to_irq_num(bp, i);
char *attr;
+ int rc;
if (bp->flags & BNXT_FLAG_SHARED_RINGS)
attr = "TxRx";
@@ -10566,24 +10567,35 @@ static void bnxt_setup_msix(struct bnxt *bp)
else
attr = "tx";
- snprintf(bp->irq_tbl[map_idx].name, len, "%s-%s-%d", dev->name,
- attr, i);
+ rc = snprintf(bp->irq_tbl[map_idx].name, len, "%s-%s-%d",
+ dev->name, attr, i);
+ if (rc >= len)
+ return -E2BIG;
bp->irq_tbl[map_idx].handler = bnxt_msix;
}
+
+ return 0;
}
-static void bnxt_setup_inta(struct bnxt *bp)
+static int bnxt_setup_inta(struct bnxt *bp)
{
const int len = sizeof(bp->irq_tbl[0].name);
+ int rc;
+
if (bp->num_tc) {
netdev_reset_tc(bp->dev);
bp->num_tc = 0;
}
- snprintf(bp->irq_tbl[0].name, len, "%s-%s-%d", bp->dev->name, "TxRx",
- 0);
+ rc = snprintf(bp->irq_tbl[0].name, len, "%s-%s-%d", bp->dev->name,
+ "TxRx", 0);
+ if (rc >= len)
+ return -E2BIG;
+
bp->irq_tbl[0].handler = bnxt_inta;
+
+ return 0;
}
static int bnxt_init_int_mode(struct bnxt *bp);
@@ -10599,9 +10611,11 @@ static int bnxt_setup_int_mode(struct bnxt *bp)
}
if (bp->flags & BNXT_FLAG_USING_MSIX)
- bnxt_setup_msix(bp);
+ rc = bnxt_setup_msix(bp);
else
- bnxt_setup_inta(bp);
+ rc = bnxt_setup_inta(bp);
+ if (rc)
+ return rc;
rc = bnxt_set_real_num_queues(bp);
return rc;
--
2.43.0
next prev parent reply other threads:[~2024-07-05 11:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-05 11:26 [PATCH net-next 0/3] bnxt_en: address string truncation Simon Horman
2024-07-05 11:26 ` [PATCH net-next 1/3] bnxt_en: check for fw_ver_str truncation Simon Horman
2024-07-05 12:37 ` Przemek Kitszel
2024-07-05 16:06 ` Simon Horman
2024-07-05 17:03 ` Pavan Chebbi
2024-07-05 17:39 ` Michael Chan
2024-07-05 11:26 ` Simon Horman [this message]
2024-07-05 18:27 ` [PATCH net-next 2/3] bnxt_en: check for irq name truncation Michael Chan
2024-07-05 19:09 ` Simon Horman
2024-07-05 11:26 ` [PATCH net-next 3/3] bnxt_en: avoid truncation of per rx run debugfs filename Simon Horman
Reply instructions:
You may reply publicly 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=20240705-bnxt-str-v1-2-bafc769ed89e@kernel.org \
--to=horms@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=michael.chan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).