Commit 736b5545 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf and netfilter.

  Previous releases - regressions:

   - Revert "net: rtnetlink: Enslave device before bringing it up",
     breaks the case inverse to the one it was trying to fix

   - net: dsa: fix oob access in DSA's netdevice event handler
     dereference netdev_priv() before check its a DSA port

   - sched: track device in tcf_block_get/put_ext() only for clsact
     binder types

   - net: tls, fix WARNING in __sk_msg_free when record becomes full
     during splice and MORE hint set

   - sfp-bus: fix SFP mode detect from bitrate

   - drv: stmmac: prevent DSA tags from breaking COE

  Previous releases - always broken:

   - bpf: fix no forward progress in in bpf_iter_udp if output buffer is
     too small

   - bpf: reject variable offset alu on registers with a type of
     PTR_TO_FLOW_KEYS to prevent oob access

   - netfilter: tighten input validation

   - net: add more sanity check in virtio_net_hdr_to_skb()

   - rxrpc: fix use of Don't Fragment flag on RESPONSE packets, avoid
     infinite loop

   - amt: do not use the portion of skb->cb area which may get clobbered

   - mptcp: improve validation of the MPTCPOPT_MP_JOIN MCTCP option

  Misc:

   - spring cleanup of inactive maintainers"

* tag 'net-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (88 commits)
  i40e: Include types.h to some headers
  ipv6: mcast: fix data-race in ipv6_mc_down / mld_ifc_work
  selftests: mlxsw: qos_pfc: Adjust the test to support 8 lanes
  selftests: mlxsw: qos_pfc: Remove wrong description
  mlxsw: spectrum_router: Register netdevice notifier before nexthop
  mlxsw: spectrum_acl_tcam: Fix stack corruption
  mlxsw: spectrum_acl_tcam: Fix NULL pointer dereference in error path
  mlxsw: spectrum_acl_erp: Fix error flow of pool allocation failure
  ethtool: netlink: Add missing ethnl_ops_begin/complete
  selftests: bonding: Add more missing config options
  selftests: netdevsim: add a config file
  libbpf: warn on unexpected __arg_ctx type when rewriting BTF
  selftests/bpf: add tests confirming type logic in kernel for __arg_ctx
  bpf: enforce types for __arg_ctx-tagged arguments in global subprogs
  bpf: extract bpf_ctx_convert_map logic and make it more reusable
  libbpf: feature-detect arg:ctx tag support in kernel
  ipvs: avoid stat macros calls from preemptible context
  netfilter: nf_tables: reject NFT_SET_CONCAT with not field length description
  netfilter: nf_tables: skip dead set elements in netlink dump
  netfilter: nf_tables: do not allow mismatch field size and set key length
  ...
parents ed8d8453 925781a4

CREDITS

+17 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ E: ralf@gnu.org 
P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE  C8 BA 9C FC 88 DE 32 C3

D: Linux/MIPS port

D: Linux/68k hacker

D: AX25 maintainer

S: Hauptstrasse 19

S: 79837 St. Blasien

S: Germany
@@ -677,6 +678,10 @@ D: Media subsystem (V4L/DVB) drivers and core 
D: EDAC drivers and EDAC 3.0 core rework

S: Brazil



N: Landen Chao

E: Landen.Chao@mediatek.com

D: MT7531 Ethernet switch support



N: Raymond Chen

E: raymondc@microsoft.com

D: Author of Configure script
@@ -814,6 +819,10 @@ D: Support for Xircom PGSDB9 (firmware and host driver) 
S: Bucharest

S: Romania



N: John Crispin

E: john@phrozen.org

D: MediaTek MT7623 Gigabit ethernet support



N: Laurence Culhane

E: loz@holmes.demon.co.uk

D: Wrote the initial alpha SLIP code
@@ -1538,6 +1547,10 @@ N: Andrew Haylett 
E: ajh@primag.co.uk

D: Selection mechanism



N: Johan Hedberg

E: johan.hedberg@gmail.com

D: Bluetooth subsystem maintainer



N: Andre Hedrick

E: andre@linux-ide.org

E: andre@linuxdiskcert.org
@@ -3052,6 +3065,10 @@ S: Demonstratsii 8-382 
S: Tula 300000

S: Russia



N: Thomas Petazzoni

E: thomas.petazzoni@bootlin.com

D: Driver for the Marvell Armada 370/XP network unit.



N: Gordon Peters

E: GordPeters@smarttech.com

D: Isochronous receive for IEEE 1394 driver (OHCI module).

MAINTAINERS

+4 −12
Original line number Diff line number Diff line
@@ -3390,9 +3390,8 @@ F: Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml 
F:	drivers/iio/adc/hx711.c









AX.25 NETWORK LAYER









M:	Ralf Baechle <ralf@linux-mips.org>









L:	linux-hams@vger.kernel.org









S:	Maintained









S:	Orphan









W:	https://linux-ax25.in-berlin.de









F:	include/net/ax25.h









F:	include/uapi/linux/ax25.h








