tequilaOS/platform_external_dtc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

yamltree: Remove marker ordering dependency

Browse source 
The check for phandle markers is fragile because the phandle marker must
be after a type marker. The only guarantee for markers is they are in
offset order. The order at a specific offset is undefined.

Rework yaml_propval_int() to get the full marker list, so it can find a
phandle marker no matter the ordering.

Signed-off-by: Rob Herring <robh@kernel.org>
Message-Id: <20210526010335.860787-2-robh@kernel.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Rob Herring 2021-05-25 20:03:31 -05:00 committed by David Gibson
parent 61e513439e
commit 2dffc192a7
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
yamltree.c
View file

@ -29,11 +29,12 @@ char *yaml_error_name[] = {
(emitter)->problem, __func__, __LINE__); \ (emitter)->problem, __func__, __LINE__); \
}) })
static void yaml_propval_int(yaml_emitter_t *emitter, struct marker *markers, char *data, unsigned int len, int width) static void yaml_propval_int(yaml_emitter_t *emitter, struct marker *markers,
char *data, unsigned int seq_offset, unsigned int len, int width)
{ {
yaml_event_t event; yaml_event_t event;
void *tag; void *tag;
unsigned int off, start_offset = markers->offset; unsigned int off;
switch(width) { switch(width) {
case 1: tag = "!u8"; break; case 1: tag = "!u8"; break;
@ -66,7 +67,7 @@ static void yaml_propval_int(yaml_emitter_t *emitter, struct marker *markers, ch
m = markers; m = markers;
is_phandle = false; is_phandle = false;
for_each_marker_of_type(m, REF_PHANDLE) { for_each_marker_of_type(m, REF_PHANDLE) {
if (m->offset == (start_offset + off)) { if (m->offset == (seq_offset + off)) {
is_phandle = true; is_phandle = true;
break; break;
} }
@ -114,6 +115,7 @@ static void yaml_propval(yaml_emitter_t *emitter, struct property *prop)
yaml_event_t event; yaml_event_t event;
unsigned int len = prop->val.len; unsigned int len = prop->val.len;
struct marker *m = prop->val.markers; struct marker *m = prop->val.markers;
struct marker *markers = prop->val.markers;
/* Emit the property name */ /* Emit the property name */
yaml_scalar_event_initialize(&event, NULL, yaml_scalar_event_initialize(&event, NULL,
@ -151,19 +153,19 @@ static void yaml_propval(yaml_emitter_t *emitter, struct property *prop)
switch(m->type) { switch(m->type) {
case TYPE_UINT16: case TYPE_UINT16:
yaml_propval_int(emitter, m, data, chunk_len, 2); yaml_propval_int(emitter, markers, data, m->offset, chunk_len, 2);
break; break;
case TYPE_UINT32: case TYPE_UINT32:
yaml_propval_int(emitter, m, data, chunk_len, 4); yaml_propval_int(emitter, markers, data, m->offset, chunk_len, 4);
break; break;
case TYPE_UINT64: case TYPE_UINT64:
yaml_propval_int(emitter, m, data, chunk_len, 8); yaml_propval_int(emitter, markers, data, m->offset, chunk_len, 8);
break; break;
case TYPE_STRING: case TYPE_STRING:
yaml_propval_string(emitter, data, chunk_len); yaml_propval_string(emitter, data, chunk_len);
break; break;
default: default:
yaml_propval_int(emitter, m, data, chunk_len, 1); yaml_propval_int(emitter, markers, data, m->offset, chunk_len, 1);
break; break;
} }
} }