diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-05-08 00:07:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-05-17 13:30:29 +0200 |
| commit | dd979d7a08adb473744f2e9d4bbaddb039dc39dc (patch) | |
| tree | e0a55586f1abf6778bab888fd641300b7327c275 | |
| parent | 1b1774998b2dec837a57d729d1a22e5eb2d6d206 (diff) | |
| download | linux-stable-dd979d7a08adb473744f2e9d4bbaddb039dc39dc.tar.gz linux-stable-dd979d7a08adb473744f2e9d4bbaddb039dc39dc.tar.bz2 linux-stable-dd979d7a08adb473744f2e9d4bbaddb039dc39dc.zip | |
apparmor: use get_unaligned() only for multi-byte words
Using get_unaligned() on a u8 pointer is pointless, and will
result in a compiler warning after a planned cleanup:
In file included from arch/x86/include/generated/asm/unaligned.h:1,
from security/apparmor/policy_unpack.c:16:
security/apparmor/policy_unpack.c: In function 'unpack_u8':
include/asm-generic/unaligned.h:13:15: error: 'packed' attribute ignored for field of type 'u8' {aka 'unsigned char'} [-Werror=attributes]
13 | const struct { type x __packed; } *__pptr = (typeof(__pptr))(ptr); \
| ^
Simply dereference this pointer directly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: John Johansen <john.johansen@canonical.com>
| -rw-r--r-- | security/apparmor/policy_unpack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index dc345ac93205..4e1f96b216a8 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -304,7 +304,7 @@ static bool unpack_u8(struct aa_ext *e, u8 *data, const char *name) if (!inbounds(e, sizeof(u8))) goto fail; if (data) - *data = get_unaligned((u8 *)e->pos); + *data = *((u8 *)e->pos); e->pos += sizeof(u8); return true; } |