Changeset 791:42fa209a8cc4 in freeDiameter for libfdproto

Timestamp:

Jul 13, 2012, 5:31:20 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)

File:

• libfdproto/messages.c (modified) (3 diffs)

libfdproto/messages.c

@@ -1323 +1323 @@
         *(uint32_t *)(_bufptr) = htonl((uint32_t)(_u32data));                                   \
 }
+
+/* The location is not on 64b boundary, so we split the writing in two operations to avoid sigbus */
 #define PUT_in_buf_64( _u64data, _bufptr ) {                                                    \
-        *(uint64_t *)(_bufptr) = htonll((uint64_t)(_u64data));                                  \
+        uint64_t __v = htonll((uint64_t)(_u64data));                                            \
+        *(uint32_t *)(_bufptr) = (uint32_t)(__v);                                               \
+        *(((uint32_t *)(_bufptr))+1) = (uint32_t)(__v >> 32);                                   \
 }
 
@@ -1774 +1778 @@
         
                 case AVP_TYPE_INTEGER64:
-                        avp->avp_storage.i64 = (int64_t)ntohll(*(uint64_t *)avp->avp_source);
+                        /* the storage might not be aligned on 64b boundary, so no direct indirection here is possible */
+                        {
+                                uint64_t __stor;
+                                memcpy(&__stor, avp->avp_source, sizeof(__stor));
+                                avp->avp_storage.i64 = (int64_t)ntohll(__stor);
+                        }
                         break;
         
@@ -1784 +1793 @@
                 case AVP_TYPE_UNSIGNED64:
                 case AVP_TYPE_FLOAT64: /* same as 32 bits */
-                        avp->avp_storage.u64 = (uint64_t)ntohll(*(uint64_t *)avp->avp_source);
+                        {
+                                uint64_t __stor;
+                                memcpy(&__stor, avp->avp_source, sizeof(__stor));
+                                avp->avp_storage.u64 = (uint64_t)ntohll(__stor);
+                        }
                         break;