From: Jon Loeliger <jdl@freescale.com>
Date: Thu, 25 Sep 2008 16:02:17 +0000 (-0500)
Subject: Fix an overflow case in fdt_offset_ptr() detected by GCC 4.3.
X-Git-Tag: v2008.10-rc3~24^2~1^2^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=741a6d010d09b5bafca8e4cdfb6b2f8a2c07994d;p=u-boot

Fix an overflow case in fdt_offset_ptr() detected by GCC 4.3.

Using Gcc 4.3 detected this problem:

    ../dtc/libfdt/fdt.c: In function 'fdt_next_tag':
    ../dtc/libfdt/fdt.c:82: error: assuming signed overflow does not
    occur when assuming that (X + c) < X is always false

To fix the problem, treat the offset as an unsigned int.

The problem report and proposed fix were provided
by Steve Papacharalambous <stevep@freescale.com>.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---

diff --git a/include/libfdt.h b/include/libfdt.h
index 94c35e330c..5492a53520 100644
--- a/include/libfdt.h
+++ b/include/libfdt.h
@@ -122,7 +122,7 @@
 /* Low-level functions (you probably don't need these)                */
 /**********************************************************************/
 
-const void *fdt_offset_ptr(const void *fdt, int offset, int checklen);
+const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int checklen);
 static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
 {
 	return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen);
diff --git a/libfdt/fdt.c b/libfdt/fdt.c
index 732103b07b..a59a518b0e 100644
--- a/libfdt/fdt.c
+++ b/libfdt/fdt.c
@@ -78,7 +78,7 @@ int fdt_check_header(const void *fdt)
 	return 0;
 }
 
-const void *fdt_offset_ptr(const void *fdt, int offset, int len)
+const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
 {
 	const char *p;