Skip to content

Commit

Permalink
xsk: avoid store-tearing when assigning umem
Browse files Browse the repository at this point in the history
The umem member of struct xdp_sock is read outside of the control
mutex, in the mmap implementation, and needs a WRITE_ONCE to avoid
potential store-tearing.

Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Fixes: 423f383 ("xsk: add umem fill queue support and mmap")
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  • Loading branch information
Björn Töpel authored and Daniel Borkmann committed Sep 5, 2019
1 parent 94a9976 commit 9764f4b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/xdp/xsk.c
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
}

xdp_get_umem(umem_xs->umem);
xs->umem = umem_xs->umem;
WRITE_ONCE(xs->umem, umem_xs->umem);
sockfd_put(sock);
} else if (!xs->umem || !xdp_umem_validate_queues(xs->umem)) {
err = -EINVAL;
Expand Down Expand Up @@ -751,7 +751,7 @@ static int xsk_setsockopt(struct socket *sock, int level, int optname,

/* Make sure umem is ready before it can be seen by others */
smp_wmb();
xs->umem = umem;
WRITE_ONCE(xs->umem, umem);
mutex_unlock(&xs->mutex);
return 0;
}
Expand Down

0 comments on commit 9764f4b

Please sign in to comment.