2007-04-01 00:59:59 +09:00
|
|
|
/*
|
|
|
|
* libfdt - Flat Device Tree manipulation
|
|
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
|
|
|
*
|
2007-10-25 01:04:22 +09:00
|
|
|
* libfdt is dual licensed: you can use it either under the terms of
|
|
|
|
* the GPL, or the BSD license, at your option.
|
2007-04-01 00:59:59 +09:00
|
|
|
*
|
2007-10-25 01:04:22 +09:00
|
|
|
* a) This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
|
|
* License, or (at your option) any later version.
|
2007-04-01 00:59:59 +09:00
|
|
|
*
|
2007-10-25 01:04:22 +09:00
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public
|
|
|
|
* License along with this library; if not, write to the Free
|
|
|
|
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
|
|
|
|
* MA 02110-1301 USA
|
|
|
|
*
|
|
|
|
* Alternatively,
|
|
|
|
*
|
|
|
|
* b) Redistribution and use in source and binary forms, with or
|
|
|
|
* without modification, are permitted provided that the following
|
|
|
|
* conditions are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above
|
|
|
|
* copyright notice, this list of conditions and the following
|
|
|
|
* disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above
|
|
|
|
* copyright notice, this list of conditions and the following
|
|
|
|
* disclaimer in the documentation and/or other materials
|
|
|
|
* provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
|
|
|
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
|
|
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
|
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
|
|
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
|
|
|
|
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
2007-04-01 00:59:59 +09:00
|
|
|
*/
|
|
|
|
#include "libfdt_env.h"
|
|
|
|
|
2008-03-01 00:00:24 +09:00
|
|
|
#ifndef USE_HOSTCC
|
2007-04-01 00:59:59 +09:00
|
|
|
#include <fdt.h>
|
|
|
|
#include <libfdt.h>
|
2008-03-01 00:00:24 +09:00
|
|
|
#else
|
|
|
|
#include "fdt_host.h"
|
|
|
|
#endif
|
2007-04-01 00:59:59 +09:00
|
|
|
|
|
|
|
#include "libfdt_internal.h"
|
|
|
|
|
2007-04-07 03:17:14 +09:00
|
|
|
int fdt_check_header(const void *fdt)
|
2007-04-01 00:59:59 +09:00
|
|
|
{
|
|
|
|
if (fdt_magic(fdt) == FDT_MAGIC) {
|
|
|
|
/* Complete tree */
|
|
|
|
if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)
|
|
|
|
return -FDT_ERR_BADVERSION;
|
|
|
|
if (fdt_last_comp_version(fdt) > FDT_LAST_SUPPORTED_VERSION)
|
|
|
|
return -FDT_ERR_BADVERSION;
|
2008-07-09 13:10:24 +09:00
|
|
|
} else if (fdt_magic(fdt) == FDT_SW_MAGIC) {
|
2007-04-01 00:59:59 +09:00
|
|
|
/* Unfinished sequential-write blob */
|
|
|
|
if (fdt_size_dt_struct(fdt) == 0)
|
|
|
|
return -FDT_ERR_BADSTATE;
|
|
|
|
} else {
|
|
|
|
return -FDT_ERR_BADMAGIC;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-09-26 01:02:17 +09:00
|
|
|
const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
|
2007-04-01 00:59:59 +09:00
|
|
|
{
|
2008-07-07 09:10:48 +09:00
|
|
|
const char *p;
|
2007-04-01 00:59:59 +09:00
|
|
|
|
|
|
|
if (fdt_version(fdt) >= 0x11)
|
|
|
|
if (((offset + len) < offset)
|
|
|
|
|| ((offset + len) > fdt_size_dt_struct(fdt)))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
p = _fdt_offset_ptr(fdt, offset);
|
|
|
|
|
|
|
|
if (p + len < p)
|
|
|
|
return NULL;
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
|
2007-10-25 01:04:22 +09:00
|
|
|
{
|
2013-01-16 22:59:50 +09:00
|
|
|
const fdt32_t *tagp, *lenp;
|
2007-10-25 01:04:22 +09:00
|
|
|
uint32_t tag;
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
int offset = startoffset;
|
2007-10-25 01:04:22 +09:00
|
|
|
const char *p;
|
|
|
|
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
*nextoffset = -FDT_ERR_TRUNCATED;
|
2007-10-25 01:04:22 +09:00
|
|
|
tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE);
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
if (!tagp)
|
2007-10-25 01:04:22 +09:00
|
|
|
return FDT_END; /* premature end */
|
|
|
|
tag = fdt32_to_cpu(*tagp);
|
|
|
|
offset += FDT_TAGSIZE;
|
|
|
|
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
*nextoffset = -FDT_ERR_BADSTRUCTURE;
|
2007-10-25 01:04:22 +09:00
|
|
|
switch (tag) {
|
|
|
|
case FDT_BEGIN_NODE:
|
|
|
|
/* skip name */
|
|
|
|
do {
|
|
|
|
p = fdt_offset_ptr(fdt, offset++, 1);
|
|
|
|
} while (p && (*p != '\0'));
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
if (!p)
|
|
|
|
return FDT_END; /* premature end */
|
2007-10-25 01:04:22 +09:00
|
|
|
break;
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
|
2007-10-25 01:04:22 +09:00
|
|
|
case FDT_PROP:
|
|
|
|
lenp = fdt_offset_ptr(fdt, offset, sizeof(*lenp));
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
if (!lenp)
|
|
|
|
return FDT_END; /* premature end */
|
|
|
|
/* skip-name offset, length and value */
|
|
|
|
offset += sizeof(struct fdt_property) - FDT_TAGSIZE
|
|
|
|
+ fdt32_to_cpu(*lenp);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case FDT_END:
|
|
|
|
case FDT_END_NODE:
|
|
|
|
case FDT_NOP:
|
2007-10-25 01:04:22 +09:00
|
|
|
break;
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
|
|
|
|
default:
|
|
|
|
return FDT_END;
|
2007-10-25 01:04:22 +09:00
|
|
|
}
|
|
|
|
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
if (!fdt_offset_ptr(fdt, startoffset, offset - startoffset))
|
|
|
|
return FDT_END; /* premature end */
|
2007-10-25 01:04:22 +09:00
|
|
|
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
*nextoffset = FDT_TAGALIGN(offset);
|
2007-10-25 01:04:22 +09:00
|
|
|
return tag;
|
|
|
|
}
|
|
|
|
|
2008-05-20 16:19:11 +09:00
|
|
|
int _fdt_check_node_offset(const void *fdt, int offset)
|
|
|
|
{
|
|
|
|
if ((offset < 0) || (offset % FDT_TAGSIZE)
|
|
|
|
|| (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE))
|
|
|
|
return -FDT_ERR_BADOFFSET;
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2010-03-09 15:39:14 +09:00
|
|
|
int _fdt_check_prop_offset(const void *fdt, int offset)
|
|
|
|
{
|
|
|
|
if ((offset < 0) || (offset % FDT_TAGSIZE)
|
|
|
|
|| (fdt_next_tag(fdt, offset, &offset) != FDT_PROP))
|
|
|
|
return -FDT_ERR_BADOFFSET;
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2008-02-12 09:58:31 +09:00
|
|
|
int fdt_next_node(const void *fdt, int offset, int *depth)
|
|
|
|
{
|
|
|
|
int nextoffset = 0;
|
|
|
|
uint32_t tag;
|
|
|
|
|
2008-05-20 16:19:11 +09:00
|
|
|
if (offset >= 0)
|
|
|
|
if ((nextoffset = _fdt_check_node_offset(fdt, offset)) < 0)
|
|
|
|
return nextoffset;
|
2008-02-12 09:58:31 +09:00
|
|
|
|
|
|
|
do {
|
|
|
|
offset = nextoffset;
|
|
|
|
tag = fdt_next_tag(fdt, offset, &nextoffset);
|
|
|
|
|
|
|
|
switch (tag) {
|
|
|
|
case FDT_PROP:
|
|
|
|
case FDT_NOP:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case FDT_BEGIN_NODE:
|
|
|
|
if (depth)
|
|
|
|
(*depth)++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case FDT_END_NODE:
|
2009-02-06 12:01:56 +09:00
|
|
|
if (depth && ((--(*depth)) < 0))
|
|
|
|
return nextoffset;
|
2008-02-12 09:58:31 +09:00
|
|
|
break;
|
|
|
|
|
|
|
|
case FDT_END:
|
libfdt: Rework/cleanup fdt_next_tag()
Currently, callers of fdt_next_tag() must usually follow the call with
some sort of call to fdt_offset_ptr() to verify that the blob isn't
truncated in the middle of the tag data they're going to process.
This is a bit silly, since fdt_next_tag() generally has to call
fdt_offset_ptr() on at least some of the data following the tag for
its own operation.
This patch alters fdt_next_tag() to always use fdt_offset_ptr() to
verify the data between its starting offset and the offset it returns
in nextoffset. This simplifies fdt_get_property() which no longer has
to verify itself that the property data is all present.
At the same time, I neaten and clarify the error handling for
fdt_next_tag(). Previously, fdt_next_tag() could return -1 instead of
a tag value in some circumstances - which almost none of the callers
checked for. Also, fdt_next_tag() could return FDT_END either because
it encountered an FDT_END tag, or because it reached the end of the
structure block - no way was provided to tell between these cases.
With this patch, fdt_next_tag() always returns FDT_END with a negative
value in nextoffset for an error. This means the several places which
loop looking for FDT_END will still work correctly - they only need to
check for errors at the end. The errors which fdt_next_tag() can
report are:
- -FDT_ERR_TRUNCATED if it reached the end of the structure
block instead of finding a tag.
- -FDT_BADSTRUCTURE if a bad tag was encountered, or if the
tag data couldn't be verified with fdt_offset_ptr().
This patch also updates the callers of fdt_next_tag(), where
appropriate, to make use of the new error reporting.
Finally, the prototype for the long gone _fdt_next_tag() is removed
from libfdt_internal.h.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2009-02-06 12:03:24 +09:00
|
|
|
if ((nextoffset >= 0)
|
|
|
|
|| ((nextoffset == -FDT_ERR_TRUNCATED) && !depth))
|
|
|
|
return -FDT_ERR_NOTFOUND;
|
|
|
|
else
|
|
|
|
return nextoffset;
|
2008-02-12 09:58:31 +09:00
|
|
|
}
|
|
|
|
} while (tag != FDT_BEGIN_NODE);
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
libfdt: Add fdt_next_subnode() to permit easy subnode iteration
Iterating through subnodes with libfdt is a little painful to write as we
need something like this:
for (depth = 0, count = 0,
offset = fdt_next_node(fdt, parent_offset, &depth);
(offset >= 0) && (depth > 0);
offset = fdt_next_node(fdt, offset, &depth)) {
if (depth == 1) {
/* code body */
}
}
Using fdt_next_subnode() we can instead write this, which is shorter and
easier to get right:
for (offset = fdt_first_subnode(fdt, parent_offset);
offset >= 0;
offset = fdt_next_subnode(fdt, offset)) {
/* code body */
}
Also, it doesn't require two levels of indentation for the loop body.
Signed-off-by: Simon Glass <sjg@chromium.org>
(Cherry-picked from dtc commit 4e76ec79)
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
2013-05-07 15:11:50 +09:00
|
|
|
int fdt_first_subnode(const void *fdt, int offset)
|
|
|
|
{
|
|
|
|
int depth = 0;
|
|
|
|
|
|
|
|
offset = fdt_next_node(fdt, offset, &depth);
|
|
|
|
if (offset < 0 || depth != 1)
|
|
|
|
return -FDT_ERR_NOTFOUND;
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
int fdt_next_subnode(const void *fdt, int offset)
|
|
|
|
{
|
|
|
|
int depth = 1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* With respect to the parent, the depth of the next subnode will be
|
|
|
|
* the same as the last.
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
offset = fdt_next_node(fdt, offset, &depth);
|
|
|
|
if (offset < 0 || depth < 1)
|
|
|
|
return -FDT_ERR_NOTFOUND;
|
|
|
|
} while (depth > 1);
|
|
|
|
|
|
|
|
return offset;
|
|
|
|
}
|
|
|
|
|
2007-04-01 00:59:59 +09:00
|
|
|
const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
|
|
|
|
{
|
|
|
|
int len = strlen(s) + 1;
|
|
|
|
const char *last = strtab + tabsize - len;
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
for (p = strtab; p <= last; p++)
|
2008-07-09 13:10:24 +09:00
|
|
|
if (memcmp(p, s, len) == 0)
|
2007-04-01 00:59:59 +09:00
|
|
|
return p;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
int fdt_move(const void *fdt, void *buf, int bufsize)
|
|
|
|
{
|
2008-07-09 13:10:24 +09:00
|
|
|
FDT_CHECK_HEADER(fdt);
|
2007-04-01 00:59:59 +09:00
|
|
|
|
|
|
|
if (fdt_totalsize(fdt) > bufsize)
|
|
|
|
return -FDT_ERR_NOSPACE;
|
|
|
|
|
|
|
|
memmove(buf, fdt, fdt_totalsize(fdt));
|
|
|
|
return 0;
|
|
|
|
}
|