Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3516ffb0 authored by David S. Miller's avatar David S. Miller
Browse files

[TCP]: Invoke tcp_sendmsg() directly, do not use inet_sendmsg(). 



As discovered by Evegniy Polyakov, if we try to sendmsg after
a connection reset, we can do incredibly stupid things.

The core issue is that inet_sendmsg() tries to autobind the
socket, but we should never do that for TCP.  Instead we should
just go straight into TCP's sendmsg() code which will do all
of the necessary state and pending socket error checks.

TCP's sendpage already directly vectors to tcp_sendpage(), so this
merely brings sendmsg() in line with that.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bcabbdb

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ extern int tcp_v4_remember_stamp(struct sock *sk); 


extern int		    	tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);



extern int			tcp_sendmsg(struct kiocb *iocb, struct sock *sk,

extern int			tcp_sendmsg(struct kiocb *iocb, struct socket *sock,

					    struct msghdr *msg, size_t size);

extern ssize_t			tcp_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags);

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ const struct proto_ops inet_stream_ops = { 
	.shutdown	   = inet_shutdown,

	.setsockopt	   = sock_common_setsockopt,

	.getsockopt	   = sock_common_getsockopt,

	.sendmsg	   = inet_sendmsg,

	.sendmsg	   = tcp_sendmsg,

	.recvmsg	   = sock_common_recvmsg,

	.mmap		   = sock_no_mmap,

	.sendpage	   = tcp_sendpage,

net/ipv4/tcp.c

+2 −1
Original line number Diff line number Diff line
@@ -658,9 +658,10 @@ static inline int select_size(struct sock *sk) 
	return tmp;

}



int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,

int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,

		size_t size)

{

	struct sock *sk = sock->sk;

	struct iovec *iov;

	struct tcp_sock *tp = tcp_sk(sk);

	struct sk_buff *skb;

net/ipv4/tcp_ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -2425,7 +2425,6 @@ struct proto tcp_prot = { 
	.shutdown		= tcp_shutdown,

	.setsockopt		= tcp_setsockopt,

	.getsockopt		= tcp_getsockopt,

	.sendmsg		= tcp_sendmsg,

	.recvmsg		= tcp_recvmsg,

	.backlog_rcv		= tcp_v4_do_rcv,

	.hash			= tcp_v4_hash,

net/ipv6/af_inet6.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ const struct proto_ops inet6_stream_ops = { 
	.shutdown	   = inet_shutdown,		/* ok		*/

	.setsockopt	   = sock_common_setsockopt,	/* ok		*/

	.getsockopt	   = sock_common_getsockopt,	/* ok		*/

	.sendmsg	   = inet_sendmsg,		/* ok		*/

	.sendmsg	   = tcp_sendmsg,		/* ok		*/

	.recvmsg	   = sock_common_recvmsg,	/* ok		*/

	.mmap		   = sock_no_mmap,

	.sendpage	   = tcp_sendpage,