mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Antony Pavlov <antonynpavlov@gmail.com>
To: Sascha Hauer <s.hauer@pengutronix.de>, barebox@lists.infradead.org
Subject: [PATCH] imd: make it work on big-endian machine
Date: Fri, 20 May 2016 00:05:59 +0300	[thread overview]
Message-ID: <1463691959-3628-1-git-send-email-antonynpavlov@gmail.com> (raw)

The commit

    commit 5e335773e0814173b40873a891964a7858d64688
    Author: Sascha Hauer <s.hauer@pengutronix.de>
    Date:   Tue Mar 29 10:06:46 2016 +0200

        imd: use struct imd_header * as argument

introduces additional imd type checks like this

    if (!imd_is_string(imd->type))
           return NULL;

These checks work incorrectly on any big-endian machine
because imd->type field needs addition convertion
to little-endian byteorder before use.

Here is the imd command output on big-endian qemu-malta:

    barebox:/ imd /dev/nor0.barebox
    release: <NULL>
    build: <NULL>

This patch fixes the problem by adding necessary convertion
via imd_read_type().

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 common/imd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/imd.c b/common/imd.c
index 159b73a..a8a10fc 100644
--- a/common/imd.c
+++ b/common/imd.c
@@ -212,7 +212,7 @@ const char *imd_string_data(struct imd_header *imd, int index)
 	int len = imd_read_length(imd);
 	char *p = (char *)(imd + 1);
 
-	if (!imd_is_string(imd->type))
+	if (!imd_is_string(imd_read_type(imd)))
 		return NULL;
 
 	for (i = 0; total < len; total += l, p += l) {
@@ -239,7 +239,7 @@ char *imd_concat_strings(struct imd_header *imd)
 	char *str;
 	char *data = (char *)(imd + 1);
 
-	if (!imd_is_string(imd->type))
+	if (!imd_is_string(imd_read_type(imd)))
 		return NULL;
 
 	str = malloc(len);
-- 
2.7.0


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

             reply	other threads:[~2016-05-19 21:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-19 21:05 Antony Pavlov [this message]
2016-05-20  5:22 ` Antony Pavlov

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=1463691959-3628-1-git-send-email-antonynpavlov@gmail.com \
    --to=antonynpavlov@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox