|
 |
31004e6 |
From 830a8f214176981d1947534daa362a1fcb28e540 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Fri, 5 Apr 2013 13:26:10 +0200
|
|
|
f74b50e |
Subject: [PATCH 266/482] Use GRUB_PROPERLY_ALIGNED_ARRAY in
|
|
|
a5bd9f6 |
grub-core/disk/cryptodisk.c and grub-core/disk/geli.c.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
grub-core/disk/cryptodisk.c | 2 +-
|
|
|
a5bd9f6 |
grub-core/disk/geli.c | 2 +-
|
|
|
a5bd9f6 |
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index 41370a1..2f2f7a3 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,5 +1,10 @@
|
|
|
a5bd9f6 |
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
+ Use GRUB_PROPERLY_ALIGNED_ARRAY in grub-core/disk/cryptodisk.c and
|
|
|
a5bd9f6 |
+ grub-core/disk/geli.c.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
* util/grub-mkfont.c: Prefer enum to #define.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
2013-04-05 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
index 5b12a23..6fbfc4a 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/cryptodisk.c
|
|
|
a5bd9f6 |
@@ -256,7 +256,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
|
|
|
a5bd9f6 |
case GRUB_CRYPTODISK_MODE_IV_BYTECOUNT64_HASH:
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
grub_uint64_t tmp;
|
|
|
a5bd9f6 |
- grub_uint64_t ctx[(dev->iv_hash->contextsize + 7) / 8];
|
|
|
a5bd9f6 |
+ GRUB_PROPERLY_ALIGNED_ARRAY (ctx, dev->iv_hash->contextsize);
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
grub_memset (ctx, 0, sizeof (ctx));
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
|
|
|
a5bd9f6 |
index 55aa5b9..2aa1ae0 100644
|
|
|
a5bd9f6 |
--- a/grub-core/disk/geli.c
|
|
|
a5bd9f6 |
+++ b/grub-core/disk/geli.c
|
|
|
a5bd9f6 |
@@ -146,7 +146,7 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno)
|
|
|
a5bd9f6 |
grub_uint64_t zone;
|
|
|
a5bd9f6 |
} __attribute__ ((packed)) tohash
|
|
|
a5bd9f6 |
= { {'e', 'k', 'e', 'y'}, grub_cpu_to_le64 (zoneno) };
|
|
|
a5bd9f6 |
- grub_uint64_t key[(dev->hash->mdlen + 7) / 8];
|
|
|
a5bd9f6 |
+ GRUB_PROPERLY_ALIGNED_ARRAY (key, dev->hash->mdlen);
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
grub_dprintf ("geli", "rekeying %" PRIuGRUB_UINT64_T " keysize=%d\n",
|
|
|
a5bd9f6 |
zoneno, dev->rekey_derived_size);
|
|
|
a5bd9f6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
a5bd9f6 |
|