From 43539d6b60ef0db3e98d00bef0024614c8c1807a Mon Sep 17 00:00:00 2001

From: George McCollister <george.mccollister@gmail.com>

Date: Tue, 31 Dec 2013 14:37:32 -0600

Subject: [PATCH] journal: Add missing byte order conversions

Convert entry_array.items[0] to host byte order prior to passing it to

chain_cache_put().

[zj: also use le64toh in journal-verify.c]

https://bugs.freedesktop.org/show_bug.cgi?id=73194

---

 src/journal/journal-file.c   | 4 ++--

 src/journal/journal-verify.c | 6 +++---

 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c

index 5ef6a2a..ba65464 100644

--- a/src/journal/journal-file.c

+++ b/src/journal/journal-file.c

@@ -1452,7 +1452,7 @@ static int generic_array_get(

 found:

         /* Let's cache this item for the next invocation */

-        chain_cache_put(f->chain_cache, ci, first, a, o->entry_array.items[0], t, i);

+        chain_cache_put(f->chain_cache, ci, first, a, le64toh(o->entry_array.items[0]), t, i);

         r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);

         if (r < 0)

@@ -1685,7 +1685,7 @@ found:

                 return 0;

         /* Let's cache this item for the next invocation */

-        chain_cache_put(f->chain_cache, ci, first, a, array->entry_array.items[0], t, subtract_one ? (i > 0 ? i-1 : (uint64_t) -1) : i);

+        chain_cache_put(f->chain_cache, ci, first, a, le64toh(array->entry_array.items[0]), t, subtract_one ? (i > 0 ? i-1 : (uint64_t) -1) : i);

         if (subtract_one && i == 0)

                 p = last_p;

diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c

index 3405811..82b0f0a 100644

--- a/src/journal/journal-verify.c

+++ b/src/journal/journal-verify.c

@@ -249,12 +249,12 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o

                 }

                 for (i = 0; i < journal_file_entry_array_n_items(o); i++)

-                        if (o->entry_array.items[i] != 0 &&

-                            !VALID64(o->entry_array.items[i])) {

+                        if (le64toh(o->entry_array.items[i]) != 0 &&

+                            !VALID64(le64toh(o->entry_array.items[i]))) {

                                 log_error(OFSfmt": invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt,

                                           offset,

                                           i, journal_file_entry_array_n_items(o),

-                                          o->entry_array.items[i]);

+                                          le64toh(o->entry_array.items[i]));

                                 return -EBADMSG;

                         }