Commit 0f1fe7b8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Daniel Borkmann says:

====================
pull-request: bpf 2021-12-31

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

The main changes are:

1) Revert of an earlier attempt to fix xsk's poll() behavior where it
   turned out that the fix for a rare problem made it much worse in
   general, from Magnus Karlsson. (Fyi, Magnus mentioned that a proper
   fix is coming early next year, so the revert is mainly to avoid
   slipping the behavior into 5.16.)

2) Minor misc spell fix in BPF selftests, from Colin Ian King.

* https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  bpf, selftests: Fix spelling mistake "tained" -> "tainted"
  Revert "xsk: Do not sleep in poll() when need_wakeup set"
====================

Link: https://lore.kernel.org/r/20211231160050.16105-1-daniel@iogearbox.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4760abaa 819d1150

net/xdp/xsk.c

+2 −2
Original line number Diff line number Diff line
@@ -677,6 +677,8 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock, 
	struct xdp_sock *xs = xdp_sk(sk);

	struct xsk_buff_pool *pool;



	sock_poll_wait(file, sock, wait);



	if (unlikely(!xsk_is_bound(xs)))

		return mask;
@@ -688,8 +690,6 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock, 
		else

			/* Poll needs to drive Tx also in copy mode */

			__xsk_sendmsg(sk);

	} else {

		sock_poll_wait(file, sock, wait);

	}



	if (xs->rx && !xskq_prod_is_empty(xs->rx))

tools/testing/selftests/bpf/verifier/value_ptr_arith.c

+1 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,7 @@ 
	.errstr_unpriv = "R0 pointer -= pointer prohibited",

},

{

	"map access: trying to leak tained dst reg",

	"map access: trying to leak tainted dst reg",

	.insns = {

	BPF_MOV64_IMM(BPF_REG_0, 0),

	BPF_ST_MEM(BPF_DW, BPF_REG_10, -8, 0),