From: Jonathan Toppins <jtoppins@redhat.com>
To: netdev@vger.kernel.org
Cc: Ariel Elior <aelior@marvell.com>,
Sudarsana Kalluru <skalluru@marvell.com>,
GR-everest-linux-l2@marvell.com,
"David S. Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next] bnx2x: initialize ethtool info->fw_version before use
Date: Mon, 18 Nov 2019 12:07:53 -0500 [thread overview]
Message-ID: <f40bcf8cd93677c12bca1f06e74385c9a5f49819.1574096873.git.jtoppins@redhat.com> (raw)
If the info->fw_version has garbage in the buffer this can lead to a BUG()
being generated in strlcat() due to the use of strlen(). Initialize the
buffer before use.
The use of a systemtap script can demonstrate the problem by injecting
garbage into fw_version:
[root@localhost ~]# cat net-info.stp
//
// compile and run with command
//# stap -g net-info.stp
//
probe begin { printf("net-info version 01.01\n")}
function memset(msg:long) %{
memset((char*)STAP_ARG_msg,-1,196);
%}
probe module("bnx2x").function("bnx2x_get_drvinfo")
{
printf("In function\n");
memset(register("rsi"));
}
[root@localhost ~]# stap -g net-info.stp &
net-info version 01.01
[root@localhost ~]# ethtool -i eth1
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 4a0ba6801c9e..49b906396dcf 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1111,6 +1111,8 @@ static void bnx2x_get_drvinfo(struct net_device *dev,
int ext_dev_info_offset;
u32 mbi;
+ info->fw_version[0] = 0;
+
strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
--
2.16.4
next reply other threads:[~2019-11-18 17:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 17:07 Jonathan Toppins [this message]
2019-11-18 22:21 ` [PATCH net-next] bnx2x: initialize ethtool info->fw_version before use Jakub Kicinski
2019-11-19 1:58 ` David Miller
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=f40bcf8cd93677c12bca1f06e74385c9a5f49819.1574096873.git.jtoppins@redhat.com \
--to=jtoppins@redhat.com \
--cc=GR-everest-linux-l2@marvell.com \
--cc=aelior@marvell.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=skalluru@marvell.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).