Commit 95e6ba51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) More jumbo frame fixes in r8169, from Heiner Kallweit.

 2) Fix bpf build in minimal configuration, from Alexei Starovoitov.

 3) Use after free in slcan driver, from Jouni Hogander.

 4) Flower classifier port ranges don't work properly in the HW offload
    case, from Yoshiki Komachi.

 5) Use after free in hns3_nic_maybe_stop_tx(), from Yunsheng Lin.

 6) Out of bounds access in mqprio_dump(), from Vladyslav Tarasiuk.

 7) Fix flow dissection in dsa TX path, from Alexander Lobakin.

 8) Stale syncookie timestampe fixes from Guillaume Nault.

[ Did an evil merge to silence a warning introduced by this pull - Linus ]

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (84 commits)
  r8169: fix rtl_hw_jumbo_disable for RTL8168evl
  net_sched: validate TCA_KIND attribute in tc_chain_tmplt_add()
  r8169: add missing RX enabling for WoL on RTL8125
  vhost/vsock: accept only packets with the right dst_cid
  net: phy: dp83867: fix hfs boot in rgmii mode
  net: ethernet: ti: cpsw: fix extra rx interrupt
  inet: protect against too small mtu values.
  gre: refetch erspan header from skb->data after pskb_may_pull()
  pppoe: remove redundant BUG_ON() check in pppoe_pernet
  tcp: Protect accesses to .ts_recent_stamp with {READ,WRITE}_ONCE()
  tcp: tighten acceptance of ACKs not matching a child socket
  tcp: fix rejected syncookies due to stale timestamps
  lpc_eth: kernel BUG on remove
  tcp: md5: fix potential overestimation of TCP option space
  net: sched: allow indirect blocks to bind to clsact in TC
  net: core: rename indirect block ingress cb function
  net-sysfs: Call dev_hold always in netdev_queue_add_kobject
  net: dsa: fix flow dissection on Tx path
  net/tls: Fix return values to avoid ENOTSUPP
  net: avoid an indirect call in ____sys_recvmsg()
  ...
parents 138f371d 0fc75219

MAINTAINERS

+17 −0
Original line number Diff line number Diff line
@@ -10107,6 +10107,15 @@ W: https://linuxtv.org 
S:	Maintained

F:	drivers/media/radio/radio-maxiradio*













MCAN MMIO DEVICE DRIVER













M:	Sriram Dash <sriram.dash@samsung.com>













L:	linux-can@vger.kernel.org













S:	Maintained













F:	Documentation/devicetree/bindings/net/can/m_can.txt













F:	drivers/net/can/m_can/m_can.c













F:	drivers/net/can/m_can/m_can.h













F:	drivers/net/can/m_can/m_can_platform.c



























MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS















M:	Peter Rosin <peda@axentia.se>















L:	linux-iio@vger.kernel.org










@@ -18139,6 +18148,14 @@ M:	Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>













S:	Maintained















F:	drivers/net/ethernet/xilinx/xilinx_axienet*



























XILINX CAN DRIVER













M:	Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>













R:	Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>













L:	linux-can@vger.kernel.org













S:	Maintained













F:	Documentation/devicetree/bindings/net/can/xilinx_can.txt













F:	drivers/net/can/xilinx_can.c



























XILINX UARTLITE SERIAL DRIVER















M:	Peter Korsgaard <jacmet@sunsite.dk>















L:	linux-serial@vger.kernel.org

























drivers/infiniband/core/addr.c



+3
−4






























Original line number
Diff line number
Diff line








@@ -421,16 +421,15 @@ static int addr6_resolve(struct sockaddr *src_sock,













				(const struct sockaddr_in6 *)dst_sock;















	struct flowi6 fl6;















	struct dst_entry *dst;













	int ret;































	memset(&fl6, 0, sizeof fl6);















	fl6.daddr = dst_in->sin6_addr;















	fl6.saddr = src_in->sin6_addr;















	fl6.flowi6_oif = addr->bound_dev_if;





























	ret = ipv6_stub->ipv6_dst_lookup(addr->net, NULL, &dst, &fl6);













	if (ret < 0)













		return ret;













	dst = ipv6_stub->ipv6_dst_lookup_flow(addr->net, NULL, &fl6, NULL);













	if (IS_ERR(dst))













		return PTR_ERR(dst);































	if (ipv6_addr_any(&src_in->sin6_addr))















		src_in->sin6_addr = fl6.saddr;

































drivers/infiniband/sw/rxe/rxe_net.c



+5
−3






























Original line number
Diff line number
Diff line








@@ -117,10 +117,12 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev,













	memcpy(&fl6.daddr, daddr, sizeof(*daddr));















	fl6.flowi6_proto = IPPROTO_UDP;





























	if (unlikely(ipv6_stub->ipv6_dst_lookup(sock_net(recv_sockets.sk6->sk),













						recv_sockets.sk6->sk, &ndst, &fl6))) {













	ndst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk),













					       recv_sockets.sk6->sk, &fl6,













					       NULL);













	if (unlikely(IS_ERR(ndst))) {















		pr_err_ratelimited("no route to %pI6\n", daddr);













		goto put;













		return NULL;















	}































	if (unlikely(ndst->error)) {

































drivers/net/can/slcan.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -617,6 +617,7 @@ err_free_chan:













	sl->tty = NULL;















	tty->disc_data = NULL;















	clear_bit(SLF_INUSE, &sl->flags);













	slc_free_netdev(sl->dev);















	free_netdev(sl->dev);































err_exit:

































drivers/net/can/usb/ucan.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -792,7 +792,7 @@ resubmit:













			  up);































	usb_anchor_urb(urb, &up->rx_urbs);













	ret = usb_submit_urb(urb, GFP_KERNEL);













	ret = usb_submit_urb(urb, GFP_ATOMIC);































	if (ret < 0) {















		netdev_err(up->netdev,









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE