netdev - Re: [PATCH] Allow specifying bridge port STP state by name rather than number.

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]

Message-ID: <CAPFHKzcOFQCtz0pwLm8XOZxTOkC9w4CFq2vcLnwxUfVVmWdNCw@mail.gmail.com>
Date:	Thu, 19 Feb 2015 21:00:23 -0500
From:	Jonathon Reinhart <jonathon.reinhart@...il.com>
To:	Alex Pilon <alp@...xpilon.ca>
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH] Allow specifying bridge port STP state by name rather
 than number.

Please don't pass -1 to exit().  It is outside the acceptable range (0 to 255)
of exit status values:

https://www.gnu.org/software/libc/manual/html_node/Exit-Status.html

Most programs exit(1) when presented with invalid user input.

On Thu, Feb 19, 2015 at 2:27 PM, Alex Pilon <alp@...xpilon.ca> wrote:
> The existing behaviour forces one to memorize the integer constants for
> STP port states.
>
>     # bridge link set dev dummy0 state 3
>
> This patch makes it possible to use the lowercased port state name.
>
>     # bridge link set dev dummy0 state forwarding
>
> Invalid non-integer inputs now cause exit with status -1.
>
> Signed-off-by: Alex Pilon <alp@...xpilon.ca>
> ---
>  bridge/link.c     | 14 +++++++++++++-
>  man/man8/bridge.8 |  4 +++-
>  2 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/bridge/link.c b/bridge/link.c
> index c8555f8..a7bd85f 100644
> --- a/bridge/link.c
> +++ b/bridge/link.c
> @@ -316,7 +316,19 @@ static int brlink_modify(int argc, char **argv)
>                         priority = atoi(*argv);
>                 } else if (strcmp(*argv, "state") == 0) {
>                         NEXT_ARG();
> -                       state = atoi(*argv);
> +                       char *endptr;
> +                       size_t nstates = sizeof(port_states) / sizeof(*port_states);
> +                       state = strtol(*argv, &endptr, 10);
> +                       if (!(**argv != '\0' && *endptr == '\0')) {
> +                               for (state = 0; state < nstates; state++)
> +                                       if (strcmp(port_states[state], *argv) == 0)
> +                                               break;
> +                               if (state == nstates) {
> +                                       fprintf(stderr,
> +                                               "Error: invalid STP port state\n");
> +                                       exit(-1);
> +                               }
> +                       }
>                 } else if (strcmp(*argv, "hwmode") == 0) {
>                         NEXT_ARG();
>                         flags = BRIDGE_FLAGS_SELF;
> diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
> index e344db2..68ad71e 100644
> --- a/man/man8/bridge.8
> +++ b/man/man8/bridge.8
> @@ -207,7 +207,9 @@ droot port selectio algorithms.
>  .TP
>  .BI state " STATE "
>  the operation state of the port.  This is primarily used by user space STP/RSTP
> -implementation.  The following is a list of valid values:
> +implementation.  One may enter a lowercased port state name, or one of the
> +numbers below.  Negative inputs are ignored, and unrecognized names return an
> +error.
>
>  .B 0
>  - port is DISABLED.  Make this port completely inactive.
> --
> 2.3.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html