Commit ea6b1720 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) Reject invalid updates to netfilter expectation policies, from Pablo
    Neira Ayuso.

 2) Fix memory leak in nfnl_cthelper, from Jeffy Chen.

 3) Don't do stupid things if we get a neigh_probe() on a neigh entry
    whose ops lack a solicit method. From Eric Dumazet.

 4) Don't transmit packets in r8152 driver when the carrier is off, from
    Hayes Wang.

 5) Fix ipv6 packet type detection in aquantia driver, from Pavel
    Belous.

 6) Don't write uninitialized data into hw registers in bna driver, from
    Arnd Bergmann.

 7) Fix locking in ping_unhash(), from Eric Dumazet.

 8) Make BPF verifier range checks able to understand certain sequences
    emitted by LLVM, from Alexei Starovoitov.

 9) Fix use after free in ipconfig, from Mark Rutland.

10) Fix refcount leak on force commit in openvswitch, from Jarno
    Rajahalme.

11) Fix various overflow checks in AF_PACKET, from Andrey Konovalov.

12) Fix endianness bug in be2net driver, from Suresh Reddy.

13) Don't forget to wake TX queues when processing a timeout, from
    Grygorii Strashko.

14) ARP header on-stack storage is wrong in flow dissector, from Simon
    Horman.

15) Lost retransmit and reordering SNMP stats in TCP can be
    underreported. From Yuchung Cheng.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (82 commits)
  nfp: fix potential use after free on xdp prog
  tcp: fix reordering SNMP under-counting
  tcp: fix lost retransmit SNMP under-counting
  sctp: get sock from transport in sctp_transport_update_pmtu
  net: ethernet: ti: cpsw: fix race condition during open()
  l2tp: fix PPP pseudo-wire auto-loading
  bnx2x: fix spelling mistake in macros HW_INTERRUT_ASSERT_SET_*
  l2tp: take reference on sessions being dumped
  tcp: minimize false-positives on TCP/GRO check
  sctp: check for dst and pathmtu update in sctp_packet_config
  flow dissector: correct size of storage for ARP
  net: ethernet: ti: cpsw: wake tx queues on ndo_tx_timeout
  l2tp: take a reference on sessions used in genetlink handlers
  l2tp: hold session while sending creation notifications
  l2tp: fix duplicate session creation
  l2tp: ensure session can't get removed during pppol2tp_session_ioctl()
  l2tp: fix race in l2tp_recv_common()
  sctp: use right in and out stream cnt
  bpf: add various verifier test cases for self-tests
  bpf, verifier: fix rejection of unaligned access checks for map_value_adj
  ...
parents aeb4a576 c383bdd1

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -4928,6 +4928,7 @@ F: include/linux/netfilter_bridge/ 
F:	net/bridge/



ETHERNET PHY LIBRARY

M:	Andrew Lunn <andrew@lunn.ch>

M:	Florian Fainelli <f.fainelli@gmail.com>

L:	netdev@vger.kernel.org

S:	Maintained
@@ -10814,6 +10815,7 @@ F: drivers/s390/block/dasd* 
F:	block/partitions/ibm.c



S390 NETWORK DRIVERS

M:	Julian Wiedmann <jwi@linux.vnet.ibm.com>

M:	Ursula Braun <ubraun@linux.vnet.ibm.com>

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/
@@ -10844,6 +10846,7 @@ S: Supported 
F:	drivers/s390/scsi/zfcp_*



S390 IUCV NETWORK LAYER

M:	Julian Wiedmann <jwi@linux.vnet.ibm.com>

M:	Ursula Braun <ubraun@linux.vnet.ibm.com>

L:	linux-s390@vger.kernel.org

W:	http://www.ibm.com/developerworks/linux/linux390/

drivers/isdn/capi/kcapi.c

+1 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) 
						     sizeof(avmb1_carddef))))

				return -EFAULT;

			cdef.cardtype = AVM_CARDTYPE_B1;

			cdef.cardnr = 0;

		} else {

			if ((retval = copy_from_user(&cdef, data,

						     sizeof(avmb1_extcarddef))))

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+0 −5
Original line number Diff line number Diff line
@@ -100,11 +100,6 @@ static int aq_ndev_change_mtu(struct net_device *ndev, int new_mtu) 
		goto err_exit;

	ndev->mtu = new_mtu;



	if (netif_running(ndev)) {

		aq_ndev_close(ndev);

		aq_ndev_open(ndev);

	}



err_exit:

	return err;

}

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+19 −4
Original line number Diff line number Diff line
@@ -487,6 +487,9 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, 
		dx_buff->mss = skb_shinfo(skb)->gso_size;

		dx_buff->is_txc = 1U;



		dx_buff->is_ipv6 =

			(ip_hdr(skb)->version == 6) ? 1U : 0U;



		dx = aq_ring_next_dx(ring, dx);

		dx_buff = &ring->buff_ring[dx];

		++ret;
@@ -510,10 +513,22 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self, 
	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		dx_buff->is_ip_cso = (htons(ETH_P_IP) == skb->protocol) ?

			1U : 0U;



		if (ip_hdr(skb)->version == 4) {

			dx_buff->is_tcp_cso =

			(ip_hdr(skb)->protocol == IPPROTO_TCP) ? 1U : 0U;

				(ip_hdr(skb)->protocol == IPPROTO_TCP) ?

					1U : 0U;

			dx_buff->is_udp_cso =

			(ip_hdr(skb)->protocol == IPPROTO_UDP) ? 1U : 0U;

				(ip_hdr(skb)->protocol == IPPROTO_UDP) ?

					1U : 0U;

		} else if (ip_hdr(skb)->version == 6) {

			dx_buff->is_tcp_cso =

				(ipv6_hdr(skb)->nexthdr == NEXTHDR_TCP) ?

					1U : 0U;

			dx_buff->is_udp_cso =

				(ipv6_hdr(skb)->nexthdr == NEXTHDR_UDP) ?

					1U : 0U;

		}

	}



	for (; nr_frags--; ++frag_count) {

drivers/net/ethernet/aquantia/atlantic/aq_ring.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ int aq_ring_init(struct aq_ring_s *self) 
	self->hw_head = 0;

	self->sw_head = 0;

	self->sw_tail = 0;

	spin_lock_init(&self->header.lock);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE