From: Paul Moore <paul@paul-moore.com>
Date: Wed, 1 Nov 2023 21:39:44 +0000 (-0400)
Subject: lsm: align based on pointer length in lsm_fill_user_ctx()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=41793202292fd2acf99fdc09eff8323cc27c80eb;p=linux.git

lsm: align based on pointer length in lsm_fill_user_ctx()

Using the size of a void pointer is much cleaner than
BITS_PER_LONG / 8.

Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---

diff --git a/security/security.c b/security/security.c
index 86f7a19959910..a808fd5eba6d4 100644
--- a/security/security.c
+++ b/security/security.c
@@ -792,7 +792,7 @@ int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, size_t *uctx_len,
 	size_t nctx_len;
 	int rc = 0;
 
-	nctx_len = ALIGN(struct_size(nctx, ctx, val_len), BITS_PER_LONG / 8);
+	nctx_len = ALIGN(struct_size(nctx, ctx, val_len), sizeof(void *));
 	if (nctx_len > *uctx_len) {
 		rc = -E2BIG;
 		goto out;