Skip to content

Commit 08d0d34

Browse files
committed
Merge tag 'net-7.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Paolo Abeni: "Including fixes from netfilter. Current release - regressions: - ipmr: free mr_table after RCU grace period. Previous releases - regressions: - core: add net_iov_init() and use it to initialize ->page_type - sched: taprio: fix NULL pointer dereference in class dump - netfilter: nf_tables: - use list_del_rcu for netlink hooks - fix strict mode inbound policy matching - tcp: make probe0 timer handle expired user timeout - vrf: fix a potential NPD when removing a port from a VRF - eth: ice: - fix NULL pointer dereference in ice_reset_all_vfs() - fix infinite recursion in ice_cfg_tx_topo via ice_init_dev_hw Previous releases - always broken: - page_pool: fix memory-provider leak in error path - sched: sch_cake: annotate data-races in cake_dump_stats() - mptcp: fix scheduling with atomic in timestamp sockopt - psp: check for device unregister when creating assoc - tls: fix strparser anchor skb leak on offload RX setup failure - eth: - stmmac: prevent NULL deref when RX memory exhausted - airoha: do not read uninitialized fragment address - rtl8150: fix use-after-free in rtl8150_start_xmit() Misc: - add Ido Schimmel as IPv4/IPv6 maintainer - add David Heidelberg as NFC subsystem maintainer" * tag 'net-7.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (79 commits) net/sched: cls_flower: revert unintended changes sfc: fix error code in efx_devlink_info_running_versions() net: tls: fix strparser anchor skb leak on offload RX setup failure ice: add dpll peer notification for paired SMA and U.FL pins ice: fix missing dpll notifications for SW pins dpll: export __dpll_pin_change_ntf() for use under dpll_lock ice: fix SMA and U.FL pin state changes affecting paired pin ice: fix missing SMA pin initialization in DPLL subsystem ice: fix infinite recursion in ice_cfg_tx_topo via ice_init_dev_hw ice: fix NULL pointer dereference in ice_reset_all_vfs() iavf: add VIRTCHNL_OP_ADD_VLAN to success completion handler iavf: wait for PF confirmation before removing VLAN filters iavf: stop removing VLAN filters from PF on interface down iavf: rename IAVF_VLAN_IS_NEW to IAVF_VLAN_ADDING page_pool: fix memory-provider leak in page_pool_create_percpu() error path bonding: 3ad: implement proper RCU rules for port->aggregator net: airoha: Do not return err in ndo_stop() callback hv_sock: fix ARM64 support MAINTAINERS: update the IPv4/IPv6 entry and add Ido Schimmel selftests: drv-net: clarify linters and frameworks in README ...
2 parents 6cd7026 + 1e01abe commit 08d0d34

74 files changed

Lines changed: 1351 additions & 603 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/netlink/specs/psp.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ operations:
188188
name: dev-set
189189
doc: Set the configuration of a PSP device.
190190
attribute-set: dev
191+
flags: [admin-perm]
191192
do:
192193
request:
193194
attributes:
@@ -207,6 +208,7 @@ operations:
207208
name: key-rotate
208209
doc: Rotate the device key.
209210
attribute-set: dev
211+
flags: [admin-perm]
210212
do:
211213
request:
212214
attributes:

MAINTAINERS

Lines changed: 52 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18672,19 +18672,59 @@ F: net/xfrm/
1867218672
F: tools/testing/selftests/net/ipsec.c
1867318673

