Home| summaryrefslogtreecommitdiff |
diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-08-10 22:28:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-10 22:28:47 +0200 |
| commit | 50430229b4b79b4e29e8450ffd55d23bf9c41945 (patch) | |
| tree | 63369d1e339b3c3dcfee234a0e6985db06a880d9 | |
| parent | d6a63cdf8bc8a30a3e0b72e73caf95ae3722caf2 (diff) | |
| parent | 54b03cd4230c47356f59c98d3acd5fa4d2ef7fc2 (diff) | |
Merge branch 'SLE12-SP3' into openSUSE-42.3rpm-4.4.79-19
suse-commit: 2dd03e85e3ece819fd1edc7cea47b915950aa65e
| -rw-r--r-- | net/ipv4/ip_output.c | 12 | ||||
| -rw-r--r-- | net/ipv6/ip6_output.c | 11 | ||||
| -rw-r--r-- | net/packet/af_packet.c | 13 |
3 files changed, 22 insertions, 14 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index f115e95583d9..3ec616f2a91f 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -922,11 +922,12 @@ static int __ip_append_data(struct sock *sk, csummode = CHECKSUM_PARTIAL; cork->length += length; - if ((((length + (skb ? skb->len : fragheaderlen)) > mtu) || - (skb && skb_is_gso(skb))) && - (sk->sk_protocol == IPPROTO_UDP) && - (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) && - (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) { + if ((skb && skb_is_gso(skb)) || + (((length + (skb ? skb->len : fragheaderlen)) > mtu) && + (skb_queue_len(queue) <= 1) && + (sk->sk_protocol == IPPROTO_UDP) && + (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) && + (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx)) { err = ip_ufo_append_data(sk, queue, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, maxfraglen, flags); @@ -1243,6 +1244,7 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page, if ((size + skb->len > mtu) && (sk->sk_protocol == IPPROTO_UDP) && + (skb_queue_len(&sk->sk_write_queue) == 1) && (rt->dst.dev->features & NETIF_F_UFO)) { if (skb->ip_summed != CHECKSUM_PARTIAL) return -EOPNOTSUPP; diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index c9f62e2d4c08..5e84ae7ff621 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1361,11 +1361,12 @@ emsgsize: */ cork->length += length; - if ((((length + (skb ? skb->len : headersize)) > mtu) || - (skb && skb_is_gso(skb))) && - (sk->sk_protocol == IPPROTO_UDP) && - (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) && - (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk)) { + if ((skb && skb_is_gso(skb)) || + (((length + (skb ? skb->len : headersize)) > mtu) && + (skb_queue_len(queue) <= 1) && + (sk->sk_protocol == IPPROTO_UDP) && + (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) && + (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk))) { err = ip6_ufo_append_data(sk, queue, getfrag, from, length, hh_len, fragheaderlen, exthdrlen, transhdrlen, mtu, flags, fl6); diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index adf62b87f667..2313f736da66 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -3621,14 +3621,19 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv if (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: { |