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

Commit a090bd4f 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) The netlink attribute passed in to dev_set_alias() is not
    necessarily NULL terminated, don't use strlcpy() on it. From
    Alexander Potapenko.

 2) Fix implementation of atomics in arm64 bpf JIT, from Daniel
    Borkmann.

 3) Correct the release of netdevs and driver private data in certain
    circumstances.

 4) Sanitize netlink message length properly in decnet, from Mateusz
    Jurczyk.

 5) Don't leak kernel data in rtnl_fill_vfinfo() netlink blobs. From
    Yuval Mintz.

 6) Hash secret is never initialized in ipv6 ILA translation code, from
    Arnd Bergmann. I guess those clang warnings about unused inline
    functions are useful for something!

 7) Fix endian selection in bpf_endian.h, from Daniel Borkmann.

 8) Sanitize sockaddr length before dereferncing any fields in AF_UNIX
    and CAIF. From Mateusz Jurczyk.

 9) Fix timestamping for GMAC3 chips in stmmac driver, from Mario
    Molitor.

10) Do not leak netdev on dev_alloc_name() errors in mac80211, from
    Johannes Berg.

11) Fix locking in sctp_for_each_endpoint(), from Xin Long.

12) Fix wrong memset size on 32-bit in snmp6, from Christian Perle.

13) Fix use after free in ip_mc_clear_src(), from WANG Cong.

14) Fix regressions caused by ICMP rate limiting changes in 4.11, from
    Jesper Dangaard Brouer.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (91 commits)
  i40e: Fix a sleep-in-atomic bug
  net: don't global ICMP rate limit packets originating from loopback
  net/act_pedit: fix an error code
  net: update undefined ->ndo_change_mtu() comment
  net_sched: move tcf_lock down after gen_replace_estimator()
  caif: Add sockaddr length check before accessing sa_family in connect handler
  qed: fix dump of context data
  qmi_wwan: new Telewell and Sierra device IDs
  net: phy: Fix MDIO_THUNDER dependencies
  netconsole: Remove duplicate "netconsole: " logging prefix
  igmp: acquire pmc lock for ip_mc_clear_src()
  r8152: give the device version
  net: rps: fix uninitialized symbol warning
  mac80211: don't send SMPS action frame in AP mode when not needed
  mac80211/wpa: use constant time memory comparison for MACs
  mac80211: set bss_info data before configuring the channel
  mac80211: remove 5/10 MHz rate code from station MLME
  mac80211: Fix incorrect condition when checking rx timestamp
  mac80211: don't look at the PM bit of BAR frames
  i40e: fix handling of HW ATR eviction
  ...
parents 54ed0f71 640f93cc

Documentation/networking/scaling.txt

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ associated flow of the packet. The hash is either provided by hardware 
or will be computed in the stack. Capable hardware can pass the hash in

the receive descriptor for the packet; this would usually be the same

hash used for RSS (e.g. computed Toeplitz hash). The hash is saved in

skb->rx_hash and can be used elsewhere in the stack as a hash of the

skb->hash and can be used elsewhere in the stack as a hash of the

packet’s flow.



Each receive hardware queue has an associated list of CPUs to which

arch/arm64/net/bpf_jit_comp.c

+5 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ int bpf_jit_enable __read_mostly; 
#define TMP_REG_1 (MAX_BPF_JIT_REG + 0)

#define TMP_REG_2 (MAX_BPF_JIT_REG + 1)

#define TCALL_CNT (MAX_BPF_JIT_REG + 2)

#define TMP_REG_3 (MAX_BPF_JIT_REG + 3)



/* Map BPF registers to A64 registers */

