diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2019-06-28 06:08:45 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2019-06-29 01:35:46 +0200 |
| commit | 0472301a28f6cf53a6bc5783e48a2d0bbff4682f (patch) | |
| tree | 98eb7f12ed6a1a6918c463da4a84238db5d0224f /arch/x86/net | |
| parent | bpf: fix BPF_ALU32 | BPF_ARSH on BE arches (diff) | |
| download | linux-0472301a28f6cf53a6bc5783e48a2d0bbff4682f.tar.xz linux-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 'arch/x86/net')
0 files changed, 0 insertions, 0 deletions