blob/blobmsg: use 32 bit load/store for 64 bit access, unaligned attributes cause...

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/blob.h b/blob.h
index a8ddce99a1c64c1fd8ae7b40254620ae291c805d..557899de922e20113ba18b2e3b6dcfad0f69c1b8 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -191,8 +191,10 @@ blob_get_u32(const struct blob_attr *attr)
 static inline uint64_t
 blob_get_u64(const struct blob_attr *attr)
 {
-       uint64_t *tmp = (uint64_t*)attr->data;
-       return be64_to_cpu(*tmp);
+       uint32_t *ptr = blob_data(attr);
+       uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32;
+       tmp |= be32_to_cpu(ptr[1]);
+       return tmp;
 }
 
 static inline int8_t

diff --git a/blobmsg.h b/blobmsg.h
index 44f1f3b428f6e79fafcbdb9c3ee441b193b7ac3a..9fdf4863603c8dd02b58e94b49565fe3cea49524 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -180,7 +180,10 @@ static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
 
 static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
 {
-       return be64_to_cpu(*(uint64_t *) blobmsg_data(attr));
+       uint32_t *ptr = blobmsg_data(attr);
+       uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32;
+       tmp |= be32_to_cpu(ptr[1]);
+       return tmp;
 }
 
 static inline char *blobmsg_get_string(struct blob_attr *attr)