2011-08-03 Robert Millan <rmh@gnu.org>

        * include/grub/zfs/zap_leaf.h (typedef union zap_leaf_chunk): Mark
        la_array as packed.
        Reported by: Zachary Bedell

diff --git a/ChangeLog b/ChangeLog
index 19e034dc040b30b873f77f59b93ba610cb66065b..184b0d763883d85ac9120c33088ff803b6d9d68a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-03  Robert Millan  <rmh@gnu.org>
+
+       * include/grub/zfs/zap_leaf.h (typedef union zap_leaf_chunk): Mark
+       la_array as packed.
+       Reported by: Zachary Bedell
+
 2011-07-26  Colin Watson  <cjwatson@ubuntu.com>
 
        * configure.ac: The Loongson port requires grub-mkfont due to its

diff --git a/include/grub/zfs/zap_leaf.h b/include/grub/zfs/zap_leaf.h
index 1ef65405494b0b744f6da9b4f9b471561b86f894..5adfdc2900f7d25c7199fe8cdbabe09d0502834a 100644 (file)
--- a/include/grub/zfs/zap_leaf.h
+++ b/include/grub/zfs/zap_leaf.h
@@ -90,7 +90,7 @@ typedef union zap_leaf_chunk {
                {
                        grub_uint8_t la_array[ZAP_LEAF_ARRAY_BYTES];
                        grub_uint64_t la_array64;
-               };
+               } __attribute__ ((packed));
                grub_uint16_t la_next;          /* next blk or CHAIN_END */
        } l_array;
        struct zap_leaf_free {