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

Commit 918fe1b3 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) Infinite loop in _decode_session6(), from Eric Dumazet.

 2) Pass correct argument to nla_strlcpy() in netfilter, also from Eric
    Dumazet.

 3) Out of bounds memory access in ipv6 srh code, from Mathieu Xhonneux.

 4) NULL deref in XDP_REDIRECT handling of tun driver, from Toshiaki
    Makita.

 5) Incorrect idr release in cls_flower, from Paul Blakey.

 6) Probe error handling fix in davinci_emac, from Dan Carpenter.

 7) Memory leak in XPS configuration, from Alexander Duyck.

 8) Use after free with cloned sockets in kcm, from Kirill Tkhai.

 9) MTU handling fixes fo ip_tunnel and ip6_tunnel, from Nicolas
    Dichtel.

10) Fix UAPI hole in bpf data structure for 32-bit compat applications,
    from Daniel Borkmann.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (33 commits)
  bpf: fix uapi hole for 32 bit compat applications
  net: usb: cdc_mbim: add flag FLAG_SEND_ZLP
  ip6_tunnel: remove magic mtu value 0xFFF8
  ip_tunnel: restore binding to ifaces with a large mtu
  net: dsa: b53: Add BCM5389 support
  kcm: Fix use-after-free caused by clonned sockets
  net-sysfs: Fix memory leak in XPS configuration
  ixgbe: fix parsing of TC actions for HW offload
  net: ethernet: davinci_emac: fix error handling in probe()
  net/ncsi: Fix array size in dumpit handler
  cls_flower: Fix incorrect idr release when failing to modify rule
  net/sonic: Use dma_mapping_error()
  xfrm Fix potential error pointer dereference in xfrm_bundle_create.
  vhost_net: flush batched heads before trying to busy polling
  tun: Fix NULL pointer dereference in XDP redirect
  be2net: Fix error detection logic for BE3
  net: qmi_wwan: Add Netgear Aircard 779S
  mlxsw: spectrum: Forbid creation of VLAN 1 over port/LAG
  atm: zatm: fix memcmp casting
  iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs
  ...
parents e0255aec cd075ce4

Documentation/devicetree/bindings/net/dsa/b53.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
      "brcm,bcm53128"

      "brcm,bcm5365"

      "brcm,bcm5395"

      "brcm,bcm5389"

      "brcm,bcm5397"

      "brcm,bcm5398"

drivers/atm/zatm.c

+2 −2
Original line number Diff line number Diff line
@@ -1151,8 +1151,8 @@ static void eprom_get_byte(struct zatm_dev *zatm_dev, unsigned char *byte, 
}





static unsigned char eprom_try_esi(struct atm_dev *dev, unsigned short cmd,

				   int offset, int swap)

static int eprom_try_esi(struct atm_dev *dev, unsigned short cmd, int offset,

			 int swap)

{

	unsigned char buf[ZEPROM_SIZE];

	struct zatm_dev *zatm_dev;

drivers/net/dsa/b53/b53_common.c

+13 −0
Original line number Diff line number Diff line
@@ -1711,6 +1711,18 @@ static const struct b53_chip_data b53_switch_chips[] = { 
		.cpu_port = B53_CPU_PORT_25,

		.duplex_reg = B53_DUPLEX_STAT_FE,

	},

	{

		.chip_id = BCM5389_DEVICE_ID,

		.dev_name = "BCM5389",

		.vlans = 4096,

		.enabled_ports = 0x1f,

		.arl_entries = 4,

		.cpu_port = B53_CPU_PORT,

		.vta_regs = B53_VTA_REGS,

		.duplex_reg = B53_DUPLEX_STAT_GE,

		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,

		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,

	},

	{

		.chip_id = BCM5395_DEVICE_ID,

		.dev_name = "BCM5395",
@@ -2034,6 +2046,7 @@ int b53_switch_detect(struct b53_device *dev) 
		else

			dev->chip_id = BCM5365_DEVICE_ID;

		break;

	case BCM5389_DEVICE_ID:

	case BCM5395_DEVICE_ID:

	case BCM5397_DEVICE_ID:

	case BCM5398_DEVICE_ID:

drivers/net/dsa/b53/b53_mdio.c

+4 −1
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ static const struct b53_io_ops b53_mdio_ops = { 
#define B53_BRCM_OUI_1	0x0143bc00

#define B53_BRCM_OUI_2	0x03625c00

#define B53_BRCM_OUI_3	0x00406000

#define B53_BRCM_OUI_4	0x01410c00



static int b53_mdio_probe(struct mdio_device *mdiodev)

{
@@ -311,7 +312,8 @@ static int b53_mdio_probe(struct mdio_device *mdiodev) 
	 */

	if ((phy_id & 0xfffffc00) != B53_BRCM_OUI_1 &&

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_2 &&

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_3) {

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_3 &&

	    (phy_id & 0xfffffc00) != B53_BRCM_OUI_4) {

		dev_err(&mdiodev->dev, "Unsupported device: 0x%08x\n", phy_id);

		return -ENODEV;

	}
@@ -360,6 +362,7 @@ static const struct of_device_id b53_of_match[] = { 
	{ .compatible = "brcm,bcm53125" },

	{ .compatible = "brcm,bcm53128" },

	{ .compatible = "brcm,bcm5365" },

	{ .compatible = "brcm,bcm5389" },

	{ .compatible = "brcm,bcm5395" },

	{ .compatible = "brcm,bcm5397" },

	{ .compatible = "brcm,bcm5398" },

drivers/net/dsa/b53/b53_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct b53_io_ops { 
enum {

	BCM5325_DEVICE_ID = 0x25,

	BCM5365_DEVICE_ID = 0x65,

	BCM5389_DEVICE_ID = 0x89,

	BCM5395_DEVICE_ID = 0x95,

	BCM5397_DEVICE_ID = 0x97,

	BCM5398_DEVICE_ID = 0x98,