Commit df479350 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from bpf, ipsec and netfilter.

  No solution yet for the stmmac issue mentioned in the last PR, but it
  proved to be a lockdep false positive, not a blocker.

  Current release - regressions:

   - dpll: move all dpll<>netdev helpers to dpll code, fix build
     regression with old compilers

  Current release - new code bugs:

   - page_pool: fix netlink dump stop/resume

  Previous releases - regressions:

   - bpf: fix verifier to check bpf_func_state->callback_depth when
     pruning states as otherwise unsafe programs could get accepted

   - ipv6: avoid possible UAF in ip6_route_mpath_notify()

   - ice: reconfig host after changing MSI-X on VF

   - mlx5:
       - e-switch, change flow rule destination checking
       - add a memory barrier to prevent a possible null-ptr-deref
       - switch to using _bh variant of of spinlock where needed

  Previous releases - always broken:

   - netfilter: nf_conntrack_h323: add protection for bmp length out of
     range

   - bpf: fix to zero-initialise xdp_rxq_info struct before running XDP
     program in CPU map which led to random xdp_md fields

   - xfrm: fix UDP encapsulation in TX packet offload

   - netrom: fix data-races around sysctls

   - ice:
       - fix potential NULL pointer dereference in ice_bridge_setlink()
       - fix uninitialized dplls mutex usage

   - igc: avoid returning frame twice in XDP_REDIRECT

   - i40e: disable NAPI right after disabling irqs when handling
     xsk_pool

   - geneve: make sure to pull inner header in geneve_rx()

   - sparx5: fix use after free inside sparx5_del_mact_entry

   - dsa: microchip: fix register write order in ksz8_ind_write8()

  Misc:

   - selftests: mptcp: fixes for diag.sh"

* tag 'net-6.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (63 commits)
  net: pds_core: Fix possible double free in error handling path
  netrom: Fix data-races around sysctl_net_busy_read
  netrom: Fix a data-race around sysctl_netrom_link_fails_count
  netrom: Fix a data-race around sysctl_netrom_routing_control
  netrom: Fix a data-race around sysctl_netrom_transport_no_activity_timeout
  netrom: Fix a data-race around sysctl_netrom_transport_requested_window_size
  netrom: Fix a data-race around sysctl_netrom_transport_busy_delay
  netrom: Fix a data-race around sysctl_netrom_transport_acknowledge_delay
  netrom: Fix a data-race around sysctl_netrom_transport_maximum_tries
  netrom: Fix a data-race around sysctl_netrom_transport_timeout
  netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser
  netrom: Fix a data-race around sysctl_netrom_obsolescence_count_initialiser
  netrom: Fix a data-race around sysctl_netrom_default_path_quality
  netfilter: nf_conntrack_h323: Add protection for bmp length out of range
  netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
  netfilter: nft_ct: fix l3num expectations with inet pseudo family
  netfilter: nf_tables: reject constant set with timeout
  netfilter: nf_tables: disallow anonymous set with timeout flag
  net/rds: fix WARNING in rds_conn_connect_if_down
  net: dsa: microchip: fix register write order in ksz8_ind_write8()
  ...
parents 67be068d ba18dedd

Documentation/devicetree/bindings/net/renesas,ethertsn.yaml

+2 −0
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ properties: 


  rx-internal-delay-ps:

    enum: [0, 1800]

    default: 0



  tx-internal-delay-ps:

    enum: [0, 2000]

    default: 0



  '#address-cells':

    const: 1

Documentation/driver-api/dpll.rst

+1 −1
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ In such scenario, dpll device input signal shall be also configurable 
to drive dpll with signal recovered from the PHY netdevice.

This is done by exposing a pin to the netdevice - attaching pin to the

netdevice itself with

``netdev_dpll_pin_set(struct net_device *dev, struct dpll_pin *dpll_pin)``.

``dpll_netdev_pin_set(struct net_device *dev, struct dpll_pin *dpll_pin)``.

Exposed pin id handle ``DPLL_A_PIN_ID`` is then identifiable by the user

as it is attached to rtnetlink respond to get ``RTM_NEWLINK`` command in

nested attribute ``IFLA_DPLL_PIN``.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -20207,8 +20207,8 @@ F: Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml 
F:	drivers/net/ethernet/socionext/sni_ave.c









SOCIONEXT (SNI) NETSEC NETWORK DRIVER









