Fix alignment trap triggered by NEON instructions

NEON instruction VLD1.64 was used to copy 64 bits data after type
casting, and they will trigger alignment trap.
This patch uses memcpy to avoid alignment problem.

Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h
index 39379fd4817840e0f546fc530b7153cfc312e088..118858b8de3199f165d48759102b56d6f878ea4d 100644 (file)
--- a/ubifs-utils/mkfs.ubifs/key.h
+++ b/ubifs-utils/mkfs.ubifs/key.h
@@ -159,10 +159,12 @@ static inline void data_key_init(union ubifs_key *key, ino_t inum,
  */
 static inline void key_write(const union ubifs_key *from, void *to)
 {
-       union ubifs_key *t = to;
+       __le32 x[2];
 
-       t->j32[0] = cpu_to_le32(from->u32[0]);
-       t->j32[1] = cpu_to_le32(from->u32[1]);
+       x[0] = cpu_to_le32(from->u32[0]);
+       x[1] = cpu_to_le32(from->u32[1]);
+
+       memcpy(to, &x, 8);
        memset(to + 8, 0, UBIFS_MAX_KEY_LEN - 8);
 }
 
@@ -174,10 +176,12 @@ static inline void key_write(const union ubifs_key *from, void *to)
  */
 static inline void key_write_idx(const union ubifs_key *from, void *to)
 {
-       union ubifs_key *t = to;
+       __le32 x[2];
+
+       x[0] = cpu_to_le32(from->u32[0]);
+       x[1] = cpu_to_le32(from->u32[1]);
 
-       t->j32[0] = cpu_to_le32(from->u32[0]);
-       t->j32[1] = cpu_to_le32(from->u32[1]);
+       memcpy(to, &x, 8);
 }
 
 /**