From: Vadim Kochan <vadim4j@gmail.com>
To: netdev@vger.kernel.org
Cc: eric.dumazet@gmail.com, daniel@iogearbox.net,
jose.r.guzman.mosqueda@intel.com,
Vadim Kochan <vadim4j@gmail.com>
Subject: [PATCH iproute2 v2] ss: Fix allocation of cong control alg name
Date: Fri, 29 May 2015 21:09:54 +0300 [thread overview]
Message-ID: <1432922994-13735-1-git-send-email-vadim4j@gmail.com> (raw)
From: Vadim Kochan <vadim4j@gmail.com>
Used 16 char array for cong alg name instead of malloc.
Fixes: 8250bc9ff4e5 ("ss: Unify inet sockets output")
Reported-by: Jose R. Guzman Mosqueda <jose.r.guzman.mosqueda@intel.com>
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
---
v2:
Used 16 byte array for cong alg name instead of malloc
suggested by Eric Dumazet <eric.dumazet@gmail.com>
misc/ss.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/misc/ss.c b/misc/ss.c
index 347e3a1..0bab8a2 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -755,7 +755,7 @@ struct tcpstat
int timer;
int timeout;
int probes;
- char *cong_alg;
+ char cong_alg[16];
double rto, ato, rtt, rttvar;
int qack, cwnd, ssthresh, backoff;
double send_bps;
@@ -1664,7 +1664,7 @@ static void tcp_stats_print(struct tcpstat *s)
printf(" ecnseen");
if (s->has_fastopen_opt)
printf(" fastopen");
- if (s->cong_alg)
+ if (s->cong_alg[0])
printf(" %s", s->cong_alg);
if (s->has_wscale_opt)
printf(" wscale:%d,%d", s->snd_wscale, s->rcv_wscale);
@@ -1907,9 +1907,9 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
}
if (tb[INET_DIAG_CONG]) {
- const char *cong_attr = rta_getattr_str(tb[INET_DIAG_CONG]);
- s.cong_alg = malloc(strlen(cong_attr + 1));
- strcpy(s.cong_alg, cong_attr);
+ strncpy(s.cong_alg,
+ rta_getattr_str(tb[INET_DIAG_CONG]),
+ sizeof(s.cong_alg) - 1);
}
if (TCPI_HAS_OPT(info, TCPI_OPT_WSCALE)) {
@@ -1984,8 +1984,6 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
tcp_stats_print(&s);
if (s.dctcp)
free(s.dctcp);
- if (s.cong_alg)
- free(s.cong_alg);
}
}
--
2.3.1
next reply other threads:[~2015-05-29 18:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 18:09 Vadim Kochan [this message]
2015-05-29 22:02 ` [PATCH iproute2 v2] ss: Fix allocation of cong control alg name Stephen Hemminger
2015-05-29 22:37 ` Eric Dumazet
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=1432922994-13735-1-git-send-email-vadim4j@gmail.com \
--to=vadim4j@gmail.com \
--cc=daniel@iogearbox.net \
--cc=eric.dumazet@gmail.com \
--cc=jose.r.guzman.mosqueda@intel.com \
--cc=netdev@vger.kernel.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