UBUNTU: SAUCE: LSM stacking: make sure LSM blob align on 64 bit boundaries

BugLink: http://bugs.launchpad.net/bugs/1763062
The security->task blob reserving the first 12 bytes means that LSM
blobs don't align on 64 byte boundaries. This is not a problem
for x86 but if an LSM stores a long or ptr in its blob, then some
architectures require it be aligned to the arch word size and
will through a fault.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/security/security.c b/security/security.c
index 14fdde773bad6804550578812a1f42c0b50b2259..76cb05f665da7efdef8e3e769510d698f05e32f6 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -55,7 +55,7 @@ char *lsm_names;
  */
 static struct lsm_blob_sizes blob_sizes = {
 #ifdef CONFIG_SECURITY_STACKING
-       .lbs_task = SECURITY_NAME_MAX + 2,
+       .lbs_task = SECURITY_NAME_MAX + 6,
 #endif
 };