From 028ce3bafd9c8415a0cd72ff135f9498d833db21 Mon Sep 17 00:00:00 2001 From: Andrea Claudi Date: Wed, 15 Apr 2020 19:09:48 +0200 Subject: [PATCH] ip-xfrm: Fix help messages Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1796045 Upstream Status: iproute2.git commit 38dd041bfe773 commit 38dd041bfe773e481ebf9c8250e49c665af2e215 Author: Andrea Claudi Date: Wed Jan 29 15:56:40 2020 +0100 ip-xfrm: Fix help messages After commit 8589eb4efdf2a ("treewide: refactor help messages") help messages for xfrm state and policy are broken, printing many times the same protocol in UPSPEC section: $ ip xfrm state help [...] UPSPEC := proto { { tcp | tcp | tcp | tcp } [ sport PORT ] [ dport PORT ] | { icmp | icmp | icmp } [ type NUMBER ] [ code NUMBER ] | gre [ key { DOTTED-QUAD | NUMBER } ] | PROTO } This happens because strxf_proto function is non-reentrant and gets called multiple times in the same fprintf instruction. This commit fix the issue avoiding calls to strxf_proto() with a constant param, just hardcoding strings for protocol names. Fixes: 8589eb4efdf2a ("treewide: refactor help messages") Signed-off-by: Andrea Claudi Signed-off-by: Stephen Hemminger --- ip/xfrm_policy.c | 21 +++------------------ ip/xfrm_state.c | 24 +++--------------------- 2 files changed, 6 insertions(+), 39 deletions(-) diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c index 7c0233c182902..d3c706d3225f0 100644 --- a/ip/xfrm_policy.c +++ b/ip/xfrm_policy.c @@ -66,24 +66,9 @@ static void usage(void) "Usage: ip xfrm policy count\n" "Usage: ip xfrm policy set [ hthresh4 LBITS RBITS ] [ hthresh6 LBITS RBITS ]\n" "SELECTOR := [ src ADDR[/PLEN] ] [ dst ADDR[/PLEN] ] [ dev DEV ] [ UPSPEC ]\n" - "UPSPEC := proto { { "); - fprintf(stderr, "%s | %s | %s | %s } ", - strxf_proto(IPPROTO_TCP), - strxf_proto(IPPROTO_UDP), - strxf_proto(IPPROTO_SCTP), - strxf_proto(IPPROTO_DCCP)); - fprintf(stderr, - "[ sport PORT ] [ dport PORT ] |\n" - " { %s | %s | %s } ", - strxf_proto(IPPROTO_ICMP), - strxf_proto(IPPROTO_ICMPV6), - strxf_proto(IPPROTO_MH)); - fprintf(stderr, - "[ type NUMBER ] [ code NUMBER ] |\n" - " %s", - strxf_proto(IPPROTO_GRE)); - fprintf(stderr, - " [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n" + "UPSPEC := proto { { tcp | udp | sctp | dccp } [ sport PORT ] [ dport PORT ] |\n" + " { icmp | ipv6-icmp | mobility-header } [ type NUMBER ] [ code NUMBER ] |\n" + " gre [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n" "DIR := in | out | fwd\n" "PTYPE := main | sub\n" "ACTION := allow | block\n" diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c index b03ccc5807e90..7b413cd9b9a22 100644 --- a/ip/xfrm_state.c +++ b/ip/xfrm_state.c @@ -106,27 +106,9 @@ static void usage(void) "EXTRA-FLAG-LIST := [ EXTRA-FLAG-LIST ] EXTRA-FLAG\n" "EXTRA-FLAG := dont-encap-dscp\n" "SELECTOR := [ src ADDR[/PLEN] ] [ dst ADDR[/PLEN] ] [ dev DEV ] [ UPSPEC ]\n" - "UPSPEC := proto { { "); - fprintf(stderr, - "%s | %s | %s | %s", - strxf_proto(IPPROTO_TCP), - strxf_proto(IPPROTO_UDP), - strxf_proto(IPPROTO_SCTP), - strxf_proto(IPPROTO_DCCP)); - fprintf(stderr, - " } [ sport PORT ] [ dport PORT ] |\n" - " { "); - fprintf(stderr, - "%s | %s | %s", - strxf_proto(IPPROTO_ICMP), - strxf_proto(IPPROTO_ICMPV6), - strxf_proto(IPPROTO_MH)); - fprintf(stderr, - " } [ type NUMBER ] [ code NUMBER ] |\n"); - fprintf(stderr, - " %s", strxf_proto(IPPROTO_GRE)); - fprintf(stderr, - " [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n" + "UPSPEC := proto { { tcp | udp | sctp | dccp } [ sport PORT ] [ dport PORT ] |\n" + " { icmp | ipv6-icmp | mobility-header } [ type NUMBER ] [ code NUMBER ] |\n" + " gre [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n" "LIMIT-LIST := [ LIMIT-LIST ] limit LIMIT\n" "LIMIT := { time-soft | time-hard | time-use-soft | time-use-hard } SECONDS |\n" " { byte-soft | byte-hard } SIZE | { packet-soft | packet-hard } COUNT\n" -- 2.25.4