summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet2008-04-14 06:39:26 +0200
committerDavid S. Miller2008-04-14 06:39:26 +0200
commitf37f0afb2916ccf287428983026261db78c7661a (patch)
tree0c86b039a03b166dc168b8ef74f6026ffecc81c9 /net
parentnet: check for underlength tap writes (diff)
downloadkernel-qcow2-linux-f37f0afb2916ccf287428983026261db78c7661a.tar.gz
kernel-qcow2-linux-f37f0afb2916ccf287428983026261db78c7661a.tar.xz
kernel-qcow2-linux-f37f0afb2916ccf287428983026261db78c7661a.zip
[SOCK] sk_stamp: should be initialized to ktime_set(-1L, 0)
Problem spotted by Andrew Brampton Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 2654c147c004..7a0567b4b2c9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1725,7 +1725,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
- sk->sk_stamp = ktime_set(-1L, -1L);
+ sk->sk_stamp = ktime_set(-1L, 0);
atomic_set(&sk->sk_refcnt, 1);
atomic_set(&sk->sk_drops, 0);