]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
randstruct: Whitelist big_key path struct overloading
authorKees Cook <keescook@chromium.org>
Fri, 26 May 2017 04:40:22 +0000 (21:40 -0700)
committerKees Cook <keescook@chromium.org>
Thu, 22 Jun 2017 23:21:42 +0000 (16:21 -0700)
The big_key payload structure intentionally stores a struct path in
two void pointers to avoid header soup. Whitelist this case:

security/keys/big_key.c: In function ‘big_key_read’:
security/keys/big_key.c:293:16: note: found mismatched rhs struct pointer types: ‘struct path’ and ‘void *’

   struct path *path = (struct path *)&key->payload.data[big_key_path];
                ^~~~

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
scripts/gcc-plugins/randomize_layout_plugin.c

index 2e710bf29699924ab40fa9566b48292f119a365b..c07818dac401a4a0fce68e999cd5cca2ecbdfc62 100644 (file)
@@ -48,6 +48,8 @@ struct whitelist_entry {
 static const struct whitelist_entry whitelist[] = {
        /* unix_skb_parms via UNIXCB() buffer */
        { "net/unix/af_unix.c", "unix_skb_parms", "char" },
+       /* big_key payload.data struct splashing */
+       { "security/keys/big_key.c", "path", "void *" },
        /* walk struct security_hook_heads as an array of struct list_head */
        { "security/security.c", "list_head", "security_hook_heads" },
        { }