mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bpf: Don't refcount LISTEN sockets in sk_assign()

Browse source 
Avoid taking a reference on listen sockets by checking the socket type
in the sk_assign and in the corresponding skb_steal_sock() code in the
the transport layer, and by ensuring that the prefetch free (sock_pfree)
function uses the same logic to check whether the socket is refcounted.

Suggested-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Joe Stringer <joe@wand.net.nz>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200329225342.16317-4-joe@wand.net.nz
This commit is contained in:
Joe Stringer 2020-03-29 15:53:40 -07:00 committed by Alexei Starovoitov
parent 71489e21d7
commit 7ae215d23c
3 changed files with 22 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

25
include/net/sock.h
View file

@ -2537,6 +2537,21 @@ skb_sk_is_prefetched(struct sk_buff *skb)
#endif /* CONFIG_INET */ #endif /* CONFIG_INET */
} }
/* This helper checks if a socket is a full socket,
* ie _not_ a timewait or request socket.
*/
static inline bool sk_fullsock(const struct sock *sk)
{
return (1 << sk->sk_state) & ~(TCPF_TIME_WAIT | TCPF_NEW_SYN_RECV);
}
static inline bool
sk_is_refcounted(struct sock *sk)
{
/* Only full sockets have sk->sk_flags. */
return !sk_fullsock(sk) || !sock_flag(sk, SOCK_RCU_FREE);
}
/** /**
* skb_steal_sock * skb_steal_sock
* @skb to steal the socket from * @skb to steal the socket from
@ -2549,6 +2564,8 @@ skb_steal_sock(struct sk_buff *skb, bool *refcounted)
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
*refcounted = true; *refcounted = true;
if (skb_sk_is_prefetched(skb))
*refcounted = sk_is_refcounted(sk);
skb->destructor = NULL; skb->destructor = NULL;
skb->sk = NULL; skb->sk = NULL;
return sk; return sk;
@ -2557,14 +2574,6 @@ skb_steal_sock(struct sk_buff *skb, bool *refcounted)
return NULL; return NULL;
} }
/* This helper checks if a socket is a full socket,
* ie _not_ a timewait or request socket.
*/
static inline bool sk_fullsock(const struct sock *sk)
{
return (1 << sk->sk_state) & ~(TCPF_TIME_WAIT | TCPF_NEW_SYN_RECV);
}
/* Checks if this SKB belongs to an HW offloaded socket /* Checks if this SKB belongs to an HW offloaded socket
* and whether any SW fallbacks are required based on dev. * and whether any SW fallbacks are required based on dev.
* Check decrypted mark in case skb_orphan() cleared socket. * Check decrypted mark in case skb_orphan() cleared socket.

6
net/core/filter.c
View file

@ -5401,8 +5401,7 @@ static const struct bpf_func_proto bpf_sk_lookup_udp_proto = {
BPF_CALL_1(bpf_sk_release, struct sock *, sk) BPF_CALL_1(bpf_sk_release, struct sock *, sk)
{ {
/* Only full sockets have sk->sk_flags. */ if (sk_is_refcounted(sk))
if (!sk_fullsock(sk) || !sock_flag(sk, SOCK_RCU_FREE))
sock_gen_put(sk); sock_gen_put(sk);
return 0; return 0;
} }
@ -5928,7 +5927,8 @@ BPF_CALL_3(bpf_sk_assign, struct sk_buff *, skb, struct sock *, sk, u64, flags)
return -ENETUNREACH; return -ENETUNREACH;
if (unlikely(sk->sk_reuseport)) if (unlikely(sk->sk_reuseport))
return -ESOCKTNOSUPPORT; return -ESOCKTNOSUPPORT;
if (unlikely(!refcount_inc_not_zero(&sk->sk_refcnt))) if (sk_is_refcounted(sk) &&
unlikely(!refcount_inc_not_zero(&sk->sk_refcnt)))
return -ENOENT; return -ENOENT;
skb_orphan(skb); skb_orphan(skb);

3
net/core/sock.c
View file

@ -2077,7 +2077,8 @@ EXPORT_SYMBOL(sock_efree);
#ifdef CONFIG_INET #ifdef CONFIG_INET
void sock_pfree(struct sk_buff *skb) void sock_pfree(struct sk_buff *skb)
{ {
sock_gen_put(skb->sk); if (sk_is_refcounted(skb->sk))
sock_gen_put(skb->sk);
} }
EXPORT_SYMBOL(sock_pfree); EXPORT_SYMBOL(sock_pfree);
#endif /* CONFIG_INET */ #endif /* CONFIG_INET */