@@ -3631,7 +3630,6 @@ F:	drivers/mtd/devices/block2mtd.c















BLUETOOTH DRIVERS









M:	Marcel Holtmann <marcel@holtmann.org>









M:	Johan Hedberg <johan.hedberg@gmail.com>









M:	Luiz Augusto von Dentz <luiz.dentz@gmail.com>









L:	linux-bluetooth@vger.kernel.org









S:	Supported








@@ -4726,11 +4724,8 @@ F:	drivers/i2c/busses/i2c-octeon*







F:	drivers/i2c/busses/i2c-thunderx*

















CAVIUM LIQUIDIO NETWORK DRIVER









M:	Derek Chickles <dchickles@marvell.com>









M:	Satanand Burla <sburla@marvell.com>









M:	Felix Manlunas <fmanlunas@marvell.com>









L:	netdev@vger.kernel.org









S:	Supported









S:	Orphan









W:	http://www.marvell.com









F:	drivers/net/ethernet/cavium/liquidio/
















@@ -10239,7 +10234,6 @@ IBM Power SRIOV Virtual NIC Device Driver







M:	Haren Myneni <haren@linux.ibm.com>









M:	Rick Lindsley <ricklind@linux.ibm.com>









R:	Nick Child <nnac123@linux.ibm.com>









R:	Dany Madden <danymadden@us.ibm.com>









R:	Thomas Falcon <tlfalcon@linux.ibm.com>









L:	netdev@vger.kernel.org









S:	Supported








@@ -13003,10 +12997,10 @@ S:	Maintained







F:	drivers/thermal/armada_thermal.c

















MARVELL MVNETA ETHERNET DRIVER









M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>









M:	Marcin Wojtas <marcin.s.wojtas@gmail.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/marvell/mvneta.*









F:	drivers/net/ethernet/marvell/mvneta*

















MARVELL MVPP2 ETHERNET DRIVER









M:	Marcin Wojtas <marcin.s.wojtas@gmail.com>








@@ -13656,7 +13650,6 @@ F:	drivers/dma/mediatek/















MEDIATEK ETHERNET DRIVER









M:	Felix Fietkau <nbd@nbd.name>









M:	John Crispin <john@phrozen.org>









M:	Sean Wang <sean.wang@mediatek.com>









M:	Mark Lee <Mark-MC.Lee@mediatek.com>









M:	Lorenzo Bianconi <lorenzo@kernel.org>








@@ -13812,7 +13805,6 @@ F:	include/soc/mediatek/smi.h







MEDIATEK SWITCH DRIVER









M:	Arınç ÜNAL <arinc.unal@arinc9.com>









M:	Daniel Golle <daniel@makrotopia.org>









M:	Landen Chao <Landen.Chao@mediatek.com>









M:	DENG Qingfang <dqfext@gmail.com>









M:	Sean Wang <sean.wang@mediatek.com>









L:	netdev@vger.kernel.org
































drivers/net/amt.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -11,7 +11,7 @@







#include <linux/net.h>









#include <linux/igmp.h>









#include <linux/workqueue.h>









#include <net/sch_generic.h>









#include <net/pkt_sched.h>









#include <net/net_namespace.h>









#include <net/ip.h>









#include <net/udp.h>








@@ -80,11 +80,11 @@ static struct mld2_grec mldv2_zero_grec;

















static struct amt_skb_cb *amt_skb_cb(struct sk_buff *skb)









{









	BUILD_BUG_ON(sizeof(struct amt_skb_cb) + sizeof(struct qdisc_skb_cb) >









	BUILD_BUG_ON(sizeof(struct amt_skb_cb) + sizeof(struct tc_skb_cb) >









		     sizeof_field(struct sk_buff, cb));



















	return (struct amt_skb_cb *)((void *)skb->cb +









		sizeof(struct qdisc_skb_cb));









		sizeof(struct tc_skb_cb));









}



















static void __amt_source_gc_work(void)
































drivers/net/dsa/vitesse-vsc73xx-core.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -1135,6 +1135,8 @@ static int vsc73xx_gpio_probe(struct vsc73xx *vsc)

















	vsc->gc.label = devm_kasprintf(vsc->dev, GFP_KERNEL, "VSC%04x",









				       vsc->chipid);









	if (!vsc->gc.label)









		return -ENOMEM;









	vsc->gc.ngpio = 4;









	vsc->gc.owner = THIS_MODULE;









	vsc->gc.parent = vsc->dev;
































drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1490,7 +1490,7 @@ int cn23xx_get_vf_stats(struct octeon_device *oct, int vfidx,







	mbox_cmd.q_no = vfidx * oct->sriov_info.rings_per_vf;









	mbox_cmd.recv_len = 0;









	mbox_cmd.recv_status = 0;









	mbox_cmd.fn = (octeon_mbox_callback_t)cn23xx_get_vf_stats_callback;









	mbox_cmd.fn = cn23xx_get_vf_stats_callback;









	ctx.stats = stats;









	atomic_set(&ctx.status, 0);









	mbox_cmd.fn_arg = (void *)&ctx;