Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8746440 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) Fix regression in multi-SKB responses to RTM_GETADDR, from Arthur
    Gautier.

 2) Fix ipv6 frag parsing in openvswitch, from Yi-Hung Wei.

 3) Unbounded recursion in ipv4 and ipv6 GUE tunnels, from Stefano
    Brivio.

 4) Use after free in hns driver, from Yonglong Liu.

 5) icmp6_send() needs to handle the case of NULL skb, from Eric
    Dumazet.

 6) Missing rcu read lock in __inet6_bind() when operating on mapped
    addresses, from David Ahern.

 7) Memory leak in tipc-nl_compat_publ_dump(), from Gustavo A. R. Silva.

 8) Fix PHY vs r8169 module loading ordering issues, from Heiner
    Kallweit.

 9) Fix bridge vlan memory leak, from Ido Schimmel.

10) Dev refcount leak in AF_PACKET, from Jason Gunthorpe.

11) Infoleak in ipv6_local_error(), flow label isn't completely
    initialized. From Eric Dumazet.

12) Handle mv88e6390 errata, from Andrew Lunn.

13) Making vhost/vsock CID hashing consistent, from Zha Bin.

14) Fix lack of UMH cleanup when it unexpectedly exits, from Taehee Yoo.

15) Bridge forwarding must clear skb->tstamp, from Paolo Abeni.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (87 commits)
  bnxt_en: Fix context memory allocation.
  bnxt_en: Fix ring checking logic on 57500 chips.
  mISDN: hfcsusb: Use struct_size() in kzalloc()
  net: clear skb->tstamp in bridge forwarding path
  net: bpfilter: disallow to remove bpfilter module while being used
  net: bpfilter: restart bpfilter_umh when error occurred
  net: bpfilter: use cleanup callback to release umh_info
  umh: add exit routine for UMH process
  isdn: i4l: isdn_tty: Fix some concurrency double-free bugs
  vhost/vsock: fix vhost vsock cid hashing inconsistent
  net: stmmac: Prevent RX starvation in stmmac_napi_poll()
  net: stmmac: Fix the logic of checking if RX Watchdog must be enabled
  net: stmmac: Check if CBS is supported before configuring
  net: stmmac: dwxgmac2: Only clear interrupts that are active
  net: stmmac: Fix PCI module removal leak
  tools/bpf: fix bpftool map dump with bitfields
  tools/bpf: test btf bitfield with >=256 struct member offset
  bpf: fix bpffs bitfield pretty print
  net: ethernet: mediatek: fix warning in phy_start_aneg
  tcp: change txhash on SYN-data timeout
  ...
parents fe76fc6a 2f960bd0

Documentation/bpf/bpf_design_QA.rst

+5 −6
Original line number Diff line number Diff line
@@ -157,12 +157,11 @@ Q: Does BPF have a stable ABI? 
------------------------------

A: YES. BPF instructions, arguments to BPF programs, set of helper

functions and their arguments, recognized return codes are all part

of ABI. However when tracing programs are using bpf_probe_read() helper

to walk kernel internal datastructures and compile with kernel

internal headers these accesses can and will break with newer

kernels. The union bpf_attr -> kern_version is checked at load time

to prevent accidentally loading kprobe-based bpf programs written

for a different kernel. Networking programs don't do kern_version check.

of ABI. However there is one specific exception to tracing programs

which are using helpers like bpf_probe_read() to walk kernel internal

data structures and compile with kernel internal headers. Both of these

kernel internals are subject to change and can break with newer kernels

such that the program needs to be adapted accordingly.



Q: How much stack space a BPF program uses?

-------------------------------------------

drivers/isdn/hardware/mISDN/hfcsusb.c

+1 −2
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ hfcsusb_ph_info(struct hfcsusb *hw) 
	struct dchannel *dch = &hw->dch;

	int i;



	phi = kzalloc(sizeof(struct ph_info) +

		      dch->dev.nrbchan * sizeof(struct ph_info_ch), GFP_ATOMIC);

	phi = kzalloc(struct_size(phi, bch, dch->dev.nrbchan), GFP_ATOMIC);

	phi->dch.ch.protocol = hw->protocol;

	phi->dch.ch.Flags = dch->Flags;

	phi->dch.state = dch->state;

drivers/isdn/i4l/isdn_tty.c

+5 −1
Original line number Diff line number Diff line
@@ -1437,15 +1437,19 @@ isdn_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios) 
{

	modem_info *info = (modem_info *) tty->driver_data;



	mutex_lock(&modem_info_mutex);

	if (!old_termios)

		isdn_tty_change_speed(info);

	else {

		if (tty->termios.c_cflag == old_termios->c_cflag &&

		    tty->termios.c_ispeed == old_termios->c_ispeed &&

		    tty->termios.c_ospeed == old_termios->c_ospeed)

		    tty->termios.c_ospeed == old_termios->c_ospeed) {

			mutex_unlock(&modem_info_mutex);

			return;

		}

		isdn_tty_change_speed(info);

	}

	mutex_unlock(&modem_info_mutex);

}



/*

drivers/net/bonding/bond_main.c

+3 −0
Original line number Diff line number Diff line
@@ -1963,6 +1963,9 @@ static int __bond_release_one(struct net_device *bond_dev, 
	if (!bond_has_slaves(bond)) {

		bond_set_carrier(bond);

		eth_hw_addr_random(bond_dev);

		bond->nest_level = SINGLE_DEPTH_NESTING;

	} else {

		bond->nest_level = dev_get_nest_level(bond_dev) + 1;

	}



	unblock_netpoll_tx();

drivers/net/dsa/microchip/ksz_common.c

+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#include <linux/delay.h>

#include <linux/export.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -15,7 +14,6 @@ 
#include <linux/phy.h>

#include <linux/etherdevice.h>

#include <linux/if_bridge.h>

#include <linux/of_gpio.h>

#include <linux/of_net.h>

#include <net/dsa.h>

#include <net/switchdev.h>