Linux 3.18.65
Greg KH
maintainerI'm announcing the release of the 3.18.65 kernel.
All users of the 3.18 kernel series must upgrade.
The updated 3.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.18.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +- net/core/dev.c | 2 +- net/ipv4/ip_output.c | 7 +++++-- net/ipv4/tcp_input.c | 4 ++-- net/ipv4/tcp_output.c | 3 +++ net/ipv4/tcp_timer.c | 3 ++- net/ipv4/udp.c | 2 +- net/ipv4/udp_offload.c | 2 +- net/ipv6/ip6_output.c | 7 ++++--- net/ipv6/udp_offload.c | 2 +- net/packet/af_packet.c | 13 +++++++++---- net/sched/act_ipt.c | 2 +- 12 files changed, 31 insertions(+), 18 deletions(-)
Eric Dumazet (2):
net: fix keepalive code vs TCP_FASTOPEN_CONNECT
tcp: fastopen: tcp_connect() must refresh the route
Greg Kroah-Hartman (2):
revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output" Linux 3.18.65
Willem de Bruijn (3):
net: avoid skb_warn_bad_offload false positives on UFO
packet: fix tp_reserve race in packet_set_ring
udp: consistently apply ufo or fragmentation
Xin Long (1):
net: sched: set xt_tgchk_param par.nft_compat as 0 in ipt_init_target
Yuchung Cheng (1):
tcp: avoid setting cwnd to invalid ssthresh after cwnd reduction states
zheng li (1):
ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 18 -SUBLEVEL = 64 +SUBLEVEL = 65 EXTRAVERSION = NAME = Diseased Newt
net/core/dev.c +1 -1
@@ -2436,7 +2436,7 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path) {if (tx_path)return skb->ip_summed !=CHECKSUM_PARTIAL && - skb->ip_summed !=CHECKSUM_NONE ; + skb->ip_summed !=CHECKSUM_UNNECESSARY ;return skb->ip_summed ==CHECKSUM_NONE ; }
net/ipv4/ip_output.c +5 -2
@@ -888,10 +888,12 @@ static int __ip_append_data(struct sock *sk, csummode =CHECKSUM_PARTIAL ; cork->length += length; -if ((((length + fragheaderlen) > mtu) || (skb &&skb_is_gso (skb))) && +if ((skb &&skb_is_gso (skb)) || + (((length + fragheaderlen) > mtu) && + (skb_queue_len (queue) <=1 ) && (sk->sk_protocol ==IPPROTO_UDP ) && (rt->dst.dev->features &NETIF_F_UFO ) && !rt->dst.header_len && - (sk->sk_type ==SOCK_DGRAM )) { + (sk->sk_type ==SOCK_DGRAM ))) { err =ip_ufo_append_data (sk, queue, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, maxfraglen, flags);
@@ -1207,6 +1209,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, cork->length += size;if ((size + skb->len > mtu) && + (skb_queue_len (&sk->sk_write_queue) ==1 ) && (sk->sk_protocol ==IPPROTO_UDP ) && (rt->dst.dev->features &NETIF_F_UFO )) {skb_shinfo (skb)->gso_size = mtu - fragheaderlen;
net/ipv4/tcp_input.c +2 -2
@@ -2535,8 +2535,8 @@ static inline void tcp_end_cwnd_reduction(struct sock *sk)struct tcp_sock *tp =tcp_sk (sk);/* Reset cwnd to ssthresh in CWR or Recovery (unless it's undone) */ -if (inet_csk (sk)->icsk_ca_state ==TCP_CA_CWR || - (tp->undo_marker && tp->snd_ssthresh <TCP_INFINITE_SSTHRESH )) { +if (tp->snd_ssthresh <TCP_INFINITE_SSTHRESH && + (inet_csk (sk)->icsk_ca_state ==TCP_CA_CWR || tp->undo_marker)) { tp->snd_cwnd = tp->snd_ssthresh; tp->snd_cwnd_stamp = tcp_time_stamp; }
net/ipv4/tcp_output.c +3 -0
@@ -3122,6 +3122,9 @@ int tcp_connect(struct sock *sk)struct sk_buff *buff;int err; +if (inet_csk (sk)->icsk_af_ops->rebuild_header (sk)) +return -EHOSTUNREACH ;/* Routing failure or similar. */ +tcp_connect_init (sk);if (unlikely (tp->repair)) {
net/ipv4/tcp_timer.c +2 -1
@@ -596,7 +596,8 @@ static void tcp_keepalive_timer (unsigned long data) goto death; } -if (!sock_flag (sk,SOCK_KEEPOPEN ) || sk->sk_state ==TCP_CLOSE ) +if (!sock_flag (sk,SOCK_KEEPOPEN ) || + ((1 << sk->sk_state) & (TCPF_CLOSE |TCPF_SYN_SENT ))) goto out; elapsed =keepalive_time_when (tp);
net/ipv4/udp.c +1 -1
@@ -804,7 +804,7 @@ static int udp_send_skb(struct sk_buff *skb, struct flowi4 *fl4)if (is_udplite)/* UDP-Lite */ csum =udplite_csum (skb); -else if (sk->sk_no_check_tx) {/* UDP csum disabled */ +else if (sk->sk_no_check_tx && !skb_is_gso (skb)) {/* UDP csum off */ skb->ip_summed =CHECKSUM_NONE ; goto send;
net/ipv4/udp_offload.c +1 -1
@@ -198,7 +198,7 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,if (uh->check ==0 ) uh->check =CSUM_MANGLED_0 ; - skb->ip_summed =CHECKSUM_NONE ; + skb->ip_summed =CHECKSUM_UNNECESSARY ;/* Fragment the skb. IP headers of the fragments are updated in * inet_gso_segment()
net/ipv6/ip6_output.c +4 -3
@@ -1305,11 +1305,12 @@ emsgsize: skb =skb_peek_tail (&sk->sk_write_queue); cork->length += length; -if ((((length + fragheaderlen) > mtu) || - (skb &&skb_is_gso (skb))) && +if ((skb &&skb_is_gso (skb)) || + (((length + fragheaderlen) > mtu) && + (skb_queue_len (&sk->sk_write_queue) <=1 ) && (sk->sk_protocol ==IPPROTO_UDP ) && (rt->dst.dev->features &NETIF_F_UFO ) && - (sk->sk_type ==SOCK_DGRAM )) { + (sk->sk_type ==SOCK_DGRAM ))) { err =ip6_ufo_append_data (sk, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, mtu, flags, rt);
net/ipv6/udp_offload.c +1 -1
@@ -82,7 +82,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb,if (uh->check ==0 ) uh->check =CSUM_MANGLED_0 ; - skb->ip_summed =CHECKSUM_NONE ; + skb->ip_summed =CHECKSUM_UNNECESSARY ;/* Check if there is enough headroom to insert fragment header. */ tnl_hlen =skb_tnl_header_len (skb);
net/packet/af_packet.c +9 -4
@@ -3310,14 +3310,19 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optvif (optlen !=sizeof (val))return -EINVAL ; -if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) -return -EBUSY ;if (copy_from_user (&val, optval,sizeof (val)))return -EFAULT ;if (val >INT_MAX )return -EINVAL ; - po->tp_reserve = val; -return 0 ; +lock_sock (sk); +if (po->rx_ring.pg_vec || po->tx_ring.pg_vec) { + ret = -EBUSY ; + }else { + po->tp_reserve = val; + ret =0 ; + } +release_sock (sk); +return ret; }case PACKET_LOSS : {
net/sched/act_ipt.c +1 -1
@@ -42,8 +42,8 @@ static int ipt_init_target(struct xt_entry_target *t, char *table, unsigned intreturn PTR_ERR (target); t->u.kernel.target = target; +memset (&par,0 ,sizeof (par)); par.table = table; - par.entryinfo =NULL ; par.target = target; par.targinfo = t->data; par.hook_mask = hook;