diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2017-01-16 16:11:48 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2017-01-16 17:26:04 +0000 |
| commit | 29440c19861894af1b283b3dd0f2f1e66c67eca6 (patch) | |
| tree | 03b31d9f6762f599443248482c7153f6448611a5 /lib/libfdt/fdt_rw.c | |
| parent | a78676b105a90c286ad43e58fc02477512235114 (diff) | |
| download | platform_external_arm-trusted-firmware-29440c19861894af1b283b3dd0f2f1e66c67eca6.tar.gz platform_external_arm-trusted-firmware-29440c19861894af1b283b3dd0f2f1e66c67eca6.tar.bz2 platform_external_arm-trusted-firmware-29440c19861894af1b283b3dd0f2f1e66c67eca6.zip | |
libfdt: Replace v1.4.1 by v1.4.2
Delete old version of libfdt at lib/libfdt. Move new libfdt API
headers to include/lib/libfdt and all other files to lib/libfdt.
Change-Id: I32b7888f1f20d62205310e363accbef169ad7b1b
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'lib/libfdt/fdt_rw.c')
| -rw-r--r-- | lib/libfdt/fdt_rw.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c index 70adec6c3..2eed4f583 100644 --- a/lib/libfdt/fdt_rw.c +++ b/lib/libfdt/fdt_rw.c @@ -101,6 +101,8 @@ static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen) if (((p + oldlen) < p) || ((p + oldlen) > end)) return -FDT_ERR_BADOFFSET; + if ((p < (char *)fdt) || ((end - oldlen + newlen) < (char *)fdt)) + return -FDT_ERR_BADOFFSET; if ((end - oldlen + newlen) > ((char *)fdt + fdt_totalsize(fdt))) return -FDT_ERR_NOSPACE; memmove(p + newlen, p + oldlen, end - p - oldlen); @@ -189,17 +191,13 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size) int fdt_del_mem_rsv(void *fdt, int n) { struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n); - int err; FDT_RW_CHECK_HEADER(fdt); if (n >= fdt_num_mem_rsv(fdt)) return -FDT_ERR_NOTFOUND; - err = _fdt_splice_mem_rsv(fdt, re, 1, 0); - if (err) - return err; - return 0; + return _fdt_splice_mem_rsv(fdt, re, 1, 0); } static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name, |