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

Commit 91b15613 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

David writes:
  "Networking

   1) Fix gro_cells leak in xfrm layer, from Li RongQing.

   2) BPF selftests change RLIMIT_MEMLOCK blindly, don't do that.  From
      Eric Dumazet.

   3) AF_XDP calls synchronize_net() under RCU lock, fix from Björn
      Töpel.

   4) Out of bounds packet access in _decode_session6(), from Alexei
      Starovoitov.

   5) Several ethtool bugs, where we copy a struct into the kernel twice
      and our validations of the values in the first copy can be
      invalidated by the second copy due to asynchronous updates to the
      memory by the user.  From Wenwen Wang.

   6) Missing netlink attribute validation in cls_api, from Davide
      Caratti.

   7) LLC SAP sockets neet to be SOCK_RCU FREE, from Cong Wang.

   8) rxrpc operates on wrong kvec, from Yue Haibing.

   9) A regression was introduced by the disassosciation of route
      neighbour references in rt6_probe(), causing probe for
      neighbourless routes to not be properly rate limited.  Fix from
      Sabrina Dubroca.

   10) Unsafe RCU locking in tipc, from Tung Nguyen.

   11) Use after free in inet6_mc_check(), from Eric Dumazet.

   12) PMTU from icmp packets should update the SCTP transport pathmtu,
       from Xin Long.

   13) Missing peer put on error in rxrpc, from David Howells.

   14) Fix pedit in nfp driver, from Pieter Jansen van Vuuren.

   15) Fix overflowing shift statement in qla3xxx driver, from Nathan
       Chancellor.

   16) Fix Spectre v1 in ptp code, from Gustavo A. R. Silva.

   17) udp6_unicast_rcv_skb() interprets udpv6_queue_rcv_skb() return
       value in an inverted manner, fix from Paolo Abeni.

   18) Fix missed unresolved entries in ipmr dumps, from Nikolay
       Aleksandrov.

   19) Fix NAPI handling under high load, we can completely miss events
       when NAPI has to loop more than one time in a cycle.  From Heiner
       Kallweit."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (49 commits)
  ip6_tunnel: Fix encapsulation layout
  tipc: fix info leak from kernel tipc_event
  net: socket: fix a missing-check bug
  net: sched: Fix for duplicate class dump
  r8169: fix NAPI handling under high load
  net: ipmr: fix unresolved entry dumps
  net: mscc: ocelot: Fix comment in ocelot_vlant_wait_for_completion()
  sctp: fix the data size calculation in sctp_data_size
  virtio_net: avoid using netif_tx_disable() for serializing tx routine
  udp6: fix encap return code for resubmitting
  mlxsw: core: Fix use-after-free when flashing firmware during init
  sctp: not free the new asoc when sctp_wait_for_connect returns err
  sctp: fix race on sctp_id2asoc
  r8169: re-enable MSI-X on RTL8168g
  net: bpfilter: use get_pid_task instead of pid_task
  ptp: fix Spectre v1 vulnerability
  net: qla3xxx: Remove overflowing shift statement
  geneve, vxlan: Don't set exceptions if skb->len < mtu
  geneve, vxlan: Don't check skb_dst() twice
  sctp: get pr_assoc and pr_stream all status with SCTP_PR_SCTP_ALL instead
  ...
parents 2a966610 d4d576f5

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -10122,7 +10122,6 @@ L: netdev@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git

S:	Maintained

F:	net/core/flow.c

F:	net/xfrm/

F:	net/key/

F:	net/ipv4/xfrm*

drivers/net/ethernet/broadcom/genet/bcmmii.c

+5 −2
Original line number Diff line number Diff line
@@ -321,9 +321,12 @@ int bcmgenet_mii_probe(struct net_device *dev) 
	phydev->advertising = phydev->supported;



	/* The internal PHY has its link interrupts routed to the

	 * Ethernet MAC ISRs

	 * Ethernet MAC ISRs. On GENETv5 there is a hardware issue

	 * that prevents the signaling of link UP interrupts when

	 * the link operates at 10Mbps, so fallback to polling for

	 * those versions of GENET.

	 */

	if (priv->internal_phy)

	if (priv->internal_phy && !GENET_IS_V5(priv))

		dev->phydev->irq = PHY_IGNORE_INTERRUPT;



	return 0;