static const int bpf2a64[] = {
@@ -57,6 +58,7 @@ static const int bpf2a64[] = { 
	/* temporary registers for internal BPF JIT */

	[TMP_REG_1] = A64_R(10),

	[TMP_REG_2] = A64_R(11),

	[TMP_REG_3] = A64_R(12),

	/* tail_call_cnt */

	[TCALL_CNT] = A64_R(26),

	/* temporary register for blinding constants */
@@ -319,6 +321,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
	const u8 src = bpf2a64[insn->src_reg];

	const u8 tmp = bpf2a64[TMP_REG_1];

	const u8 tmp2 = bpf2a64[TMP_REG_2];

	const u8 tmp3 = bpf2a64[TMP_REG_3];

	const s16 off = insn->off;

	const s32 imm = insn->imm;

	const int i = insn - ctx->prog->insnsi;
@@ -689,10 +692,10 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
		emit(A64_PRFM(tmp, PST, L1, STRM), ctx);

		emit(A64_LDXR(isdw, tmp2, tmp), ctx);

		emit(A64_ADD(isdw, tmp2, tmp2, src), ctx);

		emit(A64_STXR(isdw, tmp2, tmp, tmp2), ctx);

		emit(A64_STXR(isdw, tmp2, tmp, tmp3), ctx);

		jmp_offset = -3;

		check_imm19(jmp_offset);

		emit(A64_CBNZ(0, tmp2, jmp_offset), ctx);

		emit(A64_CBNZ(0, tmp3, jmp_offset), ctx);

		break;



	/* R0 = ntohx(*(size *)(((struct sk_buff *)R6)->data + imm)) */

drivers/hsi/clients/ssi_protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ static void ssip_pn_setup(struct net_device *dev) 
	dev->addr_len		= 1;

	dev->tx_queue_len	= SSIP_TXQUEUE_LEN;



	dev->destructor		= free_netdev;

	dev->needs_free_netdev	= true;

	dev->header_ops		= &phonet_header_ops;

}

drivers/net/bonding/bond_3ad.c

+27 −0
Original line number Diff line number Diff line
@@ -90,10 +90,13 @@ enum ad_link_speed_type { 
	AD_LINK_SPEED_100MBPS,

	AD_LINK_SPEED_1000MBPS,

	AD_LINK_SPEED_2500MBPS,

	AD_LINK_SPEED_5000MBPS,

	AD_LINK_SPEED_10000MBPS,

	AD_LINK_SPEED_14000MBPS,

	AD_LINK_SPEED_20000MBPS,

	AD_LINK_SPEED_25000MBPS,

	AD_LINK_SPEED_40000MBPS,

	AD_LINK_SPEED_50000MBPS,

	AD_LINK_SPEED_56000MBPS,

	AD_LINK_SPEED_100000MBPS,

};
@@ -259,10 +262,13 @@ static inline int __check_agg_selection_timer(struct port *port) 
 *     %AD_LINK_SPEED_100MBPS,

 *     %AD_LINK_SPEED_1000MBPS,

 *     %AD_LINK_SPEED_2500MBPS,

 *     %AD_LINK_SPEED_5000MBPS,

 *     %AD_LINK_SPEED_10000MBPS

 *     %AD_LINK_SPEED_14000MBPS,

 *     %AD_LINK_SPEED_20000MBPS

 *     %AD_LINK_SPEED_25000MBPS

 *     %AD_LINK_SPEED_40000MBPS

 *     %AD_LINK_SPEED_50000MBPS

 *     %AD_LINK_SPEED_56000MBPS

 *     %AD_LINK_SPEED_100000MBPS

 */
@@ -296,10 +302,18 @@ static u16 __get_link_speed(struct port *port) 
			speed = AD_LINK_SPEED_2500MBPS;

			break;



		case SPEED_5000:

			speed = AD_LINK_SPEED_5000MBPS;

			break;



		case SPEED_10000:

			speed = AD_LINK_SPEED_10000MBPS;

			break;



		case SPEED_14000:

			speed = AD_LINK_SPEED_14000MBPS;

			break;



		case SPEED_20000:

			speed = AD_LINK_SPEED_20000MBPS;

			break;
@@ -312,6 +326,10 @@ static u16 __get_link_speed(struct port *port) 
			speed = AD_LINK_SPEED_40000MBPS;

			break;



		case SPEED_50000:

			speed = AD_LINK_SPEED_50000MBPS;

			break;



		case SPEED_56000:

			speed = AD_LINK_SPEED_56000MBPS;

			break;
@@ -707,9 +725,15 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) 
		case AD_LINK_SPEED_2500MBPS:

			bandwidth = nports * 2500;

			break;

		case AD_LINK_SPEED_5000MBPS:

			bandwidth = nports * 5000;

			break;

		case AD_LINK_SPEED_10000MBPS:

			bandwidth = nports * 10000;

			break;

		case AD_LINK_SPEED_14000MBPS:

			bandwidth = nports * 14000;

			break;

		case AD_LINK_SPEED_20000MBPS:

			bandwidth = nports * 20000;

			break;
@@ -719,6 +743,9 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator) 
		case AD_LINK_SPEED_40000MBPS:

			bandwidth = nports * 40000;

			break;

		case AD_LINK_SPEED_50000MBPS:

			bandwidth = nports * 50000;

			break;

		case AD_LINK_SPEED_56000MBPS:

			bandwidth = nports * 56000;

			break;

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -4192,7 +4192,6 @@ static void bond_destructor(struct net_device *bond_dev) 
	struct bonding *bond = netdev_priv(bond_dev);

	if (bond->wq)

		destroy_workqueue(bond->wq);

	free_netdev(bond_dev);

}



void bond_setup(struct net_device *bond_dev)
@@ -4212,7 +4211,8 @@ void bond_setup(struct net_device *bond_dev) 
	bond_dev->netdev_ops = &bond_netdev_ops;

	bond_dev->ethtool_ops = &bond_ethtool_ops;



	bond_dev->destructor = bond_destructor;

	bond_dev->needs_free_netdev = true;

	bond_dev->priv_destructor = bond_destructor;



	SET_NETDEV_DEVTYPE(bond_dev, &bond_type);
@@ -4736,7 +4736,7 @@ int bond_create(struct net *net, const char *name) 


	rtnl_unlock();

	if (res < 0)

		bond_destructor(bond_dev);

		free_netdev(bond_dev);

	return res;

}