diff options
| author |   Eric Dumazet <edumazet@google.com> | 2021-11-15 11:02:41 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-11-16 13:10:34 +0000 |
| commit | d2489c7b6d7d5ed4b32b56703c57c47bfbfe7fa5 (patch) | |
| tree | fa179aa92c68c6c5d77cf2c1ba185cf08d24bcea /include/net/sock.h | |
| parent | tcp: small optimization in tcp recvmsg() (diff) | |
| download | linux-dev-d2489c7b6d7d5ed4b32b56703c57c47bfbfe7fa5.tar.xz linux-dev-d2489c7b6d7d5ed4b32b56703c57c47bfbfe7fa5.zip | |
tcp: add RETPOLINE mitigation to sk_backlog_rcv
Use INDIRECT_CALL_INET() to avoid an indirect call
when/if CONFIG_RETPOLINE=y
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index cb97c448472a..2d40fe4c7718 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1018,12 +1018,18 @@ static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *s int __sk_backlog_rcv(struct sock *sk, struct sk_buff *skb); +INDIRECT_CALLABLE_DECLARE(int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)); +INDIRECT_CALLABLE_DECLARE(int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)); + static inline int sk_backlog_rcv(struct sock *sk, struct sk_buff *skb) { if (sk_memalloc_socks() && skb_pfmemalloc(skb)) return __sk_backlog_rcv(sk, skb); - return sk->sk_backlog_rcv(sk, skb); + return INDIRECT_CALL_INET(sk->sk_backlog_rcv, + tcp_v6_do_rcv, + tcp_v4_do_rcv, + sk, skb); } static inline void sk_incoming_cpu_update(struct sock *sk) |