mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <ahmad@a3f.at>
To: barebox@lists.infradead.org
Cc: afa@pengutronix.de
Subject: [PATCH 5/5] commands: fix unaligned accesses of aliased commands on amd64
Date: Thu, 22 Aug 2019 08:19:41 +0200	[thread overview]
Message-ID: <20190822061941.6093-6-ahmad@a3f.at> (raw)
In-Reply-To: <20190822061941.6093-1-ahmad@a3f.at>

If a command has aliases (e.g. edit and sedit), register_command
allocates a new struct command for the alias. As struct command has a
alignment of 64 specified on __x86_64__, this new allocation needs to
observe the alignment lest unaligned access could occur. I don't think
it's likely that GCC would generate SIMD code here that expects a 64 byte
alignment, but heed UBSan's advice and use xmemalign with the appropriate
alignment.

Fixes: 8c14b97758 ("svn_rev_477")
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
I am not sure about this, because I don't understand why there was a 64
bit alignment in the x86_64 linker script in the first place.
The fix is trivial though, so even if it's only a theoretical, lets have
it? 
---
 common/command.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/command.c b/common/command.c
index d9cc4a6d4887..09655e9e78d5 100644
--- a/common/command.c
+++ b/common/command.c
@@ -106,7 +106,7 @@ int register_command(struct command *cmd)
 	if (cmd->aliases) {
 		const char * const *aliases = cmd->aliases;
 		while(*aliases) {
-			struct command *c = xzalloc(sizeof(struct command));
+			struct command *c = xmemalign(__alignof__(*c), sizeof *c);
 
 			memcpy(c, cmd, sizeof(struct command));
 
-- 
2.20.1


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

  parent reply	other threads:[~2019-08-22  6:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-22  6:19 [PATCH 0/5] sandbox: support -fsanitize={address,ubsan} Ahmad Fatoum
2019-08-22  6:19 ` [PATCH 1/5] sandbox: include header to provide missing prototype Ahmad Fatoum
2019-08-22  6:19 ` [PATCH 2/5] common: add generic CONFIG_UBSAN_SANITIZE_ALL plumbing Ahmad Fatoum
2019-08-22  6:19 ` [PATCH 3/5] common: add generic CONFIG_KASAN option Ahmad Fatoum
2019-08-22  6:19 ` [PATCH 4/5] sandbox: support Address and UndefinedBehavior sanitizers Ahmad Fatoum
2019-08-22  6:19 ` Ahmad Fatoum [this message]
2019-08-23  7:36   ` [PATCH 5/5] commands: fix unaligned accesses of aliased commands on amd64 Sascha Hauer
2019-08-23  9:08     ` Ahmad Fatoum
2019-08-23  9:13 ` [PATCH 0/5] sandbox: support -fsanitize={address,ubsan} Ahmad Fatoum
2019-08-23 12:31 ` Ahmad Fatoum

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=20190822061941.6093-6-ahmad@a3f.at \
    --to=ahmad@a3f.at \
    --cc=afa@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