From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Thu, 20 Sep 2007 19:54:07 +0000 (-0700)
Subject: Fix ipv6 double-sock-release with MSG_CONFIRM
X-Git-Tag: v2.6.22.9~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=781514c16542c6fa307fced47db9bd5d7b49734a;p=thirdparty%2Fkernel%2Fstable.git

Fix ipv6 double-sock-release with MSG_CONFIRM

commit 3ef9d943d26dea764f4fecf3767001c90b778b0c in mainline

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index a58459a766849..fc5cb83c0f427 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -858,11 +858,10 @@ back_from_confirm:
 			ip6_flush_pending_frames(sk);
 		else if (!(msg->msg_flags & MSG_MORE))
 			err = rawv6_push_pending_frames(sk, &fl, rp);
+		release_sock(sk);
 	}
 done:
 	dst_release(dst);
-	if (!inet->hdrincl)
-		release_sock(sk);
 out:
 	fl6_sock_release(flowlabel);
 	return err<0?err:len;