* [PATCH iproute2] iproute: fix printing resolved localhost
@ 2021-02-28 12:45 Luca Boccassi
0 siblings, 0 replies; only message in thread
From: Luca Boccassi @ 2021-02-28 12:45 UTC (permalink / raw)
To: netdev
format_host_rta_r might return a cached hostname
via its return value and not use the input buffer.
Before:
$ ip -resolve -6 route
dev lo proto kernel metric 256 pref medium
After:
$ ip/ip -resolve -6 route
localhost dev lo proto kernel metric 256 pref medium
Bug-Debian: https://bugs.debian.org/983591
Reported-by: Axel Scheepers <axel.scheepers76@gmail.com>
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
ip/iproute.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ip/iproute.c b/ip/iproute.c
index 291f1a58..5853f026 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -796,9 +796,10 @@ int print_route(struct nlmsghdr *n, void *arg)
"%s/%u", rt_addr_n2a_rta(family, tb[RTA_DST]),
r->rtm_dst_len);
} else {
- format_host_rta_r(family, tb[RTA_DST],
+ const char *hostname = format_host_rta_r(family, tb[RTA_DST],
b1, sizeof(b1));
-
+ if (hostname)
+ strncpy(b1, hostname, sizeof(b1) - 1);
}
} else if (r->rtm_dst_len) {
snprintf(b1, sizeof(b1), "0/%d ", r->rtm_dst_len);
@@ -818,8 +819,10 @@ int print_route(struct nlmsghdr *n, void *arg)
rt_addr_n2a_rta(family, tb[RTA_SRC]),
r->rtm_src_len);
} else {
- format_host_rta_r(family, tb[RTA_SRC],
+ const char *hostname = format_host_rta_r(family, tb[RTA_SRC],
b1, sizeof(b1));
+ if (hostname)
+ strncpy(b1, hostname, sizeof(b1) - 1);
}
print_color_string(PRINT_ANY, color,
"from", "from %s ", b1);
--
2.30.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-28 12:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-28 12:45 [PATCH iproute2] iproute: fix printing resolved localhost Luca Boccassi
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).