1867418674
NETWORKING [IPv4/IPv6]
18675-
M: "David S. Miller" <davem@davemloft.net>
1867618675
M: David Ahern <dsahern@kernel.org>
18676+
M: Ido Schimmel <idosch@nvidia.com>
1867718677
L: netdev@vger.kernel.org
1867818678
S: Maintained
18679-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
18680-
F: arch/x86/net/*
18681-
F: include/linux/ip.h
18682-
F: include/linux/ipv6*
18679+
F: Documentation/netlink/specs/rt-addr.yaml
18680+
F: Documentation/netlink/specs/rt-neigh.yaml
18681+
F: Documentation/netlink/specs/rt-route.yaml
18682+
F: Documentation/netlink/specs/rt-rule.yaml
18683+
F: include/linux/inetdevice.h
18684+
F: include/linux/mroute*
18685+
F: include/net/addrconf.h
18686+
F: include/net/arp.h
1868318687
F: include/net/fib*
18688+
F: include/net/if_inet6.h
18689+
F: include/net/inetpeer.h
1868418690
F: include/net/ip*
18691+
F: include/net/lwtunnel.h
18692+
F: include/net/ndisc.h
18693+
F: include/net/netns/nexthop.h
18694+
F: include/net/nexthop.h
1868518695
F: include/net/route.h
18686-
F: net/ipv4/
18687-
F: net/ipv6/
18696+
F: include/uapi/linux/fib_rules.h
18697+
F: include/uapi/linux/in_route.h
18698+
F: include/uapi/linux/mroute*
18699+
F: include/uapi/linux/nexthop.h
18700+
F: net/core/fib*
18701+
F: net/core/lwtunnel.c
18702+
F: net/ipv4/arp.c
18703+
F: net/ipv4/devinet.c
18704+
F: net/ipv4/fib*
18705+
F: net/ipv4/icmp.c
18706+
F: net/ipv4/igmp.c
18707+
F: net/ipv4/inet_fragment.c
18708+
F: net/ipv4/inetpeer.c
18709+
F: net/ipv4/ip*
18710+
F: net/ipv4/metrics.c
18711+
F: net/ipv4/netlink.c
18712+
F: net/ipv4/nexthop.c
18713+
F: net/ipv4/route.c
18714+
F: net/ipv6/addr*
18715+
F: net/ipv6/anycast.c
18716+
F: net/ipv6/exthdrs.c
18717+
F: net/ipv6/exthdrs_core.c
18718+
F: net/ipv6/fib*
18719+
F: net/ipv6/icmp.c
18720+
F: net/ipv6/ip*
18721+
F: net/ipv6/mcast*
18722+
F: net/ipv6/ndisc.c
18723+
F: net/ipv6/output_core.c
18724+
F: net/ipv6/reassembly.c
18725+
F: net/ipv6/route.c
18726+
F: tools/testing/selftests/net/fib*
18727+
F: tools/testing/selftests/net/forwarding/
1868818728

1868918729
NETWORKING [LABELED] (NetLabel, Labeled IPsec, SECMARK)
1869018730
M: Paul Moore <paul@paul-moore.com>
@@ -18819,18 +18859,11 @@ F: Documentation/networking/net_failover.rst
1881918859
F: drivers/net/net_failover.c
1882018860
F: include/net/net_failover.h
1882118861

18822-
NEXTHOP
18823-
M: David Ahern <dsahern@kernel.org>
18824-
L: netdev@vger.kernel.org
18825-
S: Maintained
18826-
F: include/net/netns/nexthop.h
18827-
F: include/net/nexthop.h
18828-
F: include/uapi/linux/nexthop.h
18829-
F: net/ipv4/nexthop.c
18830-
1883118862
NFC SUBSYSTEM
18832-
L: netdev@vger.kernel.org
18833-
S: Orphan
18863+
M: David Heidelberg <david+nfc@ixit.cz>
18864+
L: oe-linux-nfc@lists.linux.dev
18865+
S: Maintained
18866+
T: git https://codeberg.org/linux-nfc/linux.git
1883418867
F: Documentation/devicetree/bindings/net/nfc/
1883518868
F: drivers/nfc/
1883618869
F: include/net/nfc/
@@ -20774,6 +20807,7 @@ M: Dominik Brodowski <linux@dominikbrodowski.net>
2077420807
S: Odd Fixes
2077520808
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git
2077620809
F: Documentation/pcmcia/
20810+
F: drivers/net/ethernet/8390/pcnet_cs.c
2077720811
F: drivers/pcmcia/
2077820812
F: include/pcmcia/
2077920813
F: tools/pcmcia/

drivers/dpll/dpll_netlink.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -900,11 +900,21 @@ int dpll_pin_delete_ntf(struct dpll_pin *pin)
900900
return dpll_pin_event_send(DPLL_CMD_PIN_DELETE_NTF, pin);
901901
}
902902

903+
/**
904+
* __dpll_pin_change_ntf - notify that the pin has been changed
905+
* @pin: registered pin pointer
906+
*
907+
* Context: caller must hold dpll_lock. Suitable for use inside pin
908+
* callbacks which are already invoked under dpll_lock.
909+
* Return: 0 if succeeds, error code otherwise.
910+
*/
903911
int __dpll_pin_change_ntf(struct dpll_pin *pin)
904912
{
913+
lockdep_assert_held(&dpll_lock);
905914
dpll_pin_notify(pin, DPLL_PIN_CHANGED);
906915
return dpll_pin_event_send(DPLL_CMD_PIN_CHANGE_NTF, pin);
907916
}
917+
EXPORT_SYMBOL_GPL(__dpll_pin_change_ntf);
908918

909919
/**
910920
* dpll_pin_change_ntf - notify that the pin has been changed

drivers/dpll/dpll_netlink.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ int dpll_device_delete_ntf(struct dpll_device *dpll);
1111
int dpll_pin_create_ntf(struct dpll_pin *pin);
1212

1313
int dpll_pin_delete_ntf(struct dpll_pin *pin);
14-
15-
int __dpll_pin_change_ntf(struct dpll_pin *pin);

drivers/net/bareudp.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,9 @@ static int bareudp_fill_metadata_dst(struct net_device *dev,
529529
struct in6_addr saddr;
530530
struct socket *sock = rcu_dereference(bareudp->sock);
531531

532+
if (!sock)
533+
return -ESHUTDOWN;
534+
532535
dst = udp_tunnel6_dst_lookup(skb, dev, bareudp->net, sock,
533536
0, &saddr, &info->key,
534537
sport, bareudp->port, info->key.tos,

0 commit comments

Comments
 (0)