All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marcus Comstedt <marcus@mc.pp.se>
To: u-boot@lists.denx.de
Subject: [PATCH] libfdt: Remove superfluous NUL character from overlay symbols
Date: Fri, 22 May 2020 18:41:36 +0200	[thread overview]
Message-ID: <20200522164136.26069-1-marcus@mc.pp.se> (raw)

The symbol path already ends with a NUL character (something which is
actually checked by the code) and this NUL is included in
rel_path_len, so there is no need to add a second one.

This change fixes incorrect display in "fdt list /__symbols" after
applying an overlay with symbols.

Signed-off-by: Marcus Comstedt <marcus@mc.pp.se>
---
 scripts/dtc/libfdt/fdt_overlay.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/dtc/libfdt/fdt_overlay.c b/scripts/dtc/libfdt/fdt_overlay.c
index c090e6991e..bd75e3dd78 100644
--- a/scripts/dtc/libfdt/fdt_overlay.c
+++ b/scripts/dtc/libfdt/fdt_overlay.c
@@ -757,7 +757,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
 			   && (memcmp(s, "/__overlay__", len - 1) == 0)) {
 			/* /<fragment-name>/__overlay__ */
 			rel_path = "";
-			rel_path_len = 0;
+			rel_path_len = 1; /* Include NUL character */
 		} else {
 			/* Symbol refers to something that won't end
 			 * up in the target tree */
@@ -794,7 +794,7 @@ static int overlay_symbol_update(void *fdt, void *fdto)
 		}
 
 		ret = fdt_setprop_placeholder(fdt, root_sym, name,
-				len + (len > 1) + rel_path_len + 1, &p);
+				len + (len > 1) + rel_path_len, &p);
 		if (ret < 0)
 			return ret;
 
@@ -820,7 +820,6 @@ static int overlay_symbol_update(void *fdt, void *fdto)
 
 		buf[len] = '/';
 		memcpy(buf + len + 1, rel_path, rel_path_len);
-		buf[len + 1 + rel_path_len] = '\0';
 	}
 
 	return 0;
-- 
2.26.2

             reply	other threads:[~2020-05-22 16:41 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-22 16:41 Marcus Comstedt [this message]
2020-05-22 23:13 ` [PATCH] libfdt: Remove superfluous NUL character from overlay symbols Simon Glass
2020-05-23 11:57   ` Marcus Comstedt
     [not found]     ` <yf94ks627a2.fsf-S4ne242Fi5M@public.gmane.org>
2020-05-23 14:57       ` Simon Glass
2020-05-23 14:57         ` Simon Glass
2020-05-23 15:13         ` Marcus Comstedt
2020-05-23 15:13           ` Marcus Comstedt
     [not found]           ` <yf9o8qe8z1c.fsf-S4ne242Fi5M@public.gmane.org>
2020-05-25  2:15             ` Simon Glass
2020-05-25  2:15               ` Simon Glass
     [not found]           ` <CAPnjgZ2C3HxdZqYAS_g-CEAq1CTVvdEvaz6NiCowpd11d9f5WA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-06-13  3:11             ` sjg-hpIqsD4AKlfQT0dZR+AlfA
2020-06-13  3:11               ` sjg at google.com
  -- strict thread matches above, loose matches on Subject: below --
2020-05-23 15:12 Marcus Comstedt
     [not found] ` <20200523151239.8849-1-marcus-S4ne242Fi5M@public.gmane.org>
2020-05-25  5:15   ` David Gibson
     [not found]     ` <20200525051555.GE23110-K0bRW+63XPQe6aEkudXLsA@public.gmane.org>
2020-05-25  6:53       ` Marcus Comstedt

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=20200522164136.26069-1-marcus@mc.pp.se \
    --to=marcus@mc.pp.se \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.