This patch fixes two bugs in fastopen : 1) The tcp_sendmsg(..., @size) argument was ignored. Code was relying on user not fooling the kernel with iovec mismatches 2) When MTU is about 64KB, tcp_send_syn_data() attempts order-5 allocations, which are likely to fail when memory gets fragmented.
Unified · Split
| @@ -1303,7 +1303,8 @@ struct tcp_fastopen_request { · 1302 unmodified lines | ||
| 1303 | 1303 | /* Fast Open cookie. Size 0 means a cookie request */ |
| 1304 | 1304 | struct tcp_fastopen_cookie cookie; |
| 1305 | 1305 | struct msghdr *data; /* data in MSG_FASTOPEN */ |
| 1306 | − u16 copied; /* queued in tcp_connect() */ | |
| 1306 | + size_t size; | |
| 1307 | + int copied; /* queued in tcp_connect() */ | |
| 1307 | 1308 | }; |
| 1308 | 1309 | void tcp_free_fastopen_req(struct tcp_sock *tp); |
| 1309 | 1310 | |
| @@ -1044,7 +1044,8 @@ void tcp_free_fastopen_req(struct tcp_sock *tp) · 1043 unmodified lines | ||
| 1044 | 1044 | } |
| 1045 | 1045 | } |
| 1046 | 1046 | |
| 1047 | −static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, int *size) | |
| 1047 | +static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, | |
| 1048 | + int *copied, size_t size) | |
| 1048 | 1049 | { |
| 1049 | 1050 | struct tcp_sock *tp = tcp_sk(sk); |
| 1050 | 1051 | int err, flags; |
| @@ -1059,11 +1060,12 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, int *size) · 8 unmodified lines | ||
| 1059 | 1060 | if (unlikely(tp->fastopen_req == NULL)) |
| 1060 | 1061 | return -ENOBUFS; |
| 1061 | 1062 | tp->fastopen_req->data = msg; |
| 1063 | + tp->fastopen_req->size = size; | |
| 1062 | 1064 | |
| 1063 | 1065 | flags = (msg->msg_flags & MSG_DONTWAIT) ? O_NONBLOCK : 0; |
| 1064 | 1066 | err = __inet_stream_connect(sk->sk_socket, msg->msg_name, |
| 1065 | 1067 | msg->msg_namelen, flags); |
| 1066 | − *size = tp->fastopen_req->copied; | |
| 1068 | + *copied = tp->fastopen_req->copied; | |
| 1067 | 1069 | tcp_free_fastopen_req(tp); |
| 1068 | 1070 | return err; |
| 1069 | 1071 | } |
| @@ -1083,7 +1085,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, · 13 unmodified lines | ||
| 1083 | 1085 | |
| 1084 | 1086 | flags = msg->msg_flags; |
| 1085 | 1087 | if (flags & MSG_FASTOPEN) { |
| 1086 | − err = tcp_sendmsg_fastopen(sk, msg, &copied_syn); | |
| 1088 | + err = tcp_sendmsg_fastopen(sk, msg, &copied_syn, size); | |
| 1087 | 1089 | if (err == -EINPROGRESS && copied_syn > 0) |
| 1088 | 1090 | goto out; |
| 1089 | 1091 | else if (err) |
| @@ -2908,7 +2908,12 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) · 2907 unmodified lines | ||
| 2908 | 2908 | space = __tcp_mtu_to_mss(sk, inet_csk(sk)->icsk_pmtu_cookie) - |
| 2909 | 2909 | MAX_TCP_OPTION_SPACE; |
| 2910 | 2910 | |
| 2911 | − syn_data = skb_copy_expand(syn, skb_headroom(syn), space, | |
| 2911 | + space = min_t(size_t, space, fo->size); | |
| 2912 | + | |
| 2913 | + /* limit to order-0 allocations */ | |
| 2914 | + space = min_t(size_t, space, SKB_MAX_HEAD(MAX_TCP_HEADER)); | |
| 2915 | + | |
| 2916 | + syn_data = skb_copy_expand(syn, MAX_TCP_HEADER, space, | |
| 2912 | 2917 | sk->sk_allocation); |
| 2913 | 2918 | if (syn_data == NULL) |
| 2914 | 2919 | goto fallback; |