Commit e7ad651c authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge branch 'cve-fixes-2022-10-13' 

Pull in the fixes for various scan parsing bugs found by
Sönke Huster by fuzzing.
parents abf93f36 c90b93b5

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -18487,6 +18487,7 @@ F: drivers/misc/sgi-xp/ 
SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS

M:	Karsten Graul <kgraul@linux.ibm.com>

M:	Wenjia Zhang <wenjia@linux.ibm.com>

M:	Jan Karcher <jaka@linux.ibm.com>

L:	linux-s390@vger.kernel.org

S:	Supported

W:	http://www.ibm.com/developerworks/linux/linux390/

drivers/isdn/hardware/mISDN/hfcpci.c

+1 −2
Original line number Diff line number Diff line
@@ -2345,7 +2345,6 @@ HFC_init(void) 
static void __exit

HFC_cleanup(void)

{

	if (timer_pending(&hfc_tl))

	del_timer_sync(&hfc_tl);



	pci_unregister_driver(&hfc_driver);

drivers/net/ethernet/adi/adin1110.c

+8 −5
Original line number Diff line number Diff line
@@ -1169,6 +1169,11 @@ static int adin1110_port_bridge_leave(struct adin1110_port_priv *port_priv, 
	return ret;

}



static bool adin1110_port_dev_check(const struct net_device *dev)

{

	return dev->netdev_ops == &adin1110_netdev_ops;

}



static int adin1110_netdevice_event(struct notifier_block *unused,

				    unsigned long event, void *ptr)

{
@@ -1177,6 +1182,9 @@ static int adin1110_netdevice_event(struct notifier_block *unused, 
	struct netdev_notifier_changeupper_info *info = ptr;

	int ret = 0;



	if (!adin1110_port_dev_check(dev))

		return NOTIFY_DONE;



	switch (event) {

	case NETDEV_CHANGEUPPER:

		if (netif_is_bridge_master(info->upper_dev)) {
@@ -1202,11 +1210,6 @@ static void adin1110_disconnect_phy(void *data) 
	phy_disconnect(data);

}



static bool adin1110_port_dev_check(const struct net_device *dev)

{

	return dev->netdev_ops == &adin1110_netdev_ops;

}



static int adin1110_port_set_forwarding_state(struct adin1110_port_priv *port_priv)

{

	struct adin1110_priv *priv = port_priv->priv;

drivers/net/ethernet/broadcom/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -17,8 +17,3 @@ obj-$(CONFIG_BGMAC_BCMA) += bgmac-bcma.o bgmac-bcma-mdio.o 
obj-$(CONFIG_BGMAC_PLATFORM) += bgmac-platform.o

obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o

obj-$(CONFIG_BNXT) += bnxt/
 


# FIXME: temporarily silence -Warray-bounds on non W=1+ builds

ifndef KBUILD_EXTRA_WARN

CFLAGS_tg3.o += -Wno-array-bounds

endif

drivers/net/ethernet/freescale/enetc/enetc_qos.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/math64.h>

#include <linux/refcount.h>

#include <net/pkt_cls.h>

#include <net/pkt_sched.h>

#include <net/tc_act/tc_gate.h>



static u16 enetc_get_max_gcl_len(struct enetc_hw *hw)