diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-16 00:34:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-16 00:34:04 -0700 |
commit | 35790c0421121364883a167bab8a2e37e1f67f78 (patch) | |
tree | a3e032a9ba6bb77337176bef407d7408d6a10a4d /include/net/tcp.h | |
parent | d77f873fdd21912803836da78f627d2efd267082 (diff) | |
download | linux-3.10-35790c0421121364883a167bab8a2e37e1f67f78.tar.gz linux-3.10-35790c0421121364883a167bab8a2e37e1f67f78.tar.bz2 linux-3.10-35790c0421121364883a167bab8a2e37e1f67f78.zip |
tcp: fix MD5 (RFC2385) support
TCP MD5 support uses percpu data for temporary storage. It currently
disables preemption so that same storage cannot be reclaimed by another
thread on same cpu.
We also have to make sure a softirq handler wont try to use also same
context. Various bug reports demonstrated corruptions.
Fix is to disable preemption and BH.
Reported-by: Bhaskar Dutta <bhaskie@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r-- | include/net/tcp.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 75be5a28815..aa04b9a5093 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1197,30 +1197,15 @@ extern int tcp_v4_md5_do_del(struct sock *sk, extern struct tcp_md5sig_pool * __percpu *tcp_alloc_md5sig_pool(struct sock *); extern void tcp_free_md5sig_pool(void); -extern struct tcp_md5sig_pool *__tcp_get_md5sig_pool(int cpu); -extern void __tcp_put_md5sig_pool(void); +extern struct tcp_md5sig_pool *tcp_get_md5sig_pool(void); +extern void tcp_put_md5sig_pool(void); + extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, struct tcphdr *); extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, struct sk_buff *, unsigned header_len); extern int tcp_md5_hash_key(struct tcp_md5sig_pool *hp, struct tcp_md5sig_key *key); -static inline -struct tcp_md5sig_pool *tcp_get_md5sig_pool(void) -{ - int cpu = get_cpu(); - struct tcp_md5sig_pool *ret = __tcp_get_md5sig_pool(cpu); - if (!ret) - put_cpu(); - return ret; -} - -static inline void tcp_put_md5sig_pool(void) -{ - __tcp_put_md5sig_pool(); - put_cpu(); -} - /* write queue abstraction */ static inline void tcp_write_queue_purge(struct sock *sk) { |