Commit 781514c1 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by Greg Kroah-Hartman

Fix ipv6 double-sock-release with MSG_CONFIRM

commit 3ef9d943 in mainline
Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 770961c8
...@@ -858,11 +858,10 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, ...@@ -858,11 +858,10 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
ip6_flush_pending_frames(sk); ip6_flush_pending_frames(sk);
else if (!(msg->msg_flags & MSG_MORE)) else if (!(msg->msg_flags & MSG_MORE))
err = rawv6_push_pending_frames(sk, &fl, rp); err = rawv6_push_pending_frames(sk, &fl, rp);
release_sock(sk);
} }
done: done:
dst_release(dst); dst_release(dst);
if (!inet->hdrincl)
release_sock(sk);
out: out:
fl6_sock_release(flowlabel); fl6_sock_release(flowlabel);
return err<0?err:len; return err<0?err:len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment