Commit 847ccab8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from bpf.

  Current release - regressions:

   - tls: fix memory leak in tls_enc_skb() and tls_sw_fallback_init()

  Previous releases - regressions:

   - bridge: fix memory leaks when changing VLAN protocol

   - dsa: make dsa_master_ioctl() see through port_hwtstamp_get() shims

   - dsa: don't leak tagger-owned storage on switch driver unbind

   - eth: mlxsw: avoid warnings when not offloaded FDB entry with IPv6
     is removed

   - eth: stmmac: ensure tx function is not running in
     stmmac_xdp_release()

   - eth: hns3: fix return value check bug of rx copybreak

  Previous releases - always broken:

   - kcm: close race conditions on sk_receive_queue

   - bpf: fix alignment problem in bpf_prog_test_run_skb()

   - bpf: fix writing offset in case of fault in
     strncpy_from_kernel_nofault

   - eth: macvlan: use built-in RCU list checking

   - eth: marvell: add sleep time after enabling the loopback bit

   - eth: octeon_ep: fix potential memory leak in octep_device_setup()

  Misc:

   - tcp: configurable source port perturb table size

   - bpf: Convert BPF_DISPATCHER to use static_call() (not ftrace)"

* tag 'net-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (51 commits)
  net: use struct_group to copy ip/ipv6 header addresses
  net: usb: smsc95xx: fix external PHY reset
  net: usb: qmi_wwan: add Telit 0x103a composition
  netdevsim: Fix memory leak of nsim_dev->fa_cookie
  tcp: configurable source port perturb table size
  l2tp: Serialize access to sk_user_data with sk_callback_lock
  net: thunderbolt: Fix error handling in tbnet_init()
  net: microchip: sparx5: Fix potential null-ptr-deref in sparx_stats_init() and sparx5_start()
  net: lan966x: Fix potential null-ptr-deref in lan966x_stats_init()
  net: dsa: don't leak tagger-owned storage on switch driver unbind
  net/x25: Fix skb leak in x25_lapb_receive_frame()
  net: ag71xx: call phylink_disconnect_phy if ag71xx_hw_enable() fail in ag71xx_open()
  bridge: switchdev: Fix memory leaks when changing VLAN protocol
  net: hns3: fix setting incorrect phy link ksettings for firmware in resetting process
  net: hns3: fix return value check bug of rx copybreak
  net: hns3: fix incorrect hw rss hash type of rx packet
  net: phy: marvell: add sleep time after enabling the loopback bit
  net: ena: Fix error handling in ena_init()
  kcm: close race conditions on sk_receive_queue
  net: ionic: Fix error handling in ionic_init_module()
  ...
parents cc675d22 58e0be1e

arch/x86/net/bpf_jit_comp.c

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

#include <linux/memory.h>

#include <linux/sort.h>

#include <linux/init.h>

#include <asm/extable.h>

#include <asm/set_memory.h>

#include <asm/nospec-branch.h>
@@ -389,18 +388,6 @@ static int __bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t, 
	return ret;

}



int __init bpf_arch_init_dispatcher_early(void *ip)

{

	const u8 *nop_insn = x86_nops[5];



	if (is_endbr(*(u32 *)ip))

		ip += ENDBR_INSN_SIZE;



	if (memcmp(ip, nop_insn, X86_PATCH_SIZE))

		text_poke_early(ip, nop_insn, X86_PATCH_SIZE);

	return 0;

}



int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,

		       void *old_addr, void *new_addr)

{

drivers/isdn/mISDN/core.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ mISDN_register_device(struct mISDNdevice *dev, 


	err = get_free_devid();

	if (err < 0)

		goto error1;

		return err;

	dev->id = err;



	device_initialize(&dev->dev);

drivers/isdn/mISDN/dsp_pipeline.c

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem) 
	if (!entry)

		return -ENOMEM;



	INIT_LIST_HEAD(&entry->list);

	entry->elem = elem;



	entry->dev.class = elements_class;
@@ -107,7 +108,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem) 
	device_unregister(&entry->dev);

	return ret;

err1:

	kfree(entry);

	put_device(&entry->dev);

	return ret;

}

EXPORT_SYMBOL(mISDN_dsp_element_register);

drivers/net/ethernet/amazon/ena/ena_netdev.c

+7 −1
Original line number Diff line number Diff line
@@ -4543,13 +4543,19 @@ static struct pci_driver ena_pci_driver = { 


static int __init ena_init(void)

{

	int ret;



	ena_wq = create_singlethread_workqueue(DRV_MODULE_NAME);

	if (!ena_wq) {

		pr_err("Failed to create workqueue\n");

		return -ENOMEM;

	}



	return pci_register_driver(&ena_pci_driver);

	ret = pci_register_driver(&ena_pci_driver);

	if (ret)

		destroy_workqueue(ena_wq);



	return ret;

}



static void __exit ena_cleanup(void)

drivers/net/ethernet/atheros/ag71xx.c

+2 −1
Original line number Diff line number Diff line
@@ -1427,7 +1427,7 @@ static int ag71xx_open(struct net_device *ndev) 
	if (ret) {

		netif_err(ag, link, ndev, "phylink_of_phy_connect filed with err: %i\n",

			  ret);

		goto err;

		return ret;

	}



	max_frame_len = ag71xx_max_frame_len(ndev->mtu);
@@ -1448,6 +1448,7 @@ static int ag71xx_open(struct net_device *ndev) 


err:

	ag71xx_rings_cleanup(ag);

	phylink_disconnect_phy(ag->phylink);

	return ret;

}