netdev - Re: [PATCH iproute2] tc: Add space after format specifier

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 27 Jul 2020 22:53:50 -0700
From:   Briana Oursler <briana.oursler@...il.com>
To:     Stephen Hemminger <stephen@...workplumber.org>
Cc:     Petr Machata <petrm@...lanox.com>,
        Alexey Kuznetsov <kuznet@....inr.ac.ru>,
        Davide Caratti <dcaratti@...hat.com>,
        Stefano Brivio <sbrivio@...hat.com>, netdev@...r.kernel.org
Subject: Re: [PATCH iproute2] tc: Add space after format specifier

On Mon, 2020-07-27 at 22:20 -0700, Briana Oursler wrote:
> Add space after format specifier in print_string call. Fixes broken
> qdisc tests within tdc testing suite. Per suggestion from Petr
> Machata,
> remove a space and change spacing in tc/q_event.c to complete the
> fix.
> 
> Tested fix in tdc using:
> ./tdc.py -c qdisc
> 
> All qdisc RED tests return ok.
> 
> Fixes: d0e450438571("tc: q_red: Add support for
> qevents "mark" and "early_drop")
> 
> Signed-off-by: Briana Oursler <briana.oursler@...il.com>
> ---
>  tc/q_red.c     | 4 ++--
>  tc/tc_qevent.c | 3 ++-
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tc/q_red.c b/tc/q_red.c
> index dfef1bf8..df788f8f 100644
> --- a/tc/q_red.c
> +++ b/tc/q_red.c
> @@ -222,12 +222,12 @@ static int red_print_opt(struct qdisc_util *qu,
> FILE *f, struct rtattr *opt)
>  	print_uint(PRINT_JSON, "min", NULL, qopt->qth_min);
>  	print_string(PRINT_FP, NULL, "min %s ", sprint_size(qopt-
> >qth_min, b2));
>  	print_uint(PRINT_JSON, "max", NULL, qopt->qth_max);
> -	print_string(PRINT_FP, NULL, "max %s", sprint_size(qopt-
> >qth_max, b3));
> +	print_string(PRINT_FP, NULL, "max %s ", sprint_size(qopt-
> >qth_max, b3));
>  
>  	tc_red_print_flags(qopt->flags);
>  
>  	if (show_details) {
> -		print_uint(PRINT_ANY, "ewma", " ewma %u ", qopt->Wlog);
> +		print_uint(PRINT_ANY, "ewma", "ewma %u ", qopt->Wlog);
>  		if (max_P)
>  			print_float(PRINT_ANY, "probability",
>  				    "probability %lg ", max_P / pow(2,
> 32));
> diff --git a/tc/tc_qevent.c b/tc/tc_qevent.c
> index 2c010fcf..34568070 100644
> --- a/tc/tc_qevent.c
> +++ b/tc/tc_qevent.c
> @@ -82,8 +82,9 @@ void qevents_print(struct qevent_util *qevents,
> FILE *f)
>  			}
>  
>  			open_json_object(NULL);
> -			print_string(PRINT_ANY, "kind", " qevent %s",
> qevents->id);
> +			print_string(PRINT_ANY, "kind", "qevent %s",
> qevents->id);
>  			qevents->print_qevent(qevents, f);
> +			print_string(PRINT_FP, NULL, "%s", " ");
>  			close_json_object();
>  		}
>  	}

I made the subject PATCH iproute2 after the question discussion with
everyone, but I realized that the patch it fixes is in iproute2-next
but not yet in iproute2. Sorry about the confusion. Should I resend to
iproute2-next?