On Fri, Jun 11, 2021 at 06:10:34PM +0100, Andre Przywara wrote:
> With -Wsign-compare, compilers warn about a mismatching signedness in
> comparisons in fdtdump.c.
>
> The "len" parameter to valid_header() refers to a memory size, not a
> file offset, so the (unsigned) size_t is better fit, and fixes the
> warning nicely.
>
> In the main function we compare the difference between two pointers,
> which produces a signed ptrdiff_t type. However the while loop above the
> comparison makes sure that "p" always points before "endp" (by virtue of
> the limit in the memchr() call). This means "endp - p" is never
> negative, so we can safely cast this expression to an unsigned type.
>
> This fixes "make fdtdump", when compiled with -Wsign-compare.
>
> Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
Applied, thanks.
> ---
> fdtdump.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fdtdump.c b/fdtdump.c
> index d9fb374..bdc0f94 100644
> --- a/fdtdump.c
> +++ b/fdtdump.c
> @@ -18,7 +18,7 @@
> #include "util.h"
>
> #define FDT_MAGIC_SIZE 4
> -#define MAX_VERSION 17
> +#define MAX_VERSION 17U
>
> #define ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1))
> #define PALIGN(p, a) ((void *)(ALIGN((unsigned long)(p), (a))))
> @@ -163,7 +163,7 @@ static const char * const usage_opts_help[] = {
> USAGE_COMMON_OPTS_HELP
> };
>
> -static bool valid_header(char *p, off_t len)
> +static bool valid_header(char *p, size_t len)
> {
> if (len < sizeof(struct fdt_header) ||
> fdt_magic(p) != FDT_MAGIC ||
> @@ -235,7 +235,7 @@ int main(int argc, char *argv[])
> }
> ++p;
> }
> - if (!p || endp - p < sizeof(struct fdt_header))
> + if (!p || (size_t)(endp - p) < sizeof(struct fdt_header))
> die("%s: could not locate fdt magic\n", file);
> printf("%s: found fdt at offset %#tx\n", file, p - buf);
> buf = p;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
