Skip to content

Commit

Permalink
sock: convert sk_peek_offset functions to WRITE_ONCE
Browse files Browse the repository at this point in the history
Make the peek offset interface safe to use in lockless environments.
Use READ_ONCE and WRITE_ONCE to avoid race conditions between testing
and updating the peek offset.

Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Willem de Bruijn authored and David S. Miller committed Apr 5, 2016
1 parent e43d15c commit b9bb53f
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions include/net/sock.h
Original file line number Diff line number Diff line change
Expand Up @@ -459,26 +459,28 @@ struct sock {

static inline int sk_peek_offset(struct sock *sk, int flags)
{
if ((flags & MSG_PEEK) && (sk->sk_peek_off >= 0))
return sk->sk_peek_off;
else
return 0;
if (unlikely(flags & MSG_PEEK)) {
s32 off = READ_ONCE(sk->sk_peek_off);
if (off >= 0)
return off;
}

return 0;
}

static inline void sk_peek_offset_bwd(struct sock *sk, int val)
{
if (sk->sk_peek_off >= 0) {
if (sk->sk_peek_off >= val)
sk->sk_peek_off -= val;
else
sk->sk_peek_off = 0;
s32 off = READ_ONCE(sk->sk_peek_off);

if (unlikely(off >= 0)) {
off = max_t(s32, off - val, 0);
WRITE_ONCE(sk->sk_peek_off, off);
}
}

static inline void sk_peek_offset_fwd(struct sock *sk, int val)
{
if (sk->sk_peek_off >= 0)
sk->sk_peek_off += val;
sk_peek_offset_bwd(sk, -val);
}

/*
Expand Down

0 comments on commit b9bb53f

Please sign in to comment.