diff options
author | Eric Dumazet <edumazet@google.com> | 2015-09-25 10:39:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-25 16:00:38 -0400 |
commit | b83e3deb974ca2c11e21256fe602e517afb83247 (patch) | |
tree | d3c7dd5c5a8ee476564b5d2d34deda2b95ff5f9d /net/ipv4/tcp_ipv4.c | |
parent | 4e3f5d727d60939c890a6e86944da52b3a1625ce (diff) |
tcp: md5: constify tcp_md5_do_lookup() socket argument
When TCP new listener is done, these functions will be called
without socket lock being held. Make sure they don't change
anything.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 9d968ca7b669..1c1009d783f5 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -865,7 +865,7 @@ static void tcp_v4_reqsk_destructor(struct request_sock *req) | |||
865 | */ | 865 | */ |
866 | 866 | ||
867 | /* Find the Key structure for an address. */ | 867 | /* Find the Key structure for an address. */ |
868 | struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk, | 868 | struct tcp_md5sig_key *tcp_md5_do_lookup(const struct sock *sk, |
869 | const union tcp_md5_addr *addr, | 869 | const union tcp_md5_addr *addr, |
870 | int family) | 870 | int family) |
871 | { | 871 | { |
@@ -877,7 +877,7 @@ struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk, | |||
877 | /* caller either holds rcu_read_lock() or socket lock */ | 877 | /* caller either holds rcu_read_lock() or socket lock */ |
878 | md5sig = rcu_dereference_check(tp->md5sig_info, | 878 | md5sig = rcu_dereference_check(tp->md5sig_info, |
879 | sock_owned_by_user(sk) || | 879 | sock_owned_by_user(sk) || |
880 | lockdep_is_held(&sk->sk_lock.slock)); | 880 | lockdep_is_held((spinlock_t *)&sk->sk_lock.slock)); |
881 | if (!md5sig) | 881 | if (!md5sig) |
882 | return NULL; | 882 | return NULL; |
883 | #if IS_ENABLED(CONFIG_IPV6) | 883 | #if IS_ENABLED(CONFIG_IPV6) |
@@ -894,7 +894,7 @@ struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk, | |||
894 | } | 894 | } |
895 | EXPORT_SYMBOL(tcp_md5_do_lookup); | 895 | EXPORT_SYMBOL(tcp_md5_do_lookup); |
896 | 896 | ||
897 | struct tcp_md5sig_key *tcp_v4_md5_lookup(struct sock *sk, | 897 | struct tcp_md5sig_key *tcp_v4_md5_lookup(const struct sock *sk, |
898 | const struct sock *addr_sk) | 898 | const struct sock *addr_sk) |
899 | { | 899 | { |
900 | const union tcp_md5_addr *addr; | 900 | const union tcp_md5_addr *addr; |