Commit fc16a532 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 



Daniel Borkmann says:

====================
pull-request: bpf 2021-07-29

The following pull-request contains BPF updates for your *net* tree.

We've added 9 non-merge commits during the last 14 day(s) which contain
a total of 20 files changed, 446 insertions(+), 138 deletions(-).

The main changes are:

1) Fix UBSAN out-of-bounds splat for showing XDP link fdinfo, from Lorenz Bauer.

2) Fix insufficient Spectre v4 mitigation in BPF runtime, from Daniel Borkmann,
   Piotr Krysiuk and Benedict Schlueter.

3) Batch of fixes for BPF sockmap found under stress testing, from John Fastabend.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 89fb62fd 2039f26f

arch/arm/net/bpf_jit_32.c

+3 −0
Original line number Diff line number Diff line
@@ -1602,6 +1602,9 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
		rn = arm_bpf_get_reg32(src_lo, tmp2[1], ctx);

		emit_ldx_r(dst, rn, off, ctx, BPF_SIZE(code));

		break;

	/* speculation barrier */

	case BPF_ST | BPF_NOSPEC:

		break;

	/* ST: *(size *)(dst + off) = imm */

	case BPF_ST | BPF_MEM | BPF_W:

	case BPF_ST | BPF_MEM | BPF_H:

arch/arm64/net/bpf_jit_comp.c

+13 −0
Original line number Diff line number Diff line
@@ -823,6 +823,19 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
			return ret;

		break;



	/* speculation barrier */

	case BPF_ST | BPF_NOSPEC:

		/*

		 * Nothing required here.

		 *

		 * In case of arm64, we rely on the firmware mitigation of

		 * Speculative Store Bypass as controlled via the ssbd kernel

		 * parameter. Whenever the mitigation is enabled, it works

		 * for all of the kernel code with no need to provide any

		 * additional instructions.

		 */

		break;



	/* ST: *(size *)(dst + off) = imm */

	case BPF_ST | BPF_MEM | BPF_W:

	case BPF_ST | BPF_MEM | BPF_H:

arch/mips/net/ebpf_jit.c

+3 −0
Original line number Diff line number Diff line
@@ -1355,6 +1355,9 @@ static int build_one_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		}

		break;



	case BPF_ST | BPF_NOSPEC: /* speculation barrier */

		break;



	case BPF_ST | BPF_B | BPF_MEM:

	case BPF_ST | BPF_H | BPF_MEM:

	case BPF_ST | BPF_W | BPF_MEM:

arch/powerpc/net/bpf_jit_comp32.c

+6 −0
Original line number Diff line number Diff line
@@ -737,6 +737,12 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context * 
			}

			break;



		/*

		 * BPF_ST NOSPEC (speculation barrier)

		 */

		case BPF_ST | BPF_NOSPEC:

			break;



		/*

		 * BPF_ST(X)

		 */

arch/powerpc/net/bpf_jit_comp64.c

+6 −0
Original line number Diff line number Diff line
@@ -627,6 +627,12 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context * 
			}

			break;



		/*

		 * BPF_ST NOSPEC (speculation barrier)

		 */

		case BPF_ST | BPF_NOSPEC:

			break;



		/*

		 * BPF_ST(X)

		 */