From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
Declan Doherty <declan.doherty@intel.com>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH 1/5] net/bonding: fix buffer length when printing strings
Date: Wed, 3 Apr 2019 15:45:01 +0100 [thread overview]
Message-ID: <20190403144505.46234-2-bruce.richardson@intel.com> (raw)
Message-ID: <20190403144501.1mg51vcbZl-RuJ030P3PztJazd5v-ujvTeFQCjGAfRw@z> (raw)
In-Reply-To: <20190403144505.46234-1-bruce.richardson@intel.com>
Using the size of the source string is incorrect when printing using
snprintf. Instead pass in the buffer size to be used appropriately.
Fixes: 457ecf2953fc ("bond: add debug info for mode 6")
CC: Declan Doherty <declan.doherty@intel.com>
CC: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/bonding/rte_eth_bond_pmd.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 58b6e4344..154257ffe 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -489,35 +489,31 @@ uint32_t burstnumberTX;
#ifdef RTE_LIBRTE_BOND_DEBUG_ALB
static void
-arp_op_name(uint16_t arp_op, char *buf)
+arp_op_name(uint16_t arp_op, char *buf, size_t buf_len)
{
switch (arp_op) {
case ARP_OP_REQUEST:
- snprintf(buf, sizeof("ARP Request"), "%s", "ARP Request");
+ snprintf(buf, buf_len, "%s", "ARP Request");
return;
case ARP_OP_REPLY:
- snprintf(buf, sizeof("ARP Reply"), "%s", "ARP Reply");
+ snprintf(buf, buf_len, "%s", "ARP Reply");
return;
case ARP_OP_REVREQUEST:
- snprintf(buf, sizeof("Reverse ARP Request"), "%s",
- "Reverse ARP Request");
+ snprintf(buf, buf_len, "%s", "Reverse ARP Request");
return;
case ARP_OP_REVREPLY:
- snprintf(buf, sizeof("Reverse ARP Reply"), "%s",
- "Reverse ARP Reply");
+ snprintf(buf, buf_len, "%s", "Reverse ARP Reply");
return;
case ARP_OP_INVREQUEST:
- snprintf(buf, sizeof("Peer Identify Request"), "%s",
- "Peer Identify Request");
+ snprintf(buf, buf_len, "%s", "Peer Identify Request");
return;
case ARP_OP_INVREPLY:
- snprintf(buf, sizeof("Peer Identify Reply"), "%s",
- "Peer Identify Reply");
+ snprintf(buf, buf_len, "%s", "Peer Identify Reply");
return;
default:
break;
}
- snprintf(buf, sizeof("Unknown"), "%s", "Unknown");
+ snprintf(buf, buf_len, "%s", "Unknown");
return;
}
#endif
@@ -621,7 +617,8 @@ mode6_debug(const char __attribute__((unused)) *info, struct ether_hdr *eth_h,
arp_h = (struct arp_hdr *)((char *)(eth_h + 1) + offset);
ipv4_addr_to_dot(arp_h->arp_data.arp_sip, src_ip, MaxIPv4String);
ipv4_addr_to_dot(arp_h->arp_data.arp_tip, dst_ip, MaxIPv4String);
- arp_op_name(rte_be_to_cpu_16(arp_h->arp_op), ArpOp);
+ arp_op_name(rte_be_to_cpu_16(arp_h->arp_op),
+ ArpOp, sizeof(ArpOp));
MODE6_DEBUG(buf, src_ip, dst_ip, eth_h, ArpOp, port, *burstnumber);
}
#endif
--
2.20.1
next prev parent reply other threads:[~2019-04-03 14:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 14:45 [dpdk-dev] [PATCH 0/5] clean up snprintf use for string copying Bruce Richardson
2019-04-03 14:45 ` Bruce Richardson
2019-04-03 14:45 ` Bruce Richardson [this message]
2019-04-03 14:45 ` [dpdk-dev] [PATCH 1/5] net/bonding: fix buffer length when printing strings Bruce Richardson
2019-04-03 15:47 ` Stephen Hemminger
2019-04-03 15:47 ` Stephen Hemminger
2019-04-03 15:51 ` Bruce Richardson
2019-04-03 15:51 ` Bruce Richardson
2019-04-03 15:53 ` Stephen Hemminger
2019-04-03 15:53 ` Stephen Hemminger
2019-04-03 14:45 ` [dpdk-dev] [PATCH 2/5] devtools/cocci: make strlcpy replacement smarter Bruce Richardson
2019-04-03 14:45 ` Bruce Richardson
2019-04-03 14:45 ` [dpdk-dev] [PATCH 3/5] devtools/cocci: create safer version of strlcpy script Bruce Richardson
2019-04-03 14:45 ` Bruce Richardson
2019-04-03 14:45 ` [dpdk-dev] [PATCH 4/5] replace snprintf with strlcpy without adding extra include Bruce Richardson
2019-04-03 14:45 ` Bruce Richardson
2019-04-03 15:51 ` Stephen Hemminger
2019-04-03 15:51 ` Stephen Hemminger
2019-04-03 15:56 ` Bruce Richardson
2019-04-03 15:56 ` Bruce Richardson
2019-04-04 18:05 ` Thomas Monjalon
2019-04-04 18:05 ` Thomas Monjalon
2019-04-03 14:45 ` [dpdk-dev] [PATCH 5/5] replace snprintf with strlcpy Bruce Richardson
2019-04-03 14:45 ` Bruce Richardson
2019-04-03 14:57 ` [dpdk-dev] [PATCH 0/5] clean up snprintf use for string copying Wiles, Keith
2019-04-03 14:57 ` Wiles, Keith
2019-04-03 15:13 ` Bruce Richardson
2019-04-03 15:13 ` Bruce Richardson
2019-04-03 15:27 ` Stephen Hemminger
2019-04-03 15:27 ` Stephen Hemminger
2019-04-04 20:11 ` Thomas Monjalon
2019-04-04 20:11 ` Thomas Monjalon
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=20190403144505.46234-2-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/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).