diff options
author | Reshetova, Elena <elena.reshetova@intel.com> | 2017-06-30 06:08:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-07-01 10:39:08 -0400 |
commit | 41c6d650f6537e55a1b53438c646fbc3f49176bf (patch) | |
tree | d7fb3d5a2f1b3fb0fe76fa010141be563488d36b /net/ipv4/tcp_ipv4.c | |
parent | 14afee4b6092fde451ee17604e5f5c89da33e71e (diff) |
net: convert sock.sk_refcnt from atomic_t to refcount_t
refcount_t type and corresponding API should be
used instead of atomic_t when the variable is used as
a reference counter. This allows to avoid accidental
refcounter overflows that might lead to use-after-free
situations.
This patch uses refcount_inc_not_zero() instead of
atomic_inc_not_zero_hint() due to absense of a _hint()
version of refcount API. If the hint() version must
be used, we might need to revisit API.
Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David Windsor <dwindsor@gmail.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index d774bcd9a54b..6ec6900eb300 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -2323,7 +2323,7 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i) | |||
2323 | from_kuid_munged(seq_user_ns(f), sock_i_uid(sk)), | 2323 | from_kuid_munged(seq_user_ns(f), sock_i_uid(sk)), |
2324 | icsk->icsk_probes_out, | 2324 | icsk->icsk_probes_out, |
2325 | sock_i_ino(sk), | 2325 | sock_i_ino(sk), |
2326 | atomic_read(&sk->sk_refcnt), sk, | 2326 | refcount_read(&sk->sk_refcnt), sk, |
2327 | jiffies_to_clock_t(icsk->icsk_rto), | 2327 | jiffies_to_clock_t(icsk->icsk_rto), |
2328 | jiffies_to_clock_t(icsk->icsk_ack.ato), | 2328 | jiffies_to_clock_t(icsk->icsk_ack.ato), |
2329 | (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, | 2329 | (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong, |
@@ -2349,7 +2349,7 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw, | |||
2349 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK", | 2349 | " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK", |
2350 | i, src, srcp, dest, destp, tw->tw_substate, 0, 0, | 2350 | i, src, srcp, dest, destp, tw->tw_substate, 0, 0, |
2351 | 3, jiffies_delta_to_clock_t(delta), 0, 0, 0, 0, | 2351 | 3, jiffies_delta_to_clock_t(delta), 0, 0, 0, 0, |
2352 | atomic_read(&tw->tw_refcnt), tw); | 2352 | refcount_read(&tw->tw_refcnt), tw); |
2353 | } | 2353 | } |
2354 | 2354 | ||
2355 | #define TMPSZ 150 | 2355 | #define TMPSZ 150 |