mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/7] of: fix merge mode in of_unflatten_dtb
Date: Wed, 14 Aug 2013 10:11:19 +0200	[thread overview]
Message-ID: <1376467885-29489-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1376467885-29489-1-git-send-email-s.hauer@pengutronix.de>

In merge mode a property may be overwritte with new values. When
this happens the length has to be adjusted.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/of/fdt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 76d6bb1..8481cf7 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -185,6 +185,7 @@ struct device_node *of_unflatten_dtb(struct device_node *root, void *infdt)
 			if (merge && p) {
 				free(p->value);
 				p->value = xzalloc(len);
+				p->length = len;
 				memcpy(p->value, nodep, len);
 			} else {
 				of_new_property(node, name, nodep, len);
-- 
1.8.4.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2013-08-14  8:11 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-14  8:11 [PATCH] of_property and phandles Sascha Hauer
2013-08-14  8:11 ` Sascha Hauer [this message]
2013-08-14  8:11 ` [PATCH 2/7] of: parse phandles during unflatten Sascha Hauer
2013-08-14  8:11 ` [PATCH 3/7] of: default to internal tree in of_find_node_by_path_from Sascha Hauer
2013-08-14  8:11 ` [PATCH 4/7] of: introduce some new helpers Sascha Hauer
2013-08-14  8:11 ` [PATCH 5/7] of_property command: allow to specify a node by alias Sascha Hauer
2013-08-14  8:11 ` [PATCH 6/7] of_property command: allow to set phandles Sascha Hauer
2013-08-14  8:11 ` [PATCH 7/7] oftree command: Allow to specify node by alias Sascha Hauer
2013-08-14  9:06 ` [PATCH] of_property and phandles Jan Lübbe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1376467885-29489-2-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox