From: Eric Dumazet <edumazet@google.com>
Date: Fri, 28 Oct 2016 20:40:24 +0000 (-0700)
Subject: net: clear sk_err_soft in sk_clone_lock()
X-Git-Tag: v3.2.87~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a479261c906d2ddfdcbddaa2a1d97e7578d4241;p=thirdparty%2Fkernel%2Fstable.git

net: clear sk_err_soft in sk_clone_lock()

[ Upstream commit e551c32d57c88923f99f8f010e89ca7ed0735e83 ]

At accept() time, it is possible the parent has a non zero
sk_err_soft, leftover from a prior error.

Make sure we do not leave this value in the child, as it
makes future getsockopt(SO_ERROR) calls quite unreliable.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index b8f4f353a7d43..a1a3a507c4c4b 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1259,6 +1259,7 @@ struct sock *sk_clone(const struct sock *sk, const gfp_t priority)
 		}
 
 		newsk->sk_err	   = 0;
+		newsk->sk_err_soft = 0;
 		newsk->sk_priority = 0;
 		/*
 		 * Before updating sk_refcnt, we must commit prior changes to memory