M:	Jassi Brar <jaswinder.singh@linaro.org>









M:	Ilias Apalodimas <ilias.apalodimas@linaro.org>









M:	Masahisa Kojima <kojima.masahisa@socionext.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml

























drivers/dpll/dpll_core.c



+20
−5






























Original line number
Diff line number
Diff line







@@ -42,11 +42,6 @@ struct dpll_pin_registration {







	void *priv;









};



















struct dpll_pin *netdev_dpll_pin(const struct net_device *dev)









{









	return rcu_dereference_rtnl(dev->dpll_pin);









}



















struct dpll_device *dpll_device_get_by_id(int id)









{









	if (xa_get_mark(&dpll_device_xa, id, DPLL_REGISTERED))








@@ -513,6 +508,26 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,







	return ERR_PTR(ret);









}



















static void dpll_netdev_pin_assign(struct net_device *dev, struct dpll_pin *dpll_pin)









{









	rtnl_lock();









	rcu_assign_pointer(dev->dpll_pin, dpll_pin);









	rtnl_unlock();









}



















void dpll_netdev_pin_set(struct net_device *dev, struct dpll_pin *dpll_pin)









{









	WARN_ON(!dpll_pin);









	dpll_netdev_pin_assign(dev, dpll_pin);









}









EXPORT_SYMBOL(dpll_netdev_pin_set);



















void dpll_netdev_pin_clear(struct net_device *dev)









{









	dpll_netdev_pin_assign(dev, NULL);









}









EXPORT_SYMBOL(dpll_netdev_pin_clear);



















/**









 * dpll_pin_get - find existing or create new dpll pin









 * @clock_id: clock_id of creator
































drivers/dpll/dpll_netlink.c



+24
−14






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@







 */









#include <linux/module.h>









#include <linux/kernel.h>









#include <linux/netdevice.h>









#include <net/genetlink.h>









#include "dpll_core.h"









#include "dpll_netlink.h"








@@ -47,18 +48,6 @@ dpll_msg_add_dev_parent_handle(struct sk_buff *msg, u32 id)







	return 0;









}



















/**









 * dpll_msg_pin_handle_size - get size of pin handle attribute for given pin









 * @pin: pin pointer









 *









 * Return: byte size of pin handle attribute for given pin.









 */









size_t dpll_msg_pin_handle_size(struct dpll_pin *pin)









{









	return pin ? nla_total_size(4) : 0; /* DPLL_A_PIN_ID */









}









EXPORT_SYMBOL_GPL(dpll_msg_pin_handle_size);



















/**









 * dpll_msg_add_pin_handle - attach pin handle attribute to a given message









 * @msg: pointer to sk_buff message to attach a pin handle








@@ -68,7 +57,7 @@ EXPORT_SYMBOL_GPL(dpll_msg_pin_handle_size);







 * * 0 - success









 * * -EMSGSIZE - no space in message to attach pin handle









 */









int dpll_msg_add_pin_handle(struct sk_buff *msg, struct dpll_pin *pin)









static int dpll_msg_add_pin_handle(struct sk_buff *msg, struct dpll_pin *pin)









{









	if (!pin)









		return 0;








@@ -76,7 +65,28 @@ int dpll_msg_add_pin_handle(struct sk_buff *msg, struct dpll_pin *pin)







		return -EMSGSIZE;









	return 0;









}









EXPORT_SYMBOL_GPL(dpll_msg_add_pin_handle);



















static struct dpll_pin *dpll_netdev_pin(const struct net_device *dev)









{









	return rcu_dereference_rtnl(dev->dpll_pin);









}



















/**









 * dpll_netdev_pin_handle_size - get size of pin handle attribute of a netdev









 * @dev: netdev from which to get the pin









 *









 * Return: byte size of pin handle attribute, or 0 if @dev has no pin.









 */









size_t dpll_netdev_pin_handle_size(const struct net_device *dev)









{









	return dpll_netdev_pin(dev) ? nla_total_size(4) : 0; /* DPLL_A_PIN_ID */









}



















int dpll_netdev_add_pin_handle(struct sk_buff *msg,









			       const struct net_device *dev)









{









	return dpll_msg_add_pin_handle(msg, dpll_netdev_pin(dev));









}



















static int









dpll_msg_add_mode(struct sk_buff *msg, struct dpll_device *dpll,