Use GRUB_PROPERLY_ALIGNED_ARRAY in grub-core/disk/cryptodisk.c and

	grub-core/disk/geli.c.

diff --git a/ChangeLog b/ChangeLog
index 41370a183d2bc104aaaa5ce8ab04f13fd4284c6c..2f2f7a38bc1138c9d9b3dfa20c6527ddeb713075 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Use GRUB_PROPERLY_ALIGNED_ARRAY in grub-core/disk/cryptodisk.c and
+       grub-core/disk/geli.c.
+
 2013-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkfont.c: Prefer enum to #define.

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 5b12a23953e7739e5c47c0190d1bc404fc63e55c..6fbfc4a39d2f39ea5320df7728fff0c2e0c62be1 100644 (file)
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -256,7 +256,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
        case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64_HASH:
          {
            grub_uint64_t tmp;
-           grub_uint64_t ctx[(dev->iv_hash->contextsize + 7) / 8];
+           GRUB_PROPERLY_ALIGNED_ARRAY (ctx, dev->iv_hash->contextsize);
 
            grub_memset (ctx, 0, sizeof (ctx));
 

diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
index 55aa5b9c7b1ee9f7f5f3b199740cd8dd80303592..2aa1ae08d3d69e0e0099980a9807fd03dcb60a49 100644 (file)
--- a/grub-core/disk/geli.c
+++ b/grub-core/disk/geli.c
@@ -146,7 +146,7 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno)
     grub_uint64_t zone;
   } __attribute__ ((packed)) tohash
       = { {'e', 'k', 'e', 'y'}, grub_cpu_to_le64 (zoneno) };
-  grub_uint64_t key[(dev->hash->mdlen + 7) / 8];
+  GRUB_PROPERLY_ALIGNED_ARRAY (key, dev->hash->mdlen);
 
   grub_dprintf ("geli", "rekeying %" PRIuGRUB_UINT64_T " keysize=%d\n",
                zoneno, dev->rekey_derived_size);