[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Yd2GlT3SMtiF3Oc2@shredder>
Date: Tue, 11 Jan 2022 15:31:01 +0200
From: Ido Schimmel <idosch@...sch.org>
To: Stephen Hemminger <stephen@...workplumber.org>
Cc: netdev@...r.kernel.org, Stephen Hemminger <sthemmin@...rosoft.com>,
idosch@...dia.com
Subject: Re: [PATCH iproute2-next 06/11] nexthop: fix clang warning about
timer check
On Sat, Jan 08, 2022 at 12:46:45PM -0800, Stephen Hemminger wrote:
> diff --git a/ip/ipnexthop.c b/ip/ipnexthop.c
> index 83a5540e771c..2c65df294587 100644
> --- a/ip/ipnexthop.c
> +++ b/ip/ipnexthop.c
> @@ -31,6 +31,8 @@ enum {
> IPNH_FLUSH,
> };
>
> +#define TIMER_MAX (~(__u32)0 / 100)
> +
> #define RTM_NHA(h) ((struct rtattr *)(((char *)(h)) + \
> NLMSG_ALIGN(sizeof(struct nhmsg))))
>
> @@ -839,8 +841,8 @@ static void parse_nh_group_type_res(struct nlmsghdr *n, int maxlen, int *argcp,
> __u32 idle_timer;
>
> NEXT_ARG();
> - if (get_unsigned(&idle_timer, *argv, 0) ||
> - idle_timer >= ~0UL / 100)
> + if (get_u32(&idle_timer, *argv, 0) ||
> + idle_timer >= TIMER_MAX)
> invarg("invalid idle timer value", *argv);
>
> addattr32(n, maxlen, NHA_RES_GROUP_IDLE_TIMER,
> @@ -849,8 +851,8 @@ static void parse_nh_group_type_res(struct nlmsghdr *n, int maxlen, int *argcp,
> __u32 unbalanced_timer;
>
> NEXT_ARG();
> - if (get_unsigned(&unbalanced_timer, *argv, 0) ||
> - unbalanced_timer >= ~0UL / 100)
> + if (get_u32(&unbalanced_timer, *argv, 0) ||
> + unbalanced_timer >= TIMER_MAX)
> invarg("invalid unbalanced timer value", *argv);
I believe these were already addressed by:
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=5f8bb902e14f91161f9ed214d5fc1d813af8ed88
>
> addattr32(n, maxlen, NHA_RES_GROUP_UNBALANCED_TIMER,
> --
> 2.30.2
>
Powered by blists - more mailing lists