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

Commit 726ba84b 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 BPF divides by zero, from Eric Dumazet and Alexei Starovoitov.

 2) Reject stores into bpf context via st and xadd, from Daniel
    Borkmann.

 3) Fix a memory leak in TUN, from Cong Wang.

 4) Disable RX aggregation on a specific troublesome configuration of
    r8152 in a Dell TB16b dock.

 5) Fix sw_ctx leak in tls, from Sabrina Dubroca.

 6) Fix program replacement in cls_bpf, from Daniel Borkmann.

 7) Fix uninitialized station_info structures in cfg80211, from Johannes
    Berg.

 8) Fix miscalculation of transport header offset field in flow
    dissector, from Eric Dumazet.

 9) Fix LPM tree leak on failure in mlxsw driver, from Ido Schimmel.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
  ibmvnic: Fix IPv6 packet descriptors
  ibmvnic: Fix IP offload control buffer
  ipv6: don't let tb6_root node share routes with other node
  ip6_gre: init dev->mtu and dev->hard_header_len correctly
  mlxsw: spectrum_router: Free LPM tree upon failure
  flow_dissector: properly cap thoff field
  fm10k: mark PM functions as __maybe_unused
  cfg80211: fix station info handling bugs
  netlink: reset extack earlier in netlink_rcv_skb
  can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once
  can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once
  bpf: mark dst unknown on inconsistent {s, u}bounds adjustments
  bpf: fix cls_bpf on filter replace
  Net: ethernet: ti: netcp: Fix inbound ping crash if MTU size is greater than 1500
  tls: reset crypto_info when do_tls_setsockopt_tx fails
  tls: return -EBUSY if crypto_info is already set
  tls: fix sw_ctx leak
  net/tls: Only attach to sockets in ESTABLISHED state
  net: fs_enet: do not call phy_stop() in interrupts
  r8152: disable RX aggregation on Dell TB16 dock
  ...
parents dda3e152 a0dca10f

arch/arm64/net/bpf_jit_comp.c

+11 −9
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ static inline int epilogue_offset(const struct jit_ctx *ctx) 
/* Stack must be multiples of 16B */

#define STACK_ALIGN(sz) (((sz) + 15) & ~15)



#define PROLOGUE_OFFSET 8

/* Tail call offset to jump into */

#define PROLOGUE_OFFSET 7



static int build_prologue(struct jit_ctx *ctx)

{
@@ -200,19 +201,19 @@ static int build_prologue(struct jit_ctx *ctx) 
	/* Initialize tail_call_cnt */

	emit(A64_MOVZ(1, tcc, 0, 0), ctx);



	/* 4 byte extra for skb_copy_bits buffer */

	ctx->stack_size = prog->aux->stack_depth + 4;

	ctx->stack_size = STACK_ALIGN(ctx->stack_size);



	/* Set up function call stack */

	emit(A64_SUB_I(1, A64_SP, A64_SP, ctx->stack_size), ctx);



	cur_offset = ctx->idx - idx0;

	if (cur_offset != PROLOGUE_OFFSET) {

		pr_err_once("PROLOGUE_OFFSET = %d, expected %d!\n",

			    cur_offset, PROLOGUE_OFFSET);

		return -1;

	}



	/* 4 byte extra for skb_copy_bits buffer */

	ctx->stack_size = prog->aux->stack_depth + 4;

	ctx->stack_size = STACK_ALIGN(ctx->stack_size);



	/* Set up function call stack */

	emit(A64_SUB_I(1, A64_SP, A64_SP, ctx->stack_size), ctx);

	return 0;

}
@@ -260,11 +261,12 @@ static int emit_bpf_tail_call(struct jit_ctx *ctx) 
	emit(A64_LDR64(prg, tmp, prg), ctx);

	emit(A64_CBZ(1, prg, jmp_offset), ctx);



	/* goto *(prog->bpf_func + prologue_size); */

	/* goto *(prog->bpf_func + prologue_offset); */

	off = offsetof(struct bpf_prog, bpf_func);

	emit_a64_mov_i64(tmp, off, ctx);

	emit(A64_LDR64(tmp, prg, tmp), ctx);

	emit(A64_ADD_I(1, tmp, tmp, sizeof(u32) * PROLOGUE_OFFSET), ctx);

	emit(A64_ADD_I(1, A64_SP, A64_SP, ctx->stack_size), ctx);

	emit(A64_BR(tmp), ctx);



	/* out: */

drivers/bcma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ config BCMA_DRIVER_PCI 


