diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-09-20 12:54:07 -0700 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2007-10-17 21:30:39 +0200 |
commit | 2c230830b9869ca6d497baed3aad5bd7c2536b4e (patch) | |
tree | 4e65dfbe61742632a0327ed0f38ce6b3337689b9 | |
parent | 85aa2005a7787c0e28a005cd9c00f37b8c84c7b6 (diff) |
[PATCH] 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>
-rw-r--r-- | net/ipv6/raw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 9479fbd223c7..ddbe79085eb3 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -851,11 +851,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; |