drivers/net/ethernet/freescale/fec.h

+4 −0
Original line number Diff line number Diff line
@@ -452,6 +452,10 @@ struct bufdesc_ex { 
 * initialisation.

 */

#define FEC_QUIRK_MIB_CLEAR		(1 << 15)

/* Only i.MX25/i.MX27/i.MX28 controller supports FRBR,FRSR registers,

 * those FIFO receive registers are resolved in other platforms.

 */

#define FEC_QUIRK_HAS_FRREG		(1 << 16)



struct bufdesc_prop {

	int qid;

drivers/net/ethernet/freescale/fec_main.c

+12 −4
Original line number Diff line number Diff line
@@ -91,14 +91,16 @@ static struct platform_device_id fec_devtype[] = { 
		.driver_data = 0,

	}, {

		.name = "imx25-fec",

		.driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR,

		.driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR |

			       FEC_QUIRK_HAS_FRREG,

	}, {

		.name = "imx27-fec",

		.driver_data = FEC_QUIRK_MIB_CLEAR,

		.driver_data = FEC_QUIRK_MIB_CLEAR | FEC_QUIRK_HAS_FRREG,

	}, {

		.name = "imx28-fec",

		.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME |

				FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC,

				FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC |

				FEC_QUIRK_HAS_FRREG,

	}, {

		.name = "imx6q-fec",

		.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
@@ -2164,7 +2166,13 @@ static void fec_enet_get_regs(struct net_device *ndev, 
	memset(buf, 0, regs->len);



	for (i = 0; i < ARRAY_SIZE(fec_enet_register_offset); i++) {

		off = fec_enet_register_offset[i] / 4;

		off = fec_enet_register_offset[i];



		if ((off == FEC_R_BOUND || off == FEC_R_FSTART) &&

		    !(fep->quirks & FEC_QUIRK_HAS_FRREG))

			continue;



		off >>= 2;

		buf[off] = readl(&theregs[off]);

	}

}

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

+5 −7
Original line number Diff line number Diff line
@@ -432,10 +432,9 @@ static inline u16 mlx5e_icosq_wrap_cnt(struct mlx5e_icosq *sq) 


static inline void mlx5e_fill_icosq_frag_edge(struct mlx5e_icosq *sq,

					      struct mlx5_wq_cyc *wq,

					      u16 pi, u16 frag_pi)

					      u16 pi, u16 nnops)

{

	struct mlx5e_sq_wqe_info *edge_wi, *wi = &sq->db.ico_wqe[pi];

	u8 nnops = mlx5_wq_cyc_get_frag_size(wq) - frag_pi;



	edge_wi = wi + nnops;
@@ -454,15 +453,14 @@ static int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix) 
	struct mlx5_wq_cyc *wq = &sq->wq;

	struct mlx5e_umr_wqe *umr_wqe;

	u16 xlt_offset = ix << (MLX5E_LOG_ALIGNED_MPWQE_PPW - 1);

	u16 pi, frag_pi;

	u16 pi, contig_wqebbs_room;

	int err;

	int i;



	pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);

	frag_pi = mlx5_wq_cyc_ctr2fragix(wq, sq->pc);



	if (unlikely(frag_pi + MLX5E_UMR_WQEBBS > mlx5_wq_cyc_get_frag_size(wq))) {

		mlx5e_fill_icosq_frag_edge(sq, wq, pi, frag_pi);

	contig_wqebbs_room = mlx5_wq_cyc_get_contig_wqebbs(wq, pi);

	if (unlikely(contig_wqebbs_room < MLX5E_UMR_WQEBBS)) {

		mlx5e_fill_icosq_frag_edge(sq, wq, pi, contig_wqebbs_room);

		pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);

	}