diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-09-20 12:54:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-09-26 10:54:42 -0700 |
| commit | 781514c16542c6fa307fced47db9bd5d7b49734a (patch) | |
| tree | deb9f334946140585a147e1c18bee984ec64933c | |
| parent | 770961c871460ecba0be96b73a973eaf2c172302 (diff) | |
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 a58459a7668..fc5cb83c0f4 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; |