Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9bb53f3 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

sock: convert sk_peek_offset functions to WRITE_ONCE 



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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e43d15c8

include/net/sock.h

+13 −11
Original line number Original line Diff line number Diff line
@@ -459,26 +459,28 @@ struct sock { 




static inline int sk_peek_offset(struct sock *sk, int flags)

static inline int sk_peek_offset(struct sock *sk, int flags)

{

{

	if ((flags & MSG_PEEK) && (sk->sk_peek_off >= 0))

	if (unlikely(flags & MSG_PEEK)) {

		return sk->sk_peek_off;

		s32 off = READ_ONCE(sk->sk_peek_off);

	else

		if (off >= 0)

			return off;

	}



	return 0;

	return 0;

}

}





static inline void sk_peek_offset_bwd(struct sock *sk, int val)

static inline void sk_peek_offset_bwd(struct sock *sk, int val)

{

{

	if (sk->sk_peek_off >= 0) {

	s32 off = READ_ONCE(sk->sk_peek_off);

		if (sk->sk_peek_off >= val)



			sk->sk_peek_off -= val;

	if (unlikely(off >= 0)) {

		else

		off = max_t(s32, off - val, 0);

			sk->sk_peek_off = 0;

		WRITE_ONCE(sk->sk_peek_off, off);

	}

	}

}

}





static inline void sk_peek_offset_fwd(struct sock *sk, int val)

static inline void sk_peek_offset_fwd(struct sock *sk, int val)

{

{

	if (sk->sk_peek_off >= 0)

	sk_peek_offset_bwd(sk, -val);

		sk->sk_peek_off += val;

}

}





/*

/*