summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2019-06-28 07:08:45 +0300
committerDaniel Borkmann <daniel@iogearbox.net>2019-06-29 01:35:46 +0200
commit0472301a28f6cf53a6bc5783e48a2d0bbff4682f (patch)
tree98eb7f12ed6a1a6918c463da4a84238db5d0224f /include
parent75672dda27bd00109a84cd975c17949ad9c45663 (diff)
downloadlinux-stable-0472301a28f6cf53a6bc5783e48a2d0bbff4682f.tar.gz
linux-stable-0472301a28f6cf53a6bc5783e48a2d0bbff4682f.tar.bz2
linux-stable-0472301a28f6cf53a6bc5783e48a2d0bbff4682f.zip
bpf: fix uapi bpf_prog_info fields alignment
Merge commit 1c8c5a9d38f60 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next") undid the fix from commit 36f9814a494 ("bpf: fix uapi hole for 32 bit compat applications") by taking the gpl_compatible 1-bit field definition from commit b85fab0e67b162 ("bpf: Add gpl_compatible flag to struct bpf_prog_info") as is. That breaks architectures with 16-bit alignment like m68k. Add 31-bit pad after gpl_compatible to restore alignment of following fields. Thanks to Dmitry V. Levin his analysis of this bug history. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Song Liu <songliubraving@fb.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/bpf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index a8b823c30b43..29a5bc3d5c66 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -3143,6 +3143,7 @@ struct bpf_prog_info {
char name[BPF_OBJ_NAME_LEN];
__u32 ifindex;
__u32 gpl_compatible:1;
+ __u32 :31; /* alignment pad */
__u64 netns_dev;
__u64 netns_ino;
__u32 nr_jited_ksyms;