diff options
| author |   Eric Dumazet <edumazet@google.com> | 2015-04-16 18:10:35 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-04-17 13:28:31 -0400 |
| commit | 521f1cf1dbb9d5ad858dca5dc75d1b45f64b6589 (patch) | |
| tree | 2c6276958f5d7348616d887f4a64f5b78ec6b9ef /include/net | |
| parent | tcp: tcp_get_info() should fetch socket fields once (diff) | |
| download | wireguard-linux-521f1cf1dbb9d5ad858dca5dc75d1b45f64b6589.tar.xz wireguard-linux-521f1cf1dbb9d5ad858dca5dc75d1b45f64b6589.zip | |
inet_diag: fix access to tcp cc information
Two different problems are fixed here :
1) inet_sk_diag_fill() might be called without socket lock held.
icsk->icsk_ca_ops can change under us and module be unloaded.
-> Access to freed memory.
Fix this using rcu_read_lock() to prevent module unload.
2) Some TCP Congestion Control modules provide information
but again this is not safe against icsk->icsk_ca_ops
change and nla_put() errors were ignored. Some sockets
could not get the additional info if skb was almost full.
Fix this by returning a status from get_info() handlers and
using rcu protection as well.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 9598871485ce..051dc5c2802d 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -829,7 +829,7 @@ struct tcp_congestion_ops { /* hook for packet ack accounting (optional) */ void (*pkts_acked)(struct sock *sk, u32 num_acked, s32 rtt_us); /* get info for inet_diag (optional) */ - void (*get_info)(struct sock *sk, u32 ext, struct sk_buff *skb); + int (*get_info)(struct sock *sk, u32 ext, struct sk_buff *skb); char name[TCP_CA_NAME_MAX]; struct module *owner; |