config BCMA_DRIVER_PCI_HOSTMODE

	bool "Driver for PCI core working in hostmode"

	depends on MIPS && BCMA_DRIVER_PCI

	depends on MIPS && BCMA_DRIVER_PCI && PCI_DRIVERS_LEGACY

	help

	  PCI core hostmode operation (external PCI bus).

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

+11 −10
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int pcan_usb_fd_send_cmd(struct peak_usb_device *dev, void *cmd_tail) 
	void *cmd_head = pcan_usb_fd_cmd_buffer(dev);

	int err = 0;

	u8 *packet_ptr;

	int i, n = 1, packet_len;

	int packet_len;

	ptrdiff_t cmd_len;



	/* usb device unregistered? */
@@ -201,17 +201,13 @@ static int pcan_usb_fd_send_cmd(struct peak_usb_device *dev, void *cmd_tail) 
	}



	packet_ptr = cmd_head;

	packet_len = cmd_len;



	/* firmware is not able to re-assemble 512 bytes buffer in full-speed */

	if ((dev->udev->speed != USB_SPEED_HIGH) &&

	    (cmd_len > PCAN_UFD_LOSPD_PKT_SIZE)) {

		packet_len = PCAN_UFD_LOSPD_PKT_SIZE;

		n += cmd_len / packet_len;

	} else {

		packet_len = cmd_len;

	}

	if (unlikely(dev->udev->speed != USB_SPEED_HIGH))

		packet_len = min(packet_len, PCAN_UFD_LOSPD_PKT_SIZE);



	for (i = 0; i < n; i++) {

	do {

		err = usb_bulk_msg(dev->udev,

				   usb_sndbulkpipe(dev->udev,

						   PCAN_USBPRO_EP_CMDOUT),
@@ -224,7 +220,12 @@ static int pcan_usb_fd_send_cmd(struct peak_usb_device *dev, void *cmd_tail) 
		}



		packet_ptr += packet_len;

	}

		cmd_len -= packet_len;



		if (cmd_len < PCAN_UFD_LOSPD_PKT_SIZE)

			packet_len = cmd_len;



	} while (packet_len > 0);



	return err;

}

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

+13 −3
Original line number Diff line number Diff line
@@ -613,9 +613,11 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;

}



static void fs_timeout(struct net_device *dev)

static void fs_timeout_work(struct work_struct *work)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct fs_enet_private *fep = container_of(work, struct fs_enet_private,

						   timeout_work);

	struct net_device *dev = fep->ndev;

	unsigned long flags;

	int wake = 0;
@@ -627,7 +629,6 @@ static void fs_timeout(struct net_device *dev) 
		phy_stop(dev->phydev);

		(*fep->ops->stop)(dev);

		(*fep->ops->restart)(dev);

		phy_start(dev->phydev);

	}



	phy_start(dev->phydev);
@@ -639,6 +640,13 @@ static void fs_timeout(struct net_device *dev) 
		netif_wake_queue(dev);

}



static void fs_timeout(struct net_device *dev)

{

	struct fs_enet_private *fep = netdev_priv(dev);



	schedule_work(&fep->timeout_work);

}



/*-----------------------------------------------------------------------------

 *  generic link-change handler - should be sufficient for most cases

 *-----------------------------------------------------------------------------*/
@@ -759,6 +767,7 @@ static int fs_enet_close(struct net_device *dev) 
	netif_stop_queue(dev);

	netif_carrier_off(dev);

	napi_disable(&fep->napi);

	cancel_work_sync(&fep->timeout_work);

	phy_stop(dev->phydev);



	spin_lock_irqsave(&fep->lock, flags);
@@ -1019,6 +1028,7 @@ static int fs_enet_probe(struct platform_device *ofdev) 


	ndev->netdev_ops = &fs_enet_netdev_ops;

	ndev->watchdog_timeo = 2 * HZ;

	INIT_WORK(&fep->timeout_work, fs_timeout_work);

	netif_napi_add(ndev, &fep->napi, fs_enet_napi, fpi->napi_weight);



	ndev->ethtool_ops = &fs_ethtool_ops;

drivers/net/ethernet/freescale/fs_enet/fs_enet.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct fs_enet_private { 
	spinlock_t lock;	/* during all ops except TX pckt processing */

	spinlock_t tx_lock;	/* during fs_start_xmit and fs_tx         */

	struct fs_platform_info *fpi;

	struct work_struct timeout_work;

	const struct fs_ops *ops;

	int rx_ring, tx_ring;

	dma_addr_t ring_mem_addr;