6.12.97-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 676/1276 net: ethernet: sunplus: spl2sw: fix phy_node refcount leak in remove
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shitalkumar Gandhi <[email protected]>
[ Upstream commit a9e29dcd8a84081177f693439d663ca9e216c9fa ]
mac->phy_node is acquired via of_parse_phandle() in spl2sw_probe() and stored in the mac private data, transferring ownership of the device_node reference to mac. On driver removal, spl2sw_phy_remove() disconnects the PHY but never drops that reference, so each probe-then-remove cycle leaks one of_node refcount per port permanently.
Drop the reference after phy_disconnect(). While at it, remove the redundant inner "if (ndev)" check; comm->ndev[i] was just verified non-NULL on the line above.
Compile-tested only; no SP7021 hardware available.
--- drivers/net/ethernet/sunplus/spl2sw_phy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/sunplus/spl2sw_phy.c +4 -2
@@ -79,12 +79,14 @@ int spl2sw_phy_connect(struct spl2sw_common *comm)void spl2sw_phy_remove (struct spl2sw_common *comm) {struct net_device *ndev; +struct spl2sw_mac *mac;int i;for (i =0 ; i <MAX_NETDEV_NUM ; i++)if (comm->ndev[i]) { ndev = comm->ndev[i]; -if (ndev) -phy_disconnect (ndev->phydev); + mac =netdev_priv (ndev); +phy_disconnect (ndev->phydev); +of_node_put (mac->phy_node); } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 677/1276 ASoC: fsl_asrc_dma: fix eDMA maxburst misalignment with channel count
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shengjiu Wang <[email protected]>
[ Upstream commit cf6f56990ea21172e085f0588e5bbf2089ce8f58 ]
The back-end consumes data in units of the number of channels. When the maxburst value is not evenly divisible by the channel count, the DMA transfer length does not align with the FIFO frame boundary, causing wrong data to be copied and audible noise at the end of the stream.
This is specific to eDMA: eDMA only responds to DMA requests from the back-end, whereas SDMA handles requests from both the front-end and the back-end and is not affected.
For eDMA, when the back-end maxburst is not evenly divisible by the channel count, align it to the nearest valid boundary:
- If maxburst >= channel count, override to the channel count so each transfer corresponds to exactly one audio frame.
- If maxburst < channel count, override to 1 to avoid partial-frame transfers.
Retain the original maxburst for SDMA or when it already aligns with the channel count.
--- sound/soc/fsl/fsl_asrc_dma.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
sound/soc/fsl/fsl_asrc_dma.c +20 -0
@@ -288,6 +288,26 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, config_be.dst_addr_width = buswidth; config_be.dst_maxburst = dma_params_be->maxburst; +/* +* For eDMA, the back-end may report a maxburst size that is not evenly +* divisible by the channel count. This causes the DMA transfer length +* to misalign with the FIFO boundary, resulting in wrong data and +* audible noise. Align maxburst to the nearest valid boundary: +* - If maxburst >= channel count, override to the channel count so +* each transfer equals exactly one audio frame. +* - If maxburst < channel count, override to 1 to avoid partial-frame +* transfers. +*/ +if (asrc->use_edma && (dma_params_be->maxburst %params_channels (params))) { +if (dma_params_be->maxburst >=params_channels (params)) { + config_be.src_maxburst =params_channels (params); + config_be.dst_maxburst =params_channels (params); + }else { + config_be.src_maxburst =1 ; + config_be.dst_maxburst =1 ; + } + } +memset (&audio_config,0 ,sizeof (audio_config)); config_be.peripheral_config = &audio_config; config_be.peripheral_size =sizeof (audio_config);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 678/1276 udp_tunnel: remove rtnl_lock dependency
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislav Fomichev <[email protected]>
[ Upstream commit 1ead7501094c6a61461c0c98dde9ec5660fa1e24 ]
Drivers that are using ops lock and don't depend on RTNL lock still need to manage it because udp_tunnel's RTNL dependency. Introduce new udp_tunnel_nic_lock and use it instead of rtnl_lock. Drop non-UDP_TUNNEL_NIC_INFO_MAY_SLEEP mode from udp_tunnel infra (udp_tunnel_nic_device_sync_work needs to grab udp_tunnel_nic_lock mutex and might sleep).
Cover more places in v4:
- netlink
- udp_tunnel_notify_add_rx_port (ndo_open)
- triggers udp_tunnel_nic_device_sync_work
- udp_tunnel_notify_del_rx_port (ndo_stop)
- triggers udp_tunnel_nic_device_sync_work
- udp_tunnel_get_rx_info (__netdev_update_features)
- triggers NETDEV_UDP_TUNNEL_PUSH_INFO
- udp_tunnel_drop_rx_info (__netdev_update_features)
- triggers NETDEV_UDP_TUNNEL_DROP_INFO
- udp_tunnel_nic_reset_ntf (ndo_open)
- notifiers
- udp_tunnel_nic_netdevice_event, depending on the event:
- triggers NETDEV_UDP_TUNNEL_PUSH_INFO
- triggers NETDEV_UDP_TUNNEL_DROP_INFO
- ethnl_tunnel_info_reply_size
- udp_tunnel_nic_set_port_priv (two intel drivers)
Stable-dep-of: ecf69d4b4337 ("net: udp_tunnel: prevent double queueing in udp_tunnel_nic_device_sync")
--- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 +- drivers/net/ethernet/emulex/benet/be_main.c | 3 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 - drivers/net/ethernet/intel/ice/ice_main.c | 1 - .../net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- .../ethernet/netronome/nfp/nfp_net_common.c | 3 +- .../net/ethernet/qlogic/qede/qede_filter.c | 3 - .../net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 - drivers/net/ethernet/sfc/ef10.c | 1 - drivers/net/netdevsim/udp_tunnels.c | 4 - include/net/udp_tunnel.h | 87 ++++++++++++++----- net/core/dev.c | 2 + net/ipv4/udp_tunnel_core.c | 16 ++-- net/ipv4/udp_tunnel_nic.c | 78 +++++++++++++---- 16 files changed, 142 insertions(+), 73 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -2
@@ -10219,8 +10219,7 @@ static int bnx2x_udp_tunnel_sync(struct net_device *netdev, unsigned int table)static const struct udp_tunnel_nic_info bnx2x_udp_tunnels = { .sync_table = bnx2x_udp_tunnel_sync, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP | -UDP_TUNNEL_NIC_INFO_OPEN_ONLY , + .flags =UDP_TUNNEL_NIC_INFO_OPEN_ONLY , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_VXLAN , }, { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_GENEVE , },
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -4
@@ -15143,8 +15143,7 @@ static int bnxt_udp_tunnel_unset_port(struct net_device *netdev, unsigned int tastatic const struct udp_tunnel_nic_info bnxt_udp_tunnels = { .set_port = bnxt_udp_tunnel_set_port, .unset_port = bnxt_udp_tunnel_unset_port, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP | -UDP_TUNNEL_NIC_INFO_OPEN_ONLY , + .flags =UDP_TUNNEL_NIC_INFO_OPEN_ONLY , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_VXLAN , }, { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_GENEVE , },
@@ -15152,8 +15151,7 @@ static const struct udp_tunnel_nic_info bnxt_udp_tunnels = { }, bnxt_udp_tunnels_p7 = { .set_port = bnxt_udp_tunnel_set_port, .unset_port = bnxt_udp_tunnel_unset_port, - .flags = UDP_TUNNEL_NIC_INFO_MAY_SLEEP | - UDP_TUNNEL_NIC_INFO_OPEN_ONLY, + .flags = UDP_TUNNEL_NIC_INFO_OPEN_ONLY, .tables = { { .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, }, { .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_GENEVE, },
drivers/net/ethernet/emulex/benet/be_main.c +1 -2
@@ -4034,8 +4034,7 @@ static int be_vxlan_unset_port(struct net_device *netdev, unsigned int table,static const struct udp_tunnel_nic_info be_udp_tunnels = { .set_port = be_vxlan_set_port, .unset_port = be_vxlan_unset_port, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP | -UDP_TUNNEL_NIC_INFO_OPEN_ONLY , + .flags =UDP_TUNNEL_NIC_INFO_OPEN_ONLY , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_VXLAN , }, },
drivers/net/ethernet/intel/i40e/i40e_main.c +0 -1
@@ -15963,7 +15963,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pf->udp_tunnel_nic.set_port = i40e_udp_tunnel_set_port; pf->udp_tunnel_nic.unset_port = i40e_udp_tunnel_unset_port; - pf->udp_tunnel_nic.flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP ; pf->udp_tunnel_nic.shared = &pf->udp_tunnel_shared; pf->udp_tunnel_nic.tables[0 ].n_entries =I40E_MAX_PF_UDP_OFFLOAD_PORTS ; pf->udp_tunnel_nic.tables[0].tunnel_types = UDP_TUNNEL_TYPE_VXLAN |
drivers/net/ethernet/intel/ice/ice_main.c +0 -1
@@ -4817,7 +4817,6 @@ int ice_init_dev(struct ice_pf *pf) pf->hw.udp_tunnel_nic.set_port = ice_udp_tunnel_set_port; pf->hw.udp_tunnel_nic.unset_port = ice_udp_tunnel_unset_port; - pf->hw.udp_tunnel_nic.flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP ; pf->hw.udp_tunnel_nic.shared = &pf->hw.udp_tunnel_shared;if (pf->hw.tnl.valid_count[TNL_VXLAN ]) { pf->hw.udp_tunnel_nic.tables[0].n_entries =
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -2
@@ -2670,8 +2670,7 @@ static int mlx4_udp_tunnel_sync(struct net_device *dev, unsigned int table)static const struct udp_tunnel_nic_info mlx4_udp_tunnels = { .sync_table = mlx4_udp_tunnel_sync, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP | -UDP_TUNNEL_NIC_INFO_IPV4_ONLY , + .flags =UDP_TUNNEL_NIC_INFO_IPV4_ONLY , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_VXLAN , }, },
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -2
@@ -5258,8 +5258,7 @@ void mlx5e_vxlan_set_netdev_info(struct mlx5e_priv *priv) priv->nic_info.set_port = mlx5e_vxlan_set_port; priv->nic_info.unset_port = mlx5e_vxlan_unset_port; - priv->nic_info.flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP | -UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN ; + priv->nic_info.flags =UDP_TUNNEL_NIC_INFO_STATIC_IANA_VXLAN ; priv->nic_info.tables[0 ].tunnel_types =UDP_TUNNEL_TYPE_VXLAN ;/* Don't count the space hard-coded to the IANA port */ priv->nic_info.tables[0].n_entries =
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +1 -2
@@ -2394,8 +2394,7 @@ static int nfp_udp_tunnel_sync(struct net_device *netdev, unsigned int table)static const struct udp_tunnel_nic_info nfp_udp_tunnels = { .sync_table = nfp_udp_tunnel_sync, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP | -UDP_TUNNEL_NIC_INFO_OPEN_ONLY , + .flags =UDP_TUNNEL_NIC_INFO_OPEN_ONLY , .tables = { { .n_entries =NFP_NET_N_VXLAN_PORTS ,
drivers/net/ethernet/qlogic/qede/qede_filter.c +0 -3
@@ -987,20 +987,17 @@ static int qede_udp_tunnel_sync(struct net_device *dev, unsigned int table)static const struct udp_tunnel_nic_info qede_udp_tunnels_both = { .sync_table = qede_udp_tunnel_sync, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_VXLAN , }, { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_GENEVE , }, }, }, qede_udp_tunnels_vxlan = { .sync_table = qede_udp_tunnel_sync, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_VXLAN , }, }, }, qede_udp_tunnels_geneve = { .sync_table = qede_udp_tunnel_sync, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_GENEVE , }, },
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +0 -1
@@ -486,7 +486,6 @@ static int qlcnic_udp_tunnel_sync(struct net_device *dev, unsigned int table)static const struct udp_tunnel_nic_info qlcnic_udp_tunnels = { .sync_table = qlcnic_udp_tunnel_sync, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP , .tables = { { .n_entries =1 , .tunnel_types =UDP_TUNNEL_TYPE_VXLAN , }, },
drivers/net/ethernet/sfc/ef10.c +0 -1
@@ -3982,7 +3982,6 @@ static int efx_ef10_udp_tnl_unset_port(struct net_device *dev,static const struct udp_tunnel_nic_info efx_ef10_udp_tunnels = { .set_port = efx_ef10_udp_tnl_set_port, .unset_port = efx_ef10_udp_tnl_unset_port, - .flags =UDP_TUNNEL_NIC_INFO_MAY_SLEEP , .tables = { { .n_entries =16 ,
drivers/net/netdevsim/udp_tunnels.c +0 -4
@@ -112,12 +112,10 @@ nsim_udp_tunnels_info_reset_write(struct file *file, const char __user *data,struct net_device *dev = file->private_data;struct netdevsim *ns =netdev_priv (dev); -rtnl_lock ();if (dev->reg_state ==NETREG_REGISTERED ) {memset (ns->udp_ports.ports,0 ,sizeof (ns->udp_ports.__ports));udp_tunnel_nic_reset_ntf (dev); } -rtnl_unlock ();return count; }
@@ -181,8 +179,6 @@ int nsim_udp_tunnels_info_create(struct nsim_dev *nsim_dev, info->sync_table =NULL ; } -if (ns->udp_ports.sleep) - info->flags |=UDP_TUNNEL_NIC_INFO_MAY_SLEEP ;if (nsim_dev->udp_ports.open_only) info->flags |=UDP_TUNNEL_NIC_INFO_OPEN_ONLY ;if (nsim_dev->udp_ports.ipv4_only)
include/net/udp_tunnel.h +63 -24
135 lines not on this page · raw message
net/core/dev.c +2 -0
@@ -10241,12 +10241,14 @@ int __netdev_update_features(struct net_device *dev)* *before* calling udp_tunnel_get_rx_info, * but *after* calling udp_tunnel_drop_rx_info. */ +udp_tunnel_nic_lock (dev);if (features &NETIF_F_RX_UDP_TUNNEL_PORT ) { dev->features = features;udp_tunnel_get_rx_info (dev); }else {udp_tunnel_drop_rx_info (dev); } +udp_tunnel_nic_unlock (dev); }if (diff &NETIF_F_HW_VLAN_CTAG_FILTER ) {
net/ipv4/udp_tunnel_core.c +10 -6
@@ -119,15 +119,17 @@ void udp_tunnel_notify_add_rx_port(struct socket *sock, unsigned short type)struct udp_tunnel_info ti;struct net_device *dev; +ASSERT_RTNL (); + ti.type = type; ti.sa_family = sk->sk_family; ti.port =inet_sk (sk)->inet_sport; -rcu_read_lock (); -for_each_netdev_rcu (net, dev) { +for_each_netdev (net, dev) { +udp_tunnel_nic_lock (dev);udp_tunnel_nic_add_port (dev, &ti); +udp_tunnel_nic_unlock (dev); } -rcu_read_unlock (); }EXPORT_SYMBOL_GPL (udp_tunnel_notify_add_rx_port);
@@ -139,15 +141,17 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, unsigned short type)struct udp_tunnel_info ti;struct net_device *dev; +ASSERT_RTNL (); + ti.type = type; ti.sa_family = sk->sk_family; ti.port =inet_sk (sk)->inet_sport; -rcu_read_lock (); -for_each_netdev_rcu (net, dev) { +for_each_netdev (net, dev) { +udp_tunnel_nic_lock (dev);udp_tunnel_nic_del_port (dev, &ti); +udp_tunnel_nic_unlock (dev); } -rcu_read_unlock (); }EXPORT_SYMBOL_GPL (udp_tunnel_notify_del_rx_port);
net/ipv4/udp_tunnel_nic.c +60 -18
194 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 679/1276 net: udp_tunnel: prevent double queueing in udp_tunnel_nic_device_sync
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit ecf69d4b43370c587e48d4d70289dbdb7e039d4d ]
Yue Sun reported a use-after-free and debugobjects warning in udp_tunnel_nic_device_sync_work() during concurrent device operations.
The workqueue core clears the internal pending bit before invoking the worker. At that point, a concurrent thread can queue the work again. When the already running worker eventually clears the work_pending flag to 0, it mistakenly clears the flag for the newly queued instance. udp_tunnel_nic_unregister() then observes work_pending as 0 and frees the structure while the second work item is still active in the queue, leading to UAF.
Fix this by returning early in udp_tunnel_nic_device_sync() if work_pending is already set, preventing redundant work queueing.
--- net/ipv4/udp_tunnel_nic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/udp_tunnel_nic.c +1 -1
@@ -301,7 +301,7 @@ __udp_tunnel_nic_device_sync(struct net_device *dev, struct udp_tunnel_nic *utn)static void udp_tunnel_nic_device_sync (struct net_device *dev,struct udp_tunnel_nic *utn) { -if (!utn->need_sync) +if (!utn->need_sync || utn->work_pending)return ;queue_work (udp_tunnel_nic_workqueue, &utn->work);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 680/1276 dt-bindings: net: renesas,ether: Drop example "ethernet-phy-ieee802.3-c22" fallback
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring (Arm) <[email protected]>
[ Upstream commit 14eb1d2c03b38ce3427f299967f7a4d97ebff4c2 ]
Fix the Micrel PHY in the example which shouldn't have the fallback "ethernet-phy-ieee802.3-c22" compatible:
Documentation/devicetree/bindings/net/renesas,ether.example.dtb: ethernet-phy@1 \
(ethernet-phy-id0022.1537): compatible: ['ethernet-phy-id0022.1537', 'ethernet-phy-ieee802.3-c22'] is too long
from schema $id: http://devicetree.org/schemas/net/micrel.yaml
--- Documentation/devicetree/bindings/net/renesas,ether.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Documentation/devicetree/bindings/net/renesas,ether.yaml +1 -2
@@ -118,8 +118,7 @@ examples: #size-cells = <0>; phy1: ethernet-phy@1 { - compatible = "ethernet-phy-id0022.1537", - "ethernet-phy-ieee802.3-c22"; + compatible = "ethernet-phy-id0022.1537"; reg = <1>; interrupt-parent = <&irqc0>; interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 681/1276 net: hisilicon: hns3: use ethtool string helpers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rosen Penev <[email protected]>
[ Upstream commit 4ea3e221907aeee77c2f92953045121ddc9f5660 ]
The latter is the preferred way to copy ethtool strings.
Avoids manually incrementing the pointer. Cleans up the code quite well.
Stable-dep-of: c711f6d1cee9 ("net: hns3: fix permanent link down deadlock after reset")
--- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 +- .../hns3/hns3_common/hclge_comm_tqp_stats.c | 11 ++-- .../hns3/hns3_common/hclge_comm_tqp_stats.h | 2 +- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 54 ++++++------------- .../hisilicon/hns3/hns3pf/hclge_main.c | 50 +++++++---------- .../hisilicon/hns3/hns3vf/hclgevf_main.c | 6 +-- 6 files changed, 44 insertions(+), 81 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hnae3.h +1 -1
@@ -677,7 +677,7 @@ struct hnae3_ae_ops {void (*get_mac_stats)(struct hnae3_handle *handle,struct hns3_mac_stats *mac_stats);void (*get_strings)(struct hnae3_handle *handle, -u32 stringset,u8 *data); +u32 stringset,u8 **data);int (*get_sset_count)(struct hnae3_handle *handle,int stringset); void (*get_regs)(struct hnae3_handle *handle, u32 *version,
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c +3 -8
@@ -36,27 +36,22 @@ int hclge_comm_tqps_get_sset_count(struct hnae3_handle *handle) }EXPORT_SYMBOL_GPL (hclge_comm_tqps_get_sset_count); -u8 *hclge_comm_tqps_get_strings (struct hnae3_handle *handle,u8 *data) +void hclge_comm_tqps_get_strings (struct hnae3_handle *handle,u8 **data) {struct hnae3_knic_private_info *kinfo = &handle->kinfo; -u8 *buff = data;u16 i;for (i =0 ; i < kinfo->num_tqps; i++) {struct hclge_comm_tqp *tqp = container_of(kinfo->tqp[i], struct hclge_comm_tqp, q); -snprintf (buff,ETH_GSTRING_LEN ,"txq%u_pktnum_rcd" , tqp->index); - buff +=ETH_GSTRING_LEN ; +ethtool_sprintf (data,"txq%u_pktnum_rcd" , tqp->index); }for (i =0 ; i < kinfo->num_tqps; i++) {struct hclge_comm_tqp *tqp = container_of(kinfo->tqp[i], struct hclge_comm_tqp, q); -snprintf (buff,ETH_GSTRING_LEN ,"rxq%u_pktnum_rcd" , tqp->index); - buff +=ETH_GSTRING_LEN ; +ethtool_sprintf (data,"rxq%u_pktnum_rcd" , tqp->index); } - -return buff; }EXPORT_SYMBOL_GPL (hclge_comm_tqps_get_strings);
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h +1 -1
@@ -32,7 +32,7 @@ struct hclge_comm_tqp {u64 *hclge_comm_tqps_get_stats (struct hnae3_handle *handle,u64 *data);int hclge_comm_tqps_get_sset_count (struct hnae3_handle *handle); -u8 *hclge_comm_tqps_get_strings (struct hnae3_handle *handle,u8 *data); +void hclge_comm_tqps_get_strings (struct hnae3_handle *handle,u8 **data);void hclge_comm_reset_tqp_stats (struct hnae3_handle *handle);int hclge_comm_tqps_update_stats (struct hnae3_handle *handle,struct hclge_comm_hw *hw);
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +17 -37
89 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +20 -30
89 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +2 -4
@@ -130,12 +130,10 @@ static int hclgevf_get_sset_count(struct hnae3_handle *handle, int strset) }static void hclgevf_get_strings (struct hnae3_handle *handle,u32 strset, -u8 *data) +u8 **data) { -u8 *p = (char *)data; -if (strset ==ETH_SS_STATS ) - p =hclge_comm_tqps_get_strings (handle, p); +hclge_comm_tqps_get_strings (handle, data); }static void hclgevf_get_stats (struct hnae3_handle *handle,u64 *data)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 682/1276 net: hns3: use string choices helper
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jian Shen <[email protected]>
[ Upstream commit 9e3285040514cafee035e1be24502097d3d0b75f ]
Use string choices helper for better readability.
Stable-dep-of: c711f6d1cee9 ("net: hns3: fix permanent link down deadlock after reset")
--- .../ethernet/hisilicon/hns3/hns3_debugfs.c | 24 ++++--- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 3 +- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 63 +++++++++---------- .../hisilicon/hns3/hns3pf/hclge_main.c | 10 +-- .../hisilicon/hns3/hns3pf/hclge_ptp.c | 3 +- 5 files changed, 54 insertions(+), 49 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +14 -10
@@ -3,6 +3,7 @@#include <linux/debugfs.h> #include <linux/device.h> +#include <linux/string_choices.h> #include "hnae3.h" #include "hns3_debugfs.h"
@@ -661,12 +662,14 @@ static void hns3_dump_rx_queue_info(struct hns3_enet_ring *ring, HNS3_RING_RX_RING_PKTNUM_RECORD_REG));sprintf (result[j++],"%u" , ring->rx_copybreak); -sprintf (result[j++],"%s" ,readl_relaxed (ring->tqp->io_base + -HNS3_RING_EN_REG ) ?"on" :"off" ); +sprintf (result[j++],"%s" , +str_on_off (readl_relaxed (ring->tqp->io_base + +HNS3_RING_EN_REG )));if (hnae3_ae_dev_tqp_txrx_indep_supported (ae_dev)) -sprintf (result[j++],"%s" ,readl_relaxed (ring->tqp->io_base + -HNS3_RING_RX_EN_REG ) ?"on" :"off" ); +sprintf (result[j++],"%s" , +str_on_off (readl_relaxed (ring->tqp->io_base + +HNS3_RING_RX_EN_REG )));else sprintf (result[j++],"%s" ,"NA" );
@@ -764,12 +767,14 @@ static void hns3_dump_tx_queue_info(struct hns3_enet_ring *ring,sprintf (result[j++],"%u" ,readl_relaxed (ring->tqp->io_base +HNS3_RING_TX_RING_PKTNUM_RECORD_REG )); -sprintf (result[j++],"%s" ,readl_relaxed (ring->tqp->io_base + -HNS3_RING_EN_REG ) ?"on" :"off" ); +sprintf (result[j++],"%s" , +str_on_off (readl_relaxed (ring->tqp->io_base + +HNS3_RING_EN_REG )));if (hnae3_ae_dev_tqp_txrx_indep_supported (ae_dev)) -sprintf (result[j++],"%s" ,readl_relaxed (ring->tqp->io_base + -HNS3_RING_TX_EN_REG ) ?"on" :"off" ); +sprintf (result[j++],"%s" , +str_on_off (readl_relaxed (ring->tqp->io_base + +HNS3_RING_TX_EN_REG )));else sprintf (result[j++],"%s" ,"NA" );
@@ -1030,7 +1035,6 @@ static void hns3_dbg_dev_caps(struct hnae3_handle *h, char *buf, int len, int *pos) { struct hnae3_ae_dev *ae_dev = pci_get_drvdata(h->pdev); -const char *const str[] = {"no" ,"yes" };unsigned long *caps = ae_dev->caps;u32 i, state;
@@ -1039,7 +1043,7 @@ hns3_dbg_dev_caps(struct hnae3_handle *h, char *buf, int len, int *pos)for (i =0 ; i <ARRAY_SIZE (hns3_dbg_cap); i++) { state =test_bit (hns3_dbg_cap[i].cap_bit, caps); *pos +=scnprintf (buf + *pos, len - *pos,"%s: %s\n" , - hns3_dbg_cap[i].name, str[state]); + hns3_dbg_cap[i].name,str_yes_no (state)); } *pos +=scnprintf (buf + *pos, len - *pos,"\n" );
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +2 -1
@@ -3,6 +3,7 @@#include <linux/etherdevice.h> #include <linux/string.h> +#include <linux/string_choices.h> #include <linux/phy.h> #include <linux/sfp.h>
@@ -1198,7 +1199,7 @@ static int hns3_set_tx_push(struct net_device *netdev, u32 tx_push)return 0 ;netdev_dbg (netdev,"Changing tx push from %s to %s\n" , - old_state ?"on" :"off" , tx_push ?"on" :"off" ); +str_on_off (old_state),str_on_off (tx_push));if (tx_push)set_bit (HNS3_NIC_STATE_TX_PUSH_ENABLE , &priv->state);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +31 -32
126 lines not on this page · raw message
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +5 -5
@@ -8002,7 +8002,7 @@ static int hclge_set_loopback(struct hnae3_handle *handle, ret =hclge_tqp_enable (handle, en);if (ret)dev_err (&hdev->pdev->dev,"failed to %s tqp in loopback, ret = %d\n" , - en ?"enable" :"disable" , ret); +str_enable_disable (en), ret);return ret; }
@@ -11210,9 +11210,9 @@ static void hclge_info_show(struct hclge_dev *hdev)dev_info (dev,"This is %s PF\n" , hdev->flag &HCLGE_FLAG_MAIN ?"main" :"not main" );dev_info (dev,"DCB %s\n" , - handle->kinfo.tc_info.dcb_ets_active ?"enable" :"disable" ); +str_enable_disable (handle->kinfo.tc_info.dcb_ets_active));dev_info (dev,"MQPRIO %s\n" , - handle->kinfo.tc_info.mqprio_active ?"enable" :"disable" ); +str_enable_disable (handle->kinfo.tc_info.mqprio_active));dev_info (dev,"Default tx spare buffer size: %u\n" , hdev->tx_spare_buf_size);
@@ -11986,7 +11986,7 @@ static int hclge_set_vf_spoofchk_hw(struct hclge_dev *hdev, int vf, bool enable)if (ret) {dev_err (&hdev->pdev->dev,"Set vf %d mac spoof check %s failed, ret=%d\n" , - vf, enable ?"on" :"off" , ret); + vf,str_on_off (enable), ret);return ret; }
@@ -11994,7 +11994,7 @@ static int hclge_set_vf_spoofchk_hw(struct hclge_dev *hdev, int vf, bool enable)if (ret)dev_err (&hdev->pdev->dev,"Set vf %d vlan spoof check %s failed, ret=%d\n" , - vf, enable ?"on" :"off" , ret); + vf,str_on_off (enable), ret);return ret; }
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c +2 -1
@@ -2,6 +2,7 @@// Copyright (c) 2021 Hisilicon Limited. #include <linux/skbuff.h> +#include <linux/string_choices.h> #include "hclge_main.h" #include "hnae3.h"
@@ -226,7 +227,7 @@ static int hclge_ptp_int_en(struct hclge_dev *hdev, bool en)if (ret)dev_err (&hdev->pdev->dev,"failed to %s ptp interrupt, ret = %d\n" , - en ?"enable" :"disable" , ret); +str_enable_disable (en), ret);return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 683/1276 net: hns3: use hns3_get_ae_dev() helper to reduce the unnecessary middle layer conversion
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit 2031f01394b2cc73538b3eeec191ffb03a1de5a0 ]
There are too many indirection layers in the HNS3 driver code. This issue was previously discussed with the maintainer, who suggested adding a helper function to fix the issue. In fact, the hns3_get_ae_dev() helper is already defined and can fix this issue.
This patch uses hns3_get_ae_dev() helper to reduce the unnecessary middle layer conversion. Apply it to the whole HNS3 driver. The former discusstion can be checked from the link.
Stable-dep-of: c711f6d1cee9 ("net: hns3: fix permanent link down deadlock after reset")
--- .../ethernet/hisilicon/hns3/hns3_debugfs.c | 8 ++--- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 12 +++---- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 36 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +4 -4
@@ -684,7 +684,7 @@ static int hns3_dbg_rx_queue_info(struct hnae3_handle *h, char *buf, int len) { char data_str[ARRAY_SIZE(rx_queue_info_items)][HNS3_DBG_DATA_STR_LEN]; -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);char *result[ARRAY_SIZE (rx_queue_info_items)];struct hns3_nic_priv *priv = h->priv;char content[HNS3_DBG_INFO_LEN ];
@@ -789,7 +789,7 @@ static int hns3_dbg_tx_queue_info(struct hnae3_handle *h, char *buf, int len) { char data_str[ARRAY_SIZE(tx_queue_info_items)][HNS3_DBG_DATA_STR_LEN]; -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);char *result[ARRAY_SIZE (tx_queue_info_items)];struct hns3_nic_priv *priv = h->priv;char content[HNS3_DBG_INFO_LEN ];
@@ -1034,7 +1034,7 @@ static int hns3_dbg_tx_bd_info(struct hns3_dbg_data *d, char *buf, int len)static void hns3_dbg_dev_caps (struct hnae3_handle *h,char *buf,int len,int *pos) { -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);unsigned long *caps = ae_dev->caps;u32 i, state;
@@ -1364,7 +1364,7 @@ hns3_dbg_common_file_init(struct hnae3_handle *handle, u32 cmd)int hns3_dbg_init (struct hnae3_handle *handle) { -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const char *name =pci_name (handle->pdev);int ret;u32 i;
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +6 -6
@@ -548,9 +548,9 @@ void hns3_set_vector_coalesce_rx_ql(struct hns3_enet_tqp_vector *tqp_vector,static void hns3_vector_coalesce_init (struct hns3_enet_tqp_vector *tqp_vector,struct hns3_nic_priv *priv) { -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (priv->ae_handle->pdev);struct hns3_enet_coalesce *tx_coal = &tqp_vector->tx_group.coal;struct hns3_enet_coalesce *rx_coal = &tqp_vector->rx_group.coal; +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (priv->ae_handle);struct hns3_enet_coalesce *ptx_coal = &priv->tx_coal;struct hns3_enet_coalesce *prx_coal = &priv->rx_coal;
@@ -1315,7 +1315,7 @@ static int hns3_get_l4_protocol(struct sk_buff *skb, u8 *ol4_proto,static bool hns3_tunnel_csum_bug (struct sk_buff *skb) {struct hns3_nic_priv *priv =netdev_priv (skb->dev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (priv->ae_handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (priv->ae_handle);union l4_hdr_info l4;/* device version above V3(include V3), the hardware can
@@ -1515,7 +1515,7 @@ static int hns3_handle_vtags(struct hns3_enet_ring *tx_ring,* VLAN enabled, only one VLAN header is allowed in skb, otherwise it * will cause RAS error. */ - ae_dev =pci_get_drvdata (handle->pdev); + ae_dev =hns3_get_ae_dev (handle); if (unlikely(skb_vlan_tagged_multi(skb) && ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2 && handle->port_base_vlan_state ==
@@ -4761,7 +4761,7 @@ static int hns3_nic_init_vector_data(struct hns3_nic_priv *priv)static void hns3_nic_init_coal_cfg (struct hns3_nic_priv *priv) { -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (priv->ae_handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (priv->ae_handle);struct hns3_enet_coalesce *tx_coal = &priv->tx_coal;struct hns3_enet_coalesce *rx_coal = &priv->rx_coal;
@@ -5265,7 +5265,7 @@ static void hns3_info_show(struct hns3_nic_priv *priv)static void hns3_set_cq_period_mode (struct hns3_nic_priv *priv,enum dim_cq_period_mode mode,bool is_tx) { -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (priv->ae_handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (priv->ae_handle);struct hnae3_handle *handle = priv->ae_handle;int i;
@@ -5303,7 +5303,7 @@ void hns3_cq_period_mode_init(struct hns3_nic_priv *priv,static void hns3_state_init (struct hnae3_handle *handle) { -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);struct net_device *netdev = handle->kinfo.netdev;struct hns3_nic_priv *priv =netdev_priv (netdev);
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +18 -18
@@ -86,7 +86,7 @@ static int hns3_get_sset_count(struct net_device *netdev, int stringset);static int hns3_lp_setup (struct net_device *ndev,enum hnae3_loop loop,bool en) {struct hnae3_handle *h =hns3_get_handle (ndev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);int ret; if (!h->ae_algo->ops->set_loopback ||
@@ -171,7 +171,7 @@ static void hns3_lp_setup_skb(struct sk_buff *skb)* the purpose of mac or serdes selftest. */ handle =hns3_get_handle (ndev); - ae_dev =pci_get_drvdata (handle->pdev); + ae_dev =hns3_get_ae_dev (handle);if (ae_dev->dev_version <HNAE3_DEVICE_VERSION_V2 ) ethh->h_dest[5 ] +=HNS3_NIC_LB_DST_MAC_ADDR ;eth_zero_addr (ethh->h_source);
@@ -692,7 +692,7 @@ static void hns3_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *param) {struct hnae3_handle *h =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);if (!test_bit (HNAE3_DEV_SUPPORT_PAUSE_B , ae_dev->caps))return ;
@@ -706,7 +706,7 @@ static int hns3_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *param) {struct hnae3_handle *h =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);if (!test_bit (HNAE3_DEV_SUPPORT_PAUSE_B , ae_dev->caps))return -EOPNOTSUPP ;
@@ -751,7 +751,7 @@ static int hns3_get_link_ksettings(struct net_device *netdev, struct ethtool_link_ksettings *cmd) {struct hnae3_handle *h =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);const struct hnae3_ae_ops *ops;u8 module_type;u8 media_type;
@@ -861,7 +861,7 @@ static int hns3_set_link_ksettings(struct net_device *netdev, const struct ethtool_link_ksettings *cmd) {struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const struct hnae3_ae_ops *ops = handle->ae_algo->ops;int ret;
@@ -932,7 +932,7 @@ static u32 hns3_get_rss_key_size(struct net_device *netdev)static u32 hns3_get_rss_indir_size (struct net_device *netdev) {struct hnae3_handle *h =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);return ae_dev->dev_specs.rss_ind_tbl_size; }
@@ -954,7 +954,7 @@ static int hns3_set_rss(struct net_device *netdev, struct netlink_ext_ack *extack) {struct hnae3_handle *h =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);if (!h->ae_algo->ops->set_rss)return -EOPNOTSUPP ;
@@ -1024,7 +1024,7 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags) {enum hnae3_reset_type rst_type =HNAE3_NONE_RESET ;struct hnae3_handle *h =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);const struct hnae3_ae_ops *ops = h->ae_algo->ops;const struct hns3_reset_type_map *rst_type_map;enum ethtool_reset_flags rst_flags;
@@ -1189,7 +1189,7 @@ static int hns3_set_tx_push(struct net_device *netdev, u32 tx_push) {struct hns3_nic_priv *priv =netdev_priv (netdev);struct hnae3_handle *h =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (h->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h);u32 old_state =test_bit (HNS3_NIC_STATE_TX_PUSH_ENABLE , &priv->state);if (!test_bit (HNAE3_DEV_SUPPORT_TX_PUSH_B , ae_dev->caps) && tx_push)
@@ -1377,7 +1377,7 @@ static int hns3_check_gl_coalesce_para(struct net_device *netdev, struct ethtool_coalesce *cmd) {struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);u32 rx_gl, tx_gl;if (cmd->rx_coalesce_usecs > ae_dev->dev_specs.max_int_gl) {
@@ -1449,7 +1449,7 @@ static int hns3_check_ql_coalesce_param(struct net_device *netdev, struct ethtool_coalesce *cmd) {struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);if ((cmd->tx_max_coalesced_frames || cmd->rx_max_coalesced_frames) && !ae_dev->dev_specs.int_ql_max) {
@@ -1473,7 +1473,7 @@ hns3_check_cqe_coalesce_param(struct net_device *netdev, struct kernel_ethtool_coalesce *kernel_coal) {struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);if ((kernel_coal->use_cqe_mode_tx || kernel_coal->use_cqe_mode_rx) && !hnae3_ae_dev_cq_supported (ae_dev)) {
@@ -1649,7 +1649,7 @@ static void hns3_get_fec_stats(struct net_device *netdev, struct ethtool_fec_stats *fec_stats) {struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const struct hnae3_ae_ops *ops = handle->ae_algo->ops;if (!hnae3_ae_dev_fec_stats_supported (ae_dev) || !ops->get_fec_stats)
@@ -1700,7 +1700,7 @@ static int hns3_get_fecparam(struct net_device *netdev, struct ethtool_fecparam *fec) {struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const struct hnae3_ae_ops *ops = handle->ae_algo->ops;u8 fec_ability;u8 fec_mode;
@@ -1725,7 +1725,7 @@ static int hns3_set_fecparam(struct net_device *netdev, struct ethtool_fecparam *fec) {struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const struct hnae3_ae_ops *ops = handle->ae_algo->ops;u32 fec_mode;
@@ -1747,7 +1747,7 @@ static int hns3_get_module_info(struct net_device *netdev,#define HNS3_SFF_8636_V1_3 0x03struct hnae3_handle *handle =hns3_get_handle (netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const struct hnae3_ae_ops *ops = handle->ae_algo->ops;struct hns3_sfp_type sfp_type;int ret;
@@ -1797,7 +1797,7 @@ static int hns3_get_module_eeprom(struct net_device *netdev, struct ethtool_eeprom *ee, u8 *data) { struct hnae3_handle *handle = hns3_get_handle(netdev); -struct hnae3_ae_dev *ae_dev =pci_get_drvdata (handle->pdev); +struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const struct hnae3_ae_ops *ops = handle->ae_algo->ops; if (ae_dev->dev_version < HNAE3_DEVICE_VERSION_V2 ||
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 684/1276 net: hns3: use hns3_get_ops() helper to reduce the unnecessary middle layer conversion
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jijie Shao <[email protected]>
[ Upstream commit 5306c10396866b8050d1bb8ca9dddaab607409e5 ]
There are too many indirection layers in the HNS3 driver code, This issue was previously discussed with the maintainer, who suggested adding a helper function to fix the issue. In fact, the hns3_get_ops() helper is already defined and can fix this issue.
This patch uses hns3_get_ops() helper to reduce the unnecessary middle layer conversion. Apply it to the whole HNS3 driver. The former discusstion can be checked from the link.
Stable-dep-of: c711f6d1cee9 ("net: hns3: fix permanent link down deadlock after reset")
--- .../ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 24 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c +1 -1
@@ -1239,7 +1239,7 @@ static const struct hns3_dbg_func hns3_dbg_cmd_func[] = {static int hns3_dbg_read_cmd (struct hns3_dbg_data *dbg_data,enum hnae3_dbg_cmd cmd,char *buf,int len) { -const struct hnae3_ae_ops *ops = dbg_data->handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (dbg_data->handle);const struct hns3_dbg_func *cmd_func;u32 i;
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -961,7 +961,7 @@ static void hns3_nic_set_rx_mode(struct net_device *netdev)void hns3_request_update_promisc_mode (struct hnae3_handle *handle) { -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);if (ops->request_update_promisc_mode) ops->request_update_promisc_mode (handle);
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +12 -12
@@ -489,7 +489,7 @@ static const struct hns3_pflag_desc hns3_priv_flags[HNAE3_PFLAG_MAX] = {static int hns3_get_sset_count (struct net_device *netdev,int stringset) {struct hnae3_handle *h =hns3_get_handle (netdev); -const struct hnae3_ae_ops *ops = h->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (h);if (!ops->get_sset_count)return -EOPNOTSUPP ;
@@ -540,7 +540,7 @@ static void hns3_get_strings_tqps(struct hnae3_handle *handle, u8 **data)static void hns3_get_strings (struct net_device *netdev,u32 stringset,u8 *data) {struct hnae3_handle *h =hns3_get_handle (netdev); -const struct hnae3_ae_ops *ops = h->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (h);int i;if (!ops->get_strings)
@@ -725,7 +725,7 @@ static int hns3_set_pauseparam(struct net_device *netdev,static void hns3_get_ksettings (struct hnae3_handle *h,struct ethtool_link_ksettings *cmd) { -const struct hnae3_ae_ops *ops = h->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (h);/* 1.auto_neg & speed & duplex from cmd */ if (ops->get_ksettings_an_result)
@@ -814,7 +814,7 @@ static int hns3_check_ksettings_param(const struct net_device *netdev, const struct ethtool_link_ksettings *cmd) {struct hnae3_handle *handle =hns3_get_handle (netdev); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);u8 module_type =HNAE3_MODULE_TYPE_UNKNOWN ;u8 media_type =HNAE3_MEDIA_TYPE_UNKNOWN ;u32 lane_num;
@@ -862,7 +862,7 @@ static int hns3_set_link_ksettings(struct net_device *netdev, {struct hnae3_handle *handle =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);int ret;/* Chip don't support this mode. */
@@ -1025,7 +1025,7 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags)enum hnae3_reset_type rst_type =HNAE3_NONE_RESET ;struct hnae3_handle *h =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (h); -const struct hnae3_ae_ops *ops = h->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (h);const struct hns3_reset_type_map *rst_type_map;enum ethtool_reset_flags rst_flags;u32 i, size;
@@ -1300,7 +1300,7 @@ static int hns3_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)static int hns3_nway_reset (struct net_device *netdev) {struct hnae3_handle *handle =hns3_get_handle (netdev); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);struct phy_device *phy = netdev->phydev;int autoneg;
@@ -1650,7 +1650,7 @@ static void hns3_get_fec_stats(struct net_device *netdev, {struct hnae3_handle *handle =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);if (!hnae3_ae_dev_fec_stats_supported (ae_dev) || !ops->get_fec_stats)return ;
@@ -1701,7 +1701,7 @@ static int hns3_get_fecparam(struct net_device *netdev, {struct hnae3_handle *handle =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);u8 fec_ability;u8 fec_mode;
@@ -1726,7 +1726,7 @@ static int hns3_set_fecparam(struct net_device *netdev, {struct hnae3_handle *handle =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);u32 fec_mode;if (!test_bit (HNAE3_DEV_SUPPORT_FEC_B , ae_dev->caps))
@@ -1748,7 +1748,7 @@ static int hns3_get_module_info(struct net_device *netdev,struct hnae3_handle *handle =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);struct hns3_sfp_type sfp_type;int ret;
@@ -1798,7 +1798,7 @@ static int hns3_get_module_eeprom(struct net_device *netdev, {struct hnae3_handle *handle =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle); -const struct hnae3_ae_ops *ops = handle->ae_algo->ops; +const struct hnae3_ae_ops *ops =hns3_get_ops (handle);if (ae_dev->dev_version <HNAE3_DEVICE_VERSION_V2 || !ops->get_module_eeprom)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 685/1276 net: hns3: clear hns alarm: comparison of integer expressions of different signedness
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peiyang Wang <[email protected]>
[ Upstream commit 169d07e7e41cd64208c31b6ead93c8045304f448 ]
A static alarm exists in the hns and needs to be cleared.
The alarm is comparison of integer expressions of different signedness including 's64' and 'long unsigned int', 'int' and 'long unsigned int', 'u32' and 'int', 'int' and 'unsigned int'.
Stable-dep-of: c711f6d1cee9 ("net: hns3: fix permanent link down deadlock after reset")
--- .../hns3/hns3_common/hclge_comm_cmd.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 22 +++++++------- .../net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 4 +-- .../hisilicon/hns3/hns3pf/hclge_debugfs.c | 13 ++++---- .../hisilicon/hns3/hns3pf/hclge_main.c | 30 +++++++++---------- .../hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +++-- .../hisilicon/hns3/hns3pf/hclge_mdio.c | 2 +- .../hisilicon/hns3/hns3pf/hclge_ptp.h | 2 +- .../hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- .../hisilicon/hns3/hns3vf/hclgevf_mbx.c | 2 +- 11 files changed, 44 insertions(+), 44 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c +1 -1
@@ -348,7 +348,7 @@ static int hclge_comm_cmd_csq_clean(struct hclge_comm_hw *hw)static int hclge_comm_cmd_csq_done (struct hclge_comm_hw *hw) {u32 head =hclge_comm_read_dev (hw,HCLGE_COMM_NIC_CSQ_HEAD_REG ); -return head == hw->cmq.csq.next_to_use; +return head == (u32 )hw->cmq.csq.next_to_use; }static u32 hclge_get_cmdq_tx_timeout (u16 opcode,u32 tx_timeout)
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +11 -11
@@ -1701,8 +1701,8 @@ static int hns3_fill_desc(struct hns3_enet_ring *ring, dma_addr_t dma,#define HNS3_LIKELY_BD_NUM 1struct hns3_desc *desc = &ring->desc[ring->next_to_use]; -unsigned int frag_buf_num; -int k, sizeoflast; +unsigned int frag_buf_num, k; +int sizeoflast;if (likely (size <=HNS3_MAX_BD_SIZE )) { desc->addr =cpu_to_le64 (dma);
@@ -1874,7 +1874,7 @@ static bool hns3_skb_need_linearized(struct sk_buff *skb, unsigned int *bd_size, unsigned int bd_num, u8 max_non_tso_bd_num) {unsigned int tot_len =0 ; -int i; +unsigned int i;for (i =0 ; i < max_non_tso_bd_num -1U ; i++) tot_len += bd_size[i];
@@ -1902,7 +1902,7 @@ static bool hns3_skb_need_linearized(struct sk_buff *skb, unsigned int *bd_size,void hns3_shinfo_pack (struct skb_shared_info *shinfo,__u32 *size) { -int i; +u32 i;for (i =0 ; i <MAX_SKB_FRAGS ; i++) size[i] =skb_frag_size (&shinfo->frags[i]);
@@ -2218,9 +2218,9 @@ static int hns3_handle_tx_sgl(struct hns3_enet_ring *ring,struct hns3_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use];u32 nfrag =skb_shinfo (skb)->nr_frags +1 ;struct sg_table *sgt; -int i, bd_num =0 ; +int bd_num =0 ;dma_addr_t dma; -u32 cb_len; +u32 cb_len, i;int nents;if (skb_has_frag_list (skb))
@@ -2558,7 +2558,7 @@ static void hns3_nic_get_stats64(struct net_device *netdev,struct hnae3_handle *handle = priv->ae_handle;struct rtnl_link_stats64 ring_total_stats;struct hns3_enet_ring *ring; -unsigned int idx; +int idx;if (test_bit (HNS3_NIC_STATE_DOWN , &priv->state))return ;
@@ -2784,7 +2784,7 @@ static int hns3_nic_change_mtu(struct net_device *netdev, int new_mtu)static int hns3_get_timeout_queue (struct net_device *ndev) { -int i; +unsigned int i;/* Find the stopped queue the same way the stack does */ for (i =0 ; i < ndev->num_tx_queues; i++) {
@@ -2865,7 +2865,7 @@ static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev)struct hns3_nic_priv *priv =netdev_priv (ndev);struct hnae3_handle *h =hns3_get_handle (ndev);struct hns3_enet_ring *tx_ring; -int timeout_queue; +u32 timeout_queue; timeout_queue =hns3_get_timeout_queue (ndev);if (timeout_queue >= ndev->num_tx_queues) {
@@ -3835,7 +3835,7 @@ static int hns3_gro_complete(struct sk_buff *skb, u32 l234info) {__be16 type = skb->protocol;struct tcphdr *th; -int depth =0 ; +u32 depth =0 ;while (eth_type_vlan (type)) {struct vlan_hdr *vh;
@@ -5975,7 +5975,7 @@ static const struct hns3_hw_error_info hns3_hw_err[] = {static void hns3_process_hw_error (struct hnae3_handle *handle,enum hnae3_hw_error_type type) { -int i; +u32 i;for (i =0 ; i <ARRAY_SIZE (hns3_hw_err); i++) {if (hns3_hw_err[i].type == type) {
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h +1 -1
@@ -623,7 +623,7 @@ struct hns3_reset_type_map {enum hnae3_reset_type rst_type; }; -static inline int ring_space (struct hns3_enet_ring *ring) +static inline u32 ring_space (struct hns3_enet_ring *ring) {/* This smp_load_acquire() pairs with smp_store_release() in * hns3_nic_reclaim_one_desc called by hns3_clean_tx_ring.
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +2 -2
@@ -541,7 +541,7 @@ static void hns3_get_strings(struct net_device *netdev, u32 stringset, u8 *data) {struct hnae3_handle *h =hns3_get_handle (netdev);const struct hnae3_ae_ops *ops =hns3_get_ops (h); -int i; +u32 i;if (!ops->get_strings)return ;
@@ -569,7 +569,7 @@ static u64 *hns3_get_stats_tqps(struct hnae3_handle *handle, u64 *data)struct hns3_nic_priv *nic_priv = handle->priv;struct hns3_enet_ring *ring;u8 *stat; -int i, j; +u32 i, j;/* get stats for Tx */ for (i =0 ; i < kinfo->num_tqps; i++) {
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c +6 -7
@@ -830,10 +830,10 @@ hclge_dbg_dump_reg_tqp(struct hclge_dev *hdev, {const struct hclge_dbg_dfx_message *dfx_message = reg_info->dfx_msg;const struct hclge_dbg_reg_common_msg *reg_msg = ®_info->reg_msg; +u32 index, entry, i, cnt, min_num;struct hclge_desc *desc_src; -u32 index, entry, i, cnt; -int bd_num, min_num, ret;struct hclge_desc *desc; +int bd_num, ret; ret =hclge_dbg_get_dfx_bd_num (hdev, reg_msg->offset, &bd_num);if (ret)
@@ -885,9 +885,9 @@ hclge_dbg_dump_reg_common(struct hclge_dev *hdev,const struct hclge_dbg_reg_common_msg *reg_msg = ®_info->reg_msg;const struct hclge_dbg_dfx_message *dfx_message = reg_info->dfx_msg;struct hclge_desc *desc_src; -int bd_num, min_num, ret; +int bd_num, min_num, ret, i;struct hclge_desc *desc; -u32 entry, i; +u32 entry; ret =hclge_dbg_get_dfx_bd_num (hdev, reg_msg->offset, &bd_num);if (ret)
@@ -1279,7 +1279,7 @@ static int hclge_dbg_dump_reg_cmd(struct hclge_dev *hdev, {const struct hclge_dbg_reg_type_info *reg_info;int pos =0 , ret =0 ; -int i; +u32 i;for (i =0 ; i <ARRAY_SIZE (hclge_dbg_reg_info); i++) { reg_info = &hclge_dbg_reg_info[i];
@@ -2648,9 +2648,8 @@ static void hclge_dbg_dump_mac_list(struct hclge_dev *hdev, char *buf, int len,struct hclge_mac_node *mac_node, *tmp;struct hclge_vport *vport;struct list_head *list; -u32 func_id; +u32 func_id, i;int pos =0 ; -int i;for (i =0 ; i <ARRAY_SIZE (mac_list_items); i++) result[i] = &data_str[i][0 ];
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +15 -15
@@ -582,7 +582,7 @@ static u64 *hclge_comm_get_stats(struct hclge_dev *hdev, int size, u64 *data) { u64 *buf = data; -u32 i; +int i;for (i =0 ; i < size; i++) {if (strs[i].stats_num > hdev->ae_dev->dev_specs.mac_stats_num)
@@ -599,7 +599,7 @@ static void hclge_comm_get_strings(struct hclge_dev *hdev, u32 stringset,const struct hclge_comm_stats_str strs[], int size, u8 **data) { - u32 i; + int i;if (stringset !=ETH_SS_STATS )return ;
@@ -2624,7 +2624,7 @@ int hclge_cfg_mac_speed_dup(struct hclge_dev *hdev, int speed, u8 duplex, u8 lanint ret; duplex =hclge_check_speed_dup (duplex, speed); -if (!mac->support_autoneg && mac->speed == speed && +if (!mac->support_autoneg && mac->speed == (u32 )speed && mac->duplex == duplex && (mac->lane_num == lane_num || lane_num ==0 ))return 0 ;
@@ -2652,7 +2652,7 @@ static int hclge_cfg_mac_speed_dup_h(struct hnae3_handle *handle, int speed,if (ret)return ret; - hdev->hw.mac.req_speed = speed; + hdev->hw.mac.req_speed = (u32 )speed; hdev->hw.mac.req_duplex = duplex;return 0 ;
@@ -3446,7 +3446,7 @@ static int hclge_tp_port_init(struct hclge_dev *hdev)static int hclge_update_port_info (struct hclge_dev *hdev) {struct hclge_mac *mac = &hdev->hw.mac; -int speed; +u32 speed;int ret;/* get the port info from SFP cmd if not copper port */
@@ -6991,7 +6991,7 @@ static int hclge_get_all_rules(struct hnae3_handle *handle,struct hclge_dev *hdev = vport->back;struct hclge_fd_rule *rule;struct hlist_node *node2; -int cnt =0 ; +u32 cnt =0 ;if (!hnae3_ae_dev_fd_supported (hdev->ae_dev))return -EOPNOTSUPP ;
@@ -8225,14 +8225,14 @@ static int hclge_update_desc_vfid(struct hclge_desc *desc, int vfid, bool clr) word_num = vfid /32 ; bit_num = vfid %32 ;if (clr) - desc[1 ].data[word_num] &=cpu_to_le32 (~(1 << bit_num)); + desc[1 ].data[word_num] &=cpu_to_le32 (~(1U << bit_num));else desc[1 ].data[word_num] |=cpu_to_le32 (1 << bit_num); }else { word_num = (vfid -HCLGE_VF_NUM_IN_FIRST_DESC ) /32 ; bit_num = vfid %32 ;if (clr) - desc[2 ].data[word_num] &=cpu_to_le32 (~(1 << bit_num)); + desc[2 ].data[word_num] &=cpu_to_le32 (~(1U << bit_num));else desc[2 ].data[word_num] |=cpu_to_le32 (1 << bit_num); }
@@ -9294,7 +9294,7 @@ static int hclge_add_mgr_tbl(struct hclge_dev *hdev,static int init_mgr_tbl (struct hclge_dev *hdev) {int ret; -int i; +u32 i;for (i =0 ; i <ARRAY_SIZE (hclge_mgr_table); i++) { ret =hclge_add_mgr_tbl (hdev, &hclge_mgr_table[i]);
@@ -10723,7 +10723,7 @@ int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu) max_frm_size =max (max_frm_size,HCLGE_MAC_DEFAULT_FRAME );mutex_lock (&hdev->vport_lock);/* VF's mps must fit within hdev->mps */ -if (vport->vport_id && max_frm_size > hdev->mps) { +if (vport->vport_id && (u32 )max_frm_size > hdev->mps) {mutex_unlock (&hdev->vport_lock);return -EINVAL ; }else if (vport->vport_id) {
@@ -10734,7 +10734,7 @@ int hclge_set_vport_mtu(struct hclge_vport *vport, int new_mtu)/* PF's mps must be greater then VF's mps */ for (i =1 ; i < hdev->num_alloc_vport; i++) -if (max_frm_size < hdev->vport[i].mps) { +if ((u32 )max_frm_size < hdev->vport[i].mps) {dev_err (&hdev->pdev->dev,"failed to set pf mtu for less than vport %d, mps = %u.\n" , i, hdev->vport[i].mps);
@@ -11224,7 +11224,7 @@ static int hclge_init_nic_client_instance(struct hnae3_ae_dev *ae_dev, {struct hnae3_client *client = vport->nic.client;struct hclge_dev *hdev = ae_dev->priv; -int rst_cnt = hdev->rst_stats.reset_cnt; +u32 rst_cnt = hdev->rst_stats.reset_cnt;int ret; ret = client->ops->init_instance (&vport->nic);
@@ -11268,7 +11268,7 @@ static int hclge_init_roce_client_instance(struct hnae3_ae_dev *ae_dev, {struct hclge_dev *hdev = ae_dev->priv;struct hnae3_client *client; -int rst_cnt; +u32 rst_cnt;int ret; if (!hnae3_dev_roce_supported(hdev) || !hdev->roce_client ||
@@ -12098,7 +12098,7 @@ static int hclge_vf_rate_param_check(struct hclge_dev *hdev, int min_tx_rate, int max_tx_rate) {if (min_tx_rate !=0 || - max_tx_rate <0 || max_tx_rate > hdev->hw.mac.max_speed) { + max_tx_rate <0 || (u32 )max_tx_rate > hdev->hw.mac.max_speed) {dev_err (&hdev->pdev->dev,"min_tx_rate:%d [0], max_tx_rate:%d [0, %u]\n" , min_tx_rate, max_tx_rate, hdev->hw.mac.max_speed);
@@ -12123,7 +12123,7 @@ static int hclge_set_vf_rate(struct hnae3_handle *handle, int vf,if (!vport)return -EINVAL ; -if (!force && max_tx_rate == vport->vf_info.max_tx_rate) +if (!force && (u32 )max_tx_rate == vport->vf_info.max_tx_rate)return 0 ; ret =hclge_tm_qs_shaper_cfg (vport, max_tx_rate);
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +4 -3
@@ -749,16 +749,17 @@ static int hclge_get_rss_key(struct hclge_vport *vport,#define HCLGE_RSS_MBX_RESP_LEN 8struct hclge_dev *hdev = vport->back;struct hclge_comm_rss_cfg *rss_cfg; +int rss_hash_key_size;u8 index; index = mbx_req->msg.data[0 ]; rss_cfg = &hdev->rss_cfg; + rss_hash_key_size =sizeof (rss_cfg->rss_hash_key);/* Check the query index of rss_hash_key from VF, make sure no * more than the size of rss_hash_key. */ -if (((index +1 ) *HCLGE_RSS_MBX_RESP_LEN ) > -sizeof (rss_cfg->rss_hash_key)) { +if (((index +1 ) *HCLGE_RSS_MBX_RESP_LEN ) > rss_hash_key_size) {dev_warn (&hdev->pdev->dev,"failed to get the rss hash key, the index(%u) invalid !\n" , index);
@@ -800,7 +801,7 @@ static void hclge_handle_link_change_event(struct hclge_dev *hdev,static bool hclge_cmd_crq_empty (struct hclge_hw *hw) { -u32 tail =hclge_read_dev (hw,HCLGE_COMM_NIC_CRQ_TAIL_REG ); +int tail =hclge_read_dev (hw,HCLGE_COMM_NIC_CRQ_TAIL_REG );return tail == hw->hw.cmq.crq.next_to_use; }
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c +1 -1
@@ -151,7 +151,7 @@ int hclge_mac_mdio_config(struct hclge_dev *hdev) mdio_bus->parent = &hdev->pdev->dev; mdio_bus->priv = hdev; - mdio_bus->phy_mask = ~(1 << mac->phy_addr); + mdio_bus->phy_mask = ~(1U << mac->phy_addr); ret =mdiobus_register (mdio_bus);if (ret) { dev_err(mdio_bus->parent,
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h +1 -1
@@ -25,7 +25,7 @@ struct ifreq;#define HCLGE_PTP_TIME_SEC_H_MASK GENMASK(15, 0)#define HCLGE_PTP_TIME_SEC_L_REG 0x54#define HCLGE_PTP_TIME_NSEC_REG 0x58 -#define HCLGE_PTP_TIME_NSEC_MASK GENMASK(29, 0) +#define HCLGE_PTP_TIME_NSEC_MASK 0x3fffffffLL#define HCLGE_PTP_TIME_NSEC_NEG BIT(31)#define HCLGE_PTP_TIME_SYNC_REG 0x5C#define HCLGE_PTP_TIME_SYNC_EN BIT(0)
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +1 -1
@@ -2465,7 +2465,7 @@ static int hclgevf_init_nic_client_instance(struct hnae3_ae_dev *ae_dev, struct hnae3_client *client) {struct hclgevf_dev *hdev = ae_dev->priv; -int rst_cnt = hdev->rst_stats.rst_cnt; +u32 rst_cnt = hdev->rst_stats.rst_cnt;int ret; ret = client->ops->init_instance (&hdev->nic);
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c +1 -1
@@ -159,7 +159,7 @@ static bool hclgevf_cmd_crq_empty(struct hclgevf_hw *hw) {u32 tail =hclgevf_read_dev (hw,HCLGE_COMM_NIC_CRQ_TAIL_REG ); -return tail == hw->hw.cmq.crq.next_to_use; +return tail == (u32 )hw->hw.cmq.crq.next_to_use; } static void hclgevf_handle_mbx_response(struct hclgevf_dev *hdev,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 686/1276 net: hns3: unify copper port ksettings configuration path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuaisong Yang <[email protected]>
[ Upstream commit d77e98f8b2b382b06be7f17e482480dd8c4c5046 ]
Refactor hns3_set_link_ksettings() and hclge_set_phy_link_ksettings() to unify the configuration path for copper ports.
Previously, netdevs with a native kernel phy attached bypassed the main MAC parameter caching logic and returned early via phy_ethtool_ksettings_set(). This prevented the driver from updating hdev->hw.mac.req_xxx variables for kernel PHY setups, leaving them out-of-sync during reset recovery.
Clean this up by routing all copper port configurations through ops->set_phy_link_ksettings(), and perform driver-level or kernel-level PHY arbitration inside hclge_set_phy_link_ksettings() via hnae3_dev_phy_imp_supported(). This ensures that the user's intended link profiles (req_speed, req_duplex, req_autoneg) are uniformly recorded across all copper and fiber deployment topologies, laying the groundwork for stable reset recovery.
For copper ports where neither IMP firmware nor a kernel PHY is available (e.g. PHY_INEXISTENT), hclge_set_phy_link_ksettings() returns -ENODEV. In hns3_set_link_ksettings(), this is caught so the configuration falls through to the existing MAC-level path (check_ksettings_param -> cfg_mac_speed_dup_h), preserving compatibility with PHY-less copper deployments.
Stable-dep-of: c711f6d1cee9 ("net: hns3: fix permanent link down deadlock after reset")
--- .../ethernet/hisilicon/hns3/hns3_ethtool.c | 31 +++++++++---------- .../hisilicon/hns3/hns3pf/hclge_main.c | 28 +++++++++++++++-- 2 files changed, 40 insertions(+), 19 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +15 -16
@@ -811,12 +811,11 @@ static int hns3_get_link_ksettings(struct net_device *netdev, }static int hns3_check_ksettings_param (const struct net_device *netdev, -const struct ethtool_link_ksettings *cmd) +const struct ethtool_link_ksettings *cmd, +u8 media_type) {struct hnae3_handle *handle =hns3_get_handle (netdev);const struct hnae3_ae_ops *ops =hns3_get_ops (handle); -u8 module_type =HNAE3_MODULE_TYPE_UNKNOWN ; -u8 media_type =HNAE3_MEDIA_TYPE_UNKNOWN ;u32 lane_num;u8 autoneg;u32 speed;
@@ -836,9 +835,6 @@ static int hns3_check_ksettings_param(const struct net_device *netdev,return 0 ; } -if (ops->get_media_type) - ops->get_media_type (handle, &media_type, &module_type); -if (cmd->base.duplex ==DUPLEX_HALF && media_type !=HNAE3_MEDIA_TYPE_COPPER ) { netdev_err(netdev,
@@ -863,6 +859,8 @@ static int hns3_set_link_ksettings(struct net_device *netdev,struct hnae3_handle *handle =hns3_get_handle (netdev);struct hnae3_ae_dev *ae_dev =hns3_get_ae_dev (handle);const struct hnae3_ae_ops *ops =hns3_get_ops (handle); +u8 module_type =HNAE3_MODULE_TYPE_UNKNOWN ; +u8 media_type =HNAE3_MEDIA_TYPE_UNKNOWN ;int ret;/* Chip don't support this mode. */
@@ -878,22 +876,23 @@ static int hns3_set_link_ksettings(struct net_device *netdev, cmd->base.autoneg, cmd->base.speed, cmd->base.duplex, cmd->lanes); -/* Only support ksettings_set for netdev with phy attached for now */ -if (netdev->phydev) { -if (cmd->base.speed ==SPEED_1000 && - cmd->base.autoneg ==AUTONEG_DISABLE ) -return -EINVAL ; +if (!ops->get_media_type) +return -EOPNOTSUPP ; + ops->get_media_type (handle, &media_type, &module_type); -return phy_ethtool_ksettings_set (netdev->phydev, cmd); - }else if (test_bit (HNAE3_DEV_SUPPORT_PHY_IMP_B , ae_dev->caps) && - ops->set_phy_link_ksettings) { -return ops->set_phy_link_ksettings (handle, cmd); +if (media_type ==HNAE3_MEDIA_TYPE_COPPER ) { +if (!ops->set_phy_link_ksettings) +return -EOPNOTSUPP ; + ret = ops->set_phy_link_ksettings (handle, cmd); +if (ret != -ENODEV ) +return ret; +/* PHY_INEXISTENT, use MAC-level configuration */ }if (ae_dev->dev_version <HNAE3_DEVICE_VERSION_V2 )return -EOPNOTSUPP ; - ret =hns3_check_ksettings_param (netdev, cmd); + ret =hns3_check_ksettings_param (netdev, cmd, media_type);if (ret)return ret;
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +25 -3
@@ -3358,8 +3358,8 @@ static int hclge_get_phy_link_ksettings(struct hnae3_handle *handle, }static int -hclge_set_phy_link_ksettings (struct hnae3_handle *handle, -const struct ethtool_link_ksettings *cmd) +hclge_ethtool_ksettings_set (struct hnae3_handle *handle, +const struct ethtool_link_ksettings *cmd) {struct hclge_desc desc[HCLGE_PHY_LINK_SETTING_BD_NUM ];struct hclge_vport *vport =hclge_get_vport (handle);
@@ -3400,10 +3400,32 @@ hclge_set_phy_link_ksettings(struct hnae3_handle *handle,return ret; } +linkmode_copy (hdev->hw.mac.advertising, cmd->link_modes.advertising); +return 0 ; +} + +static int +hclge_set_phy_link_ksettings (struct hnae3_handle *handle, +const struct ethtool_link_ksettings *cmd) +{ +struct hclge_vport *vport =hclge_get_vport (handle); +struct hclge_dev *hdev = vport->back; +int ret = -ENODEV ; + +if (hnae3_dev_phy_imp_supported (hdev)) { + ret =hclge_ethtool_ksettings_set (handle, cmd); + }else if (handle->netdev->phydev) { +if (cmd->base.speed ==SPEED_1000 && + cmd->base.autoneg ==AUTONEG_DISABLE ) +return -EINVAL ; + ret =phy_ethtool_ksettings_set (handle->netdev->phydev, cmd); + } +if (ret) +return ret; + hdev->hw.mac.req_autoneg = cmd->base.autoneg; hdev->hw.mac.req_speed = cmd->base.speed; hdev->hw.mac.req_duplex = cmd->base.duplex; -linkmode_copy (hdev->hw.mac.advertising, cmd->link_modes.advertising);return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 687/1276 net: hns3: refactor MAC autoneg and speed configuration
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuaisong Yang <[email protected]>
[ Upstream commit c01f6e6bdc1ccd21b2d07d23f50b82437b8cbf88 ]
Extract the MAC autoneg and speed/duplex/lane configuration logic out of hclge_mac_init() and encapsulate it into a new dedicated helper function hclge_set_autoneg_speed_dup().
In the init path (hclge_init_ae_dev), this helper is now called after hclge_update_port_info() so that firmware-reported autoneg values are already populated before applying the link configuration.
Introduce a separate req_lane_num field in struct hclge_mac to isolate the user-requested lane count from mac.lane_num, which firmware may overwrite via hclge_get_sfp_info() with stale values from a prior link lifecycle (e.g., lane_num=4 from 100G). During probe, req_lane_num is initialized to 0, which instructs firmware to auto-select the correct lane count for the current speed, rather than reusing the firmware- reported mac.lane_num that may be inconsistent with the target speed. This prevents probe failures from mismatched (speed, lane_num) pairs.
In the reset path (hclge_reset_ae_dev), it runs immediately after hclge_mac_init(), using the previously cached req_* values to restore the link without re-querying firmware.
Stable-dep-of: c711f6d1cee9 ("net: hns3: fix permanent link down deadlock after reset")
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 55 ++++++++++++++----- .../hisilicon/hns3/hns3pf/hclge_main.h | 1 + 2 files changed, 42 insertions(+), 14 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +41 -14
@@ -1577,6 +1577,11 @@ static int hclge_configure(struct hclge_dev *hdev) hdev->hw.mac.req_autoneg =AUTONEG_ENABLE ; hdev->hw.mac.req_duplex =DUPLEX_FULL ; +/* When lane_num is 0, the firmware will automatically +* select the appropriate lane_num based on the speed. +*/ + hdev->hw.mac.req_lane_num =0 ; +hclge_parse_link_mode (hdev, cfg.speed_ability); hdev->hw.mac.max_speed =hclge_get_max_speed (cfg.speed_ability);
@@ -2652,6 +2657,7 @@ static int hclge_cfg_mac_speed_dup_h(struct hnae3_handle *handle, int speed,if (ret)return ret; + hdev->hw.mac.req_lane_num = lane_num; hdev->hw.mac.req_speed = (u32 )speed; hdev->hw.mac.req_duplex = duplex;
@@ -2957,20 +2963,6 @@ static int hclge_mac_init(struct hclge_dev *hdev)if (!test_bit (HCLGE_STATE_RST_HANDLING , &hdev->state)) hdev->hw.mac.duplex =HCLGE_MAC_FULL ; -if (hdev->hw.mac.support_autoneg) { - ret =hclge_set_autoneg_en (hdev, hdev->hw.mac.autoneg); -if (ret) -return ret; - } - -if (!hdev->hw.mac.autoneg) { - ret =hclge_cfg_mac_speed_dup_hw (hdev, hdev->hw.mac.req_speed, - hdev->hw.mac.req_duplex, - hdev->hw.mac.lane_num); -if (ret) -return ret; - } - mac->link =0 ;if (mac->user_fec_mode &BIT (HNAE3_FEC_USER_DEF )) {
@@ -11748,6 +11740,27 @@ static int hclge_set_wol(struct hnae3_handle *handle,return ret; } +static int hclge_set_autoneg_speed_dup (struct hclge_dev *hdev) +{ +int ret; + +if (hdev->hw.mac.support_autoneg) { + ret =hclge_set_autoneg_en (hdev, hdev->hw.mac.autoneg); +if (ret) +return ret; + } + +if (!hdev->hw.mac.autoneg) { + ret =hclge_cfg_mac_speed_dup_hw (hdev, hdev->hw.mac.req_speed, + hdev->hw.mac.req_duplex, + hdev->hw.mac.req_lane_num); +if (ret) +return ret; + } + +return 0 ; +} +static int hclge_init_ae_dev (struct hnae3_ae_dev *ae_dev) {struct pci_dev *pdev = ae_dev->pdev;
@@ -11909,6 +11922,13 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)if (ret) goto err_ptp_uninit; + ret =hclge_set_autoneg_speed_dup (hdev); +if (ret) { +dev_err (&pdev->dev, +"failed to set autoneg speed duplex, ret = %d\n" , ret); + goto err_ptp_uninit; + } +INIT_KFIFO (hdev->mac_tnl_log);hclge_dcb_ops_set (hdev);
@@ -12239,6 +12259,13 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev)return ret; } + ret =hclge_set_autoneg_speed_dup (hdev); +if (ret) { +dev_err (&pdev->dev, +"failed to set autoneg speed duplex, ret = %d\n" , ret); +return ret; + } + ret =hclge_tp_port_init (hdev);if (ret) { dev_err(&pdev->dev, "failed to init tp port, ret = %d\n",
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +1 -0
@@ -287,6 +287,7 @@ struct hclge_mac {u8 support_autoneg;u8 speed_type;/* 0: sfp speed, 1: active speed */ u8 lane_num; +u8 req_lane_num;u32 speed;u32 req_speed;u32 max_speed;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 688/1276 net: hns3: fix permanent link down deadlock after reset
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuaisong Yang <[email protected]>
[ Upstream commit c711f6d1cee955e04d1cd1f76cd8abd024b27a72 ]
Fix a critical race condition deadlock where the network interface remains permanently Link Down after a hardware reset under specific ethtool sequences.
This issue exclusively manifests in firmware-controlled PHY topologies where the driver relies on the IMP firmware to arbitrate link parameters. Standard devices driven by the kernel's native PHY_LIB are unaffected.
The deadlock occurs via the following path:
1. User disables autoneg and forces an unmatched speed, forcing link
down: ethtool -s ethx autoneg off speed 10 duplex full
2. User re-enables autoneg: ethtool -s ethx autoneg on. The netdev stack passes cmd->base.speed as SPEED_UNKNOWN (0xffffffff).
3. Driver saves req_autoneg=1, but before the interface can link up, a hardware reset is triggered.
4. During reset recovery, MAC init reads the un-synchronized runtime state mac.autoneg (which is still 0/OFF), misinterprets it as forced mode, and pushes the cached SPEED_UNKNOWN into the hardware registers, causing the MAC firmware state machine to freeze. Meanwhile, PHY init reads req_autoneg=1 and enables PHY autoneg.
Since the MAC is frozen with 0xffffffff and PHY is running autoneg, they mismatch permanently.
Fix this by:
1. Intercepting SPEED_UNKNOWN/DUPLEX_UNKNOWN in hclge_set_phy_link_ksettings() and hclge_cfg_mac_speed_dup_h() to prevent it from corrupting the driver's cached valid configuration.
2. Save req_autoneg in hclge_set_autoneg().
3. Aligning the state judgment in hclge_set_autoneg_speed_dup() to use req_autoneg instead of the un-synchronized runtime mac.autoneg, ensuring both MAC and PHY consistently enter the autoneg branch to eliminate configuration discrepancies during reset recovery.
--- .../hisilicon/hns3/hns3pf/hclge_main.c | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +15 -7
@@ -2658,8 +2658,10 @@ static int hclge_cfg_mac_speed_dup_h(struct hnae3_handle *handle, int speed,return ret; hdev->hw.mac.req_lane_num = lane_num; - hdev->hw.mac.req_speed = (u32 )speed; - hdev->hw.mac.req_duplex = duplex; +if (speed !=SPEED_UNKNOWN ) + hdev->hw.mac.req_speed = (u32 )speed; +if (duplex !=DUPLEX_UNKNOWN ) + hdev->hw.mac.req_duplex = duplex;return 0 ; }
@@ -2690,6 +2692,7 @@ static int hclge_set_autoneg(struct hnae3_handle *handle, bool enable) {struct hclge_vport *vport =hclge_get_vport (handle);struct hclge_dev *hdev = vport->back; +int ret;if (!hdev->hw.mac.support_autoneg) {if (enable) {
@@ -2701,7 +2704,10 @@ static int hclge_set_autoneg(struct hnae3_handle *handle, bool enable) } } -return hclge_set_autoneg_en (hdev, enable); + ret =hclge_set_autoneg_en (hdev, enable); +if (!ret) + hdev->hw.mac.req_autoneg = enable; +return ret; }static int hclge_get_autoneg (struct hnae3_handle *handle)
@@ -3416,8 +3422,10 @@ hclge_set_phy_link_ksettings(struct hnae3_handle *handle,return ret; hdev->hw.mac.req_autoneg = cmd->base.autoneg; - hdev->hw.mac.req_speed = cmd->base.speed; - hdev->hw.mac.req_duplex = cmd->base.duplex; +if (cmd->base.speed !=SPEED_UNKNOWN ) + hdev->hw.mac.req_speed = cmd->base.speed; +if (cmd->base.duplex !=DUPLEX_UNKNOWN ) + hdev->hw.mac.req_duplex = cmd->base.duplex;return 0 ; }
@@ -11745,12 +11753,12 @@ static int hclge_set_autoneg_speed_dup(struct hclge_dev *hdev)int ret;if (hdev->hw.mac.support_autoneg) { - ret =hclge_set_autoneg_en (hdev, hdev->hw.mac.autoneg); + ret =hclge_set_autoneg_en (hdev, hdev->hw.mac.req_autoneg);if (ret)return ret; } -if (!hdev->hw.mac.autoneg) { +if (!hdev->hw.mac.req_autoneg) { ret =hclge_cfg_mac_speed_dup_hw (hdev, hdev->hw.mac.req_speed, hdev->hw.mac.req_duplex, hdev->hw.mac.req_lane_num);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 689/1276 net: hns3: differentiate autoneg default values between copper and fiber
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuaisong Yang <[email protected]>
[ Upstream commit d9d349c4e8a0acd73bac8baa3605443c0df5eb26 ]
Fix a link loss issue during driver initialization on optical ports connected to forced-mode (non-autoneg) remote switches.
Previously, during driver probe or initialization, hclge_configure() blindly hardcoded hdev->hw.mac.req_autoneg to AUTONEG_ENABLE for all media types. While this is necessary for copper (BASE-T) ports to establish a link, many high-speed optical (fiber) ports in data centers are connected to switches running in forced mode (fixed speed, autoneg disabled). Forcing autoneg on these optical ports during initialization causes a permanent link failure since the remote end refuses to respond to autoneg pulses.
Fix this by implementing media-type differentiated initialization in hclge_init_ae_dev(). Copper ports continue to default to AUTONEG_ENABLE, while optical ports strictly inherit the preset autoneg status pre-configured by the firmware (hdev->hw.mac.autoneg), preserving native compatibility with forced-mode network environments.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +7 -0
@@ -11930,6 +11930,13 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)if (ret) goto err_ptp_uninit; +if (hdev->hw.mac.media_type !=HNAE3_MEDIA_TYPE_COPPER ) { + hdev->hw.mac.req_autoneg = hdev->hw.mac.autoneg; +if (hdev->hw.mac.autoneg ==AUTONEG_DISABLE && + hdev->hw.mac.speed !=SPEED_UNKNOWN ) + hdev->hw.mac.req_speed = hdev->hw.mac.speed; + } + ret =hclge_set_autoneg_speed_dup (hdev);if (ret) { dev_err(&pdev->dev,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 690/1276 tracing: probes: fix typo in a log message
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kaiser <[email protected]>
[ Upstream commit 72c8646956ffc8050bb8be5988a0f28fc37e1ac4 ]
Fix a typo ("Invalid $-variable") in a log message.
--- kernel/trace/trace_probe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_probe.h +1 -1
@@ -499,7 +499,7 @@ extern int traceprobe_define_arg_fields(struct trace_event_call *event_call,C (NO_RETVAL ,"This function returns 'void' type" ), \C (BAD_STACK_NUM ,"Invalid stack number" ), \C (BAD_ARG_NUM ,"Invalid argument number" ), \ -C (BAD_VAR ,"Invalid $-valiable specified" ), \ +C (BAD_VAR ,"Invalid $-variable specified" ), \C (BAD_REG_NAME ,"Invalid register name" ), \C (BAD_MEM_ADDR ,"Invalid memory address" ), \ C(BAD_IMM, "Invalid immediate value"), \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 691/1276 spi: sh-msiof: abort transfers when reset times out
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 6dbaa4d288432c697cea47028480481b8b29bd6a ]
sh_msiof_spi_reset_regs() asserts TX/RX reset and polls until the reset bits clear, but the poll result is ignored. sh_msiof_transfer_one() can therefore continue programming a transfer after the controller did not leave reset.
Return the reset poll result from the helper and abort the transfer on timeout, matching the existing transfer path's error-return style.
--- drivers/spi/spi-sh-msiof.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/spi/spi-sh-msiof.c +6 -4
@@ -242,7 +242,7 @@ static irqreturn_t sh_msiof_spi_irq(int irq, void *data)return IRQ_HANDLED ; } -static void sh_msiof_spi_reset_regs (struct sh_msiof_spi_priv *p) +static int sh_msiof_spi_reset_regs (struct sh_msiof_spi_priv *p) {u32 mask =SICTR_TXRST |SICTR_RXRST ;u32 data;
@@ -251,8 +251,8 @@ static void sh_msiof_spi_reset_regs(struct sh_msiof_spi_priv *p) data |= mask;sh_msiof_write (p,SICTR , data); -readl_poll_timeout_atomic (p->mapbase +SICTR , data, !(data & mask),1 , -100 ); +return readl_poll_timeout_atomic (p->mapbase +SICTR , data, + !(data & mask),1 ,100 ); }static const u32 sh_msiof_spi_div_array[] = {
@@ -926,7 +926,9 @@ static int sh_msiof_transfer_one(struct spi_controller *ctlr,int ret;/* reset registers */ -sh_msiof_spi_reset_regs (p); + ret =sh_msiof_spi_reset_regs (p); +if (ret) +return ret;/* setup clocks (clock already enabled in chipselect()) */ if (!spi_controller_is_target (p->ctlr))
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 692/1276 gpio: mvebu: fail probe if gpiochip registration fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 479e91fc92416a4d54d2b3150aa1e4550d9cc759 ]
mvebu_gpio_probe() registers the GPIO chip with devm_gpiochip_add_data() but ignores the return value. If registration fails, probe continues and leaves later code operating on a GPIO chip that was never published to gpiolib.
Return the registration error so the device fails probe cleanly.
--- drivers/gpio/gpio-mvebu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpio/gpio-mvebu.c +4 -1
@@ -1227,7 +1227,10 @@ static int mvebu_gpio_probe(struct platform_device *pdev)BUG (); } -devm_gpiochip_add_data (&pdev->dev, &mvchip->chip, mvchip); + err =devm_gpiochip_add_data (&pdev->dev, &mvchip->chip, mvchip); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to register gpiochip\n" );/* Some MVEBU SoCs have simple PWM support for GPIO lines */ if (IS_REACHABLE (CONFIG_PWM )) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 693/1276 gpio: htc-egpio: use managed gpiochip registration
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengpeng Hou <[email protected]>
[ Upstream commit 17326db5f0ab4ec1901e75d052b5ebef486b467f ]
egpio_probe() registers each nested gpio_chip with gpiochip_add_data() but ignores the return value. If one registration fails, probe still returns success even though one of the chips was not published to gpiolib.
Use devm_gpiochip_add_data() and fail probe if any chip registration fails. This lets devres unwind already registered chips and prevents the driver from publishing a partially initialized device.
--- drivers/gpio/gpio-htc-egpio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpio/gpio-htc-egpio.c +5 -1
@@ -268,6 +268,7 @@ static int __init egpio_probe(struct platform_device *pdev)struct gpio_chip *chip;unsigned int irq, irq_end;int i; +int ret;/* Initialize ei data structure. */ ei =devm_kzalloc (&pdev->dev,sizeof (*ei),GFP_KERNEL );
@@ -331,7 +332,10 @@ static int __init egpio_probe(struct platform_device *pdev) chip->base = pdata->chip[i].gpio_base; chip->ngpio = pdata->chip[i].num_gpios; -gpiochip_add_data (chip, &ei->chip[i]); + ret =devm_gpiochip_add_data (&pdev->dev, chip, &ei->chip[i]); +if (ret) +return dev_err_probe (&pdev->dev, ret, +"failed to register gpiochip %d\n" , i); }/* Set initial pin values */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 694/1276 seg6: validate SRH length before reading fixed fields
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuoqi Gui <[email protected]>
[ Upstream commit a75d99f46bf21b45965ce39c5cfb3b8bb5ffb1aa ]
seg6_validate_srh() reads fixed SRH fields such as srh->type and srh->hdrlen before checking that the supplied length covers the fixed struct ipv6_sr_hdr fields.
The BPF SEG6 encap path reaches this with a BPF program-supplied pointer and length: bpf_lwt_push_encap() and the SEG6 local BPF END_B6 and END_B6_ENCAP actions call bpf_push_seg6_encap(), which forwards the length to seg6_validate_srh() with no minimum-size guard. A 2-byte SEG6 encap header can therefore make the validator read srh->type at offset 2 beyond the caller-supplied buffer.
Reject lengths shorter than the fixed SRH at the top of seg6_validate_srh(), before any field is read. This fixes the BPF helper path and keeps the common validator robust.
--- net/ipv6/seg6.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv6/seg6.c +3 -0
@@ -29,6 +29,9 @@ bool seg6_validate_srh(struct ipv6_sr_hdr *srh, int len, bool reduced)int max_last_entry;int trailing; +if (len <sizeof (*srh)) +return false; +if (srh->type !=IPV6_SRCRT_TYPE_4 )return false;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 695/1276 qede: fix out-of-bounds check for cqe->len_list[]
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matvey Kovalev <[email protected]>
[ Upstream commit f9ba47fce5932c15891c89c60e76dfaca919cb8d ]
Move index check before element access.
--- drivers/net/ethernet/qlogic/qede/qede_fp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qede/qede_fp.c +2 -2
@@ -961,7 +961,7 @@ static inline void qede_tpa_cont(struct qede_dev *edev, {int i; -for (i =0 ; cqe->len_list[i] && i <ARRAY_SIZE (cqe->len_list); i++) +for (i =0 ; i <ARRAY_SIZE (cqe->len_list) && cqe->len_list[i]; i++)qede_fill_frag_skb (edev, rxq, cqe->tpa_agg_index,le16_to_cpu (cqe->len_list[i]));
@@ -986,7 +986,7 @@ static int qede_tpa_end(struct qede_dev *edev,dma_unmap_page (rxq->dev, tpa_info->buffer.mapping,PAGE_SIZE , rxq->data_direction); -for (i =0 ; cqe->len_list[i] && i <ARRAY_SIZE (cqe->len_list); i++) +for (i =0 ; i <ARRAY_SIZE (cqe->len_list) && cqe->len_list[i]; i++)qede_fill_frag_skb (edev, rxq, cqe->tpa_agg_index,le16_to_cpu (cqe->len_list[i]));if (unlikely (i >1 ))
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 696/1276 net: enetc: check the number of BDs needed for xdp_frame
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Fang <[email protected]>
[ Upstream commit 555c5475e787802eeae0d2b91c2f66c330db2767 ]
The size of xdp_redirect_arr array is ENETC_MAX_SKB_FRAGS. However, the number of fragments contained in xdp_frame may be greater than or equal to ENETC_MAX_SKB_FRAGS, which will cause the access to xdp_redirect_arr to be out of bounds.
--- drivers/net/ethernet/freescale/enetc/enetc.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/ethernet/freescale/enetc/enetc.c +7 -0
@@ -1425,6 +1425,7 @@ int enetc_xdp_xmit(struct net_device *ndev, int num_frames, {struct enetc_tx_swbd xdp_redirect_arr[ENETC_MAX_SKB_FRAGS ] = {0 };struct enetc_ndev_priv *priv =netdev_priv (ndev); +struct skb_shared_info *shinfo;struct enetc_bdr *tx_ring;int xdp_tx_bd_cnt, i, k;int xdp_tx_frm_cnt =0 ;
@@ -1440,6 +1441,12 @@ int enetc_xdp_xmit(struct net_device *ndev, int num_frames,prefetchw (ENETC_TXBD (*tx_ring, tx_ring->next_to_use));for (k =0 ; k < num_frames; k++) { +if (xdp_frame_has_frags (frames[k])) { + shinfo =xdp_get_shared_info_from_frame (frames[k]); +if (unlikely ((shinfo->nr_frags +1 ) >ENETC_MAX_SKB_FRAGS )) +break ; + } + xdp_tx_bd_cnt =enetc_xdp_frame_to_xdp_tx_swbd (tx_ring, xdp_redirect_arr, frames[k]);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 697/1276 sctp: fix SCTP_RESET_STREAMS stream list length limit
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yousef Alhouseen <[email protected]>
[ Upstream commit 2b9f5ef534184bd81b8a4772780626c40eed1fd5 ]
SCTP_RESET_STREAMS carries a flexible array of u16 stream IDs, but the optlen clamps treat USHRT_MAX as a byte count and then multiply sizeof(__u16) by the fixed header size.
That caps the copied and validated option buffer at about 64 KiB, which rejects valid requests containing more than about half of the u16 stream ID range.
Use struct_size_t() for the maximum struct sctp_reset_streams layout instead, so the bound matches the flexible array described by srs_number_streams.
--- net/sctp/socket.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/sctp/socket.c +5 -4
@@ -4111,8 +4111,9 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,if (optlen <sizeof (*params))return -EINVAL ;/* srs_number_streams is u16, so optlen can't be bigger than this. */ - optlen = min_t(unsigned int, optlen, USHRT_MAX + -sizeof (__u16) *sizeof (*params)); + optlen = min_t(unsigned int, optlen, + struct_size_t(struct sctp_reset_streams, srs_stream_list, +USHRT_MAX ));if (params->srs_number_streams *sizeof (__u16) > optlen -sizeof (*params))
@@ -4598,8 +4599,8 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,if (optlen >0 ) {/* Trim it to the biggest size sctp sockopt may need if necessary */ optlen = min_t(unsigned int, optlen, -PAGE_ALIGN (USHRT_MAX + -sizeof (__u16) *sizeof (struct sctp_reset_streams ))); + PAGE_ALIGN(struct_size_t(struct sctp_reset_streams, + srs_stream_list,USHRT_MAX ))); kopt =memdup_sockptr (optval, optlen);if (IS_ERR (kopt))return PTR_ERR (kopt);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 698/1276 MIPS: DEC: Ensure RTC platform device deregistration upon failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maciej W. Rozycki <[email protected]>
[ Upstream commit eacaf5ae747f7dead6cc268de17a7382d79031fc ]
Switch RTC platform device registration from platform_device_register() to platform_add_devices() so as to make sure any failure will result in automatic device unregistration.
--- arch/mips/dec/platform.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/mips/dec/platform.c +5 -1
@@ -38,6 +38,10 @@ static struct platform_device dec_rtc_device = { .num_resources = ARRAY_SIZE(dec_rtc_resources), }; +static struct platform_device *dec_rtc_devices[]__initdata = { + &dec_rtc_device, +}; +static struct resource dec_dz_resources[] = { { .name ="dz" , .flags =IORESOURCE_MEM , }, { .name ="dz" , .flags =IORESOURCE_IRQ , },
@@ -137,7 +141,7 @@ static int __init dec_add_devices(void) } num_zs = i; - ret1 =platform_device_register (&dec_rtc_device); + ret1 =platform_add_devices (dec_rtc_devices,1 ); ret2 =IS_ENABLED (CONFIG_32BIT ) ?platform_add_devices (dec_dz_devices, num_dz) :0 ; ret3 =platform_add_devices (dec_zs_devices, num_zs);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 699/1276 ASoC: codecs: lpass-va-macro: add SM6115 compatible
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Kandagatla <[email protected]>
[ Upstream commit 893e2fd509e968cc1d76caadee0f5d2f2c72f137 ]
SM6115 does not have "macro" clock, so its bindings differ with existing SoC support in va-macro. So add dedicated compatible in both driver and dt-bindings to be able to address that difference.
Stable-dep-of: 0773610eef71 ("ASoC: codecs: lpass-va-macro: Fix LPASS Codec Version for SC7280")
--- sound/soc/codecs/lpass-va-macro.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/lpass-va-macro.c +1 -0
@@ -1722,6 +1722,7 @@ static const struct dev_pm_ops va_macro_pm_ops = {static const struct of_device_id va_macro_dt_match[] = { { .compatible ="qcom,sc7280-lpass-va-macro" , .data = &sm8250_va_data }, + { .compatible ="qcom,sm6115-lpass-va-macro" , .data = &sm8450_va_data }, { .compatible ="qcom,sm8250-lpass-va-macro" , .data = &sm8250_va_data }, { .compatible ="qcom,sm8450-lpass-va-macro" , .data = &sm8450_va_data }, { .compatible ="qcom,sm8550-lpass-va-macro" , .data = &sm8550_va_data },
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 700/1276 ASoC: codecs: lpass-va-macro: Fix LPASS Codec Version for SC7280
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luca Weiss <[email protected]>
[ Upstream commit 0773610eef71c30df3cb4c113c8215625d2a7c23 ]
According to both the static definition in downstream...
yupik-audio-overlay.dtsi: qcom,bolero-version = <4>; #define BOLERO_VERSION_2_0 0x0004)
and the runtime detection:
CDC_VA_TOP_CSR_CORE_ID_0=0x1
CDC_VA_TOP_CSR_CORE_ID_1=0xf
SC7280 has LPASS Codec Version 2.0 and not, as declared with sm8250_va_data LPASS_CODEC_VERSION_1_0.
Create new va_macro_data with .version not set to use the runtime detection and correctly get .version = LPASS_CODEC_VERSION_2_0.
--- sound/soc/codecs/lpass-va-macro.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/codecs/lpass-va-macro.c +6 -1
@@ -237,6 +237,11 @@ static const struct va_macro_data sm8250_va_data = { .version = LPASS_CODEC_VERSION_1_0, }; +static const struct va_macro_data sc7280_va_data = { + .has_swr_master = false, + .has_npl_clk = false, +}; +static const struct va_macro_data sm8450_va_data = { .has_swr_master = true, .has_npl_clk = true,
@@ -1721,7 +1726,7 @@ static const struct dev_pm_ops va_macro_pm_ops = { };static const struct of_device_id va_macro_dt_match[] = { - { .compatible ="qcom,sc7280-lpass-va-macro" , .data = &sm8250_va_data }, + { .compatible ="qcom,sc7280-lpass-va-macro" , .data = &sc7280_va_data }, { .compatible ="qcom,sm6115-lpass-va-macro" , .data = &sm8450_va_data }, { .compatible ="qcom,sm8250-lpass-va-macro" , .data = &sm8250_va_data }, { .compatible ="qcom,sm8450-lpass-va-macro" , .data = &sm8450_va_data },
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 701/1276 hwmon: adm1275: Prevent reading uninitialized stack
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matti Vaittinen <[email protected]>
[ Upstream commit 553f9517813912a5ab661af5504485d96824a61c ]
While adding support for the ROHM BD127X0 hot-swap controllers, sashiko reported an error in device-name comparison, which can lead to reading uninitialized stack memory.
Quoting Sashiko:
This is a pre-existing issue, but I noticed that just before this block in adm1275_probe(), there might be an out-of-bounds stack read:
ret = i2c_smbus_read_block_data(client, PMBUS_MFR_MODEL, block_buffer);
if (ret < 0) { ... }
for (mid = adm1275_id; mid->name[0]; mid++) {
if (!strncasecmp(mid->name, block_buffer, strlen(mid->name)))
break;
}Since i2c_smbus_read_block_data() reads up to 32 bytes into the uninitialized stack array block_buffer without appending a null terminator, strncasecmp() could read past the valid bytes returned in ret.
For example, if the device returns a shorter string like "adm12", checking it against "adm1275" up to the length of "adm1275" will continue reading into uninitialized stack bounds.
Prevent reading uninitialized memory by zeroing the stack array.
--- drivers/hwmon/pmbus/adm1275.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/pmbus/adm1275.c +1 -1
@@ -509,7 +509,7 @@ static int adm1275_enable_vout_temp(struct adm1275_data *data,static int adm1275_probe (struct i2c_client *client) {s32 (*config_read_fn)(const struct i2c_client *client,u8 reg); -u8 block_buffer[I2C_SMBUS_BLOCK_MAX +1 ]; +u8 block_buffer[I2C_SMBUS_BLOCK_MAX +1 ] = {0 };int config, device_config;int ret;struct pmbus_driver_info *info;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 702/1276 hwmon: (pmbus) Fix passing events to regulator core
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit 9ef7dacd44216bf5ea05c8aef49eba4d145f4047 ]
Sashiko reports:
Commit 754bd2b4a084 ("hwmon: (pmbus/core) Protect regulator operations with mutex") introduced a worker to batch regulator events over time using atomic_or(). The delayed worker then passes the combined bitmask unmodified to regulator_notifier_call_chain().
The core regulator subsystem's regulator_handle_critical() function evaluates the event parameter using a strict switch statement. If multiple distinct faults occur before the worker runs (e.g., REGULATOR_EVENT_UNDER_VOLTAGE | REGULATOR_EVENT_OVER_CURRENT), the combined bitmask fails to match any case. This leaves the reason as NULL and completely bypasses the critical hw_protection_trigger().
Fix the problem by passing events bit by bit to the regulator event handler.
--- drivers/hwmon/pmbus/pmbus_core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/hwmon/pmbus/pmbus_core.c +9 -4
@@ -3315,18 +3315,23 @@ static void pmbus_regulator_notify_worker(struct work_struct *work)int i, j;for (i =0 ; i < data->info->pages; i++) { -int event; +unsigned int event; event =atomic_xchg (&data->regulator_events[i],0 );if (!event)continue ;for (j =0 ; j < data->info->num_regulators; j++) { -if (i ==rdev_get_id (data->rdevs[j])) { +if (i !=rdev_get_id (data->rdevs[j])) +continue ; +while (event) { +unsigned int _event =BIT (__ffs (event)); +regulator_notifier_call_chain (data->rdevs[j], - event,NULL ); -break ; + _event,NULL ); + event &= ~_event; } +break ; } } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 703/1276 hwmon: (aspeed-g6-pwm-tach) Guard fan RPM calculation against divide-by-zero
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guenter Roeck <[email protected]>
[ Upstream commit fe87b8dc67f1b2c64e76a66e78468c533d3c44ca ]
Sashiko reports:
In the aspeed-g6-pwm-tacho driver, the aspeed_tach_val_to_rpm() function calculates the fan RPM using the tachometer value. However, it does not check if the tachometer value is zero before performing the division.
If the hardware reports a tachometer value of 0 (which can happen due to an extremely fast pulse, a stuck edge, or a hardware glitch), the calculated tach_div evaluates to 0. The subsequent call to do_div() with tach_div as the divisor triggers a divide-by-zero exception, leading to a kernel panic.
Check the divisor against zero to fix the problem.
--- drivers/hwmon/aspeed-g6-pwm-tach.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hwmon/aspeed-g6-pwm-tach.c +4 -1
@@ -293,7 +293,10 @@ static int aspeed_tach_val_to_rpm(struct aspeed_pwm_tach_data *priv, u32 tach_va priv->clk_rate, tach_val, tach_div); rpm = (u64 )priv->clk_rate *60 ; -do_div (rpm, tach_div); +if (tach_div) +do_div (rpm, tach_div); +else + rpm =0 ;return (int )rpm; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 704/1276 ipv6: fib6: fix NULL deref in fib6_walk_continue() on multi-batch dump
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pengfei Zhang <[email protected]>
[ Upstream commit 9facb861dc6b9b9ea9793ef5032a9a826f7a4229 ]
inet6_dump_fib() saves its progress in cb->args[1] as a positional index within the current hash chain. Between batches, a concurrent fib6_new_table() can insert a new table at the chain head, shifting all existing entries. The saved index then lands on a different table, causing fib6_dump_table() to set w->root to the wrong table while w->node still points into the previous one. fib6_walk_continue() dereferences w->node->parent (NULL) and panics:
BUG: kernel NULL pointer dereference, address: 0000000000000008 RIP: 0010:fib6_walk_continue+0x6e/0x170 Call Trace: <TASK> fib6_dump_table.isra.0+0xc5/0x240 inet6_dump_fib+0xf6/0x420 rtnl_dumpit+0x30/0xa0 netlink_dump+0x15b/0x460 netlink_recvmsg+0x1d6/0x2a0 ____sys_recvmsg+0x17a/0x190
Fix by storing tb->tb6_id in cb->args[1] instead of a positional index. On resume, skip entries until the id matches; a concurrent head-insert can never match the saved id, so the walker always resumes on the correct table.
--- net/ipv6/ip6_fib.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
net/ipv6/ip6_fib.c +8 -9
@@ -629,12 +629,12 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) };const struct nlmsghdr *nlh = cb->nlh;struct net *net =sock_net (skb->sk); -unsigned int e =0 , s_e;struct hlist_head *head;struct fib6_walker *w;struct fib6_table *tb;unsigned int h, s_h;int err =0 ; +u32 s_id;rcu_read_lock ();if (cb->strict_check) {
@@ -694,23 +694,22 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) } s_h = cb->args[0 ]; - s_e = cb->args[1 ]; + s_id = cb->args[1 ]; -for (h = s_h; h <FIB6_TABLE_HASHSZ ; h++, s_e =0 ) { - e =0 ; +for (h = s_h; h <FIB6_TABLE_HASHSZ ; h++, s_id =0 ) { head = &net->ipv6.fib_table_hash[h];hlist_for_each_entry_rcu (tb, head, tb6_hlist) { -if (e < s_e) - goto next; +if (s_id && tb->tb6_id != s_id) +continue ; + + s_id =0 ; + cb->args[1 ] = tb->tb6_id; err =fib6_dump_table (tb, skb, cb);if (err !=0 ) goto out; -next: - e++; } } out: - cb->args[1 ] = e; cb->args[0 ] = h; unlock:
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 705/1276 usbnet: gl620a: fix out-of-bounds read in genelink_rx_fixup()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit 8ff7f2a6da4fccaa5cc9be7251a24e71e29fbd1a ]
genelink_rx_fixup() splits an aggregated RX frame into its individual packets, using a per-packet length taken from device-supplied data. That length is only bounded by GL_MAX_PACKET_LEN (1514); it is never compared against how many bytes were actually received.
A malicious GeneLink (GL620A) device can therefore send a short URB whose header claims packet_count > 1 and a first packet of up to 1514 bytes.
skb_put_data(gl_skb, packet->packet_data, size);
then copies past the end of the receive buffer and hands the adjacent slab contents up the network stack, an out-of-bounds read that leaks kernel heap. No privilege is required: the path runs in the usbnet RX softirq as soon as the interface is up.
BUG: KASAN: slab-out-of-bounds in genelink_rx_fixup (drivers/net/usb/gl620a.c:112)
Read of size 1514 at addr ffff888011309708 by task ksoftirqd/0/14
Call Trace:
...
__asan_memcpy (mm/kasan/shadow.c:105)
genelink_rx_fixup (include/linux/skbuff.h:2814 drivers/net/usb/gl620a.c:112)
usbnet_bh (drivers/net/usb/usbnet.c:572 drivers/net/usb/usbnet.c:1589)
process_one_work (kernel/workqueue.c:3322)
bh_worker (kernel/workqueue.c:3405)
tasklet_action (kernel/softirq.c:965)
handle_softirqs (kernel/softirq.c:622)
run_ksoftirqd (kernel/softirq.c:1076)
...skb_pull() already verifies that the requested length fits the buffer and returns NULL otherwise. Move it ahead of the copy and check its result, so a packet that overruns the received data is rejected before it is read. Well-formed frames, whose packets are fully present, are unaffected.
--- drivers/net/usb/gl620a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/usb/gl620a.c +3 -3
@@ -104,6 +104,9 @@ static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)return 0 ; } +if (!skb_pull (skb, size +4 )) +return 0 ; +// allocate the skb for the individual packet gl_skb =alloc_skb (size,GFP_ATOMIC );if (gl_skb) {
@@ -116,9 +119,6 @@ static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)// advance to the next packet packet = (struct gl_packet *)&packet->packet_data[size]; count--; - -// shift the data pointer to the next gl_packet -skb_pull (skb, size +4 ); }// skip the packet length field 4 bytes
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 706/1276 net: phy: sfp: free mii_bus in sfp_i2c_mdiobus_destroy
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Wozniak <[email protected]>
[ Upstream commit 8f31efff9206f9f0adb853cad6916086aac4d5ef ]
sfp_i2c_mdiobus_create() allocates the I2C MDIO bus with mdio_i2c_alloc(), a plain (non-devm) allocation, and registers it. sfp_i2c_mdiobus_destroy() only unregisters the bus and clears sfp->i2c_mii without calling mdiobus_free(). As the only reference to the bus is then cleared, the struct mii_bus is leaked.
This is hit whenever a copper/RollBall SFP module that instantiated an MDIO bus is removed: sfp_sm_main() takes the global teardown path and calls sfp_i2c_mdiobus_destroy(). sfp_cleanup(), on driver unbind, frees sfp->i2c_mii directly, which is why the leak only triggered on module hot-removal and not on unbind.
Free the bus in sfp_i2c_mdiobus_destroy() to match the allocation done in sfp_i2c_mdiobus_create().
--- drivers/net/phy/sfp.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/phy/sfp.c +1 -0
@@ -787,6 +787,7 @@ static int sfp_i2c_mdiobus_create(struct sfp *sfp)static void sfp_i2c_mdiobus_destroy (struct sfp *sfp) {mdiobus_unregister (sfp->i2c_mii); +mdiobus_free (sfp->i2c_mii); sfp->i2c_mii =NULL ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 707/1276 net: gianfar: dispose irq mappings on probe failure and device removal
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rosen Penev <[email protected]>
[ Upstream commit dbf803bc4a8b0522c9a12560c20905a5952d1cb9 ]
irq_of_parse_and_map() creates irqdomain mappings that should be balanced with irq_dispose_mapping(). The driver never called irq_dispose_mapping(), leaking mappings on probe failure and device removal.
Fix by adding irq_dispose_mapping() in free_gfar_dev() and expanding its loop from priv->num_grps to MAXGROUPS so the error path also catches partially-initialized groups. All irqinfo pointers are pre-initialized to NULL in gfar_of_init(), making the NULL-guarded walk in free_gfar_dev() safe for every scenario.
gfar_parse_group() itself is left as a simple parse function with no resource management; cleanup is centralized in the caller's error path.
--- drivers/net/ethernet/freescale/gianfar.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +11 -5
@@ -470,10 +470,13 @@ static void free_gfar_dev(struct gfar_private *priv) {int i, j; -for (i =0 ; i < priv->num_grps; i++) +for (i =0 ; i <MAXGROUPS ; i++)for (j =0 ; j <GFAR_NUM_IRQS ; j++) { -kfree (priv->gfargrp[i].irqinfo[j]); - priv->gfargrp[i].irqinfo[j] =NULL ; +if (priv->gfargrp[i].irqinfo[j]) { +irq_dispose_mapping (priv->gfargrp[i].irqinfo[j]->irq); +kfree (priv->gfargrp[i].irqinfo[j]); + priv->gfargrp[i].irqinfo[j] =NULL ; + } }free_netdev (priv->ndev);
@@ -630,7 +633,7 @@ static phy_interface_t gfar_get_interface(struct net_device *dev)static int gfar_of_init (struct platform_device *ofdev,struct net_device **pdev) {const char *model; -int err =0 , i; +int err =0 , i, j;phy_interface_t interface;struct net_device *dev =NULL ;struct gfar_private *priv =NULL ;
@@ -714,8 +717,11 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) priv->rx_list.count =0 ;mutex_init (&priv->rx_queue_access); -for (i =0 ; i <MAXGROUPS ; i++) +for (i =0 ; i <MAXGROUPS ; i++) { priv->gfargrp[i].regs =NULL ; +for (j =0 ; j <GFAR_NUM_IRQS ; j++) + priv->gfargrp[i].irqinfo[j] =NULL ; + }/* Parse and initialize group specific information */ if (priv->mode ==MQ_MG_MODE ) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 708/1276 net/sched: sch_teql: Introduce slaves_lock to avoid race condition and UAF
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamal Hadi Salim <[email protected]>
[ Upstream commit e5b811fe793166aecc59b085c1b7c31262ef2316 ]
The teql master->slaves singly linked list is not protected against multiple writes. It can be mod'ed concurently from teql_master_xmit(), teql_dequeue(), teql_init() and teql_destroy() without holding any list lock or RCU protection.
[email protected] has demonstrated that the qdisc is freed after an RCU grace period, but teql_master_xmit() running on another CPU can still hold a stale pointer into the list, resulting in a slab-use-after-free:
BUG: KASAN: slab-use-after-free in teql_master_xmit+0xf0f/0x16b0 Read of size 8 at addr ffff888013fb0440 by task poc/332
Freed 512-byte region [ffff888013fb0400, ffff888013fb0600) (kmalloc-512)
The fix?
Add a per-master slaves_lock spinlock that serializes all mutations of master->slaves and the NEXT_SLAVE() links in teql_destroy() and teql_qdisc_init(). teql_master_xmit() also takes the same slaves_lock around those updates.
Annotate master->slaves and the per-slave ->next pointer with __rcu and use the appropriate RCU accessors everywhere they are touched:rcu_assign_pointer() on the writer side (under slaves_lock), rcu_dereference_protected() for the writer-side loads (also under slaves_lock), rcu_dereference_bh() for the loads in teql_master_xmit() and rtnl_dereference() for the loads in teql_master_open()/teql_master_mtu(), which run under RTNL.
Pair this with rcu_read_lock_bh()/rcu_read_unlock_bh() around the list traversal in teql_master_xmit(), so that readers either observe a fully linked list or are deferred until the in-flight mutation completes. The two early-return paths in teql_master_xmit() are updated to release the RCU-bh read-side critical section before returning, since leaving it held would disable BH on that CPU for good.
--- net/sched/sch_teql.c | 125 +++++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 39 deletions(-)
net/sched/sch_teql.c +86 -39
@@ -52,7 +52,8 @@struct teql_master {struct Qdisc_ops qops;struct net_device *dev; -struct Qdisc *slaves; +struct Qdisc __rcu *slaves; +spinlock_t slaves_lock;/* serializes writes to ->slaves */ struct list_head master_list;unsigned long tx_bytes;unsigned long tx_packets;
@@ -61,7 +62,7 @@ struct teql_master { };struct teql_sched_data { -struct Qdisc *next; +struct Qdisc __rcu *next;struct teql_master *m;struct sk_buff_head q; };
@@ -101,7 +102,9 @@ teql_dequeue(struct Qdisc *sch)if (skb ==NULL ) {struct net_device *m =qdisc_dev (q);if (m) { - dat->m->slaves = sch; +spin_lock_bh (&dat->m->slaves_lock); +rcu_assign_pointer (dat->m->slaves, sch); +spin_unlock_bh (&dat->m->slaves_lock);netif_wake_queue (m); } }else {
@@ -132,34 +135,49 @@ teql_destroy(struct Qdisc *sch)struct Qdisc *q, *prev;struct teql_sched_data *dat =qdisc_priv (sch);struct teql_master *master = dat->m; +struct netdev_queue *txq =NULL ; +bool reset_master_queue = false;if (!master)return ; - prev = master->slaves; +spin_lock_bh (&master->slaves_lock); + prev =rcu_dereference_protected (master->slaves, +lockdep_is_held (&master->slaves_lock));if (prev) {do { - q =NEXT_SLAVE (prev); -if (q == sch) { -NEXT_SLAVE (prev) =NEXT_SLAVE (q); -if (q == master->slaves) { - master->slaves =NEXT_SLAVE (q); -if (q == master->slaves) { -struct netdev_queue *txq; - - txq =netdev_get_tx_queue (master->dev,0 ); - master->slaves =NULL ; - -dev_reset_queue (master->dev, - txq,NULL ); - } - } -skb_queue_purge (&dat->q); -break ; +struct Qdisc *head, *next; + + q =rcu_dereference_protected (NEXT_SLAVE (prev), +lockdep_is_held (&master->slaves_lock)); +if (q != sch) { + prev = q; +continue ; } - }while ((prev = q) != master->slaves); + next =rcu_dereference_protected (NEXT_SLAVE (q), +lockdep_is_held (&master->slaves_lock)); +rcu_assign_pointer (NEXT_SLAVE (prev), next); + + head =rcu_dereference_protected (master->slaves, +lockdep_is_held (&master->slaves_lock)); +if (q == head) { +rcu_assign_pointer (master->slaves, next); +if (q == next) { + txq =netdev_get_tx_queue (master->dev,0 ); +rcu_assign_pointer (master->slaves,NULL ); + reset_master_queue = true; + } + } +skb_queue_purge (&dat->q); +break ; + }while (prev !=rcu_dereference_protected (master->slaves, +lockdep_is_held (&master->slaves_lock))); } +spin_unlock_bh (&master->slaves_lock); + +if (reset_master_queue) +dev_reset_queue (master->dev, txq,NULL ); } static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt,
@@ -168,6 +186,7 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt,struct net_device *dev =qdisc_dev (sch);struct teql_master *m = (struct teql_master *)sch->ops;struct teql_sched_data *q =qdisc_priv (sch); +struct Qdisc *first;if (dev->hard_header_len > m->dev->hard_header_len)return -EINVAL ;
@@ -184,7 +203,9 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt,skb_queue_head_init (&q->q); -if (m->slaves) { +spin_lock_bh (&m->slaves_lock); + first =rcu_dereference_protected (m->slaves,lockdep_is_held (&m->slaves_lock)); +if (first) {if (m->dev->flags &IFF_UP ) { if ((m->dev->flags & IFF_POINTOPOINT && !(dev->flags & IFF_POINTOPOINT)) ||
@@ -192,8 +213,10 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt, !(dev->flags & IFF_BROADCAST)) || (m->dev->flags & IFF_MULTICAST && !(dev->flags & IFF_MULTICAST)) || - dev->mtu < m->dev->mtu) + dev->mtu < m->dev->mtu) { +spin_unlock_bh (&m->slaves_lock);return -EINVAL ; + } }else {if (!(dev->flags&IFF_POINTOPOINT )) m->dev->flags &= ~IFF_POINTOPOINT ;
@@ -204,14 +227,17 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt,if (dev->mtu < m->dev->mtu) m->dev->mtu = dev->mtu; } - q->next =NEXT_SLAVE (m->slaves); -NEXT_SLAVE (m->slaves) = sch; +rcu_assign_pointer (q->next, +rcu_dereference_protected (NEXT_SLAVE (first), +lockdep_is_held (&m->slaves_lock))); +rcu_assign_pointer (NEXT_SLAVE (first), sch); }else { - q->next = sch; - m->slaves = sch; +rcu_assign_pointer (q->next, sch); +rcu_assign_pointer (m->slaves, sch); m->dev->mtu = dev->mtu; m->dev->flags = (m->dev->flags&~FMASK )|(dev->flags&FMASK ); } +spin_unlock_bh (&m->slaves_lock);return 0 ; }
@@ -285,7 +311,9 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev)int subq =skb_get_queue_mapping (skb);struct sk_buff *skb_res =NULL ; - start = master->slaves; +rcu_read_lock_bh (); + + start =rcu_dereference_bh (master->slaves); restart: nores =0 ;
@@ -317,10 +345,17 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev) netdev_start_xmit(skb, slave, slave_txq, false) == NETDEV_TX_OK) {__netif_tx_unlock (slave_txq); - master->slaves =NEXT_SLAVE (q); +spin_lock_bh (&master->slaves_lock); +if (rcu_dereference_protected (master->slaves, +lockdep_is_held (&master->slaves_lock)) == q) +rcu_assign_pointer (master->slaves, +rcu_dereference_protected (NEXT_SLAVE (q), +lockdep_is_held (&master->slaves_lock))); +spin_unlock_bh (&master->slaves_lock);netif_wake_queue (dev); master->tx_packets++; master->tx_bytes += length; +rcu_read_unlock_bh ();return NETDEV_TX_OK ; }__netif_tx_unlock (slave_txq);
@@ -329,14 +364,21 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev) busy =1 ;break ;case 1 : - master->slaves =NEXT_SLAVE (q); +spin_lock_bh (&master->slaves_lock); +if (rcu_dereference_protected (master->slaves, +lockdep_is_held (&master->slaves_lock)) == q) +rcu_assign_pointer (master->slaves, +rcu_dereference_protected (NEXT_SLAVE (q), +lockdep_is_held (&master->slaves_lock))); +spin_unlock_bh (&master->slaves_lock); +rcu_read_unlock_bh ();return NETDEV_TX_OK ;default : nores =1 ;break ; }__skb_pull (skb,skb_network_offset (skb)); - }while ((q =NEXT_SLAVE (q)) != start); + }while ((q =rcu_dereference_bh (NEXT_SLAVE (q))) != start);if (nores && skb_res ==NULL ) { skb_res = skb;
@@ -345,29 +387,32 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev)if (busy) {netif_stop_queue (dev); +rcu_read_unlock_bh ();return NETDEV_TX_BUSY ; } master->tx_errors++; drop: master->tx_dropped++; +rcu_read_unlock_bh ();dev_kfree_skb (skb);return NETDEV_TX_OK ; }static int teql_master_open (struct net_device *dev) { -struct Qdisc *q; +struct Qdisc *q, *first;struct teql_master *m =netdev_priv (dev);int mtu =0xFFFE ;unsigned int flags =IFF_NOARP |IFF_MULTICAST ; -if (m->slaves ==NULL ) + first =rtnl_dereference (m->slaves); +if (!first)return -EUNATCH ; flags =FMASK ; - q = m->slaves; + q = first; do { struct net_device *slave = qdisc_dev(q);
@@ -389,7 +434,7 @@ static int teql_master_open(struct net_device *dev) flags &= ~IFF_BROADCAST ;if (!(slave->flags&IFF_MULTICAST )) flags &= ~IFF_MULTICAST ; - }while ((q =NEXT_SLAVE (q)) != m->slaves); + }while ((q =rtnl_dereference (NEXT_SLAVE (q))) != first); m->dev->mtu = mtu; m->dev->flags = (m->dev->flags&~FMASK ) | flags;
@@ -417,14 +462,15 @@ static void teql_master_stats64(struct net_device *dev,static int teql_master_mtu (struct net_device *dev,int new_mtu) {struct teql_master *m =netdev_priv (dev); -struct Qdisc *q; +struct Qdisc *q, *first; - q = m->slaves; + first =rtnl_dereference (m->slaves); + q = first;if (q) {do {if (new_mtu >qdisc_dev (q)->mtu)return -EINVAL ; - }while ((q =NEXT_SLAVE (q)) != m->slaves); + }while ((q =rtnl_dereference (NEXT_SLAVE (q))) != first); }WRITE_ONCE (dev->mtu, new_mtu);
@@ -444,6 +490,7 @@ static __init void teql_master_setup(struct net_device *dev)struct teql_master *master =netdev_priv (dev);struct Qdisc_ops *ops = &master->qops; +spin_lock_init (&master->slaves_lock); master->dev = dev; ops->priv_size =sizeof (struct teql_sched_data );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 709/1276 bridge: stp: Fix a potential use-after-free when deleting a bridge
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ido Schimmel <[email protected]>
[ Upstream commit 2a00517db8de4be7df3d483b215c5544fb30a191 ]
The three STP timers are not supposed to be armed while the bridge is administratively down. They are synchronously deactivated when the bridge is put administratively down and the various call sites check for 'IFF_UP' before arming them.
This check is missing from br_topology_change_detection() and it is possible to engineer a situation in which the topology change timer is armed while the bridge is administratively down, resulting in a use-after-free [1] when the bridge is deleted.
Fix by adding the missing check and for good measures synchronously shutdown the three timers when the bridge is deleted.
[1]
ODEBUG: free active (active state 0) object: ffff88811662b9b0 object type: timer_list hint: br_topology_change_timer_expired (net/bridge/br_stp_timer.c:120)
WARNING: lib/debugobjects.c:629 at debug_print_object+0x1bc/0x450, CPU#9: ip/359
--- net/bridge/br_if.c | 3 +++ net/bridge/br_stp.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)
net/bridge/br_if.c +3 -0
@@ -391,6 +391,9 @@ void br_dev_delete(struct net_device *dev, struct list_head *head)br_fdb_delete_by_port (br,NULL ,0 ,1 ); +timer_shutdown_sync (&br->hello_timer); +timer_shutdown_sync (&br->topology_change_timer); +timer_shutdown_sync (&br->tcn_timer);cancel_delayed_work_sync (&br->gc_work);br_sysfs_delbr (br->dev);
net/bridge/br_stp.c +2 -1
@@ -371,7 +371,8 @@ void br_topology_change_detection(struct net_bridge *br) {int isroot =br_is_root_bridge (br); -if (br->stp_enabled !=BR_KERNEL_STP ) +if (br->stp_enabled !=BR_KERNEL_STP || + !(br->dev->flags &IFF_UP ))return ; br_info(br, "topology change detected, %s\n",
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 710/1276 drm/panthor: Fix potential invalid pointer deref in group_process_tiler_oom()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
[ Upstream commit b39436d0ba1571dbcda69d20ec567344b3eecfc7 ]
If heaps is an ERR_PTR(), panthor_heap_pool_put() will deref an invalid pointer. Make sure we set it to NULL in that case.
--- drivers/gpu/drm/panthor/panthor_sched.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/panthor/panthor_sched.c +4 -1
@@ -1439,7 +1439,10 @@ static int group_process_tiler_oom(struct panthor_group *group, u32 cs_id)if (unlikely (csg_id <0 ))return 0 ; -if (IS_ERR (heaps) || frag_end > vt_end || vt_end >= vt_start) { +if (IS_ERR (heaps)) { + ret = -EINVAL ; + heaps =NULL ; + }else if (frag_end > vt_end || vt_end >= vt_start) { ret = -EINVAL ; }else {/* We do the allocation without holding the scheduler lock to avoid
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 711/1276 drm/panthor: Dont overrule pending immediate ticks in sched_resume_tick()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
[ Upstream commit 6fec8b473497b7f32e604a6dd92b32b0889af3e8 ]
We schedule immediate ticks when we need to process events on CSGs, but those immediate ticks don't change the resched_target because we want the other groups to stay scheduled for the remaining of the GPU timeslot they were given. Make sure these immediate ticks don't get overruled by a sched_queue_delayed_work() that would delay the tick execution.
--- drivers/gpu/drm/panthor/panthor_sched.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/panthor/panthor_sched.c +8 -1
@@ -2535,7 +2535,14 @@ static void sched_resume_tick(struct panthor_device *ptdev)else delay_jiffies =0 ; -sched_queue_delayed_work (sched, tick, delay_jiffies); +/* We schedule immediate ticks when we need to process events on CSGs, +* but those don't change the resched_target because we want the other +* groups to stay scheduled for the remaining of the GPU timeslot they +* were given. Make sure those immediate ticks don't get overruled by +* a sched_queue_delayed_work() that would delay the tick execution. +*/ +if (!delayed_work_pending (&sched->tick_work)) +sched_queue_delayed_work (sched, tick, delay_jiffies); }static void group_schedule_locked (struct panthor_group *group,u32 queue_mask)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 712/1276 drm/panthor: Fix a leak when a group is evicted before the tiler OOM is serviced
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
[ Upstream commit 6efeb9ddb4fbf5ac30aff03e8f09ffbdf966abd0 ]
A group ref is tied to the pending tiler_oom_work, so we need to release it if the cancel was effective.
--- drivers/gpu/drm/panthor/panthor_sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/panthor/panthor_sched.c +2 -1
@@ -999,7 +999,8 @@ group_unbind_locked(struct panthor_group *group)/* Tiler OOM events will be re-issued next time the group is scheduled. */ atomic_set (&group->tiler_oom,0 ); -cancel_work (&group->tiler_oom_work); +if (cancel_work (&group->tiler_oom_work)) +group_put (group);for (u32 i =0 ; i < group->queue_count; i++) group->queues[i]->doorbell_id =-1 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 713/1276 drm/panthor: Interrupt group start/resumption if group_bind_locked() fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Brezillon <[email protected]>
[ Upstream commit 1f27cef1f41dac0bd254d8741766f189936c9880 ]
group_bind_locked() can fail if the MMU block is stuck. This is normally a reset situation, but by the time we reset the GPU, we might have tried to resume a group that's not resident, which will probably trip out the FW. So let's avoid that by bailing out when group_bind_locked() returns an error. We don't even try to start more groups because the GPU will be reset anyway.
--- drivers/gpu/drm/panthor/panthor_sched.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/panthor/panthor_sched.c +7 -1
@@ -2236,7 +2236,13 @@ tick_ctx_apply(struct panthor_scheduler *sched, struct panthor_sched_tick_ctx *c csg_iface =panthor_fw_get_csg_iface (ptdev, csg_id); csg_slot = &sched->csg_slots[csg_id]; -group_bind_locked (group, csg_id); + ret =group_bind_locked (group, csg_id); +if (ret) { +panthor_device_schedule_reset (ptdev); + ctx->csg_upd_failed_mask |=BIT (csg_id); +return ; + } +csg_slot_prog_locked (ptdev, csg_id, new_csg_prio--); csgs_upd_ctx_queue_reqs(ptdev, &upd_ctx, csg_id, group->state == PANTHOR_CS_GROUP_SUSPENDED ?
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 714/1276 tracing/events: Fix to check the simple_tsk_fn creation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masami Hiramatsu (Google) <[email protected]>
[ Upstream commit cda1fbfc5313bb90daa271d45eea4a8d317a8544 ]
Sashiko pointed that this sample code does not correctly handle the failure of thread creation because kthread_run() can return -errno.
Check the simple_tsk_fn is correctly initialized (created) or not.
--- samples/trace_events/trace-events-sample.c | 4 ++++ 1 file changed, 4 insertions(+)
samples/trace_events/trace-events-sample.c +4 -0
@@ -107,6 +107,10 @@ int foo_bar_reg(void)* for consistency sake, we still take the thread_mutex. */ simple_tsk_fn =kthread_run (simple_thread_fn,NULL ,"event-sample-fn" ); +if (IS_ERR_OR_NULL (simple_tsk_fn)) { +pr_err ("Failed to create simple_thread_fn\n" ); + simple_tsk_fn =NULL ; + } out:mutex_unlock (&thread_mutex);return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 715/1276 tracing: eprobe: read the complete FILTER_PTR_STRING pointer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Martin Kaiser <[email protected]>
[ Upstream commit 206b25c09080cc20fd4c2bea12d59df4b7ba2121 ]
For a char * element in an event, the FILTER_PTR_STRING filter type is used. When the event occurs, a pointer is stored in the ringbuffer.
If an eprobe references such a char * element of a "base event", the stored pointer is truncated when it's read from the ringbuffer.
$ cd /sys/kernel/tracing $ echo 'e rcu.rcu_utilization $s:x64 $s:string' > dynamic_events $ echo 1 > tracing_on $ echo 1 > events/eprobes/enable $ sleep 1 $ echo 0 > events/eprobes/enable $ cat trace <idle>-0 ...: (rcu.rcu_utilization) arg1=0x4f arg2=(fault) <idle>-0 ...: (rcu.rcu_utilization) arg1=0x2 arg2=(fault)
The problem is in get_event_field
val = (unsigned long)(*(char *)addr);
addr points to the position in the ringbuffer where the pointer was stored. The assignment reads only the lowest byte of the pointer.
Fix the cast to read the whole pointer. The output of the test above is now
<idle>-0 ... arg1=0xffffffff81c7d3f3 arg2="Start scheduler-tick" <idle>-0 ... arg1=0xffffffff81c57340 arg2="End scheduler-tick"
--- kernel/trace/trace_eprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_eprobe.c +1 -1
@@ -314,7 +314,7 @@ get_event_field(struct fetch_insn *code, void *rec) val = (unsigned long )addr;break ;case FILTER_PTR_STRING : - val = (unsigned long )(*(char *)addr); + val = *(unsigned long *)addr;break ;default :WARN_ON_ONCE (1 );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 716/1276 irqchip/gic-v3-its: Fix OF node reference leak
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuho Choi <[email protected]>
[ Upstream commit 2e1368a9d61bdf5502ddade004f223a5831c5b8c ]
of_get_cpu_node() returns a referenced device node. In its_cpu_init_collection(), the Cavium 23144 workaround only uses the node to compare the CPU NUMA node, but the reference is never dropped.
Use the device_node cleanup helper for the CPU node reference so it is released when leaving the workaround block, including the NUMA mismatch return path.
--- drivers/irqchip/irq-gic-v3-its.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/irqchip/irq-gic-v3-its.c +2 -4
@@ -3209,11 +3209,9 @@ static void its_cpu_init_collection(struct its_node *its)/* avoid cross node collections and its mapping */ if (its->flags &ITS_FLAGS_WORKAROUND_CAVIUM_23144 ) { -struct device_node *cpu_node; + struct device_node *cpu_node __free(device_node) = of_get_cpu_node(cpu, NULL); - cpu_node =of_get_cpu_node (cpu,NULL ); -if (its->numa_node !=NUMA_NO_NODE && - its->numa_node !=of_node_to_nid (cpu_node)) +if (its->numa_node !=NUMA_NO_NODE && its->numa_node !=of_node_to_nid (cpu_node))return ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 717/1276 irqchip/ts4800: Fix missing chained handler cleanup on remove
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qingshuang Fu <[email protected]>
[ Upstream commit 98bf7e54cec07d514b3575c11896a8b12d50ecc4 ]
The driver installs a chained handler for the parent interrupt during probe using irq_set_chained_handler_and_data(), but the remove function does not clear this handler. This leaves a dangling handler that may be called when the parent interrupt fires after the driver has been removed, potentially accessing freed memory and causing a kernel crash.
Additionally, the parent_irq obtained via irq_of_parse_and_map() is not stored, making it inaccessible in the remove function. Moreover, interrupt mappings created during probe are not properly disposed.
Fix this by:
- Saving parent_irq in probe
- Clearing the chained handler with NULL in ts4800_ic_remove()
- Disposing all IRQ mappings before domain removal to prevent resource leaks
--- drivers/irqchip/irq-ts4800.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/irqchip/irq-ts4800.c +10 -0
@@ -28,6 +28,7 @@ struct ts4800_irq_data {void __iomem *base;struct platform_device *pdev;struct irq_domain *domain; +unsigned int parent_irq; };static void ts4800_irq_mask (struct irq_data *d)
@@ -134,6 +135,7 @@ static int ts4800_ic_probe(struct platform_device *pdev)irq_set_chained_handler_and_data (parent_irq, ts4800_ic_chained_handle_irq, data); + data->parent_irq = parent_irq;platform_set_drvdata (pdev, data);return 0 ;
@@ -142,6 +144,14 @@ static int ts4800_ic_probe(struct platform_device *pdev)static void ts4800_ic_remove (struct platform_device *pdev) {struct ts4800_irq_data *data =platform_get_drvdata (pdev); +unsigned int hwirq; + +irq_set_chained_handler_and_data (data->parent_irq,NULL ,NULL ); + +for (hwirq =0 ; hwirq <8 ; hwirq++) +irq_dispose_mapping (irq_find_mapping (data->domain, hwirq)); + +irq_dispose_mapping (data->parent_irq);irq_domain_remove (data->domain); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 718/1276 virtio_net: disable cb when NAPI is busy-polled
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Longjun Tang <[email protected]>
[ Upstream commit 1eb8fc67ca41db71c90866ff76c990d85247daef ]
When busy-poll is active, napi_schedule_prep() returns false in virtqueue_napi_schedule(), so virtqueue_disable_cb() is skipped. The device may keep firing irqs until reaches virtqueue_napi_complete(). Under load (received == budget), it will lead to a large number of spurious interrupts.
Fix it by disabling the callback at the virtnet_poll() entry. This keeps the callback off while we poll and it is re-enabled by virtqueue_napi_complete() when going idle.
--- drivers/net/virtio_net.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/virtio_net.c +3 -0
@@ -2886,6 +2886,9 @@ static int virtnet_poll(struct napi_struct *napi, int budget)unsigned int xdp_xmit =0 ;bool napi_complete; +if (budget) +virtqueue_disable_cb (rq->vq); +virtnet_poll_cleantx (rq, budget); received =virtnet_receive (rq, budget, &xdp_xmit);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 719/1276 cxgb4: Fix decode strings dump for T6 adapters
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gleb Markov <[email protected]>
[ Upstream commit 5d6dc22d62682d93f5f55f145ad792f2891de911 ]
Depending on the value of chip_version, the correct decode set is selected. However, the subsequent matching with the t4 encoding type in the if-else block results in a reassignment, which leads to the loss of support for t6_decode as well as reinitializing of values t4_decode and t5_decode.
The component history shows that the if-else block previously used for this purpose, as well as the execution order, was not affected by the change.
Furthermore, it is suggested by the execution order that the scenario with overwriting and loss of support will be implemented.
Delete the if-else block.
--- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +0 -8
@@ -6737,14 +6737,6 @@ void t4_sge_decode_idma_state(struct adapter *adapter, int state)return ; } -if (is_t4 (adapter->params.chip)) { - sge_idma_decode = (const char **)t4_decode; - sge_idma_decode_nstates =ARRAY_SIZE (t4_decode); - }else { - sge_idma_decode = (const char **)t5_decode; - sge_idma_decode_nstates =ARRAY_SIZE (t5_decode); - } -if (state < sge_idma_decode_nstates)CH_WARN (adapter,"idma state %s\n" , sge_idma_decode[state]);else
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 720/1276 net/sched: act_bpf: use rcu_dereference_bh() to read the filter
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sechang Lim <[email protected]>
[ Upstream commit adc49c7ba690c9b33b8392ec27397456b65d0893 ]
tcf_bpf_act() can run from the tc egress path, which holds only rcu_read_lock_bh(), but reads prog->filter with rcu_dereference() and trips lockdep:
WARNING: suspicious RCU usage
net/sched/act_bpf.c:47 suspicious rcu_dereference_check() usage! 1 lock held by syz.2.1588/12756:
#0: (rcu_read_lock_bh){....}-{1:3}, at: __dev_queue_xmit net/core/dev.c:4792
tcf_bpf_act+0x6ae/0x940 net/sched/act_bpf.c:47 tcf_classify+0x6e4/0x1080 net/sched/cls_api.c:1860 sch_handle_egress net/core/dev.c:4545 [inline] __dev_queue_xmit+0x2185/0x2c00 net/core/dev.c:4808 packet_sendmsg+0x3dfa/0x5120 net/packet/af_packet.c:3114
The other tc actions and cls_bpf already use rcu_dereference_bh() here. Do the same.
--- net/sched/act_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sched/act_bpf.c +1 -1
@@ -44,7 +44,7 @@ TC_INDIRECT_SCOPE int tcf_bpf_act(struct sk_buff *skb,tcf_lastuse_update (&prog->tcf_tm);bstats_update (this_cpu_ptr (prog->common.cpu_bstats), skb); - filter =rcu_dereference (prog->filter); + filter =rcu_dereference_bh (prog->filter);if (at_ingress) {__skb_push (skb, skb->mac_len); filter_res =bpf_prog_run_data_pointers (filter, skb);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 721/1276 ksmbd: reject undersized DACLs before parsing ACEs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haofeng Li <[email protected]>
[ Upstream commit 60908f7ebcd9b6cde74ad5711fab0f49c7970949 ]
parse_dacl() limits the attacker-controlled ACE count by comparing it with the number of minimal ACEs that fit in the DACL size. The DACL size field is 16 bits, but the expression subtracts sizeof(struct smb_acl). Because sizeof() is unsigned, a DACL size smaller than the ACL header underflows to a large size_t.
A malicious client can reach this with:
SMB2_SET_INFO (InfoType=SMB2_O_INFO_SECURITY)
-> smb2_set_info_sec()
-> set_info_sec()
-> parse_sec_desc()
-> parse_dacl()
-> init_acl_state(..., 0xffff)
-> init_acl_state(..., 0xffff)
-> kmalloc_objs(..., 0xffff)Thus a malformed security descriptor can make num_aces pass the guard and drive large temporary ACL state and pointer-array allocations.
Reject DACLs smaller than struct smb_acl before doing the subtraction, so the ACE count check cannot be bypassed by the underflow.
--- fs/smb/server/smbacl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/smb/server/smbacl.c +6 -1
@@ -374,6 +374,7 @@ static void parse_dacl(struct mnt_idmap *idmap, {int i, ret;u16 num_aces =0 ; +u16 dacl_size;unsigned int acl_size;char *acl_base;struct smb_ace **ppace;
@@ -403,7 +404,11 @@ static void parse_dacl(struct mnt_idmap *idmap,if (num_aces <=0 )return ; -if (num_aces > (le16_to_cpu (pdacl->size) -sizeof (struct smb_acl )) / + dacl_size =le16_to_cpu (pdacl->size); +if (dacl_size <sizeof (struct smb_acl )) +return ; + +if (num_aces > (dacl_size -sizeof (struct smb_acl )) / (offsetof(struct smb_ace , sid) + offsetof(struct smb_sid , sub_auth) +sizeof (__le16)))return ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 722/1276 ksmbd: fix use-after-free of fp->owner.name in durable handle owner check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gil Portnoy <[email protected]>
[ Upstream commit 38637163501fd9e2f684b8cd275d0db5d79f37c6 ]
Two concurrent SMB2 durable reconnects (DH2C/DHnC) on the same persistent_id race the fp->owner.name compare-read in ksmbd_vfs_compare_durable_owner() against the kfree() in ksmbd_reopen_durable_fd()'s reopen-success path. fp->owner.name is a standalone kstrdup() buffer whose lifetime is independent of the fp refcount, and the two sites share no lock: the compare reads the buffer while the reopen frees it, so the strcmp() can dereference freed memory.
Commit 7ce4fc40018d ("ksmbd: fix durable reconnect double-bind race in ksmbd_reopen_durable_fd") made the fp->conn claim atomic under global_ft.lock (closing the owner.name double-free and the ksmbd_file write-UAF), but the compare-read versus reopen-free pair was left unserialized.
BUG: KASAN: slab-use-after-free in strcmp+0x2c/0x80
Read of size 1 by task kworker
strcmp
ksmbd_vfs_compare_durable_owner
smb2_check_durable_oplock
smb2_open
Freed by task kworker:
kfree
ksmbd_reopen_durable_fd
smb2_open
Allocated by task kworker:
kstrdup
session_fd_check
smb2_session_logoff
The buggy address belongs to the cache kmalloc-8Serialize both sides of the race with fp->f_lock. The global durable file-table lock still protects the durable reconnect claim, but fp->owner.name is per-open state and does not need to block unrelated durable table lookups or reconnects. The teardown is left at its existing location after the reopen-success point so that an __open_id() rollback still retains owner.name for a later legitimate reconnect to verify.
--- fs/smb/server/vfs_cache.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
fs/smb/server/vfs_cache.c +21 -8
@@ -980,16 +980,21 @@ void ksmbd_stop_durable_scavenger(void)static int ksmbd_vfs_copy_durable_owner (struct ksmbd_file *fp,struct ksmbd_user *user) { +char *name; +if (!user)return -EINVAL ;/* Duplicate the user name to ensure identity persistence */ - fp->owner.name =kstrdup (user->name,GFP_KERNEL ); -if (!fp->owner.name) + name =kstrdup (user->name,GFP_KERNEL ); +if (!name)return -ENOMEM ; +spin_lock (&fp->f_lock); fp->owner.uid = user->uid; fp->owner.gid = user->gid; + fp->owner.name = name; +spin_unlock (&fp->f_lock);return 0 ; }
@@ -1007,18 +1012,24 @@ static int ksmbd_vfs_copy_durable_owner(struct ksmbd_file *fp,bool ksmbd_vfs_compare_durable_owner (struct ksmbd_file *fp,struct ksmbd_user *user) { -if (!user || !fp->owner.name) +bool ret = false; + +if (!user)return false; +spin_lock (&fp->f_lock); +if (!fp->owner.name) + goto out; +/* Check if the UID and GID match first (fast path) */ if (fp->owner.uid != user->uid || fp->owner.gid != user->gid) -return false; + goto out;/* Validate the account name to ensure the same SecurityContext */ -if (strcmp (fp->owner.name, user->name)) -return false; - -return true; + ret = (strcmp (fp->owner.name, user->name) ==0 ); +out: +spin_unlock (&fp->f_lock); +return ret; } static bool session_fd_check(struct ksmbd_tree_connect *tcon,
@@ -1172,9 +1183,11 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp) }up_write (&ci->m_lock); +spin_lock (&fp->f_lock); fp->owner.uid = fp->owner.gid =0 ;kfree (fp->owner.name); fp->owner.name =NULL ; +spin_unlock (&fp->f_lock);return 0 ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 723/1276 gpio: timberdale: Return -ENOMEM on dynamic memory allocation in probe
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Zapolskiy <[email protected]>
[ Upstream commit 8d7e62d5e9b2d2ff146f472a9215d7e29c7e2307 ]
Out of memory situation on driver's probe is expected to be reported to the driver's framework with a proper -ENOMEM error code.
--- drivers/gpio/gpio-timberdale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-timberdale.c +1 -1
@@ -228,7 +228,7 @@ static int timbgpio_probe(struct platform_device *pdev) tgpio =devm_kzalloc (dev,sizeof (*tgpio),GFP_KERNEL );if (!tgpio) -return -EINVAL ; +return -ENOMEM ; tgpio->irq_base = pdata->irq_base;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 724/1276 pinctrl: meson: restore non-sleeping GPIO access
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Viacheslav Bocharov <[email protected]>
[ Upstream commit 9777530157e7b82fd994327ff878c4245dadc931 ]
Commit 28f240683871 ("pinctrl: meson: mark the GPIO controller as sleeping") set gpio_chip.can_sleep = true to work around gpio-shared-proxy holding a spinlock across a sleeping pinctrl config path. That locking bug is now fixed in the shared-proxy itself ("gpio:
shared-proxy: always serialize with a sleeping mutex"), so the controller-wide workaround is no longer needed; the meson GPIO controller does not sleep.
meson_gpio_get/set/direction_* access MMIO through regmap. The regmap_mmio bus uses fast I/O (spinlock) locking, so these value callbacks do not contain sleeping operations. Since gpio_chip.can_sleep describes the get/set value path, restore can_sleep = false.
Marking the controller sleeping also broke atomic value consumers such as w1-gpio (1-Wire bitbang): w1_io.c runs its read time slot under local_irq_save() and uses the non-cansleep gpiod_set_value() / gpiod_get_value(), which with can_sleep=true trigger WARN_ON(can_sleep) in gpiolib on every transferred bit (from w1_gpio_write_bit() / w1_gpio_read_bit() via w1_reset_bus() and w1_search()). The printk and stack dump inside the IRQs-off, microsecond-scale time slot destroy the bit timing, so reset/presence detection and ROM search fail: the bus master registers but w1_master_slave_count stays at 0 and no devices are found. Verified on an Amlogic A113X board (DS18B20 on GPIOA_14):
with can_sleep restored to false the warnings are gone and the sensor is detected and read again.
This must not be applied or backported without the shared-proxy locking fix above; otherwise the original Khadas VIM3 splat returns on boards that genuinely share a meson GPIO.
--- drivers/pinctrl/meson/pinctrl-meson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-meson.c +1 -1
@@ -619,7 +619,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc) pc->chip.set = meson_gpio_set; pc->chip.base =-1 ; pc->chip.ngpio = pc->data->num_pins; - pc->chip.can_sleep = true; + pc->chip.can_sleep = false; ret =gpiochip_add_data (&pc->chip, pc);if (ret) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 725/1276 net/sched: hhf: clear heavy-hitter state on reset
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Moelius <[email protected]>
[ Upstream commit a225f8c20712713406ae47024b8df42deacddd4a ]
HHF reset does not clear the classifier state used to identify heavy hitters. Packets after reset can therefore be scheduled using flow history from before the reset.
The reset operation should return the qdisc to an empty state.
Clear the heavy-hitter classifier tables when HHF is reset.
--- net/sched/sch_hhf.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
net/sched/sch_hhf.c +27 -0
@@ -461,12 +461,39 @@ static struct sk_buff *hhf_dequeue(struct Qdisc *sch)return skb; } +static void hhf_reset_classifier (struct hhf_sched_data *q) +{ +int i; + +if (!q->hh_flows) +return ; + +for (i =0 ; i <HH_FLOWS_CNT ; i++) { +struct hh_flow_state *flow, *next; +struct list_head *head = &q->hh_flows[i]; + +list_for_each_entry_safe (flow, next, head, flowchain) { +list_del (&flow->flowchain); +kfree (flow); + } + } +WRITE_ONCE (q->hh_flows_current_cnt,0 ); + +for (i =0 ; i <HHF_ARRAYS_CNT ; i++) { +if (q->hhf_valid_bits[i]) +bitmap_zero (q->hhf_valid_bits[i],HHF_ARRAYS_LEN ); + } + q->hhf_arrays_reset_timestamp =hhf_time_stamp (); +} +static void hhf_reset (struct Qdisc *sch) { +struct hhf_sched_data *q =qdisc_priv (sch);struct sk_buff *skb;while ((skb =hhf_dequeue (sch)) !=NULL )rtnl_kfree_skbs (skb, skb); +hhf_reset_classifier (q); }static void hhf_destroy (struct Qdisc *sch)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 726/1276 fs: refuse O_TMPFILE creation with an unmapped fsuid or fsgid
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Brauner <[email protected]>
[ Upstream commit 539dce1144651f7976fa418e618b0b574bf15eeb ]
vfs_tmpfile() never checked that the caller's fsuid and fsgid map into the filesystem. On an idmapped mount whose idmapping does not cover the caller's fs{u,g}id, the ->tmpfile() instance initializes the new inode through inode_init_owner(), where mapped_fsuid()/mapped_fsgid() return INVALID_UID/INVALID_GID, and the tmpfile ends up owned by (uid_t)-1.
Every other creation path already refuses this: may_o_create() (O_CREAT) and may_create_dentry() (mkdir, mknod, symlink, link) bail out with -EOVERFLOW via fsuidgid_has_mapping() precisely so that an object cannot be created with an owner the filesystem cannot represent. An O_TMPFILE is no exception: it is created I_LINKABLE and linkat(2) can splice it into the namespace afterwards, so the same guarantee must hold.
Add the missing fsuidgid_has_mapping() check to vfs_tmpfile(). On a non-idmapped mount the caller's fs{u,g}id always map in the superblock's user namespace, so this is a no-op there and only takes effect on an idmapped mount that does not map the caller. It applies to every filesystem that sets FS_ALLOW_IDMAP and implements ->tmpfile() (tmpfs, ext4, btrfs, xfs, f2fs, ...), and to overlayfs, whose upper-layer tmpfile creation funnels through vfs_tmpfile() via backing_tmpfile_open().
--- fs/namei.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/namei.c +4 -0
@@ -3818,6 +3818,10 @@ int vfs_tmpfile(struct mnt_idmap *idmap,int error;int open_flag = file->f_flags; +/* A tmpfile is I_LINKABLE, so guard its owner like may_o_create(). */ +if (!fsuidgid_has_mapping (dir->i_sb, idmap)) +return -EOVERFLOW ; +/* we want directory to be writable */ error =inode_permission (idmap, dir,MAY_WRITE |MAY_EXEC );if (error)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 727/1276 afs: Fix error code in afs_extract_vl_addrs()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Carpenter <[email protected]>
[ Upstream commit 4897cb71d4ab1f7e1a214adb1e4b80176702368d ]
The error codes on these paths are only set on the first iteration through the loop. Set the correct error code on every iteration.
--- fs/afs/vl_list.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/afs/vl_list.c +3 -1
@@ -93,7 +93,7 @@ static struct afs_addr_list *afs_extract_vl_addrs(struct afs_net *net, {struct afs_addr_list *alist;const u8 *b = *_b; -int ret = -EINVAL ; +int ret; alist =afs_alloc_addrlist (nr_addrs);if (!alist)
@@ -111,6 +111,7 @@ static struct afs_addr_list *afs_extract_vl_addrs(struct afs_net *net,case DNS_ADDRESS_IS_IPV4 :if (end - b <4 ) {_leave (" = -EINVAL [short inet]" ); + ret = -EINVAL ; goto error; }memcpy (x, b,4 );
@@ -123,6 +124,7 @@ static struct afs_addr_list *afs_extract_vl_addrs(struct afs_net *net,case DNS_ADDRESS_IS_IPV6 :if (end - b <16 ) {_leave (" = -EINVAL [short inet6]" ); + ret = -EINVAL ; goto error; }memcpy (x, b,16 );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 728/1276 afs: Fix double netfs initialisation in afs_root_iget()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 733a984a4ee7345325e47efb505eebfe67b299bc ]
Fix afs_root_iget() to leave initialisation of the netfs_inode part of the afs_vnode to afs_inode_init_from_status().
--- fs/afs/inode.c | 1 - 1 file changed, 1 deletion(-)
fs/afs/inode.c +0 -1
@@ -546,7 +546,6 @@ struct inode *afs_root_iget(struct super_block *sb, struct key *key) vnode =AFS_FS_I (inode); vnode->cb_v_check =atomic_read (&as->volume->cb_v_break); -afs_set_netfs_context (vnode); op =afs_alloc_operation (key, as->volume);if (IS_ERR (op)) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 729/1276 afs: use kvfree() to free memory allocated by kvcalloc()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zilin Guan <[email protected]>
[ Upstream commit cb39654926f8e7a08ecc1dcb3941628855275940 ]
op->more_files is allocated with kvcalloc() but released via afs_put_operation(), which uses kfree() internally. This mismach prevents the resource from being released properly and may lead to undefined behavior.
Fix this by using kvfree() to free op->more_files to match its allocation method.
--- fs/afs/fs_operation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/afs/fs_operation.c +1 -1
@@ -249,7 +249,7 @@ int afs_put_operation(struct afs_operation *op)for (i =0 ; i < op->nr_files -2 ; i++)if (op->more_files[i].put_vnode)iput (&op->more_files[i].vnode->netfs.inode); -kfree (op->more_files); +kvfree (op->more_files); }if (op->estate) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 730/1276 afs: Remove erroneous seq |= 1 in volume lookup loop
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit a58edda50a3ec08e6adac1d04dc3e488494e412d ]
The seq |= 1 operation in the volume lookup loop is incorrect because:
seq is already incremented at start, making it odd in next iteration which triggers lock, but The |= 1 operation causes seq to be even and unintended lockless operation
Remove this erroneous operation to maintain proper lock sequencing.
--- fs/afs/callback.c | 1 - 1 file changed, 1 deletion(-)
fs/afs/callback.c +0 -1
@@ -140,7 +140,6 @@ static struct afs_volume *afs_lookup_volume_rcu(struct afs_cell *cell,break ;if (!need_seqretry (&cell->volume_lock, seq))break ; - seq |=1 ;/* Want a lock next time */ }done_seqretry (&cell->volume_lock, seq);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 731/1276 afs: Make /afs/.<cell> as well as /afs/<cell> mountpoints
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 92f08e9d3cf0f8005ac6fcb931e3c388efc3ac49 ]
When a cell is instantiated, automatically create an /afs/.<cell> mountpoint to match the /afs/<cell> mountpoint to match other AFS clients.
Stable-dep-of: c9c3b615a462 ("afs: Fix misplaced inc of net->cells_outstanding")
--- fs/afs/cell.c | 13 +++++++----- fs/afs/dynroot.c | 52 ++++++++++++++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 24 deletions(-)
fs/afs/cell.c +8 -5
@@ -146,18 +146,20 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,return ERR_PTR (-ENOMEM ); } - cell->name =kmalloc (namelen +1 ,GFP_KERNEL ); + cell->name =kmalloc (1 + namelen +1 ,GFP_KERNEL );if (!cell->name) {kfree (cell);return ERR_PTR (-ENOMEM ); } - cell->net = net; + cell->name[0 ] ='.' ; + cell->name++; cell->name_len = namelen;for (i =0 ; i < namelen; i++) cell->name[i] =tolower (name[i]); cell->name[i] =0 ; + cell->net = net;refcount_set (&cell->ref,1 );atomic_set (&cell->active,0 );INIT_WORK (&cell->manager, afs_manage_cell_work);
@@ -211,7 +213,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,if (ret == -EINVAL )printk (KERN_ERR "kAFS: bad VL server IP address\n" ); error: -kfree (cell->name); +kfree (cell->name -1 );kfree (cell);_leave (" = %d" , ret);return ERR_PTR (ret);
@@ -502,7 +504,7 @@ static void afs_cell_destroy(struct rcu_head *rcu)afs_put_vlserverlist (net,rcu_access_pointer (cell->vl_servers));afs_unuse_cell (net, cell->alias_of, afs_cell_trace_unuse_alias);key_put (cell->anonymous_key); -kfree (cell->name); +kfree (cell->name -1 );kfree (cell);afs_dec_cells_outstanding (net);
@@ -710,7 +712,8 @@ static void afs_deactivate_cell(struct afs_net *net, struct afs_cell *cell)afs_proc_cell_remove (cell);mutex_lock (&net->proc_cells_lock); -hlist_del_rcu (&cell->proc_link); +if (!hlist_unhashed (&cell->proc_link)) +hlist_del_rcu (&cell->proc_link);afs_dynroot_rmdir (net, cell);mutex_unlock (&net->proc_cells_lock);
fs/afs/dynroot.c +33 -19
82 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 732/1276 afs: Add rootcell checks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 3e914febd79a8d1a78ee6e67ff3fa4214d6d1d57 ]
Add some checks for the validity of the cell name. It's may get put into a symlink, so preclude it containing any slashes or "..". Also disallow starting/ending with a dot. This makes /afs/@cell/ as a symlink less of a security risk.
Also disallow multiple setting of /proc/net/afs/rootcell for any given network namespace. Once set, the value may not be changed. This makes it easier to only create /afs/@cell and /afs/.@cell if there's a rootcell.
Stable-dep-of: c9c3b615a462 ("afs: Fix misplaced inc of net->cells_outstanding")
--- fs/afs/cell.c | 8 ++++++++ fs/afs/proc.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-)
fs/afs/cell.c +8 -0
@@ -367,6 +367,14 @@ int afs_cell_init(struct afs_net *net, const char *rootcell) len = cp - rootcell; } +if (len ==0 || !rootcell[0 ] || rootcell[0 ] =='.' || rootcell[len -1 ] =='.' ) +return -EINVAL ; +if (memchr (rootcell,'/' , len)) +return -EINVAL ; + cp =strstr (rootcell,".." ); +if (cp && cp < rootcell + len) +return -EINVAL ; +/* allocate a cell record for the root cell */ new_root =afs_lookup_cell (net, rootcell, len, vllist, false);if (IS_ERR (new_root)) {
fs/afs/proc.c +7 -1
@@ -240,7 +240,13 @@ static int afs_proc_rootcell_write(struct file *file, char *buf, size_t size)/* determine command to perform */ _debug ("rootcell=%s" , buf); - ret =afs_cell_init (net, buf); + ret = -EEXIST ; +inode_lock (file_inode (file)); +if (!net->ws_cell) + ret =afs_cell_init (net, buf); +else +printk ("busy\n" ); +inode_unlock (file_inode (file)); out:_leave (" = %d" , ret);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 733/1276 afs: Make /afs/@cell and /afs/.@cell symlinks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 30bca65bbbae13f32ee4f2897c55a496ea8132cf ]
Make /afs/@cell a symlink in the /afs dynamic root to match what other AFS clients do rather than doing a substitution in the dentry name. This has the bonus of being tab-expandable also.
Further, provide a /afs/.@cell symlink to point to the dotted cell share.
Stable-dep-of: c9c3b615a462 ("afs: Fix misplaced inc of net->cells_outstanding")
--- fs/afs/dynroot.c | 177 +++++++++++++++++++++++++++---------- include/trace/events/afs.h | 2 + 2 files changed, 131 insertions(+), 48 deletions(-)
fs/afs/dynroot.c +129 -48
@@ -185,50 +185,6 @@ struct inode *afs_try_auto_mntpt(struct dentry *dentry, struct inode *dir)return ret == -ENOENT ?NULL :ERR_PTR (ret); } -/* -* Look up @cell in a dynroot directory. This is a substitution for the -* local cell name for the net namespace. -*/ -static struct dentry *afs_lookup_atcell (struct dentry *dentry) -{ -struct afs_cell *cell; -struct afs_net *net =afs_d2net (dentry); -struct dentry *ret; -char *name; -int len; - -if (!net->ws_cell) -return ERR_PTR (-ENOENT ); - - ret =ERR_PTR (-ENOMEM ); - name =kmalloc (AFS_MAXCELLNAME +1 ,GFP_KERNEL ); -if (!name) - goto out_p; - -down_read (&net->cells_lock); - cell = net->ws_cell; -if (cell) { - len = cell->name_len; -memcpy (name, cell->name, len +1 ); - } -up_read (&net->cells_lock); - - ret =ERR_PTR (-ENOENT ); -if (!cell) - goto out_n; - - ret =lookup_one_len (name, dentry->d_parent, len); - -/* We don't want to d_add() the @cell dentry here as we don't want to -* the cached dentry to hide changes to the local cell name. -*/ - -out_n: -kfree (name); -out_p: -return ret; -} -/* * Look up an entry in a dynroot directory. */
@@ -247,10 +203,6 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentrreturn ERR_PTR (-ENAMETOOLONG ); } -if (dentry->d_name.len ==5 && -memcmp (dentry->d_name.name,"@cell" ,5 ) ==0 ) -return afs_lookup_atcell (dentry); -return d_splice_alias (afs_try_auto_mntpt (dentry, dir), dentry); }
@@ -343,6 +295,131 @@ void afs_dynroot_rmdir(struct afs_net *net, struct afs_cell *cell)_leave ("" ); } +static void afs_atcell_delayed_put_cell (void *arg) +{ +struct afs_cell *cell = arg; + +afs_put_cell (cell, afs_cell_trace_put_atcell); +} + +/* +* Read @cell or .@cell symlinks. +*/ +static const char *afs_atcell_get_link (struct dentry *dentry,struct inode *inode, +struct delayed_call *done) +{ +struct afs_vnode *vnode =AFS_FS_I (inode); +struct afs_cell *cell; +struct afs_net *net =afs_i2net (inode); +const char *name; +bool dotted = vnode->fid.vnode ==3 ; + +if (!net->ws_cell) +return ERR_PTR (-ENOENT ); + +down_read (&net->cells_lock); + + cell = net->ws_cell; +if (dotted) + name = cell->name -1 ; +else + name = cell->name; +afs_get_cell (cell, afs_cell_trace_get_atcell); +set_delayed_call (done, afs_atcell_delayed_put_cell, cell); + +up_read (&net->cells_lock); +return name; +} + +static const struct inode_operations afs_atcell_inode_operations = { + .get_link = afs_atcell_get_link, +}; + +/* +* Look up @cell or .@cell in a dynroot directory. This is a substitution for +* the local cell name for the net namespace. +*/ +static struct dentry *afs_dynroot_create_symlink (struct dentry *root,const char *name) +{ +struct afs_vnode *vnode; +struct afs_fid fid = { .vnode =2 , .unique =1 , }; +struct dentry *dentry; +struct inode *inode; + +if (name[0 ] =='.' ) + fid.vnode =3 ; + + dentry =d_alloc_name (root, name); +if (!dentry) +return ERR_PTR (-ENOMEM ); + + inode =iget5_locked (dentry->d_sb, fid.vnode, + afs_iget5_pseudo_test, afs_iget5_pseudo_set, &fid); +if (!inode) { +dput (dentry); +return ERR_PTR (-ENOMEM ); + } + + vnode =AFS_FS_I (inode); + +/* there shouldn't be an existing inode */ +if (WARN_ON_ONCE (!(inode->i_state &I_NEW ))) { +iput (inode); +dput (dentry); +return ERR_PTR (-EIO ); + } + +netfs_inode_init (&vnode->netfs,NULL , false); +simple_inode_init_ts (inode); +set_nlink (inode,1 ); + inode->i_size =0 ; + inode->i_mode =S_IFLNK |0555 ; + inode->i_op = &afs_atcell_inode_operations; + inode->i_uid =GLOBAL_ROOT_UID ; + inode->i_gid =GLOBAL_ROOT_GID ; + inode->i_blocks =0 ; + inode->i_generation =0 ; + inode->i_flags |=S_NOATIME ; + +unlock_new_inode (inode); +d_splice_alias (inode, dentry); +return dentry; +} + +/* +* Create @cell and .@cell symlinks. +*/ +static int afs_dynroot_symlink (struct afs_net *net) +{ +struct super_block *sb = net->dynroot_sb; +struct dentry *root, *symlink, *dsymlink; +int ret; + +/* Let the ->lookup op do the creation */ + root = sb->s_root; +inode_lock (root->d_inode); + symlink =afs_dynroot_create_symlink (root,"@cell" ); +if (IS_ERR (symlink)) { + ret =PTR_ERR (symlink); + goto unlock; + } + + dsymlink =afs_dynroot_create_symlink (root,".@cell" ); +if (IS_ERR (dsymlink)) { + ret =PTR_ERR (dsymlink); +dput (symlink); + goto unlock; + } + +/* Note that we're retaining extra refs on the dentries. */ + symlink->d_fsdata = (void *)1UL ; + dsymlink->d_fsdata = (void *)1UL ; + ret =0 ; +unlock: +inode_unlock (root->d_inode); +return ret; +} +/* * Populate a newly created dynamic root with cell names. */
@@ -355,6 +432,10 @@ int afs_dynroot_populate(struct super_block *sb)mutex_lock (&net->proc_cells_lock); net->dynroot_sb = sb; + ret =afs_dynroot_symlink (net); +if (ret <0 ) + goto error; +hlist_for_each_entry (cell, &net->proc_cells, proc_link) { ret =afs_dynroot_mkdir (net, cell);if (ret <0 )
include/trace/events/afs.h +2 -0
@@ -170,6 +170,7 @@ enum yfs_cm_operation {#define afs_cell_traces \ EM(afs_cell_trace_alloc, "ALLOC ") \ EM(afs_cell_trace_free, "FREE ") \ + EM(afs_cell_trace_get_atcell, "GET atcell") \ EM(afs_cell_trace_get_queue_dns, "GET q-dns ") \ EM(afs_cell_trace_get_queue_manage, "GET q-mng ") \ EM(afs_cell_trace_get_queue_new, "GET q-new ") \
@@ -177,6 +178,7 @@ enum yfs_cm_operation { EM(afs_cell_trace_get_vol, "GET vol ") \ EM(afs_cell_trace_insert, "INSERT ") \ EM(afs_cell_trace_manage, "MANAGE ") \ + EM(afs_cell_trace_put_atcell, "PUT atcell") \ EM(afs_cell_trace_put_candidate, "PUT candid") \ EM(afs_cell_trace_put_destroy, "PUT destry") \EM (afs_cell_trace_put_queue_work,"PUT q-work" ) \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 734/1276 afs: Fix afs_atcell_get_link() to handle RCU pathwalk
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 823869e1e61607ab0d433de3c8abed221dc80a5e ]
The ->get_link() method may be entered under RCU pathwalk conditions (in which case, the dentry pointer is NULL). This is not taken account of by afs_atcell_get_link() and lockdep will complain when it tries to lock an rwsem.
Fix this by marking net->ws_cell as __rcu and using RCU access macros on it and by making afs_atcell_get_link() just return a pointer to the name in RCU pathwalk without taking net->cells_lock or a ref on the cell as RCU will protect the name storage (the cell is already freed via call_rcu()).
Stable-dep-of: c9c3b615a462 ("afs: Fix misplaced inc of net->cells_outstanding")
--- fs/afs/cell.c | 11 ++++++----- fs/afs/dynroot.c | 15 +++++++++++++-- fs/afs/internal.h | 2 +- fs/afs/proc.c | 4 ++-- 4 files changed, 22 insertions(+), 10 deletions(-)
fs/afs/cell.c +6 -5
@@ -64,7 +64,8 @@ static struct afs_cell *afs_find_cell_locked(struct afs_net *net,return ERR_PTR (-ENAMETOOLONG );if (!name) { - cell = net->ws_cell; + cell =rcu_dereference_protected (net->ws_cell, +lockdep_is_held (&net->cells_lock));if (!cell)return ERR_PTR (-EDESTADDRREQ ); goto found;
@@ -388,8 +389,8 @@ int afs_cell_init(struct afs_net *net, const char *rootcell)/* install the new cell */ down_write (&net->cells_lock);afs_see_cell (new_root, afs_cell_trace_see_ws); - old_root = net->ws_cell; - net->ws_cell = new_root; + old_root =rcu_replace_pointer (net->ws_cell, new_root, +lockdep_is_held (&net->cells_lock));up_write (&net->cells_lock);afs_unuse_cell (net, old_root, afs_cell_trace_unuse_ws);
@@ -945,8 +946,8 @@ void afs_cell_purge(struct afs_net *net)_enter ("" );down_write (&net->cells_lock); - ws = net->ws_cell; - net->ws_cell =NULL ; + ws =rcu_replace_pointer (net->ws_cell,NULL , +lockdep_is_held (&net->cells_lock));up_write (&net->cells_lock);afs_unuse_cell (net, ws, afs_cell_trace_unuse_ws);
fs/afs/dynroot.c +13 -2
@@ -314,12 +314,23 @@ static const char *afs_atcell_get_link(struct dentry *dentry, struct inode *inodconst char *name;bool dotted = vnode->fid.vnode ==3 ; -if (!net->ws_cell) +if (!dentry) { +/* We're in RCU-pathwalk. */ + cell =rcu_dereference (net->ws_cell); +if (dotted) + name = cell->name -1 ; +else + name = cell->name; +/* Shouldn't need to set a delayed call. */ +return name; + } + +if (!rcu_access_pointer (net->ws_cell))return ERR_PTR (-ENOENT );down_read (&net->cells_lock); - cell = net->ws_cell; + cell =rcu_dereference_protected (net->ws_cell,lockdep_is_held (&net->cells_lock));if (dotted) name = cell->name -1 ;else
fs/afs/internal.h +1 -1
@@ -302,7 +302,7 @@ struct afs_net {/* Cell database */ struct rb_root cells; -struct afs_cell *ws_cell; +struct afs_cell __rcu *ws_cell;struct work_struct cells_manager;struct timer_list cells_timer;atomic_t cells_outstanding;
fs/afs/proc.c +2 -2
@@ -206,7 +206,7 @@ static int afs_proc_rootcell_show(struct seq_file *m, void *v) net =afs_seq2net_single (m);down_read (&net->cells_lock); - cell = net->ws_cell; + cell =rcu_dereference_protected (net->ws_cell,lockdep_is_held (&net->cells_lock));if (cell)seq_printf (m,"%s\n" , cell->name);up_read (&net->cells_lock);
@@ -242,7 +242,7 @@ static int afs_proc_rootcell_write(struct file *file, char *buf, size_t size) ret = -EEXIST ;inode_lock (file_inode (file)); -if (!net->ws_cell) +if (!rcu_access_pointer (net->ws_cell)) ret =afs_cell_init (net, buf);else printk ("busy\n" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 735/1276 afs: Remove the "autocell" mount option
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 4c5ad63f85ef984cc809538b2dcbc113aed82330 ]
Remove the "autocell" mount option. It was an attempt to do automounting of arbitrary cells based on what the user looked up but within the root directory of a mounted volume. This isn't really the right thing to do, and using the "dyn" mount option to get the dynamic root is the right way to do it. The kafs-client package uses "-o dyn" when mounting /afs, so it should be safe to drop "-o autocell".
Stable-dep-of: c9c3b615a462 ("afs: Fix misplaced inc of net->cells_outstanding")
--- fs/afs/dir.c | 5 ++--- fs/afs/dynroot.c | 5 +---- fs/afs/internal.h | 2 -- fs/afs/super.c | 5 ----- 4 files changed, 3 insertions(+), 14 deletions(-)
fs/afs/dir.c +2 -3
@@ -1031,9 +1031,8 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, inode =afs_do_lookup (dir, dentry, key);key_put (key);if (inode ==ERR_PTR (-ENOENT )) - inode =afs_try_auto_mntpt (dentry, dir); - -if (!IS_ERR_OR_NULL (inode)) + inode =NULL ; +else if (!IS_ERR_OR_NULL (inode)) fid =AFS_FS_I (inode)->fid;_debug ("splice %p" , dentry->d_inode);
fs/afs/dynroot.c +1 -4
@@ -155,7 +155,7 @@ static int afs_probe_cell_name(struct dentry *dentry)* Try to auto mount the mountpoint with pseudo directory, if the autocell * operation is setted. */ -struct inode *afs_try_auto_mntpt (struct dentry *dentry,struct inode *dir) +static struct inode *afs_try_auto_mntpt (struct dentry *dentry,struct inode *dir) {struct afs_vnode *vnode =AFS_FS_I (dir);struct inode *inode;
@@ -164,9 +164,6 @@ struct inode *afs_try_auto_mntpt(struct dentry *dentry, struct inode *dir)_enter ("%p{%pd}, {%llx:%llu}" , dentry, dentry, vnode->fid.vid, vnode->fid.vnode); -if (!test_bit (AFS_VNODE_AUTOCELL , &vnode->flags)) - goto out; - ret =afs_probe_cell_name (dentry);if (ret <0 ) goto out;
fs/afs/internal.h +0 -2
@@ -714,7 +714,6 @@ struct afs_vnode {#define AFS_VNODE_ZAP_DATA 3/* set if vnode's data should be invalidated */ #define AFS_VNODE_DELETED 4/* set if vnode deleted on server */ #define AFS_VNODE_MOUNTPOINT 5/* set if vnode is a mountpoint symlink */ -#define AFS_VNODE_AUTOCELL 6/* set if Vnode is an auto mount point */ #define AFS_VNODE_PSEUDODIR 7/* set if Vnode is a pseudo directory */ #define AFS_VNODE_NEW_CONTENT 8/* Set if file has new content (create/trunc-0) */ #define AFS_VNODE_SILLY_DELETED 9/* Set if file has been silly-deleted */
@@ -1089,7 +1088,6 @@ extern int afs_silly_iput(struct dentry *, struct inode *);extern const struct inode_operations afs_dynroot_inode_operations;extern const struct dentry_operations afs_dynroot_dentry_operations; -extern struct inode *afs_try_auto_mntpt (struct dentry *,struct inode *);extern int afs_dynroot_mkdir (struct afs_net *,struct afs_cell *);extern void afs_dynroot_rmdir (struct afs_net *,struct afs_cell *);extern int afs_dynroot_populate (struct super_block *);
fs/afs/super.c +0 -5
@@ -194,8 +194,6 @@ static int afs_show_options(struct seq_file *m, struct dentry *root)if (as->dyn_root)seq_puts (m,",dyn" ); -if (test_bit (AFS_VNODE_AUTOCELL , &AFS_FS_I (d_inode (root))->flags)) -seq_puts (m,",autocell" );switch (as->flock_mode) {case afs_flock_mode_unset:break ;case afs_flock_mode_local: p ="local" ;break ;
@@ -478,9 +476,6 @@ static int afs_fill_super(struct super_block *sb, struct afs_fs_context *ctx)if (IS_ERR (inode))return PTR_ERR (inode); -if (ctx->autocell || as->dyn_root) -set_bit (AFS_VNODE_AUTOCELL , &AFS_FS_I (inode)->flags); - ret = -ENOMEM ; sb->s_root =d_make_root (inode);if (!sb->s_root)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 736/1276 afs: Change dynroot to create contents on demand
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 1d0b929fc070b4115403a0a6206a0c6a62dd61f5 ]
Change the AFS dynamic root to do things differently:
(1) Rather than having the creation of cell records create inodes and dentries for cell mountpoints, create them on demand during lookup.
This simplifies cell management and locking as we no longer have to create these objects in advance *and* on speculative lookup by the user for a cell that isn't precreated.
(2) Rather than using the libfs dentry-based readdir (the dentries now no longer exist until accessed from (1)), have readdir generate the contents by reading the list of cells. The @cell symlinks get pushed in positions 2 and 3 if rootcell has been configured.
(3) Make the @cell symlink dentries persist for the life of the superblock or until reclaimed, but make cell mountpoints disappear immediately if unused.
It's not perfect as someone doing an "ls -l /afs" may create a whole bunch of dentries which will be garbage collected immediately. But any dentry that gets automounted will be pinned by the mount, so it shouldn't be too bad.
(4) Allocate the inode numbers for the cell mountpoints from an IDR to prevent duplicates appearing in the event it cycles round. The number allocated from the IDR is doubled to provide two inode numbers - one for the normal cell name (RO) and one for the dotted cell name (RW).
Stable-dep-of: c9c3b615a462 ("afs: Fix misplaced inc of net->cells_outstanding")
--- fs/afs/cell.c | 9 +- fs/afs/dynroot.c | 482 +++++++++++++++---------------------- fs/afs/internal.h | 8 +- fs/afs/main.c | 3 + fs/afs/super.c | 8 +- include/trace/events/afs.h | 2 + 6 files changed, 213 insertions(+), 299 deletions(-)
fs/afs/cell.c +7 -2
@@ -204,7 +204,13 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net, cell->dns_status = vllist->status;smp_store_release (&cell->dns_lookup_count,1 );/* vs source/status */ atomic_inc (&net->cells_outstanding); + ret =idr_alloc_cyclic (&net->cells_dyn_ino, cell, +2 ,INT_MAX /2 ,GFP_KERNEL ); +if (ret <0 ) + goto error; + cell->dynroot_ino = ret; cell->debug_id =atomic_inc_return (&cell_debug_id); +trace_afs_cell (cell->debug_id,1 ,0 , afs_cell_trace_alloc);_leave (" = %p" , cell);
@@ -513,6 +519,7 @@ static void afs_cell_destroy(struct rcu_head *rcu)afs_put_vlserverlist (net,rcu_access_pointer (cell->vl_servers));afs_unuse_cell (net, cell->alias_of, afs_cell_trace_unuse_alias);key_put (cell->anonymous_key); +idr_remove (&net->cells_dyn_ino, cell->dynroot_ino);kfree (cell->name -1 );kfree (cell);
@@ -706,7 +713,6 @@ static int afs_activate_cell(struct afs_net *net, struct afs_cell *cell)if (cell->proc_link.next) cell->proc_link.next->pprev = &cell->proc_link.next; -afs_dynroot_mkdir (net, cell);mutex_unlock (&net->proc_cells_lock);return 0 ; }
@@ -723,7 +729,6 @@ static void afs_deactivate_cell(struct afs_net *net, struct afs_cell *cell)mutex_lock (&net->proc_cells_lock);if (!hlist_unhashed (&cell->proc_link))hlist_del_rcu (&cell->proc_link); -afs_dynroot_rmdir (net, cell);mutex_unlock (&net->proc_cells_lock);_leave ("" );
fs/afs/dynroot.c +197 -285
608 lines not on this page · raw message
fs/afs/internal.h +3 -5
@@ -302,6 +302,7 @@ struct afs_net {/* Cell database */ struct rb_root cells; +struct idr cells_dyn_ino;/* cell->dynroot_ino mapping */ struct afs_cell __rcu *ws_cell;struct work_struct cells_manager;struct timer_list cells_timer;
@@ -413,6 +414,7 @@ struct afs_cell { enum dns_lookup_status dns_status:8; /* Latest status of data from lookup */unsigned int dns_lookup_count;/* Counter of DNS lookups */ unsigned int debug_id; +unsigned int dynroot_ino;/* Inode numbers for dynroot (a pair) */ /* The volumes belonging to this cell */ struct rw_semaphore vs_lock;/* Lock for server->volumes */
@@ -1088,10 +1090,7 @@ extern int afs_silly_iput(struct dentry *, struct inode *);extern const struct inode_operations afs_dynroot_inode_operations;extern const struct dentry_operations afs_dynroot_dentry_operations; -extern int afs_dynroot_mkdir (struct afs_net *,struct afs_cell *); -extern void afs_dynroot_rmdir (struct afs_net *,struct afs_cell *); -extern int afs_dynroot_populate (struct super_block *); -extern void afs_dynroot_depopulate (struct super_block *); +struct inode *afs_dynroot_iget_root (struct super_block *sb);/* * file.c
@@ -1206,7 +1205,6 @@ extern const struct afs_operation_ops afs_fetch_status_operation;extern void afs_vnode_commit_status (struct afs_operation *,struct afs_vnode_param *);extern int afs_fetch_status (struct afs_vnode *,struct key *,bool ,afs_access_t *);extern int afs_ilookup5_test_by_fid (struct inode *,void *); -extern struct inode *afs_iget_pseudo_dir (struct super_block *,bool );extern struct inode *afs_iget (struct afs_operation *,struct afs_vnode_param *);extern struct inode *afs_root_iget (struct super_block *,struct key *); extern int afs_getattr(struct mnt_idmap *idmap, const struct path *,
fs/afs/main.c +3 -0
@@ -76,6 +76,7 @@ static int __net_init afs_net_init(struct net *net_ns)mutex_init (&net->socket_mutex); net->cells =RB_ROOT ; +idr_init (&net->cells_dyn_ino);init_rwsem (&net->cells_lock);INIT_WORK (&net->cells_manager, afs_manage_cells);timer_setup (&net->cells_timer, afs_cells_timer,0 );
@@ -137,6 +138,7 @@ static int __net_init afs_net_init(struct net *net_ns) error_proc:afs_put_sysnames (net->sysnames); error_sysnames: +idr_destroy (&net->cells_dyn_ino); net->live = false;return ret; }
@@ -155,6 +157,7 @@ static void __net_exit afs_net_exit(struct net *net_ns)afs_close_socket (net);afs_proc_cleanup (net);afs_put_sysnames (net->sysnames); +idr_destroy (&net->cells_dyn_ino);kfree_rcu (rcu_access_pointer (net->address_prefs), rcu); }
fs/afs/super.c +1 -7
@@ -466,7 +466,7 @@ static int afs_fill_super(struct super_block *sb, struct afs_fs_context *ctx)/* allocate the root inode and dentry */ if (as->dyn_root) { - inode =afs_iget_pseudo_dir (sb, true); + inode =afs_dynroot_iget_root (sb); }else {sprintf (sb->s_id,"%llu" , as->volume->vid);afs_activate_volume (as->volume);
@@ -483,9 +483,6 @@ static int afs_fill_super(struct super_block *sb, struct afs_fs_context *ctx)if (as->dyn_root) { sb->s_d_op = &afs_dynroot_dentry_operations; - ret =afs_dynroot_populate (sb); -if (ret <0 ) - goto error; }else { sb->s_d_op = &afs_fs_dentry_operations;rcu_assign_pointer (as->volume->sb, sb);
@@ -534,9 +531,6 @@ static void afs_kill_super(struct super_block *sb) {struct afs_super_info *as =AFS_FS_S (sb); -if (as->dyn_root) -afs_dynroot_depopulate (sb); -/* Clear the callback interests (which will do ilookup5) before * deactivating the superblock. */
include/trace/events/afs.h +2 -0
@@ -190,8 +190,10 @@ enum yfs_cm_operation { EM(afs_cell_trace_unuse_alias, "UNU alias ") \ EM(afs_cell_trace_unuse_check_alias, "UNU chk-al") \ EM(afs_cell_trace_unuse_delete, "UNU delete") \ + EM(afs_cell_trace_unuse_dynroot_mntpt, "UNU dyn-mp") \ EM(afs_cell_trace_unuse_fc, "UNU fc ") \ EM(afs_cell_trace_unuse_lookup, "UNU lookup") \ + EM(afs_cell_trace_unuse_lookup_dynroot, "UNU lu-dyn") \ EM(afs_cell_trace_unuse_mntpt, "UNU mntpt ") \ EM(afs_cell_trace_unuse_no_pin, "UNU no-pin") \EM (afs_cell_trace_unuse_parse,"UNU parse " ) \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 737/1276 afs: Fix misplaced inc of net->cells_outstanding
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit c9c3b615a462a4023bd148f02c564e175ed10502 ]
Fix net->cells_outstanding being incremented before the check for failure of idr_alloc_cyclic(), leaving the count incremented on error.
--- fs/afs/cell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/afs/cell.c +1 -1
@@ -203,11 +203,11 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net, cell->dns_source = vllist->source; cell->dns_status = vllist->status;smp_store_release (&cell->dns_lookup_count,1 );/* vs source/status */ -atomic_inc (&net->cells_outstanding); ret =idr_alloc_cyclic (&net->cells_dyn_ino, cell,2 ,INT_MAX /2 ,GFP_KERNEL );if (ret <0 ) goto error; +atomic_inc (&net->cells_outstanding); cell->dynroot_ino = ret; cell->debug_id =atomic_inc_return (&cell_debug_id);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 738/1276 afs: Fix callback service message parsers to pass through -EAGAIN
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 0f36469d7ce98b362934113c550d08bb0c784231 ]
The AFS filesystem client uses an rxrpc server to listen for callback notifications. Each callback call type handler has a delivery function that parses the incoming request stream, and this should return -EAGAIN the last packet hasn't yet been seen, but all currently queued received data is consumed. afs_extract_data() does this, but the -EAGAIN return is switched to 0 inadvertantly
Fix callback service message parsers to pass through -EAGAIN
--- fs/afs/cmservice.c | 2 -- 1 file changed, 2 deletions(-)
fs/afs/cmservice.c +0 -2
@@ -391,7 +391,6 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call) ret =afs_extract_data (call, false);switch (ret) {case 0 :break ; -case -EAGAIN :return 0 ;default :return ret; }
@@ -504,7 +503,6 @@ static int afs_deliver_cb_probe_uuid(struct afs_call *call) ret =afs_extract_data (call, false);switch (ret) {case 0 :break ; -case -EAGAIN :return 0 ;default :return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 739/1276 afs: Fix missing NULL pointer check in afs_break_some_callbacks()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 794a01110390c1b76f59ece773fb0fbfd89c6f5c ]
Fix afs_break_some_callbacks() to check to see if afs_lookup_volume_rcu() returned NULL (e.g. the specified volume is unknown).
--- fs/afs/callback.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/afs/callback.c +5 -1
@@ -220,7 +220,11 @@ static void afs_break_some_callbacks(struct afs_server *server,rcu_read_lock (); volume =afs_lookup_volume_rcu (server->cell, vid); -if (cbb->fid.vnode ==0 && cbb->fid.unique ==0 ) { +if (!volume) { +/* Ignore breaks on unknown volumes. */ +rcu_read_unlock (); + *_count =0 ; + }else if (cbb->fid.vnode ==0 && cbb->fid.unique ==0 ) {afs_break_volume_callback (server, volume); *_count -=1 ;if (*_count)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 740/1276 afs: Fix vllist leak
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit fc10c0ecf06f2981af5d04357612b00051e03e9e ]
Fix a leak of the new vllist in afs_update_cell() in the event that it is an empty list (nr_servers == 0), in which case the old list isn't displaced unless the old list is also empty.
--- fs/afs/cell.c | 2 ++ 1 file changed, 2 insertions(+)
fs/afs/cell.c +2 -0
@@ -489,6 +489,8 @@ static int afs_update_cell(struct afs_cell *cell)rcu_assign_pointer (cell->vl_servers, vllist); cell->dns_source = vllist->source; old = p; + }else { + old = vllist; }write_unlock (&cell->vl_servers_lock);afs_put_vlserverlist (cell->net, old);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 741/1276 afs: Fix the volume AFS_VOLUME_RM_TREE is set on
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 56b4e4b26f84411d880f968a539207b0a8889c8c ]
Fix afs_insert_volume_into_cell() to set AFS_VOLUME_RM_TREE on the volume replaced, not the new volume, as it's now removed from the cell's volume tree. This will cause the old volume to be removed from the tree twice and the new volume never to be removed.
--- fs/afs/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/afs/volume.c +1 -1
@@ -39,7 +39,7 @@ static struct afs_volume *afs_insert_volume_into_cell(struct afs_cell *cell, goto found; } -set_bit (AFS_VOLUME_RM_TREE , &volume->flags); +set_bit (AFS_VOLUME_RM_TREE , &p->flags);rb_replace_node_rcu (&p->cell_node, &volume->cell_node, &cell->volumes); } }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 742/1276 afs: Fix unchecked-length string display in debug statement
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 903d37c97228258da71e092f8b4ab260ce81497d ]
Fix afs_extract_vlserver_list() to limit the length of the displayed string in a debug statement().
--- fs/afs/vl_list.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/afs/vl_list.c +5 -1
@@ -201,6 +201,8 @@ struct afs_vlserver_list *afs_extract_vlserver_list(struct afs_cell *cell, b +=sizeof (*hdr);while (end - b >=sizeof (bs)) { +int nlen; + bs.name_len =afs_extract_le16 (&b); bs.priority =afs_extract_le16 (&b); bs.weight =afs_extract_le16 (&b);
@@ -210,10 +212,12 @@ struct afs_vlserver_list *afs_extract_vlserver_list(struct afs_cell *cell, bs.protocol = *b++; bs.nr_addrs = *b++; + nlen =min3 (bs.name_len, end - b,255 ); +_debug ("extract %u %u %u %u %u %u %*.*s" , bs.name_len, bs.priority, bs.weight, bs.port, bs.protocol, bs.nr_addrs, - bs.name_len, bs.name_len, b); + bs.name_len, nlen, b);if (end - b < bs.name_len)break ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 743/1276 minix: avoid overflow in bitmap block count calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michael Bommarito <[email protected]>
[ Upstream commit fb3e566cafc38fe3ba35e6843a2d529a3748870c ]
minix_check_superblock() uses minix_blocks_needed() to verify that the on-disk imap and zmap block counts are large enough for the advertised inode and zone counts.
The helper currently performs DIV_ROUND_UP() in unsigned int arithmetic. A Minix v3 image can set s_ninodes or s_zones near UINT_MAX so the addition inside DIV_ROUND_UP() wraps to zero. That makes a zero imap/zmap block count look valid, after which minix_fill_super() can dereference s_imap[0] or s_zmap[0] even though no bitmap buffers were allocated.
Impact: mounting a crafted Minix v3 image whose s_ninodes or s_zones is near UINT_MAX makes minix_check_superblock() accept a zero bitmap-block count and minix_fill_super() dereference s_imap[0]/s_zmap[0], panicking the kernel.
The divisor is the bitmap capacity in bits, blocksize * 8, which is always a power of two: minix_fill_super() obtains the block size through sb_set_blocksize(), and blk_validate_block_size() rejects any size that is not a power of two. Use DIV_ROUND_UP_POW2(), which divides before adding the round-up term and so cannot overflow for a power-of-two divisor.
--- fs/minix/minix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/minix/minix.h +1 -1
@@ -91,7 +91,7 @@ static inline struct minix_inode_info *minix_i(struct inode *inode)static inline unsigned minix_blocks_needed (unsigned bits,unsigned blocksize) { -return DIV_ROUND_UP (bits, blocksize *8 ); +return DIV_ROUND_UP_POW2 (bits, blocksize *8 ); } #if defined(CONFIG_MINIX_FS_NATIVE_ENDIAN) && \
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 744/1276 ovl: fix comment about locking order
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Goldstein <[email protected]>
[ Upstream commit fd5637a2fe6dd4448392738691d63e5559fafb12 ]
Forgot to update the comment when we changed the locking order.
--- fs/overlayfs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/overlayfs/inode.c +2 -2
@@ -800,8 +800,8 @@ static const struct address_space_operations ovl_aops = {* * This chain is valid: * - inode->i_rwsem (inode_lock[2]) -* - upper_mnt->mnt_sb->s_writers (ovl_want_write[0]) * - OVL_I(inode)->lock (ovl_inode_lock[2]) +* - upper_mnt->mnt_sb->s_writers (ovl_want_write[0]) * - OVL_I(lowerinode)->lock (ovl_inode_lock[1]) * * And this chain is valid:
@@ -814,8 +814,8 @@ static const struct address_space_operations ovl_aops = {* held, because it is in reverse order of the non-nested case using the same * upper fs: * - inode->i_rwsem (inode_lock[1]) -* - upper_mnt->mnt_sb->s_writers (ovl_want_write[0]) * - OVL_I(inode)->lock (ovl_inode_lock[1]) +* - upper_mnt->mnt_sb->s_writers (ovl_want_write[0]) */ #define OVL_MAX_NESTING FILESYSTEM_MAX_STACK_DEPTH
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 745/1276 netfs: Fix writeback error handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit ac5f95ac5d6d0f4c567b8b642825705a2bf0d79e ]
Fix the error handling in writeback_iter() loop. If an error occurs, writeback_iter() needs to be called again with *error set to the error so that it can clean up iteration state. Further, the current folio needs unlocking and redirtying.
--- fs/netfs/write_issue.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
fs/netfs/write_issue.c +8 -3
@@ -574,8 +574,6 @@ int netfs_writepages(struct address_space *mapping, } error =netfs_write_folio (wreq, wbc, folio); -if (error <0 ) -break ; }while ((folio =writeback_iter (mapping, wbc, folio, &error)));netfs_end_issue_write (wreq);
@@ -587,7 +585,14 @@ int netfs_writepages(struct address_space *mapping,return error; couldnt_start: -netfs_kill_dirty_pages (mapping, wbc, folio); +if (error == -ENOMEM ) { +folio_redirty_for_writepage (wbc, folio); +folio_unlock (folio); + folio =writeback_iter (mapping, wbc, folio, &error); +WARN_ON_ONCE (folio !=NULL ); + }else { +netfs_kill_dirty_pages (mapping, wbc, folio); + } out:mutex_unlock (&ictx->wb_lock);_leave (" = %d" , error);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 746/1276 drm/xe/pt: Fix NULL pointer dereference in xe_pt_zap_ptes_entry()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francois Dugast <[email protected]>
[ Upstream commit 3feeb667197bd58a17f4edfdbcad249ffcb3c864 ]
The page-table walk framework may pass a NULL *child pointer for unpopulated entries. xe_pt_zap_ptes_entry() called container_of(*child) before checking for NULL, then dereferenced the result, causing a crash.
Move the container_of() call after a NULL guard, so the function returns early instead of proceeding with an invalid pointer. XE_WARN_ON is kept to help root cause the issue, but we now bail instead of crashing the driver.
v2: Comment that triggering XE_WARN_ON is unexpected behavior (Matt Brost)
--- drivers/gpu/drm/xe/xe_pt.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_pt.c +10 -2
@@ -786,12 +786,20 @@ static int xe_pt_zap_ptes_entry(struct xe_ptw *parent, pgoff_t offset, {struct xe_pt_zap_ptes_walk *xe_walk =container_of (walk,typeof (*xe_walk), base); -struct xe_pt *xe_child =container_of (*child,typeof (*xe_child), base); +struct xe_pt *xe_child;pgoff_t end_offset; -XE_WARN_ON (!*child);XE_WARN_ON (!level); +/* +* Below would be unexpected behavior that needs to be root caused +* but better warn and bail than crash the driver. +*/ +if (XE_WARN_ON (!*child)) +return 0 ; + + xe_child =container_of (*child,typeof (*xe_child), base); +/* * Note that we're called from an entry callback, and we're dealing * with the child of that entry rather than the parent, so need to
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 747/1276 drm/xe/hw_engine: Fix double-free of managed BO in error path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shuicheng Lin <[email protected]>
[ Upstream commit 7ac3cae7a251d28e9079de07a991bd4eb2bb7fd8 ]
The error path in hw_engine_init() explicitly frees a BO allocated with xe_managed_bo_create_pin_map() via xe_bo_unpin_map_no_vm(). Since the managed BO already has a devm cleanup action registered, this causes a double-free when devm unwinds during probe failure.
Remove the explicit free and let devm handle it, consistent with all other xe_managed_bo_create_pin_map() callers.
--- drivers/gpu/drm/xe/xe_hw_engine.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_hw_engine.c +1 -3
@@ -561,7 +561,7 @@ static int hw_engine_init(struct xe_gt *gt, struct xe_hw_engine *hwe, hwe->exl_port =xe_execlist_port_create (xe, hwe);if (IS_ERR (hwe->exl_port)) { err =PTR_ERR (hwe->exl_port); - goto err_hwsp; + goto err_name; } }else {/* GSCCS has a special interrupt for reset */
@@ -578,8 +578,6 @@ static int hw_engine_init(struct xe_gt *gt, struct xe_hw_engine *hwe,return devm_add_action_or_reset (xe->drm.dev, hw_engine_fini, hwe); -err_hwsp: -xe_bo_unpin_map_no_vm (hwe->hwsp); err_name: hwe->name =NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 748/1276 drm/xe/pf: Dont attempt to process FAST_REQ or EVENT relays
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wajdeczko <[email protected]>
[ Upstream commit ed8b0d731892c68b41ecbd27c952af284816dec1 ]
Currently defined VF/PF relay actions use regular REQUEST messages only and the PF shouldn't attempt to handle FAST_REQUEST nor EVENT messages as this would result in breaking the VFPF ABI protocol and also might trigger an assert on the PF side.
--- drivers/gpu/drm/xe/xe_guc_relay.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_guc_relay.c +9 -4
@@ -675,12 +675,17 @@ static int relay_action_handler(struct xe_guc_relay *relay, u32 origin,return relay_testloop_action_handler (relay, origin, msg, len, response, size); type =FIELD_GET (GUC_HXG_MSG_0_TYPE , msg[0 ]); +relay_assert (relay,guc_hxg_type_is_action (type)); -if (IS_SRIOV_PF (relay_to_xe (relay))) - ret =xe_gt_sriov_pf_service_process_request (gt, origin, msg, len, response, size); -else +if (IS_SRIOV_PF (relay_to_xe (relay))) { +if (type ==GUC_HXG_TYPE_REQUEST ) + ret =xe_gt_sriov_pf_service_process_request (gt, origin, msg, len, + response, size); +else + ret = -EOPNOTSUPP ; + }else { ret = -EOPNOTSUPP ; - + }if (type ==GUC_HXG_TYPE_EVENT )relay_assert (relay, ret <=0 );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 749/1276 netfs: Drop the error arg from netfs_read_subreq_terminated()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit 360157829ee3dba848ffa817792d9a07969e0a95 ]
Drop the error argument from netfs_read_subreq_terminated() in favour of passing the value in subreq->error.
Stable-dep-of: c16b8c4cfb4f ("cifs: Fix missing credit release on failure in cifs_issue_read()")
--- fs/9p/vfs_addr.c | 3 ++- fs/afs/file.c | 15 ++++++++----- fs/ceph/addr.c | 13 +++++++---- fs/netfs/buffered_read.c | 16 +++++++------- fs/netfs/objects.c | 15 ++++++++++++- fs/netfs/read_collect.c | 47 +++++++++++++++++++++++++--------------- fs/nfs/fscache.c | 6 +++-- fs/nfs/fscache.h | 3 ++- fs/smb/client/cifssmb.c | 10 +-------- fs/smb/client/file.c | 3 ++- fs/smb/client/smb2pdu.c | 10 +-------- include/linux/netfs.h | 7 +++--- 12 files changed, 86 insertions(+), 62 deletions(-)
fs/9p/vfs_addr.c +2 -1
@@ -83,7 +83,8 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq)if (!err) subreq->transferred += total; -netfs_read_subreq_terminated (subreq, err, false); + subreq->error = err; +netfs_read_subreq_terminated (subreq, false); }/**
fs/afs/file.c +10 -5
@@ -246,7 +246,8 @@ static void afs_fetch_data_notify(struct afs_operation *op) subreq->rreq->i_size = req->file_size;if (req->pos + req->actual_len >= req->file_size)__set_bit (NETFS_SREQ_HIT_EOF , &subreq->flags); -netfs_read_subreq_terminated (subreq, error, false); + subreq->error = error; +netfs_read_subreq_terminated (subreq, false); req->subreq =NULL ; }else if (req->done) { req->done (req);
@@ -301,8 +302,10 @@ int afs_fetch_data(struct afs_vnode *vnode, struct afs_read *req) op =afs_alloc_operation (req->key, vnode->volume);if (IS_ERR (op)) { -if (req->subreq) -netfs_read_subreq_terminated (req->subreq,PTR_ERR (op), false); +if (req->subreq) { + req->subreq->error =PTR_ERR (op); +netfs_read_subreq_terminated (req->subreq, false); + }return PTR_ERR (op); }
@@ -320,8 +323,10 @@ static void afs_read_worker(struct work_struct *work)struct afs_read *fsreq; fsreq =afs_alloc_read (GFP_NOFS ); -if (!fsreq) -return netfs_read_subreq_terminated (subreq, -ENOMEM , false); +if (!fsreq) { + subreq->error = -ENOMEM ; +return netfs_read_subreq_terminated (subreq, false); + } fsreq->subreq = subreq; fsreq->pos = subreq->start + subreq->transferred;
fs/ceph/addr.c +9 -4
@@ -253,8 +253,9 @@ static void finish_netfs_read(struct ceph_osd_request *req) subreq->transferred = err; err =0 ; } + subreq->error = err;trace_netfs_sreq (subreq, netfs_sreq_trace_io_progress); -netfs_read_subreq_terminated (subreq, err, false); +netfs_read_subreq_terminated (subreq, false);iput (req->r_inode);ceph_dec_osd_stopping_blocker (fsc->mdsc); }
@@ -314,7 +315,9 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq)ceph_mdsc_put_request (req); out: -netfs_read_subreq_terminated (subreq, err, false); + subreq->error = err; +trace_netfs_sreq (subreq, netfs_sreq_trace_io_progress); +netfs_read_subreq_terminated (subreq, false);return true; }
@@ -435,8 +438,10 @@ static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)ceph_osdc_start_request (req->r_osdc, req); out:ceph_osdc_put_request (req); -if (err) -netfs_read_subreq_terminated (subreq, err, false); +if (err) { + subreq->error = err; +netfs_read_subreq_terminated (subreq, false); + }doutc (cl,"%llx.%llx result %d\n" ,ceph_vinop (inode), err); }
fs/netfs/buffered_read.c +8 -8
@@ -190,14 +190,13 @@ static void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error {struct netfs_io_subrequest *subreq = priv; -if (transferred_or_error <0 ) { -netfs_read_subreq_terminated (subreq, transferred_or_error, was_async); -return ; - } - -if (transferred_or_error >0 ) +if (transferred_or_error >0 ) { subreq->transferred += transferred_or_error; -netfs_read_subreq_terminated (subreq,0 , was_async); + subreq->error =0 ; + }else { + subreq->error = transferred_or_error; + } +netfs_read_subreq_terminated (subreq, was_async); }/*
@@ -297,7 +296,8 @@ static void netfs_read_to_pagecache(struct netfs_io_request *rreq)if (slice <0 ) goto prep_iter_failed;__set_bit (NETFS_SREQ_CLEAR_TAIL , &subreq->flags); -netfs_read_subreq_terminated (subreq,0 , false); + subreq->error =0 ; +netfs_read_subreq_terminated (subreq, false); goto done; }
fs/netfs/objects.c +14 -1
@@ -191,7 +191,20 @@ struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq }memset (subreq,0 ,kmem_cache_size (cache)); -INIT_WORK (&subreq->work,NULL ); + +switch (rreq->origin) { +case NETFS_READAHEAD : +case NETFS_READPAGE : +case NETFS_READ_GAPS : +case NETFS_READ_FOR_WRITE : +case NETFS_DIO_READ : +INIT_WORK (&subreq->work, netfs_read_subreq_termination_worker); +break ; +default : +INIT_WORK (&subreq->work,NULL ); +break ; + } +INIT_LIST_HEAD (&subreq->rreq_link);refcount_set (&subreq->ref,2 ); subreq->rreq = rreq;
fs/netfs/read_collect.c +30 -17
91 lines not on this page · raw message
fs/nfs/fscache.c +4 -2
@@ -314,8 +314,10 @@ static void nfs_netfs_issue_read(struct netfs_io_subrequest *sreq) &nfs_async_read_completion_ops); netfs =nfs_netfs_alloc (sreq); -if (!netfs) -return netfs_read_subreq_terminated (sreq, -ENOMEM , false); +if (!netfs) { + sreq->error = -ENOMEM ; +return netfs_read_subreq_terminated (sreq, false); + } pgio.pg_netfs = netfs;/* used in completion */
fs/nfs/fscache.h +2 -1
@@ -74,7 +74,8 @@ static inline void nfs_netfs_put(struct nfs_netfs_io_data *netfs)*/ netfs->sreq->transferred =min_t (s64, netfs->sreq->len,atomic64_read (&netfs->transferred)); -netfs_read_subreq_terminated (netfs->sreq, netfs->error, false); + netfs->sreq->error = netfs->error; +netfs_read_subreq_terminated (netfs->sreq, false);kfree (netfs); }static inline void nfs_netfs_inode_init (struct nfs_inode *nfsi)
fs/smb/client/cifssmb.c +1 -9
@@ -1262,14 +1262,6 @@ CIFS_open(const unsigned int xid, struct cifs_open_parms *oparms, int *oplock,return rc; } -static void cifs_readv_worker (struct work_struct *work) -{ -struct cifs_io_subrequest *rdata = - container_of(work, struct cifs_io_subrequest, subreq.work); - -netfs_read_subreq_terminated (&rdata->subreq, rdata->result, false); -} -static void cifs_readv_callback (struct mid_q_entry *mid) {
@@ -1336,8 +1328,8 @@ cifs_readv_callback(struct mid_q_entry *mid) } rdata->credits.value =0 ; + rdata->subreq.error = rdata->result; rdata->subreq.transferred += rdata->got_bytes; -INIT_WORK (&rdata->subreq.work, cifs_readv_worker);queue_work (cifsiod_wq, &rdata->subreq.work);release_mid (mid);add_credits (server, &credits,0 );
fs/smb/client/file.c +2 -1
@@ -229,7 +229,8 @@ static void cifs_issue_read(struct netfs_io_subrequest *subreq)return ; failed: -netfs_read_subreq_terminated (subreq, rc, false); + subreq->error = rc; +netfs_read_subreq_terminated (subreq, false); }/*
fs/smb/client/smb2pdu.c +1 -9
@@ -4536,14 +4536,6 @@ smb2_new_read_req(void **buf, unsigned int *total_len,return rc; } -static void smb2_readv_worker (struct work_struct *work) -{ -struct cifs_io_subrequest *rdata = - container_of(work, struct cifs_io_subrequest, subreq.work); - -netfs_read_subreq_terminated (&rdata->subreq, rdata->result, false); -} -static void smb2_readv_callback (struct mid_q_entry *mid) {
@@ -4656,9 +4648,9 @@ smb2_readv_callback(struct mid_q_entry *mid) server->credits, server->in_flight, 0, cifs_trace_rw_credits_read_response_clear); rdata->credits.value =0 ; + rdata->subreq.error = rdata->result; rdata->subreq.transferred += rdata->got_bytes;trace_netfs_sreq (&rdata->subreq, netfs_sreq_trace_io_progress); -INIT_WORK (&rdata->subreq.work, smb2_readv_worker);queue_work (cifsiod_wq, &rdata->subreq.work);release_mid (mid); trace_smb3_rw_credits(rreq_debug_id, subreq_debug_index, 0,
include/linux/netfs.h +3 -4
@@ -429,10 +429,9 @@ bool netfs_release_folio(struct folio *folio, gfp_t gfp);vm_fault_t netfs_page_mkwrite (struct vm_fault *vmf,struct netfs_group *netfs_group);/* (Sub)request management API. */ -void netfs_read_subreq_progress (struct netfs_io_subrequest *subreq, -bool was_async); -void netfs_read_subreq_terminated (struct netfs_io_subrequest *subreq, -int error,bool was_async); +void netfs_read_subreq_progress (struct netfs_io_subrequest *subreq,bool was_async); +void netfs_read_subreq_terminated (struct netfs_io_subrequest *subreq,bool was_async); +void netfs_read_subreq_termination_worker (struct work_struct *work);void netfs_get_subrequest (struct netfs_io_subrequest *subreq,enum netfs_sreq_ref_trace what); void netfs_put_subrequest(struct netfs_io_subrequest *subreq,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 750/1276 cifs: Fix missing credit release on failure in cifs_issue_read()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit c16b8c4cfb4fe2244cc33e469a93c1ab8684146b ]
Fix missing release of credits in the failure path in cifs_issue_read() lest retrying the subreq just overwrites the credits value.
--- fs/smb/client/file.c | 1 + 1 file changed, 1 insertion(+)
fs/smb/client/file.c +1 -0
@@ -229,6 +229,7 @@ static void cifs_issue_read(struct netfs_io_subrequest *subreq)return ; failed: +add_credits_and_wake_if (rdata->server, &rdata->credits,0 ); subreq->error = rc;netfs_read_subreq_terminated (subreq, false); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 751/1276 ata: sata_gemini: unwind clocks on IDE pinctrl errors
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myeonghun Pak <[email protected]>
[ Upstream commit c0ace4130e813acbabdfaa28d4e94a849c2ffdd7 ]
gemini_sata_bridge_init() prepares and enables both SATA PCLKs, then disables them again while keeping the clocks prepared for later bridge start and stop operations. If gemini_setup_ide_pins() fails after that, gemini_sata_probe() returns directly and skips the existing out_unprep_clk unwind path.
Route the IDE pinctrl failure through out_unprep_clk so the clocks prepared by gemini_sata_bridge_init() are unprepared before probe fails.
--- drivers/ata/sata_gemini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/sata_gemini.c +1 -1
@@ -385,7 +385,7 @@ static int gemini_sata_probe(struct platform_device *pdev)if (sg->ide_pins) { ret =gemini_setup_ide_pins (dev);if (ret) -return ret; + goto out_unprep_clk; }dev_info (dev,"set up the Gemini IDE/SATA nexus\n" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 752/1276 ata: libata-scsi: limit simulated SCSI command copy to response length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karuna Ramkumar <[email protected]>
[ Upstream commit cd64be0ecd399fa2b1ab60b3aaf2b2b744243467 ]
The function ata_scsi_rbuf_fill() is used to copy the response of emulated SCSI commands from ata_scsi_rbuf to the SCSI command's scatterlist.
Currently, sg_copy_from_buffer() is called with the size argument set to ATA_SCSI_RBUF_SIZE (2048 bytes). Since ata_scsi_rbuf is zeroed out before the simulation actor is invoked, copying the full buffer size causes the remainder of the SCSI command's transfer buffer (beyond the actual response length 'len') to be overwritten with zeroes. This clobbers any pre-existing sentinel values or data in the caller's buffer tail, even though the correct residual count is reported via scsi_set_resid().
Fix this by passing the actual response length 'len' as the copy size to sg_copy_from_buffer(), ensuring that the tail of the caller's buffer remains untouched. Also, add a defensive check to ensure that the actor does not return a length exceeding the static buffer capacity. If this occurs, trigger a WARN_ON(), fail the command with an aborted command error, and return immediately without copying any data.
The fix was tested by invoking an SCSI SG_IO INQUIRY on an ATA disk on vanilla build, and build with the fix. Confirmed that the input buffer's tail end remains unmodified with the fix.
--- drivers/ata/libata-scsi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/ata/libata-scsi.c +6 -1
@@ -1942,8 +1942,13 @@ static void ata_scsi_rbuf_fill(struct ata_device *dev, struct scsi_cmnd *cmd,memset (ata_scsi_rbuf,0 ,ATA_SCSI_RBUF_SIZE ); len =actor (dev, cmd, ata_scsi_rbuf);if (len) { +if (WARN_ON (len >ATA_SCSI_RBUF_SIZE )) { +ata_scsi_set_sense (dev, cmd,ABORTED_COMMAND ,0 ,0 ); +spin_unlock_irqrestore (&ata_scsi_rbuf_lock, flags); +return ; + }sg_copy_from_buffer (scsi_sglist (cmd),scsi_sg_count (cmd), - ata_scsi_rbuf,ATA_SCSI_RBUF_SIZE ); + ata_scsi_rbuf, len); cmd->result =SAM_STAT_GOOD ;if (scsi_bufflen (cmd) > len)scsi_set_resid (cmd,scsi_bufflen (cmd) - len);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 753/1276 HID: picolcd: prevent NULL pointer dereference in picolcd_send_and_wait()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Georgiy Osokin <[email protected]>
[ Upstream commit 0021eb09041f021c079be1022934a280f7f176c0 ]
In picolcd_send_and_wait(), an integer overflow of the signed loop counter 'k' can theoretically lead to a NULL pointer dereference of 'raw_data'. If the loop executes more than INT_MAX times, 'k' becomes negative, making the condition 'k < size' true even when 'size' is 0.
Change the type of 'k' to 'unsigned int' to prevent the overflow and eliminate the out-of-bounds access.
Found by Linux Verification Center (linuxtesting.org) with the Svace static analysis tool.
--- drivers/hid/hid-picolcd_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/hid/hid-picolcd_core.c +2 -1
@@ -72,7 +72,8 @@ struct picolcd_pending *picolcd_send_and_wait(struct hid_device *hdev,struct picolcd_pending *work;struct hid_report *report =picolcd_out_report (report_id, hdev);unsigned long flags; -int i, j, k; +int i, j; +unsigned int k;if (!report || !data)return NULL ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 754/1276 HID: core: Fix OOB read in hid_get_report for numbered reports
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lee Jones <[email protected]>
[ Upstream commit af1a9b65ebe8a948eda805c14b78d4d0767cb1b5 ]
When a caller passes a size of 0 to hid_report_raw_event() for a numbered report, the function originally called hid_get_report() before performing any size validation.
Inside hid_get_report(), if the report is numbered (report_enum->numbered is true), it unconditionally dereferences data[0] to extract the report ID. With a size of 0, this results in an out-of-bounds read or kernel panic.
Fix this by moving the numbered report size validation check before the call to hid_get_report(), ensuring that size is at least 1 before dereferencing the data pointer.
--- drivers/hid/hid-core.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/hid/hid-core.c +7 -0
@@ -2010,6 +2010,13 @@ int hid_report_raw_event(struct hid_device *hid, enum hid_report_type type, u8 *u8 *cdata = data;int ret =0 ; +if (report_enum->numbered && (size <1 || bufsize <1 )) { +hid_warn_ratelimited (hid, +"Event data for numbered report is too short (%d vs %zu)\n" , + size, bufsize); +return -EINVAL ; + } + report =hid_get_report (report_enum, data);if (!report)return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 755/1276 arm64/mm: Optimize TLB flush in unmap_hotplug_[pmd|pud]_range()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anshuman Khandual <[email protected]>
[ Upstream commit ff4c5a0de1f2ef7737a8688a86e19301e567020d ]
Commit 48478b9f7913 ("arm64/mm: Enable batched TLB flush in unmap_hotplug_range") inadvertently introduced redundant TLB invalidation when clearing a block entry, resulting in unnecessary broadcast invalidation on CPUs without support for range-based invalidation.
Re-introduce the old behaviour, along with some expanded comments to help people working in this area next time around.
--- arch/arm64/mm/mmu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
arch/arm64/mm/mmu.c +9 -2
@@ -900,7 +900,13 @@ static void unmap_hotplug_pmd_range(pud_t *pudp, unsigned long addr,if (free_mapped) {/* CONT blocks are not supported in the vmemmap */ WARN_ON (pmd_cont (pmd)); -flush_tlb_kernel_range (addr, addr +PMD_SIZE ); +/* +* Invalidating a block entry requires just +* a single overlapping TLB invalidation, +* so limit the range of the flush to a single +* page. +*/ +flush_tlb_kernel_range (addr, addr +PAGE_SIZE );free_hotplug_page_range (pmd_page (pmd),PMD_SIZE , altmap); }
@@ -930,7 +936,8 @@ static void unmap_hotplug_pud_range(p4d_t *p4dp, unsigned long addr,if (pud_sect (pud)) {pud_clear (pudp);if (free_mapped) { -flush_tlb_kernel_range (addr, addr +PUD_SIZE ); +/* See comment in unmap_hotplug_pmd_range(). */ +flush_tlb_kernel_range (addr, addr +PAGE_SIZE );free_hotplug_page_range (pud_page (pud),PUD_SIZE , altmap); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 756/1276 HID: bpf: Fix hid_bpf_get_data() range check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yiyang Chen <[email protected]>
[ Upstream commit 2d044049421dd48212b28646a850749d4a2d57fa ]
hid_bpf_get_data() returns a pointer into the HID-BPF context data when the caller-provided offset and size fit inside ctx->allocated_size.
The current check adds rdwr_buf_size and offset before comparing the result against ctx->allocated_size. Since both values are unsigned, a very large size can wrap the sum below ctx->allocated_size and make the helper return a pointer even though the requested range is not contained in the backing buffer.
Use check_add_overflow() to reject wrapped range ends before comparing the requested range end against ctx->allocated_size.
--- drivers/hid/bpf/hid_bpf_dispatch.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/hid/bpf/hid_bpf_dispatch.c +4 -1
@@ -17,6 +17,7 @@#include <linux/kfifo.h> #include <linux/minmax.h> #include <linux/module.h> +#include <linux/overflow.h> #include "hid_bpf_dispatch.h" struct hid_ops *hid_ops;
@@ -293,13 +294,15 @@ __bpf_kfunc __u8 * hid_bpf_get_data(struct hid_bpf_ctx *ctx, unsigned int offset, const size_t rdwr_buf_size) { struct hid_bpf_ctx_kern *ctx_kern; +size_t end;if (!ctx)return NULL ; ctx_kern = container_of(ctx, struct hid_bpf_ctx_kern, ctx); -if (rdwr_buf_size + offset > ctx->allocated_size) +if (check_add_overflow (rdwr_buf_size, offset, &end) || + end > ctx->allocated_size)return NULL ;return ctx_kern->data + offset;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 757/1276 selftests/hid: Load only requested struct_ops maps
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yiyang Chen <[email protected]>
[ Upstream commit 5aad55011a37d999cf99d14bafb6a093a1a70466 ]
The HID selftest skeleton contains several struct_ops maps, but each test usually wants to load only the programs named by that test.
load_programs() disabled auto-attach for all maps, but left struct_ops autocreate enabled. libbpf can enable autoload for programs referenced by autocreated struct_ops maps, so an unrelated program can be loaded and fail even when the current test does not use it.
Disable autocreate for all struct_ops maps by default, then re-enable it only for the maps selected by the test before loading the skeleton.
--- tools/testing/selftests/hid/hid_bpf.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
tools/testing/selftests/hid/hid_bpf.c +18 -7
@@ -109,6 +109,20 @@ static void load_programs(const struct test_program programs[], self->skel =hid__open (); ASSERT_OK_PTR(self->skel) TEARDOWN_LOG("Error while calling hid__open"); +/* +* Disable all struct_ops maps by default so libbpf does not autoload +* programs referenced by maps that are unrelated to the current test. +*/ +bpf_object__for_each_map (iter_map, *self->skel->skeleton->obj) { +if (bpf_map__type (iter_map) ==BPF_MAP_TYPE_STRUCT_OPS ) { + err =bpf_map__set_autocreate (iter_map, false); + ASSERT_OK(err) TH_LOG("can not disable struct_ops map '%s'", + bpf_map__name(iter_map)); + } + +bpf_map__set_autoattach (iter_map, false); + } +for (int i =0 ; i < progs_count; i++) {struct bpf_program *prog;struct bpf_map *map;
@@ -125,6 +139,10 @@ static void load_programs(const struct test_program programs[], ASSERT_OK_PTR(map) TH_LOG("can not find struct_ops by name '%s'", programs[i].name + 4); + err =bpf_map__set_autocreate (map, true); + ASSERT_OK(err) TH_LOG("can not enable struct_ops map '%s'", + programs[i].name + 4); +/* hid_id is the first field of struct hid_bpf_ops */ ops_hid_id =bpf_map__initial_value (map,NULL ); ASSERT_OK_PTR(ops_hid_id) TH_LOG("unable to retrieve struct_ops data");
@@ -132,13 +150,6 @@ static void load_programs(const struct test_program programs[], *ops_hid_id = self->hid_id; } -/* we disable the auto-attach feature of all maps because we -* only want the tested one to be manually attached in the next -* call to bpf_map__attach_struct_ops() -*/ -bpf_object__for_each_map (iter_map, *self->skel->skeleton->obj) -bpf_map__set_autoattach (iter_map, false); - err =hid__load (self->skel); ASSERT_OK(err) TH_LOG("hid_skel_load failed: %d", err);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 758/1276 selftests/hid: Cover hid_bpf_get_data() size overflow
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yiyang Chen <[email protected]>
[ Upstream commit eebbef7c468a5cb58c4772849ee5066441166cf0 ]
Add a HID-BPF regression check for hid_bpf_get_data() requests whose size would overflow when added to the offset.
The new rdesc fixup callback asks for offset 2 and size ~0ULL, then records whether the helper returns NULL. A vulnerable kernel returns a non-NULL pointer because the runtime check wraps the addition. A fixed kernel rejects the request. The callback records the helper result without dereferencing any returned pointer.
The callback reports the helper result through BSS and returns 0 intentionally. hid_rdesc_fixup return values are consumed as report descriptor fixup results, so a positive test-result value would be interpreted as a replacement report descriptor size.
Also add KHDR_INCLUDES to the HID selftest build so hid_bpf.c sees the current kernel UAPI HID definitions on systems whose installed headers do not provide enum hid_report_type.
--- tools/testing/selftests/hid/Makefile | 2 +- tools/testing/selftests/hid/hid_bpf.c | 11 +++++++++++ tools/testing/selftests/hid/progs/hid.c | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-)
tools/testing/selftests/hid/Makefile +1 -1
@@ -24,7 +24,7 @@ CXX ?= $(CROSS_COMPILE)g++ HOSTPKG_CONFIG := pkg-config -CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(OUTPUT) +CFLAGS += -g -O0 -rdynamic -Wall -Werror -I$(OUTPUT) $(KHDR_INCLUDES) CFLAGS += -I$(OUTPUT)/tools/include LDLIBS += -lelf -lz -lrt -lpthread
tools/testing/selftests/hid/hid_bpf.c +11 -0
@@ -921,6 +921,17 @@ TEST_F(hid_bpf, test_rdesc_fixup)ASSERT_EQ (rpt_desc.value[4 ],0x42 ); } +TEST_F(hid_bpf, test_rdesc_fixup_get_data_overflow) +{ +const struct test_program progs[] = { + { .name ="hid_rdesc_fixup_get_data_overflow" }, + }; + +LOAD_PROGRAMS (progs); + +ASSERT_EQ (self->skel->bss->get_data_overflow_check,1 ); +} +static int libbpf_print_fn (enum libbpf_print_level level,const char *format,va_list args) {
tools/testing/selftests/hid/progs/hid.c +15 -0
@@ -13,6 +13,7 @@ struct attach_prog_args {__u64 callback_check =52 ;__u64 callback2_check =52 ; +__u64 get_data_overflow_check; SEC("?struct_ops/hid_device_event")int BPF_PROG (hid_first_event ,struct hid_bpf_ctx *hid_ctx,enum hid_report_type type)
@@ -240,6 +241,20 @@ struct hid_bpf_ops rdesc_fixup = { .hid_rdesc_fixup = (void *)hid_rdesc_fixup, }; +SEC("?struct_ops.s/hid_rdesc_fixup") +int BPF_PROG (hid_rdesc_fixup_get_data_overflow ,struct hid_bpf_ctx *hid_ctx) +{ +if (!hid_bpf_get_data (hid_ctx,2 /* offset */ , ~0ULL /* size */ )) + get_data_overflow_check =1 ; + +return 0 ; +} + +SEC(".struct_ops.link") +struct hid_bpf_ops rdesc_fixup_get_data_overflow = { + .hid_rdesc_fixup = (void *)hid_rdesc_fixup_get_data_overflow, +}; + SEC("?struct_ops/hid_device_event")int BPF_PROG (hid_test_insert1 ,struct hid_bpf_ctx *hid_ctx,enum hid_report_type type) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 759/1276 net: usb: net1080: validate packet_len before pad-byte access in rx_fixup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit 03f384bc0cb8d4a1301d4f5b0baef2d980258383 ]
For an even packet_len, net1080_rx_fixup() reads the pad byte at skb->data[packet_len] before the skb->len != packet_len check further down, and packet_len is only bounded against NC_MAX_PACKET. A malicious NetChip 1080 device can send a short frame advertising a large even packet_len (e.g. 0x4000), so the pad-byte read lands past the end of the skb:
BUG: KASAN: slab-out-of-bounds in net1080_rx_fixup Read of size 1 at addr ffff8880106c83c6 by task ksoftirqd/0/14 ... net1080_rx_fixup (drivers/net/usb/net1080.c:384) usbnet_bh (drivers/net/usb/usbnet.c:1589) process_one_work (kernel/workqueue.c:3322) bh_worker (kernel/workqueue.c:3708) tasklet_action (kernel/softirq.c:965) handle_softirqs (kernel/softirq.c:622) ...
Reject the frame when packet_len >= skb->len before reading.
--- drivers/net/usb/net1080.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/usb/net1080.c +1 -1
@@ -381,7 +381,7 @@ static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)skb_trim (skb, skb->len -sizeof *trailer);if ((packet_len &0x01 ) ==0 ) { -if (skb->data [packet_len] !=PAD_BYTE ) { +if (packet_len >= skb->len || skb->data[packet_len] !=PAD_BYTE ) { dev->net->stats.rx_frame_errors++;netdev_dbg (dev->net,"bad pad\n" );return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 760/1276 gue: validate REMCSUM private option length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qihang <[email protected]>
[ Upstream commit d335dcc6f521571d57117b8deeebc940836e5450 ]
GUE private flags can indicate that remote checksum offload metadata is present. The private flags field itself is accounted for by guehdr_flags_len(), but guehdr_priv_flags_len() currently returns 0 even when GUE_PFLAG_REMCSUM is set.
This lets a packet with only the private flags field pass validate_gue_flags(), after which gue_remcsum() and gue_gro_remcsum() read the missing REMCSUM start/offset fields from the following bytes.
Account for GUE_PLEN_REMCSUM when GUE_PFLAG_REMCSUM is present so that malformed packets are rejected during option validation.
--- include/net/gue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/gue.h +1 -1
@@ -80,7 +80,7 @@ static inline size_t guehdr_flags_len(__be16 flags)static inline size_t guehdr_priv_flags_len (__be32 flags) { -return 0 ; +return (flags &GUE_PFLAG_REMCSUM ) ?GUE_PLEN_REMCSUM :0 ; }/* Validate standard and private flags. Returns non-zero (meaning invalid)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 761/1276 netfilter: xt_u32: reject invalid shift counts
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wyatt Feng <[email protected]>
[ Upstream commit 64cdf7d30ac18e43df6c48004435febb965809a8 ]
u32_match_it() executes rule-supplied shift operands on a 32-bit value. A malformed u32 rule can provide a shift count of 32 or more, triggering an undefined shift out-of-bounds during packet evaluation.
Validate XT_U32_LEFTSH and XT_U32_RIGHTSH operands in u32_mt_checkentry() and reject malformed rules before they reach the packet path.
--- net/netfilter/xt_u32.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
net/netfilter/xt_u32.c +11 -1
@@ -106,7 +106,7 @@ static int u32_mt_checkentry(const struct xt_mtchk_param *par) {const struct xt_u32 *data = par->matchinfo;const struct xt_u32_test *ct; -unsigned int i; +unsigned int i, j;if (data->ntests >ARRAY_SIZE (data->tests))return -EINVAL ;
@@ -117,6 +117,16 @@ static int u32_mt_checkentry(const struct xt_mtchk_param *par)if (ct->nnums >ARRAY_SIZE (ct->location) || ct->nvalues >ARRAY_SIZE (ct->value))return -EINVAL ; + +for (j =1 ; j < ct->nnums; ++j) { +switch (ct->location[j].nextop) { +case XT_U32_LEFTSH : +case XT_U32_RIGHTSH : +if (ct->location[j].number >=32 ) +return -EINVAL ; +break ; + } + } }return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 762/1276 netfilter: xt_rateest: fix u64 truncation in xt_rateest_mt()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Wu <[email protected]>
[ Upstream commit 444853cd438201007da5359821adcc2995655ab1 ]
On links faster than ~34 Gbps, where byte rate may exceed 2^32-1 (~ 4.3 GBps), the comparison result becomes incorrect because the truncated value no longer reflects the actual estimator rate.
Fix by changing the local variables to u64.
--- net/netfilter/xt_rateest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/xt_rateest.c +1 -1
@@ -16,7 +16,7 @@ xt_rateest_mt(const struct sk_buff *skb, struct xt_action_param *par) {const struct xt_rateest_match_info *info = par->matchinfo;struct gnet_stats_rate_est64 sample = {0 }; -u_int32_t bps1, bps2, pps1, pps2; +u64 bps1, bps2, pps1, pps2;bool ret = true;gen_estimator_read (&info->est1->rate_est, &sample);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 763/1276 netfilter: ip6tables: mark malformed IPv6 extension headers for hotdrop
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhixing Chen <[email protected]>
[ Upstream commit 43ccc20b5a733226417832cf16ef45322e594990 ]
The ah, hbh and rt matches check that the fixed extension header is present, then use the header length field to derive the advertised extension header length for matching.
For the ah match, add the missing advertised-length check. For hbh and rt, update the existing advertised-length checks. In all three cases, set hotdrop to true before returning false when the advertised extension header length exceeds the available skb data.
Returning false treats the packet as a rule mismatch. Set hotdrop to true and drop malformed packets so they cannot bypass rules intended to drop packets with these IPv6 extension headers.
--- net/ipv6/netfilter/ip6t_ah.c | 5 +++++ net/ipv6/netfilter/ip6t_hbh.c | 1 + net/ipv6/netfilter/ip6t_rt.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)
net/ipv6/netfilter/ip6t_ah.c +5 -0
@@ -56,6 +56,11 @@ static bool ah_mt6(const struct sk_buff *skb, struct xt_action_param *par) } hdrlen =ipv6_authlen (ah); +if (skb->len - ptr < hdrlen) { +/* Packet smaller than its length field */ + par->hotdrop = true; +return false; + }pr_debug ("IPv6 AH LEN %u %u " , hdrlen, ah->hdrlen);pr_debug ("RES %04X " , ah->reserved);
net/ipv6/netfilter/ip6t_hbh.c +1 -0
@@ -75,6 +75,7 @@ hbh_mt6(const struct sk_buff *skb, struct xt_action_param *par) hdrlen =ipv6_optlen (oh);if (skb->len - ptr < hdrlen) {/* Packet smaller than it's length field */ + par->hotdrop = true;return false; }
net/ipv6/netfilter/ip6t_rt.c +2 -1
@@ -56,7 +56,8 @@ static bool rt_mt6(const struct sk_buff *skb, struct xt_action_param *par) hdrlen =ipv6_optlen (rh);if (skb->len - ptr < hdrlen) { -/* Pcket smaller than its length field */ +/* Packet smaller than its length field */ + par->hotdrop = true;return false; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 764/1276 netfilter: xt_connmark: reject invalid shift parameters
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wyatt Feng <[email protected]>
[ Upstream commit 1b47026fb4b35bac850ad6e8a4ad7fc018e09ebc ]
Revision 2 of the CONNMARK target accepts user-controlled shift parameters and applies them to 32-bit mark values in connmark_tg_shift().
A shift_bits value of 32 or more triggers an undefined-shift bug when the rule is evaluated. Invalid shift_dir values are also accepted and silently fall back to the left-shift path.
Reject invalid revision-2 shift parameters in connmark_tg_check() so malformed rules fail at installation time, before they can reach the packet path.
--- net/netfilter/xt_connmark.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
net/netfilter/xt_connmark.c +12 -2
@@ -112,6 +112,16 @@ static int connmark_tg_check(const struct xt_tgchk_param *par)return ret; } +static int connmark_tg_check_v2 (const struct xt_tgchk_param *par) +{ +const struct xt_connmark_tginfo2 *info = par->targinfo; + +if (info->shift_dir >D_SHIFT_RIGHT || info->shift_bits >=32 ) +return -EINVAL ; + +return connmark_tg_check (par); +} +static void connmark_tg_destroy (const struct xt_tgdtor_param *par) {nf_ct_netns_put (par->net, par->family);
@@ -162,7 +172,7 @@ static struct xt_target connmark_tg_reg[] __read_mostly = { .name = "CONNMARK", .revision = 2, .family = NFPROTO_IPV4, - .checkentry = connmark_tg_check, + .checkentry = connmark_tg_check_v2, .target = connmark_tg_v2, .targetsize = sizeof(struct xt_connmark_tginfo2), .destroy = connmark_tg_destroy,
@@ -183,7 +193,7 @@ static struct xt_target connmark_tg_reg[] __read_mostly = { .name = "CONNMARK", .revision = 2, .family = NFPROTO_IPV6, - .checkentry = connmark_tg_check, + .checkentry = connmark_tg_check_v2, .target = connmark_tg_v2, .targetsize = sizeof(struct xt_connmark_tginfo2), .destroy = connmark_tg_destroy,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 765/1276 net/mlx5: LAG, MPESW, Fix missing complete() on devcom error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shay Drory <[email protected]>
[ Upstream commit d4b85f9a668b9c44216bb78daf4ec1a915cc92d1 ]
mlx5_mpesw_work() returned without calling complete() when mlx5_lag_get_devcom_comp() returned NULL. A caller that queued the work and waited on mpesww->comp would block indefinitely.
Funnel the early-return path through a new "complete" label so the waiter is always woken.
--- drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c +5 -2
@@ -134,8 +134,10 @@ static void mlx5_mpesw_work(struct work_struct *work)struct mlx5_lag *ldev = mpesww->lag; devcom =mlx5_lag_get_devcom_comp (ldev); -if (!devcom) -return ; +if (!devcom) { + mpesww->result = -ENODEV ; + goto complete; + }mlx5_devcom_comp_lock (devcom);mutex_lock (&ldev->lock);
@@ -151,6 +153,7 @@ static void mlx5_mpesw_work(struct work_struct *work) unlock:mutex_unlock (&ldev->lock);mlx5_devcom_comp_unlock (devcom); +complete:complete (&mpesww->comp); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 766/1276 net/mlx5e: Fix HV VHCA stats zero-sized buffer allocation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Liu <[email protected]>
[ Upstream commit 25f6b929c7e379cbea7cb8caa67b49b2d1efae17 ]
mlx5e_hv_vhca_stats_create() is called from mlx5e_nic_enable(), before mlx5e_open(). At that point priv->stats_nch is still zero, because it is only ever incremented in mlx5e_channel_stats_alloc(), which is reached only from mlx5e_open_channel().
mlx5e_hv_vhca_stats_buf_size() therefore returns 0, and kvzalloc(0, GFP_KERNEL) returns ZERO_SIZE_PTR ((void *)16) rather than NULL. The "if (!buf)" guard does not catch this, and mlx5e_hv_vhca_stats_create() completes "successfully" with priv->stats_agent.buf set to ZERO_SIZE_PTR.
Once channels are opened (priv->stats_nch > 0) and the hypervisor enables stats reporting, mlx5e_hv_vhca_stats_work() recomputes buf_len using the new non-zero stats_nch and calls memset(buf, 0, buf_len) on ZERO_SIZE_PTR, faulting at address 0x10.
Allocate the buffer based on priv->max_nch, which is set in mlx5e_priv_init() and is the upper bound on stats_nch:
- Add a separate helper mlx5e_hv_vhca_stats_buf_max_size() that returns sizeof(per_ring_stats) * max(max_nch, stats_nch), and use it for the kvzalloc() in mlx5e_hv_vhca_stats_create().
- Keep mlx5e_hv_vhca_stats_buf_size() (which returns based on stats_nch) for the worker's active payload size, so the wire format (block->rings = stats_nch) and the amount of data filled by mlx5e_hv_vhca_fill_stats() are unchanged.
The max(max_nch, stats_nch) guard handles the rare case where mlx5e_attach_netdev() recomputes max_nch downward across a detach/resume cycle while priv->stats_nch persists (mlx5e_detach_netdev does not call mlx5e_priv_cleanup, so stats_nch is only reset when the netdev is destroyed). Without the guard, the worker could compute buf_len from stats_nch and overrun the smaller buffer allocated based on the reduced max_nch.
Allocating a non-zero buffer also makes the kvzalloc() failure path in mlx5e_hv_vhca_stats_create() reachable for the first time: it returns early without (re)creating the agent. Clear priv->stats_agent.{agent,buf} in mlx5e_hv_vhca_stats_destroy() after freeing them, so that if a later create() bails out on this path, a subsequent teardown does not double-free the stale agent/buffer left from a previous enable/disable cycle.
This mirrors the existing mlx5e pattern of preallocating arrays of size max_nch (e.g. priv->channel_stats) and lazily populating entries up to stats_nch on demand.
--- .../net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c +9 -1
@@ -54,6 +54,12 @@ static int mlx5e_hv_vhca_stats_buf_size(struct mlx5e_priv *priv) priv->stats_nch); } +static int mlx5e_hv_vhca_stats_buf_max_size (struct mlx5e_priv *priv) +{ +return (sizeof (struct mlx5e_hv_vhca_per_ring_stats ) * +max (priv->max_nch, priv->stats_nch)); +} +static void mlx5e_hv_vhca_stats_work (struct work_struct *work) {struct mlx5e_hv_vhca_stats_agent *sagent;
@@ -122,7 +128,7 @@ static void mlx5e_hv_vhca_stats_cleanup(struct mlx5_hv_vhca_agent *agent)void mlx5e_hv_vhca_stats_create (struct mlx5e_priv *priv) { -int buf_len =mlx5e_hv_vhca_stats_buf_size (priv); +int buf_len =mlx5e_hv_vhca_stats_buf_max_size (priv);struct mlx5_hv_vhca_agent *agent; priv->stats_agent.buf =kvzalloc (buf_len,GFP_KERNEL );
@@ -155,5 +161,7 @@ void mlx5e_hv_vhca_stats_destroy(struct mlx5e_priv *priv)return ;mlx5_hv_vhca_agent_destroy (priv->stats_agent.agent); + priv->stats_agent.agent =NULL ;kvfree (priv->stats_agent.buf); + priv->stats_agent.buf =NULL ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 767/1276 net/mlx5e: Fix HV VHCA stats agent registration race
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Feng Liu <[email protected]>
[ Upstream commit 89b25b5f46f488ea3b29b3444864c76944c9075b ]
mlx5e_hv_vhca_stats_create() registers the stats agent through mlx5_hv_vhca_agent_create(). The helper publishes the agent in hv_vhca->agents[type] under agents_lock and immediately schedules an asynchronous control invalidation on the HV VHCA workqueue before returning to mlx5e.
The asynchronous invalidation invokes the control agent's invalidate callback, which reads the hypervisor control block and forwards the command to mlx5e_hv_vhca_stats_control(). That callback may either:
- call cancel_delayed_work_sync(&priv->stats_agent.work), or
- call queue_delayed_work(priv->wq, &sagent->work, sagent->delay).
However, the delayed_work and priv->stats_agent.agent are only initialized after mlx5_hv_vhca_agent_create() returns to mlx5e:
agent = mlx5_hv_vhca_agent_create(...); /* publish + invalidate */
...
priv->stats_agent.agent = agent; /* too late */
INIT_DELAYED_WORK(&priv->stats_agent.work, ...); /* too late */If the asynchronous control path runs before the two assignments above, it can:
- Operate on an uninitialized delayed_work whose timer.function is NULL. queue_delayed_work() calls add_timer() unconditionally, so when the timer expires the timer softirq invokes a NULL function pointer.
- Re-initialize the timer later through INIT_DELAYED_WORK() while the timer is already enqueued in the timer wheel, corrupting the hlist (entry.pprev cleared while the previous bucket node still points at this entry).
- When the worker eventually runs, mlx5e_hv_vhca_stats_work() reads
sagent->agent (NULL) and dereferences it inside
mlx5_hv_vhca_agent_write().Fix this by:
- Initializing priv->stats_agent.work before invoking mlx5_hv_vhca_agent_create(), so the work is always in a valid state when the control callback observes it.
- Adding a struct mlx5_hv_vhca_agent **ctx_update out-parameter to mlx5_hv_vhca_agent_create(). The helper writes the agent pointer to *ctx_update before publishing into hv_vhca->agents[] and triggering the agents_update flow, so any callback subsequently invoked from that flow already sees a valid priv->stats_agent.agent. This avoids having the control callback participate in agent initialization.
While at it, access priv->stats_agent.agent with READ_ONCE()/WRITE_ONCE() for the cross-CPU access with the worker, and clear priv->stats_agent.buf on the agent_create() failure path.
--- .../mellanox/mlx5/core/en/hv_vhca_stats.c | 21 +++++++++++-------- .../ethernet/mellanox/mlx5/core/lib/hv_vhca.c | 8 +++++-- .../ethernet/mellanox/mlx5/core/lib/hv_vhca.h | 6 ++++-- 3 files changed, 22 insertions(+), 13 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c +12 -9
@@ -73,7 +73,7 @@ static void mlx5e_hv_vhca_stats_work(struct work_struct *work) sagent = container_of(dwork, struct mlx5e_hv_vhca_stats_agent, work); priv = container_of(sagent, struct mlx5e_priv, stats_agent); buf_len =mlx5e_hv_vhca_stats_buf_size (priv); - agent = sagent->agent; + agent =READ_ONCE (sagent->agent); buf = sagent->buf;memset (buf,0 , buf_len);
@@ -135,11 +135,14 @@ void mlx5e_hv_vhca_stats_create(struct mlx5e_priv *priv)if (!priv->stats_agent.buf)return ; +INIT_DELAYED_WORK (&priv->stats_agent.work, mlx5e_hv_vhca_stats_work); + agent =mlx5_hv_vhca_agent_create (priv->mdev->hv_vhca,MLX5_HV_VHCA_AGENT_STATS , mlx5e_hv_vhca_stats_control,NULL , mlx5e_hv_vhca_stats_cleanup, - priv); + priv, + &priv->stats_agent.agent);if (IS_ERR_OR_NULL (agent)) {if (IS_ERR (agent))
@@ -148,20 +151,20 @@ void mlx5e_hv_vhca_stats_create(struct mlx5e_priv *priv) PTR_ERR(agent));kvfree (priv->stats_agent.buf); -return ; + priv->stats_agent.buf =NULL ; } - - priv->stats_agent.agent = agent; -INIT_DELAYED_WORK (&priv->stats_agent.work, mlx5e_hv_vhca_stats_work); }void mlx5e_hv_vhca_stats_destroy (struct mlx5e_priv *priv) { -if (IS_ERR_OR_NULL (priv->stats_agent.agent)) +struct mlx5_hv_vhca_agent *agent; + + agent =READ_ONCE (priv->stats_agent.agent); +if (IS_ERR_OR_NULL (agent))return ; -mlx5_hv_vhca_agent_destroy (priv->stats_agent.agent); - priv->stats_agent.agent =NULL ; +mlx5_hv_vhca_agent_destroy (agent); +WRITE_ONCE (priv->stats_agent.agent,NULL );kvfree (priv->stats_agent.buf); priv->stats_agent.buf =NULL ; }
drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c +6 -2
@@ -190,7 +190,7 @@ mlx5_hv_vhca_control_agent_create(struct mlx5_hv_vhca *hv_vhca)return mlx5_hv_vhca_agent_create (hv_vhca,MLX5_HV_VHCA_AGENT_CONTROL ,NULL , mlx5_hv_vhca_control_agent_invalidate, -NULL ,NULL ); +NULL ,NULL ,NULL ); }static void mlx5_hv_vhca_control_agent_destroy (struct mlx5_hv_vhca_agent *agent)
@@ -256,7 +256,8 @@ mlx5_hv_vhca_agent_create(struct mlx5_hv_vhca *hv_vhca,void (*invalidate)(struct mlx5_hv_vhca_agent *,u64 block_mask), void (*cleaup)(struct mlx5_hv_vhca_agent *agent), - void *priv) + void *priv, + struct mlx5_hv_vhca_agent **ctx_update) { struct mlx5_hv_vhca_agent *agent;
@@ -284,6 +285,9 @@ mlx5_hv_vhca_agent_create(struct mlx5_hv_vhca *hv_vhca, agent->invalidate = invalidate; agent->cleanup = cleaup; +if (ctx_update) +WRITE_ONCE (*ctx_update, agent); +mutex_lock (&hv_vhca->agents_lock); hv_vhca->agents[type] = agent;mutex_unlock (&hv_vhca->agents_lock);
drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h +4 -2
@@ -43,7 +43,8 @@ mlx5_hv_vhca_agent_create(struct mlx5_hv_vhca *hv_vhca,void (*invalidate)(struct mlx5_hv_vhca_agent *,u64 block_mask), void (*cleanup)(struct mlx5_hv_vhca_agent *agent), - void *context); + void *context, + struct mlx5_hv_vhca_agent **ctx_update);void mlx5_hv_vhca_agent_destroy (struct mlx5_hv_vhca_agent *agent); int mlx5_hv_vhca_agent_write(struct mlx5_hv_vhca_agent *agent,
@@ -84,7 +85,8 @@ mlx5_hv_vhca_agent_create(struct mlx5_hv_vhca *hv_vhca,void (*invalidate)(struct mlx5_hv_vhca_agent *,u64 block_mask), void (*cleanup)(struct mlx5_hv_vhca_agent *agent), - void *context) + void *context, + struct mlx5_hv_vhca_agent **ctx_update) { return NULL; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 768/1276 net: microchip: vcap: fix races on the shared Super VCAP block
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Emil Schulz Østergaard <[email protected]>
[ Upstream commit d7a8d500d7e42837bd8dce40cb52c97c6e8706a9 ]
The VCAP instances on a chip are not independent, yet they are locked independently. On sparx5 and lan969x the IS0 and IS2 instances are backed by the same Super VCAP hardware block and share its cache and command registers: every access drives the shared VCAP_SUPER_CTRL register and moves data through the shared cache registers.
Accessing one instance therefore races with accessing another. The per-instance admin->lock cannot prevent this, as each instance takes a different lock.
The locking issue is mostly disguised by the fact that the core usage of the vcap api runs under rtnl. However, the full rule dump in debugfs decodes rules straight from hardware (a READ command followed by a cache read) and runs outside rtnl, so it races a concurrent tc-flower rule write to another Super VCAP instance.
Besides corrupting the dump, the read repopulates the shared cache between the writers cache fill and its write command, so the writer commits the wrong data and corrupts the hardware entry.
Introduce vcap_lock() and vcap_unlock() helpers and route every rule lock site in the VCAP API and its debugfs code through them. Replace the per-instance admin->lock with a single mutex in struct vcap_control that serializes access to all instances. The helpers reach it through a new admin->vctrl back-pointer, and the clients initialise and destroy the control lock instead of a per-instance one.
No path holds more than one instance lock, so collapsing them onto a single mutex cannot self-deadlock.
--- .../microchip/lan966x/lan966x_vcap_impl.c | 5 +- .../microchip/sparx5/sparx5_vcap_impl.c | 5 +- .../net/ethernet/microchip/vcap/vcap_api.c | 72 +++++++++++-------- .../net/ethernet/microchip/vcap/vcap_api.h | 3 +- .../microchip/vcap/vcap_api_debugfs.c | 8 +-- .../microchip/vcap/vcap_api_debugfs_kunit.c | 3 +- .../ethernet/microchip/vcap/vcap_api_kunit.c | 3 +- .../microchip/vcap/vcap_api_private.h | 3 + 8 files changed, 60 insertions(+), 42 deletions(-)
drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c +3 -2
@@ -601,7 +601,6 @@ static void lan966x_vcap_admin_free(struct vcap_admin *admin)kfree (admin->cache.keystream);kfree (admin->cache.maskstream);kfree (admin->cache.actionstream); -mutex_destroy (&admin->lock);kfree (admin); }
@@ -615,7 +614,7 @@ lan966x_vcap_admin_alloc(struct lan966x *lan966x, struct vcap_control *ctrl,if (!admin)return ERR_PTR (-ENOMEM ); -mutex_init (&admin->lock); + admin->vctrl = ctrl;INIT_LIST_HEAD (&admin->list);INIT_LIST_HEAD (&admin->rules);INIT_LIST_HEAD (&admin->enabled);
@@ -721,6 +720,7 @@ int lan966x_vcap_init(struct lan966x *lan966x) ctrl->ops = &lan966x_vcap_ops;INIT_LIST_HEAD (&ctrl->list); +mutex_init (&ctrl->lock);for (int i =0 ; i <ARRAY_SIZE (lan966x_vcap_inst_cfg); ++i) { cfg = &lan966x_vcap_inst_cfg[i];
@@ -780,5 +780,6 @@ void lan966x_vcap_deinit(struct lan966x *lan966x)lan966x_vcap_admin_free (admin); } +mutex_destroy (&ctrl->lock);kfree (ctrl); }
drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c +3 -2
@@ -1941,7 +1941,6 @@ static void sparx5_vcap_admin_free(struct vcap_admin *admin) {if (!admin)return ; -mutex_destroy (&admin->lock);kfree (admin->cache.keystream);kfree (admin->cache.maskstream);kfree (admin->cache.actionstream);
@@ -1961,7 +1960,7 @@ sparx5_vcap_admin_alloc(struct sparx5 *sparx5, struct vcap_control *ctrl,INIT_LIST_HEAD (&admin->list);INIT_LIST_HEAD (&admin->rules);INIT_LIST_HEAD (&admin->enabled); -mutex_init (&admin->lock); + admin->vctrl = ctrl; admin->vtype = cfg->vtype; admin->vinst = cfg->vinst; admin->ingress = cfg->ingress;
@@ -2069,6 +2068,7 @@ int sparx5_vcap_init(struct sparx5 *sparx5) ctrl->ops = &sparx5_vcap_ops;INIT_LIST_HEAD (&ctrl->list); +mutex_init (&ctrl->lock);for (idx =0 ; idx <ARRAY_SIZE (sparx5_vcap_inst_cfg); ++idx) { cfg = &sparx5_vcap_inst_cfg[idx]; admin =sparx5_vcap_admin_alloc (sparx5, ctrl, cfg);
@@ -2107,5 +2107,6 @@ void sparx5_vcap_destroy(struct sparx5 *sparx5)list_del (&admin->list);sparx5_vcap_admin_free (admin); } +mutex_destroy (&ctrl->lock);kfree (ctrl); }
drivers/net/ethernet/microchip/vcap/vcap_api.c +41 -31
235 lines not on this page · raw message
drivers/net/ethernet/microchip/vcap/vcap_api.h +2 -1
@@ -164,7 +164,7 @@ struct vcap_admin {struct list_head list;/* for insertion in vcap_control */ struct list_head rules;/* list of rules */ struct list_head enabled;/* list of enabled ports */ -struct mutex lock;/* control access to rules */ +struct vcap_control *vctrl;/* the control instance owning this vcap */ enum vcap_type vtype;/* type of vcap */ int vinst;/* instance number within the same type */ int first_cid;/* first chain id in this vcap */
@@ -275,6 +275,7 @@ struct vcap_control {const struct vcap_info *vcaps;/* client supplied vcap models */ const struct vcap_statistics *stats;/* client supplied vcap stats */ struct list_head list;/* list of vcap instances */ + struct mutex lock; /* serialize access to all vcap instances */ };#endif /* __VCAP_API__ */
drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c +4 -4
@@ -410,9 +410,9 @@ static int vcap_debugfs_show(struct seq_file *m, void *unused) };int ret; -mutex_lock (&info->admin->lock); +vcap_lock (info->admin); ret =vcap_show_admin (info->vctrl, info->admin, &out); -mutex_unlock (&info->admin->lock); +vcap_unlock (info->admin);return ret; }DEFINE_SHOW_ATTRIBUTE (vcap_debugfs);
@@ -427,9 +427,9 @@ static int vcap_raw_debugfs_show(struct seq_file *m, void *unused) };int ret; -mutex_lock (&info->admin->lock); +vcap_lock (info->admin); ret =vcap_show_admin_raw (info->vctrl, info->admin, &out); -mutex_unlock (&info->admin->lock); +vcap_unlock (info->admin);return ret; }DEFINE_SHOW_ATTRIBUTE (vcap_raw_debugfs);
drivers/net/ethernet/microchip/vcap/vcap_api_debugfs_kunit.c +2 -1
@@ -243,10 +243,11 @@ static void vcap_test_api_init(struct vcap_admin *admin) {/* Initialize the shared objects */ INIT_LIST_HEAD (&test_vctrl.list); +mutex_init (&test_vctrl.lock);INIT_LIST_HEAD (&admin->list);INIT_LIST_HEAD (&admin->rules);INIT_LIST_HEAD (&admin->enabled); -mutex_init (&admin->lock); + admin->vctrl = &test_vctrl;list_add_tail (&admin->list, &test_vctrl.list);memset (test_updateaddr,0 ,sizeof (test_updateaddr)); test_updateaddridx =0 ;
drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c +2 -1
@@ -233,10 +233,11 @@ static void vcap_test_api_init(struct vcap_admin *admin) {/* Initialize the shared objects */ INIT_LIST_HEAD (&test_vctrl.list); +mutex_init (&test_vctrl.lock);INIT_LIST_HEAD (&admin->list);INIT_LIST_HEAD (&admin->rules);INIT_LIST_HEAD (&admin->enabled); -mutex_init (&admin->lock); + admin->vctrl = &test_vctrl;list_add_tail (&admin->list, &test_vctrl.list);memset (test_updateaddr,0 ,sizeof (test_updateaddr)); test_updateaddridx =0 ;
drivers/net/ethernet/microchip/vcap/vcap_api_private.h +3 -0
@@ -50,6 +50,9 @@ struct vcap_stream_iter {/* Check that the control has a valid set of callbacks */ int vcap_api_check (struct vcap_control *ctrl); +/* Serialize access to the vcap instances of a control */ +void vcap_lock (struct vcap_admin *admin); +void vcap_unlock (struct vcap_admin *admin);/* Erase the VCAP cache area used or encoding and decoding */ void vcap_erase_cache (struct vcap_rule_internal *ri);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 769/1276 qede: fix off-by-one in BD ring consumption on build_skb failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shigeru Yoshida <[email protected]>
[ Upstream commit a0a558ca7e75b49e71f8c545c30e8c005e6e4e2f ]
qede_rx_build_skb() and qede_tpa_rx_build_skb() do not check for a NULL return from qede_build_skb(). When it returns NULL under memory pressure, the functions still consume a BD from the ring before returning NULL. The callers then recycle additional BDs, resulting in one extra BD being consumed (off-by-one). This desynchronizes the BD ring, which can corrupt DMA page reference counts and lead to SLUB freelist corruption.
Commit 4e910dbe3650 ("qede: confirm skb is allocated before using") added a NULL check inside qede_build_skb() to prevent a NULL pointer dereference, but did not address the missing NULL checks in the callers, making this off-by-one reachable.
Fix this by adding NULL checks for the return value of qede_build_skb() in both qede_rx_build_skb() and qede_tpa_rx_build_skb(), returning NULL immediately before any BD ring manipulation.
--- drivers/net/ethernet/qlogic/qede/qede_fp.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/qlogic/qede/qede_fp.c +5 -0
@@ -765,6 +765,9 @@ qede_tpa_rx_build_skb(struct qede_dev *edev,struct sk_buff *skb; skb =qede_build_skb (rxq, bd, len, pad); +if (unlikely (!skb)) +return NULL ; + bd->page_offset += rxq->rx_buf_seg_size;if (bd->page_offset ==PAGE_SIZE ) {
@@ -812,6 +815,8 @@ qede_rx_build_skb(struct qede_dev *edev, } skb =qede_build_skb (rxq, bd, len, pad); +if (unlikely (!skb)) +return NULL ;if (unlikely (qede_realloc_rx_buffer (rxq, bd))) {/* Incr page ref count to reuse on allocation failure so
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 770/1276 net: qualcomm: rmnet: validate MAP frame length before ingress parsing
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit f0f1887a9e30712a1df03e152dce6fb91344b1f3 ]
When ingress deaggregation is disabled, rmnet_map_ingress_handler() passes the skb straight to __rmnet_map_ingress_handler(), skipping the length validation that rmnet_map_deaggregate() performs on the aggregated path. The parser then dereferences the MAP header and csum header/trailer based on the on-wire pkt_len without checking skb->len, so a short frame is read out of bounds:
BUG: KASAN: slab-out-of-bounds in rmnet_map_checksum_downlink_packet Read of size 1 at addr ffff88801118ed00 by task exploit/147 Call Trace: ... rmnet_map_checksum_downlink_packet (drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c:413) __rmnet_map_ingress_handler (drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c:96) rmnet_rx_handler (drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c:129) __netif_receive_skb_core.constprop.0 (net/core/dev.c:6089) netif_receive_skb (net/core/dev.c:6460) tun_get_user (drivers/net/tun.c:1955) tun_chr_write_iter (drivers/net/tun.c:2001) vfs_write (fs/read_write.c:688) ksys_write (fs/read_write.c:740) do_syscall_64 (arch/x86/entry/syscall_64.c:94) ...
Factor that validation out of rmnet_map_deaggregate() into rmnet_map_validate_packet_len() and run it on the no-aggregation path too. The MAP header is bounds-checked first, since this path can receive a frame shorter than the header.
--- .../ethernet/qualcomm/rmnet/rmnet_handlers.c | 5 +- .../net/ethernet/qualcomm/rmnet/rmnet_map.h | 1 + .../ethernet/qualcomm/rmnet/rmnet_map_data.c | 72 ++++++++++--------- 3 files changed, 45 insertions(+), 33 deletions(-)
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c +4 -1
@@ -126,7 +126,10 @@ rmnet_map_ingress_handler(struct sk_buff *skb,consume_skb (skb); }else { -__rmnet_map_ingress_handler (skb, port); +if (rmnet_map_validate_packet_len (skb, port)) +__rmnet_map_ingress_handler (skb, port); +else +kfree_skb (skb); } }
drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h +1 -0
@@ -59,5 +59,6 @@ void rmnet_map_tx_aggregate_init(struct rmnet_port *port);void rmnet_map_tx_aggregate_exit (struct rmnet_port *port);void rmnet_map_update_ul_agg_config (struct rmnet_port *port,u32 size,u32 count,u32 time); +u32 rmnet_map_validate_packet_len (struct sk_buff *skb,struct rmnet_port *port);#endif /* _RMNET_MAP_H_ */
drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c +40 -32
94 lines not on this page · raw message
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 771/1276 net/sched: act_pedit: fix TOCTOU heap OOB write in tc offload
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jamal Hadi Salim <[email protected]>
[ Upstream commit 8b519cbcabe836a441369fbec1a8a6518a709251 ]
There is a TOCTOU race condition in flower lockless approach between sizing a flow_rule buffer and filling it. [email protected] reports:
The cls_flower classifier operates with TCF_PROTO_OPS_DOIT_UNLOCKED (fl_change runs without RTNL), while RTM_NEWACTION holds RTNL, so the independent locking domains make the race reachable in practice. KASAN confirms:
BUG: KASAN: slab-out-of-bounds in tcf_pedit_offload_act_setup+0x81b/0x930 Write of size 4 at addr ffff888001f27520 by task poc-toctou/312 The buggy address is located 0 bytes to the right of allocated 288-byte region [ffff888001f27400, ffff888001f27520) (cache kmalloc-512)
Note: The result is a heap OOB write attacker-controlled content into the adjacent slab object (requires CAP_NET_ADMIN).
The fix introduces reading tcfp_nkeys under act->tcfa_lock in all places using a new tcf_pedit_nkeys_locked() which replaces the old tcf_pedit_nkeys(). Additionally we close the remaining TOCTOU window between the sizing read and the fill reads by more careful accounting.
Rather than silently truncating the key count, which leads to incorrect action semantics offloaded to hardware and secondary OOB writes if the remaining capacity is zero or consumed by prior actions, we enforce remaining capacity checks and return -ENOSPC if the required space exceeds the remaining capacity.
--- include/net/tc_act/tc_pedit.h | 18 ++++++++---------- net/sched/act_api.c | 13 +++++++++---- net/sched/act_pedit.c | 13 +++++++++++-- net/sched/cls_api.c | 22 +++++++++++++++++----- 4 files changed, 45 insertions(+), 21 deletions(-)
include/net/tc_act/tc_pedit.h +8 -10
@@ -37,17 +37,15 @@ static inline bool is_tcf_pedit(const struct tc_action *a)return false; } -static inline int tcf_pedit_nkeys (const struct tc_action *a) +/* Must be called with act->tcfa_lock held to ensure consistency of parallel +* reads of the same action's pedit keys (e.g. flow_offload count vs fill). +* Note, this is only used for pedit offload. +*/ +static inline int tcf_pedit_nkeys_locked (const struct tc_action *a) { -struct tcf_pedit_parms *parms; -int nkeys; - -rcu_read_lock (); - parms =to_pedit_parms (a); - nkeys = parms->tcfp_nkeys; -rcu_read_unlock (); - -return nkeys; +lockdep_assert_held (&a->tcfa_lock); +return rcu_dereference_protected (to_pedit (a)->parms, +lockdep_is_held (&a->tcfa_lock))->tcfp_nkeys; }static inline u32 tcf_pedit_htype (const struct tc_action *a,int index)
net/sched/act_api.c +9 -4
@@ -148,10 +148,15 @@ static void offload_action_hw_count_dec(struct tc_action *act,static unsigned int tcf_offload_act_num_actions_single (struct tc_action *act) { -if (is_tcf_pedit (act)) -return tcf_pedit_nkeys (act); -else -return 1 ; +unsigned int count; + +if (is_tcf_pedit (act)) { +spin_lock_bh (&act->tcfa_lock); + count =tcf_pedit_nkeys_locked (act); +spin_unlock_bh (&act->tcfa_lock); +return count; + } +return 1 ; }static bool tc_act_skip_hw (u32 flags)
net/sched/act_pedit.c +11 -2
@@ -563,9 +563,18 @@ static int tcf_pedit_offload_act_setup(struct tc_action *act, void *entry_data, {if (bind) {struct flow_action_entry *entry = entry_data; +int nkeys =tcf_pedit_nkeys_locked (act);int k; -for (k =0 ; k <tcf_pedit_nkeys (act); k++) { +/* If the required keys exceed the remaining capacity return +* -ENOSPC to abort the offload and fallback to software. +*/ +if (nkeys > *index_inc) { +NL_SET_ERR_MSG_MOD (extack,"Not enough space to offload all pedit keys" ); +return -ENOSPC ; + } + +for (k =0 ; k < nkeys; k++) {switch (tcf_pedit_cmd (act, k)) {case TCA_PEDIT_KEY_EX_CMD_SET : entry->id =FLOW_ACTION_MANGLE ;
@@ -602,7 +611,7 @@ static int tcf_pedit_offload_act_setup(struct tc_action *act, void *entry_data,return -EOPNOTSUPP ; } -for (k =1 ; k <tcf_pedit_nkeys (act); k++) { +for (k =1 ; k <tcf_pedit_nkeys_locked (act); k++) {if (cmd !=tcf_pedit_cmd (act, k)) {NL_SET_ERR_MSG_MOD (extack,"Unsupported pedit command offload" );return -EOPNOTSUPP ;
net/sched/cls_api.c +17 -5
@@ -3876,12 +3876,21 @@ int tc_setup_action(struct flow_action *flow_action, entry = &flow_action->entries[j];spin_lock_bh (&act->tcfa_lock); + +/* Abort the offload if we have exhausted the allocated capacity */ +if (j >= flow_action->num_entries) { +NL_SET_ERR_MSG_MOD (extack,"Flow action buffer overflow" ); + err = -ENOSPC ; + goto err_out_locked; + } + err =tcf_act_get_user_cookie (entry, act);if (err) goto err_out_locked; - index =0 ; - err =tc_setup_offload_act (act, entry, &index, extack); + index = flow_action->num_entries - j; + err =tc_setup_offload_act (act, entry, &index, + extack);if (err) goto err_out_locked;
@@ -3935,10 +3944,13 @@ unsigned int tcf_exts_num_actions(struct tcf_exts *exts)int i;tcf_exts_for_each_action (i, act, exts) { -if (is_tcf_pedit (act)) - num_acts +=tcf_pedit_nkeys (act); -else +if (is_tcf_pedit (act)) { +spin_lock_bh (&act->tcfa_lock); + num_acts +=tcf_pedit_nkeys_locked (act); +spin_unlock_bh (&act->tcfa_lock); + }else { num_acts++; + } }return num_acts; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 772/1276 net/smc: fix UAF in smc_cdc_rx_handler() by pinning the socket
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Mei <[email protected]>
[ Upstream commit 9d160b35cc34a2ba8229d07651468a7848325135 ]
smc_cdc_rx_handler() looks up the connection by token under the link group's conns_lock, drops the lock, and then dereferences conn and the smc_sock derived from it, ending in sock_hold(&smc->sk) inside smc_cdc_msg_recv(). No reference is held across the lock release.
The only reference pinning the socket while the connection is discoverable in the link group is taken in smc_lgr_register_conn() (sock_hold) and dropped in __smc_lgr_unregister_conn() (sock_put), both under conns_lock. Once the handler drops conns_lock, a concurrent close() -> smc_release() -> smc_conn_free() -> smc_lgr_unregister_conn() can drop that reference and free the smc_sock, so the handler's later sock_hold() runs on freed memory:
WARNING: lib/refcount.c:25 at refcount_warn_saturate Workqueue: rxe_wq do_work refcount_warn_saturate (lib/refcount.c:25) smc_cdc_msg_recv (net/smc/smc_cdc.c:430) smc_cdc_rx_handler (net/smc/smc_cdc.c:502) smc_wr_rx_tasklet_fn (net/smc/smc_wr.c:445) tasklet_action_common (kernel/softirq.c:938) handle_softirqs (kernel/softirq.c:622) Kernel panic - not syncing: panic_on_warn set
Only SMC-R is affected. The SMC-D receive tasklet is stopped by tasklet_kill(&conn->rx_tsklet) in smc_conn_free() before the connection is unregistered, so it cannot run concurrently with the free.
Take the socket reference while still holding conns_lock, so the registration reference can no longer be the last one, and drop it once the handler is done.
--- net/smc/smc_cdc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
net/smc/smc_cdc.c +10 -5
@@ -470,9 +470,9 @@ static void smc_cdc_rx_handler(struct ib_wc *wc, void *buf) {struct smc_link *link = (struct smc_link *)wc->qp->qp_context;struct smc_cdc_msg *cdc = buf; +struct smc_sock *smc =NULL ;struct smc_connection *conn;struct smc_link_group *lgr; -struct smc_sock *smc;if (wc->byte_len < offsetof(struct smc_cdc_msg , reserved))return ;/* short message */
@@ -483,21 +483,26 @@ static void smc_cdc_rx_handler(struct ib_wc *wc, void *buf) lgr =smc_get_lgr (link);read_lock_bh (&lgr->conns_lock); conn =smc_lgr_find_conn (ntohl (cdc->token), lgr); -read_unlock_bh (&lgr->conns_lock); -if (!conn || conn->out_of_sync) +if (!conn || conn->out_of_sync) { +read_unlock_bh (&lgr->conns_lock);return ; + } smc = container_of(conn, struct smc_sock, conn); +sock_hold (&smc->sk); +read_unlock_bh (&lgr->conns_lock);if (cdc->prod_flags.failover_validation) {smc_cdc_msg_validate (smc, cdc, link); -return ; + goto out; }if (smc_cdc_before (ntohs (cdc->seqno), conn->local_rx_ctrl.seqno))/* received seqno is old */ -return ; + goto out;smc_cdc_msg_recv (smc, cdc); +out: +sock_put (&smc->sk); }static struct smc_wr_rx_handler smc_cdc_rx_handlers[] = {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 773/1276 amt: fix size calculation in amt_get_size()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9e05e91a9a847ed57926414bd7c2c5e54d6c56c6 ]
amt_get_size() incorrectly used sizeof(struct iphdr) for the sizes of IFLA_AMT_DISCOVERY_IP, IFLA_AMT_REMOTE_IP, and IFLA_AMT_LOCAL_IP. These attributes contain IPv4 addresses (__be32), not full IP headers.
Replace sizeof(struct iphdr) with sizeof(__be32) to avoid over-allocating netlink message space.
--- drivers/net/amt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/amt.c +3 -3
@@ -3297,9 +3297,9 @@ static size_t amt_get_size(const struct net_device *dev)nla_total_size (sizeof (__u16)) +/* IFLA_AMT_GATEWAY_PORT */ nla_total_size (sizeof (__u32)) +/* IFLA_AMT_LINK */ nla_total_size (sizeof (__u32)) +/* IFLA_MAX_TUNNELS */ -nla_total_size (sizeof (struct iphdr )) +/* IFLA_AMT_DISCOVERY_IP */ -nla_total_size (sizeof (struct iphdr )) +/* IFLA_AMT_REMOTE_IP */ -nla_total_size (sizeof (struct iphdr ));/* IFLA_AMT_LOCAL_IP */ +nla_total_size (sizeof (__be32)) +/* IFLA_AMT_DISCOVERY_IP */ +nla_total_size (sizeof (__be32)) +/* IFLA_AMT_REMOTE_IP */ +nla_total_size (sizeof (__be32));/* IFLA_AMT_LOCAL_IP */ }static int amt_fill_info (struct sk_buff *skb,const struct net_device *dev)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 774/1276 Bluetooth: 6lowpan: hold L2CAP conn across debugfs control
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cen Zhang <[email protected]>
[ Upstream commit 518aa9505fa10ea5662349e5d2efd8c9e32a820b ]
get_l2cap_conn() looks up an LE hci_conn under hdev protection, but then drops that protection before reading hcon->l2cap_data and before lowpan_control_write() later dereferences conn->hcon. A disconnect or device close can tear down the same L2CAP connection in that window.
The buggy scenario involves two paths, with each column showing the order within that path:
6LoWPAN control write: HCI disconnect/device close:
1. get_l2cap_conn() finds hcon 1. hci_disconn_cfm() dispatches
and hcon->l2cap_data. the L2CAP disconnect callback.
2. get_l2cap_conn() drops hdev 2. l2cap_conn_del() clears
protection and returns conn. hcon->l2cap_data and drops the
L2CAP connection reference.
3. lowpan_control_write() reads 3. hci_conn_del() removes and drops
conn->hcon. the HCI connection.Take a reference to the L2CAP connection with l2cap_conn_hold_unless_zero() while hdev is still locked, and drop that reference after the debugfs command's last use of conn. This mirrors the existing L2CAP ACL receive-side handoff and keeps the connection dereferenceable after leaving hdev protection. Export the existing helper so the bluetooth_6lowpan module can use the same lifetime primitive.
Validation reproduced this kernel report:
BUG: KASAN: slab-use-after-free in lowpan_control_write+0x374/0x520 The buggy address belongs to the object at ffff888111b9d000 which belongs to the cache kmalloc-1k of size 1024 The buggy address is located 0 bytes inside of freed 1024-byte region [ffff888111b9d000, ffff888111b9d400) Read of size 8 Call trace: dump_stack_lvl+0x66/0xa0 print_report+0xce/0x5f0 lowpan_control_write+0x374/0x520 (net/bluetooth/6lowpan.c:1131) srso_alias_return_thunk+0x5/0xfbef5 __virt_addr_valid+0x19f/0x330 kasan_report+0xe0/0x110 __debugfs_file_get+0xf7/0x400 full_proxy_write+0x9e/0xd0 vfs_write+0x1b0/0x810 ksys_write+0xd2/0x170 dnotify_flush+0x32/0x220 do_syscall_64+0x115/0x6a0 (arch/x86/entry/syscall_64.c:87) entry_SYSCALL_64_after_hwframe+0x77/0x7f Allocated by task stack: kasan_save_stack+0x33/0x60 kasan_save_track+0x17/0x60 __kasan_kmalloc+0xaa/0xb0 l2cap_conn_add+0x45/0x520 l2cap_chan_connect+0xac6/0xd90 l2cap_sock_connect+0x216/0x350 __sys_connect+0x101/0x130 __x64_sys_connect+0x40/0x50 do_syscall_64+0x115/0x6a0 (arch/x86/entry/syscall_64.c:87) entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task stack: kasan_save_stack+0x33/0x60 kasan_save_track+0x17/0x60 kasan_save_free_info+0x3b/0x60 __kasan_slab_free+0x5f/0x80 kfree+0x313/0x590 hci_conn_hash_flush+0xc0/0x140 hci_dev_close_sync+0x41a/0xb00 hci_dev_close+0x12f/0x160 hci_sock_ioctl+0x157/0x570 sock_do_ioctl+0xf7/0x210 sock_ioctl+0x32f/0x490 __x64_sys_ioctl+0xc7/0x110 do_syscall_64+0x115/0x6a0 (arch/x86/entry/syscall_64.c:87) entry_SYSCALL_64_after_hwframe+0x77/0x7f kasan_record_aux_stack+0xa7/0xc0 insert_work+0x32/0x100 __queue_work+0x262/0xa60 queue_work_on+0xad/0xb0 l2cap_connect_cfm+0x4ef/0x670 hci_le_remote_feat_complete_evt+0x247/0x430 hci_event_packet+0x360/0x6f0 hci_rx_work+0x2ae/0x7a0 process_one_work+0x4fd/0xbc0 worker_thread+0x2d8/0x570 kthread+0x1ad/0x1f0 ret_from_fork+0x3c9/0x540 ret_from_fork_asm+0x1a/0x30
--- net/bluetooth/6lowpan.c | 21 +++++++++++++++------ net/bluetooth/l2cap_core.c | 1 + 2 files changed, 16 insertions(+), 6 deletions(-)
net/bluetooth/6lowpan.c +15 -6
@@ -1006,16 +1006,19 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,hci_dev_lock (hdev); hcon =hci_conn_hash_lookup_le (hdev, addr, le_addr_type); -hci_dev_unlock (hdev); -hci_dev_put (hdev); - -if (!hcon) +if (!hcon) { +hci_dev_unlock (hdev); +hci_dev_put (hdev);return -ENOENT ; + } - *conn = (struct l2cap_conn *)hcon->l2cap_data; + *conn =l2cap_conn_hold_unless_zero (hcon->l2cap_data);BT_DBG ("conn %p dst %pMR type %u" , *conn, &hcon->dst, hcon->dst_type); +hci_dev_unlock (hdev); +hci_dev_put (hdev); +return 0 ; }
@@ -1158,18 +1161,22 @@ static ssize_t lowpan_control_write(struct file *fp,if (conn) {struct lowpan_peer *peer; -if (!is_bt_6lowpan (conn->hcon)) +if (!is_bt_6lowpan (conn->hcon)) { +l2cap_conn_put (conn);return -EINVAL ; + } peer =lookup_peer (conn);if (peer) {BT_DBG ("6LoWPAN connection already exists" ); +l2cap_conn_put (conn);return -EALREADY ; }BT_DBG ("conn %p dst %pMR type %d user %u" , conn, &conn->hcon->dst, conn->hcon->dst_type, addr_type); +l2cap_conn_put (conn); } ret =bt_6lowpan_connect (&addr, addr_type);
@@ -1185,6 +1192,8 @@ static ssize_t lowpan_control_write(struct file *fp,return ret; ret =bt_6lowpan_disconnect (conn, addr_type); +if (conn) +l2cap_conn_put (conn);if (ret <0 )return ret;
net/bluetooth/l2cap_core.c +1 -0
@@ -7639,6 +7639,7 @@ struct l2cap_conn *l2cap_conn_hold_unless_zero(struct l2cap_conn *c)return c; } +EXPORT_SYMBOL (l2cap_conn_hold_unless_zero);void l2cap_recv_acldata (struct hci_conn *hcon,struct sk_buff *skb,u16 flags) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 775/1276 Bluetooth: MGMT: Fix adv monitor add failure cleanup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cen Zhang <[email protected]>
[ Upstream commit 384a4b2fef9ffe5e270ee5558975c0504881c5fb ]
hci_add_adv_monitor() publishes a new adv_monitor in hdev->adv_monitors_idr before the powered MSFT setup step. The MSFT offload add path can then fail either locally before the controller add command completes, or in the MSFT add callback. In the current queued management add flow, hci_cmd_sync_work() still invokes mgmt_add_adv_patterns_monitor_complete() with the original pending command after msft_add_monitor_pattern() returns.
The buggy scenario involves two paths, with each column showing the order within that path:
MSFT add handling MGMT completion 1. insert monitor and handle 1. receive sync error 2. send MSFT add command 2. call add-monitor completion 3. callback sees bad response 3. load cmd->user_data 4. callback frees monitor 4. read monitor->handle
Local MSFT setup failures have the other half of the same ownership bug:
they return an error after the IDR insertion, but no later code removes the failed monitor from the IDR.
Keep ownership with the pending management command until its completion. For normal management adds, the MSFT add callback now records successful controller state and returns errors to its caller. The management completion frees the monitor on non-success after copying the response handle, while resume/reregister callback-error cleanup remains in the MSFT callback. The success path keeps the existing bookkeeping.
Validation reproduced this kernel report:
BUG: KASAN: slab-use-after-free in mgmt_add_adv_patterns_monitor_complete+0xfb/0x260 [bluetooth] Call Trace: <TASK> dump_stack_lvl+0x66/0xa0 print_report+0xce/0x5f0 ? mgmt_add_adv_patterns_monitor_complete+0xfb/0x260 [bluetooth] ? srso_alias_return_thunk+0x5/0xfbef5 ? __virt_addr_valid+0x19f/0x330 ? mgmt_add_adv_patterns_monitor_complete+0xfb/0x260 [bluetooth] kasan_report+0xe0/0x110 ? mgmt_add_adv_patterns_monitor_complete+0xfb/0x260 [bluetooth] mgmt_add_adv_patterns_monitor_complete+0xfb/0x260 [bluetooth] ? srso_alias_return_thunk+0x5/0xfbef5 ? 0xffffffffc00d00da ? __pfx_mgmt_add_adv_patterns_monitor_complete+0x10/0x10 [bluetooth] ? __pfx_mgmt_add_adv_patterns_monitor_complete+0x10/0x10 [bluetooth] ? hci_cmd_sync_work+0x1ab/0x210 [bluetooth] hci_cmd_sync_work+0x1c0/0x210 [bluetooth] ? __pfx_mgmt_add_adv_patterns_monitor_complete+0x10/0x10 [bluetooth] process_one_work+0x4fd/0xbc0 ? __pfx_process_one_work+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 ? srso_alias_return_thunk+0x5/0xfbef5 ? __list_add_valid_or_report+0x37/0xf0 ? __pfx_hci_cmd_sync_work+0x10/0x10 [bluetooth] ? srso_alias_return_thunk+0x5/0xfbef5 worker_thread+0x2d8/0x570 ? __pfx_worker_thread+0x10/0x10 kthread+0x1ad/0x1f0 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x3c9/0x540 ? __pfx_ret_from_fork+0x10/0x10 ? srso_alias_return_thunk+0x5/0xfbef5 ? __switch_to+0x2e9/0x730 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1a/0x30 </TASK> Allocated by task 471 on cpu 3 at 285.205389s: kasan_save_stack+0x33/0x60 kasan_save_track+0x17/0x60 __kasan_kmalloc+0xaa/0xb0 add_adv_patterns_monitor_rssi+0xd5/0x230 [bluetooth] hci_sock_sendmsg+0x96b/0xf80 [bluetooth] __sys_sendto+0x2bc/0x2d0 __x64_sys_sendto+0x76/0x90 do_syscall_64+0x115/0x6a0 entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task 454 on cpu 2 at 285.217112s: kasan_save_stack+0x33/0x60 kasan_save_track+0x17/0x60 kasan_save_free_info+0x3b/0x60 __kasan_slab_free+0x5f/0x80 kfree+0x313/0x590 msft_add_monitor_sync+0x54a/0x570 [bluetooth] hci_add_adv_monitor+0x133/0x180 [bluetooth] hci_cmd_sync_work+0x187/0x210 [bluetooth] process_one_work+0x4fd/0xbc0 worker_thread+0x2d8/0x570 kthread+0x1ad/0x1f0 ret_from_fork+0x3c9/0x540 ret_from_fork_asm+0x1a/0x30
--- net/bluetooth/mgmt.c | 2 ++ net/bluetooth/msft.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
net/bluetooth/mgmt.c +2 -0
@@ -5355,6 +5355,8 @@ static void mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev,if (monitor->state ==ADV_MONITOR_STATE_NOT_REGISTERED ) monitor->state =ADV_MONITOR_STATE_REGISTERED ;hci_update_passive_scan (hdev); + }else { +hci_free_adv_monitor (hdev, monitor); } mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode,
net/bluetooth/msft.c +1 -1
@@ -291,7 +291,7 @@ static int msft_le_monitor_advertisement_cb(struct hci_dev *hdev, u16 opcode, monitor->state =ADV_MONITOR_STATE_OFFLOADED ; unlock: -if (status) +if (status && msft->resuming)hci_free_adv_monitor (hdev, monitor);hci_dev_unlock (hdev);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 776/1276 Bluetooth: ISO: exclude RFU bits from ISO_SDU_Length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pauli Virtanen <[email protected]>
[ Upstream commit fd076d8deeab6f9f18ef13400f89e1f550df665b ]
slen contains ISO_SDU_Length (12 bits), RFU (2 bits), Packet_Status_Flags (2 bits).
Exclude the RFU bits from hci_iso_data_len. Also add masks to the pack macro.
--- include/net/bluetooth/hci.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/net/bluetooth/hci.h +3 -2
@@ -2958,8 +2958,9 @@ static inline struct hci_iso_hdr *hci_iso_hdr(const struct sk_buff *skb)#define hci_iso_flags_pack (pb, ts) ((pb & 0x03) | ((ts & 0x01) << 2))/* ISO data length and flags pack/unpack */ -#define hci_iso_data_len_pack (h, f) ((__u16) ((h) | ((f) << 14))) -#define hci_iso_data_len (h) ((h) & 0x3fff) +#define hci_iso_data_len_pack (h, f) ((__u16) (((h) & 0x0fff) | \ + (((f) & 0x3) << 14))) +#define hci_iso_data_len (h) ((h) & 0x0fff)#define hci_iso_data_flags (h) ((h) >> 14)/* codec transport types */
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 777/1276 Bluetooth: bpa10x: avoid OOB read of revision string in bpa10x_setup()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Weiming Shi <[email protected]>
[ Upstream commit dd068ef044128db655f48323a4acfd5907e04903 ]
bpa10x_setup() sends the vendor command 0xfc0e and passes the response to bt_dev_info() and hci_set_fw_info() as a "%s" string starting at skb->data + 1, without checking the length:
bt_dev_info(hdev, "%s", (char *)(skb->data + 1)); hci_set_fw_info(hdev, "%s", skb->data + 1);
A device that returns a one-byte response (status only) leaves skb->data + 1 past the end of the data, and the %s walk reads adjacent slab memory until it meets a NUL. The same happens when the payload is not NUL-terminated within skb->len. The out-of-bounds bytes end up in the kernel log and the firmware-info debugfs file.
Print the revision string with a bounded "%.*s" limited to skb->len - 1 instead. This keeps the string readable for well-behaved devices while never reading past the received data, and does not fail setup, so a device returning a short or unterminated response keeps working.
--- drivers/bluetooth/bpa10x.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/bluetooth/bpa10x.c +6 -2
@@ -254,9 +254,13 @@ static int bpa10x_setup(struct hci_dev *hdev)if (IS_ERR (skb))return PTR_ERR (skb); -bt_dev_info (hdev,"%s" , (char *)(skb->data +1 )); +/* Bounded print: the device controls skb->len. */ +if (skb->len >1 ) { +int len = skb->len -1 ; -hci_set_fw_info (hdev,"%s" , skb->data +1 ); +bt_dev_info (hdev,"%.*s" , len, (char *)(skb->data +1 )); +hci_set_fw_info (hdev,"%.*s" , len, skb->data +1 ); + }kfree_skb (skb);return 0 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 778/1276 ring-buffer: Fix event length with forced 8-byte alignment
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Wang <[email protected]>
[ Upstream commit c37e0a4b79a6bbb96ce5ffe279d7c001e20529e0 ]
When RB_FORCE_8BYTE_ALIGNMENT is true, rb_calculate_event_length() reserves the space of event->array[0] for placing the data length and rb_update_event() stores the data length in event->array[0] accordingly. As a result the whole event length will add extra 4 bytes for sizeof(event.array[0]) unconditionally.
But ring_buffer_event_length() only subtracts the sizeof(event->array[0]) for events larger than RB_MAX_SMALL_DATA + sizeof(event->array[0]). As a result, small events on architectures with RB_FORCE_8BYTE_ALIGNMENT=true report a data length that is 4 bytes larger than expected.
To fix it, add the RB_FORCE_8BYTE_ALIGNMENT as a condition to subtract the size of that length field whenever RB_FORCE_8BYTE_ALIGNMENT is true.
This issue is observed in a riscv64 kernel with CONFIG_HAVE_64BIT_ALIGNED_ACCESS set to y, when we run ftrace selftest trace_marker_raw.tc, we get the weird log: for cases where the id is 1..100, the number of data field is 8*N, but once id exceeds 100, the number of data field becomes 8*N+4:
# 1 buf: 58 00 00 00 80 5e d1 63 (number of data field is 8*1)
...
# a buf: 58 ... (number of data field is 8*2) ... # 64 buf: 58 ... (number of data field is 8*13) # 65 buf: 58 ... (number of data field is 8*13+4)
After applying this change, the number of data field keeps being 8*N+4 consistently.
--- kernel/trace/ring_buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/ring_buffer.c +2 -1
@@ -277,7 +277,8 @@ unsigned ring_buffer_event_length(struct ring_buffer_event *event)if (event->type_len >RINGBUF_TYPE_DATA_TYPE_LEN_MAX )return length; length -=RB_EVNT_HDR_SIZE ; -if (length >RB_MAX_SMALL_DATA +sizeof (event->array[0 ])) +if (length >RB_MAX_SMALL_DATA +sizeof (event->array[0 ]) || +RB_FORCE_8BYTE_ALIGNMENT ) length -=sizeof (event->array[0 ]);return length; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 779/1276 net/tls: Consume empty data records in tls_sw_read_sock()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 3be28e2c9cd0230cb51fd4967df095273afd3848 ]
A peer may send a zero-length TLS application_data record; TLS 1.3 explicitly permits these as a traffic-analysis countermeasure (RFC 8446, Section 5.1). After decryption such a record has full_len ==
0. tls_sw_read_sock() hands it to the read_actor, which has no payload to consume and returns zero. The loop treats a zero return as backpressure (used <= 0), requeues the skb at the head of rx_list, and stops. rx_list is serviced head-first on the next call, so the empty record is dequeued, fails the same way, and is requeued again; every later record on the connection is blocked behind it.
tls_sw_recvmsg() does not stall on this: a zero-length data record copies nothing and falls through to consume_skb(). Mirror that in the read_sock() path by recognizing an empty data record before the actor runs, consuming it, and continuing.
--- net/tls/tls_sw.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/tls/tls_sw.c +11 -0
@@ -2391,6 +2391,17 @@ int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc, goto read_sock_requeue; } +/* An empty data record (legal in TLS 1.3) gives a zero +* read_actor return, indistinguishable from the consumer +* stalling; the used <= 0 path would requeue it at the +* head of rx_list and block all later records. Consume it +* here instead. +*/ +if (rxm->full_len ==0 ) { +consume_skb (skb); +continue ; + } + used =read_actor (desc, skb, rxm->offset, rxm->full_len);if (used <=0 ) {if (!copied)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 780/1276 net: usb: lan78xx: move functions to avoid forward definitions
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
[ Upstream commit 39aa1d620d10cdd276f4728da50f136dbe939643 ]
Move following functions to avoid forward declarations in the code:
- lan78xx_start_hw()
- lan78xx_stop_hw()
- lan78xx_flush_fifo()
- lan78xx_start_tx_path()
- lan78xx_stop_tx_path()
- lan78xx_flush_tx_fifo()
- lan78xx_start_rx_path()
- lan78xx_stop_rx_path()
- lan78xx_flush_rx_fifo()
These functions will be used in an upcoming PHYlink migration patch.
No modifications to the functionality of the code are made.
Stable-dep-of: 60444706aa17 ("net: usb: lan78xx: disable VLAN filter in promiscuous mode")
--- drivers/net/usb/lan78xx.c | 300 +++++++++++++++++++------------------- 1 file changed, 150 insertions(+), 150 deletions(-)
drivers/net/usb/lan78xx.c +150 -150
@@ -812,6 +812,156 @@ static void lan78xx_update_stats(struct lan78xx_net *dev)usb_autopm_put_interface (dev->intf); } +static int lan78xx_start_hw (struct lan78xx_net *dev,u32 reg,u32 hw_enable) +{ +return lan78xx_update_reg (dev, reg, hw_enable, hw_enable); +} + +static int lan78xx_stop_hw (struct lan78xx_net *dev,u32 reg,u32 hw_enabled, +u32 hw_disabled) +{ +unsigned long timeout; +bool stopped = true; +int ret; +u32 buf; + +/* Stop the h/w block (if not already stopped) */ + + ret =lan78xx_read_reg (dev, reg, &buf); +if (ret <0 ) +return ret; + +if (buf & hw_enabled) { + buf &= ~hw_enabled; + + ret =lan78xx_write_reg (dev, reg, buf); +if (ret <0 ) +return ret; + + stopped = false; + timeout = jiffies +HW_DISABLE_TIMEOUT ; +do { + ret =lan78xx_read_reg (dev, reg, &buf); +if (ret <0 ) +return ret; + +if (buf & hw_disabled) + stopped = true; +else +msleep (HW_DISABLE_DELAY_MS ); + }while (!stopped && !time_after (jiffies, timeout)); + } + + ret = stopped ?0 : -ETIME ; + +return ret; +} + +static int lan78xx_flush_fifo (struct lan78xx_net *dev,u32 reg,u32 fifo_flush) +{ +return lan78xx_update_reg (dev, reg, fifo_flush, fifo_flush); +} + +static int lan78xx_start_tx_path (struct lan78xx_net *dev) +{ +int ret; + +netif_dbg (dev, drv, dev->net,"start tx path" ); + +/* Start the MAC transmitter */ + + ret =lan78xx_start_hw (dev,MAC_TX ,MAC_TX_TXEN_ ); +if (ret <0 ) +return ret; + +/* Start the Tx FIFO */ + + ret =lan78xx_start_hw (dev,FCT_TX_CTL ,FCT_TX_CTL_EN_ ); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int lan78xx_stop_tx_path (struct lan78xx_net *dev) +{ +int ret; + +netif_dbg (dev, drv, dev->net,"stop tx path" ); + +/* Stop the Tx FIFO */ + + ret =lan78xx_stop_hw (dev,FCT_TX_CTL ,FCT_TX_CTL_EN_ ,FCT_TX_CTL_DIS_ ); +if (ret <0 ) +return ret; + +/* Stop the MAC transmitter */ + + ret =lan78xx_stop_hw (dev,MAC_TX ,MAC_TX_TXEN_ ,MAC_TX_TXD_ ); +if (ret <0 ) +return ret; + +return 0 ; +} + +/* The caller must ensure the Tx path is stopped before calling +* lan78xx_flush_tx_fifo(). +*/ +static int lan78xx_flush_tx_fifo (struct lan78xx_net *dev) +{ +return lan78xx_flush_fifo (dev,FCT_TX_CTL ,FCT_TX_CTL_RST_ ); +} + +static int lan78xx_start_rx_path (struct lan78xx_net *dev) +{ +int ret; + +netif_dbg (dev, drv, dev->net,"start rx path" ); + +/* Start the Rx FIFO */ + + ret =lan78xx_start_hw (dev,FCT_RX_CTL ,FCT_RX_CTL_EN_ ); +if (ret <0 ) +return ret; + +/* Start the MAC receiver*/ + + ret =lan78xx_start_hw (dev,MAC_RX ,MAC_RX_RXEN_ ); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int lan78xx_stop_rx_path (struct lan78xx_net *dev) +{ +int ret; + +netif_dbg (dev, drv, dev->net,"stop rx path" ); + +/* Stop the MAC receiver */ + + ret =lan78xx_stop_hw (dev,MAC_RX ,MAC_RX_RXEN_ ,MAC_RX_RXD_ ); +if (ret <0 ) +return ret; + +/* Stop the Rx FIFO */ + + ret =lan78xx_stop_hw (dev,FCT_RX_CTL ,FCT_RX_CTL_EN_ ,FCT_RX_CTL_DIS_ ); +if (ret <0 ) +return ret; + +return 0 ; +} + +/* The caller must ensure the Rx path is stopped before calling +* lan78xx_flush_rx_fifo(). +*/ +static int lan78xx_flush_rx_fifo (struct lan78xx_net *dev) +{ +return lan78xx_flush_fifo (dev,FCT_RX_CTL ,FCT_RX_CTL_RST_ ); +} +/* Loop until the read is completed with timeout called with phy_mutex held */ static int lan78xx_phy_wait_not_busy (struct lan78xx_net *dev) {
@@ -2742,156 +2892,6 @@ static int lan78xx_urb_config_init(struct lan78xx_net *dev)return result; } -static int lan78xx_start_hw (struct lan78xx_net *dev,u32 reg,u32 hw_enable) -{ -return lan78xx_update_reg (dev, reg, hw_enable, hw_enable); -} - -static int lan78xx_stop_hw (struct lan78xx_net *dev,u32 reg,u32 hw_enabled, -u32 hw_disabled) -{ -unsigned long timeout; -bool stopped = true; -int ret; -u32 buf; - -/* Stop the h/w block (if not already stopped) */ - - ret =lan78xx_read_reg (dev, reg, &buf); -if (ret <0 ) -return ret; - -if (buf & hw_enabled) { - buf &= ~hw_enabled; - - ret =lan78xx_write_reg (dev, reg, buf); -if (ret <0 ) -return ret; - - stopped = false; - timeout = jiffies +HW_DISABLE_TIMEOUT ; -do { - ret =lan78xx_read_reg (dev, reg, &buf); -if (ret <0 ) -return ret; - -if (buf & hw_disabled) - stopped = true; -else -msleep (HW_DISABLE_DELAY_MS ); - }while (!stopped && !time_after (jiffies, timeout)); - } - - ret = stopped ?0 : -ETIME ; - -return ret; -} - -static int lan78xx_flush_fifo (struct lan78xx_net *dev,u32 reg,u32 fifo_flush) -{ -return lan78xx_update_reg (dev, reg, fifo_flush, fifo_flush); -} - -static int lan78xx_start_tx_path (struct lan78xx_net *dev) -{ -int ret; - -netif_dbg (dev, drv, dev->net,"start tx path" ); - -/* Start the MAC transmitter */ - - ret =lan78xx_start_hw (dev,MAC_TX ,MAC_TX_TXEN_ ); -if (ret <0 ) -return ret; - -/* Start the Tx FIFO */ - - ret =lan78xx_start_hw (dev,FCT_TX_CTL ,FCT_TX_CTL_EN_ ); -if (ret <0 ) -return ret; - -return 0 ; -} - -static int lan78xx_stop_tx_path (struct lan78xx_net *dev) -{ -int ret; - -netif_dbg (dev, drv, dev->net,"stop tx path" ); - -/* Stop the Tx FIFO */ - - ret =lan78xx_stop_hw (dev,FCT_TX_CTL ,FCT_TX_CTL_EN_ ,FCT_TX_CTL_DIS_ ); -if (ret <0 ) -return ret; - -/* Stop the MAC transmitter */ - - ret =lan78xx_stop_hw (dev,MAC_TX ,MAC_TX_TXEN_ ,MAC_TX_TXD_ ); -if (ret <0 ) -return ret; - -return 0 ; -} - -/* The caller must ensure the Tx path is stopped before calling -* lan78xx_flush_tx_fifo(). -*/ -static int lan78xx_flush_tx_fifo (struct lan78xx_net *dev) -{ -return lan78xx_flush_fifo (dev,FCT_TX_CTL ,FCT_TX_CTL_RST_ ); -} - -static int lan78xx_start_rx_path (struct lan78xx_net *dev) -{ -int ret; - -netif_dbg (dev, drv, dev->net,"start rx path" ); - -/* Start the Rx FIFO */ - - ret =lan78xx_start_hw (dev,FCT_RX_CTL ,FCT_RX_CTL_EN_ ); -if (ret <0 ) -return ret; - -/* Start the MAC receiver*/ - - ret =lan78xx_start_hw (dev,MAC_RX ,MAC_RX_RXEN_ ); -if (ret <0 ) -return ret; - -return 0 ; -} - -static int lan78xx_stop_rx_path (struct lan78xx_net *dev) -{ -int ret; - -netif_dbg (dev, drv, dev->net,"stop rx path" ); - -/* Stop the MAC receiver */ - - ret =lan78xx_stop_hw (dev,MAC_RX ,MAC_RX_RXEN_ ,MAC_RX_RXD_ ); -if (ret <0 ) -return ret; - -/* Stop the Rx FIFO */ - - ret =lan78xx_stop_hw (dev,FCT_RX_CTL ,FCT_RX_CTL_EN_ ,FCT_RX_CTL_DIS_ ); -if (ret <0 ) -return ret; - -return 0 ; -} - -/* The caller must ensure the Rx path is stopped before calling -* lan78xx_flush_rx_fifo(). -*/ -static int lan78xx_flush_rx_fifo (struct lan78xx_net *dev) -{ -return lan78xx_flush_fifo (dev,FCT_RX_CTL ,FCT_RX_CTL_RST_ ); -} -static int lan78xx_reset (struct lan78xx_net *dev) {struct lan78xx_priv *pdata = (struct lan78xx_priv *)(dev->data[0 ]);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 781/1276 net: usb: lan78xx: disable VLAN filter in promiscuous mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Enrico Pozzobon <[email protected]>
[ Upstream commit 60444706aa17616efc03190d099ac347e28b3d0a ]
The hardware VLAN filter (RFE_CTL_VLAN_FILTER_) drops VLAN-tagged frames whose VID has not been registered via lan78xx_vlan_rx_add_vid(). It is left enabled in promiscuous mode, so packet capture (e.g. tcpdump or Wireshark) does not see tagged frames for unregistered VIDs.
Clear the filter while the interface is promiscuous and restore it from NETIF_F_HW_VLAN_CTAG_FILTER otherwise. Enforce the same condition in lan78xx_set_features() so netdev_update_features() cannot re-enable the filter while promiscuous.
--- drivers/net/usb/lan78xx.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/net/usb/lan78xx.c +14 -4
@@ -1413,6 +1413,17 @@ static void lan78xx_deferred_multicast_write(struct work_struct *param)lan78xx_write_reg (dev,RFE_CTL , pdata->rfe_ctl); } +static void lan78xx_update_vlan_filter (struct lan78xx_priv *pdata, +struct net_device *netdev, +netdev_features_t features) +{ +if ((features &NETIF_F_HW_VLAN_CTAG_FILTER ) && + !(netdev->flags &IFF_PROMISC )) + pdata->rfe_ctl |=RFE_CTL_VLAN_FILTER_ ; +else + pdata->rfe_ctl &= ~RFE_CTL_VLAN_FILTER_ ; +} +static void lan78xx_set_multicast (struct net_device *netdev) {struct lan78xx_net *dev =netdev_priv (netdev);
@@ -1447,6 +1458,8 @@ static void lan78xx_set_multicast(struct net_device *netdev) } } +lan78xx_update_vlan_filter (pdata, dev->net, dev->net->features); +if (netdev_mc_count (dev->net)) {struct netdev_hw_addr *ha;int i;
@@ -2751,10 +2764,7 @@ static int lan78xx_set_features(struct net_device *netdev,else pdata->rfe_ctl &= ~RFE_CTL_VLAN_STRIP_ ; -if (features &NETIF_F_HW_VLAN_CTAG_FILTER ) - pdata->rfe_ctl |=RFE_CTL_VLAN_FILTER_ ; -else - pdata->rfe_ctl &= ~RFE_CTL_VLAN_FILTER_ ; +lan78xx_update_vlan_filter (pdata, netdev, features);spin_unlock_irqrestore (&pdata->rfe_ctl_lock, flags);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 782/1276 drm/v3d: Reject invalid indirect BO handle in indirect CSD setup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maíra Canal <[email protected]>
[ Upstream commit 2f8b8593c7832fad655290cef9e99af05b1b52b3 ]
v3d_get_cpu_indirect_csd_params() looks up the indirect buffer object from a userspace-supplied handle but never checks the result. A bogus or stale handle makes drm_gem_object_lookup() return NULL, which is then stored in info->indirect and only dereferenced later when the indirect CSD job runs, turning a userspace mistake into a NULL pointer dereference in the kernel.
Bail out with -ENOENT as soon as the lookup fails, so the bad handle is rejected at submission time.
--- drivers/gpu/drm/v3d/v3d_submit.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/v3d/v3d_submit.c +2 -0
@@ -461,6 +461,8 @@ v3d_get_cpu_indirect_csd_params(struct drm_file *file_priv, sizeof(indirect_csd.wg_uniform_offsets)); info->indirect =drm_gem_object_lookup (file_priv, indirect_csd.indirect); +if (!info->indirect) +return -ENOENT ; return v3d_setup_csd_jobs_and_bos(file_priv, v3d, &indirect_csd.submit, &info->job, &info->clean_job,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 783/1276 net/sched: cake: reject overhead values that underflow length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Moelius <[email protected]>
[ Upstream commit b7f97cae7ec1b6c3c32843c42be218690d310467 ]
CAKE accepts signed overhead values and stores them in an s16, but the adjusted packet length calculation uses unsigned arithmetic. A negative effective length can therefore wrap to a large value.
Such configurations make rate accounting depend on integer wraparound rather than on the packet size userspace intended to model. A static netlink lower bound is not enough because packets reaching CAKE can be smaller than any reasonable manual-overhead allowance.
Fold the signed overhead adjustment into the existing datapath MPU clamp so negative adjusted lengths are clamped before link-layer framing adjustments.
--- net/sched/sch_cake.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
net/sched/sch_cake.c +1 -4
@@ -1365,10 +1365,7 @@ static u32 cake_calc_overhead(struct cake_sched_data *q, u32 len, u32 off)if (q->min_netlen > len) q->min_netlen = len; - len += q->rate_overhead; - -if (len < q->rate_mpu) - len = q->rate_mpu; + len =max ((s32 )len + q->rate_overhead, (s32 )q->rate_mpu);if (q->atm_mode ==CAKE_ATM_ATM ) { len +=47 ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 784/1276 octeontx2-pf: check DMAC extraction support before filtering
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suman Ghosh <[email protected]>
[ Upstream commit 235acadd310533ba386ae61ad155b72bee381559 ]
Currently, configuring a VF MAC address via the PF (e.g., 'ip link set <pf> vf 0 mac <mac>') blindly attempts to install a DMAC-based hardware filter. However, the hardware parser profile might not support DMAC extraction.
Check if the hardware parsing profile supports DMAC extraction before adding the filter. Additionally, emit a warning message to inform the operator if the MAC filter installation fails due to missing DMAC extraction support. Update config->mac only after hardware programming succeeds in otx2_set_vf_mac().
--- .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 43 ++++++++++++++++--- 1 file changed, 37 insertions(+), 6 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +37 -6
@@ -2365,10 +2365,42 @@ EXPORT_SYMBOL(otx2_ioctl);static int otx2_do_set_vf_mac (struct otx2_nic *pf,int vf,const u8 *mac) { +struct npc_get_field_status_req *freq; +struct npc_get_field_status_rsp *frsp;struct npc_install_flow_req *req;int err;mutex_lock (&pf->mbox.lock); + +/* Skip installing the DMAC filter if the hardware parser profile +* does not support DMAC extraction. +*/ + freq =otx2_mbox_alloc_msg_npc_get_field_status (&pf->mbox); +if (!freq) { + err = -ENOMEM ; + goto out; + } + + freq->field =NPC_DMAC ; + err =otx2_sync_mbox_msg (&pf->mbox); +if (err) + goto out; + + frsp = (struct npc_get_field_status_rsp *)otx2_mbox_get_rsp + (&pf->mbox.mbox,0 , &freq->hdr); +if (IS_ERR (frsp)) { + err =PTR_ERR (frsp); + goto out; + } + +if (!frsp->enable) { +netdev_warn (pf->netdev, +"VF %d MAC filter not installed: DMAC extraction not supported by parser profile\n" , + vf); + err = -EOPNOTSUPP ; + goto out; + } + req =otx2_mbox_alloc_msg_npc_install_flow (&pf->mbox);if (!req) { err = -ENOMEM ;
@@ -2407,13 +2439,12 @@ static int otx2_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)if (!is_valid_ether_addr (mac))return -EINVAL ; - config = &pf->vf_configs[vf]; -ether_addr_copy (config->mac, mac); - ret =otx2_do_set_vf_mac (pf, vf, mac); -if (ret ==0 ) -dev_info (&pdev->dev, -"Load/Reload VF driver\n" ); +if (ret ==0 ) { + config = &pf->vf_configs[vf]; +ether_addr_copy (config->mac, mac); +dev_info (&pdev->dev,"Load/Reload VF driver\n" ); + }return ret; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 785/1276 perf/x86/amd/core: Avoid enabling BRS from the SVM reload path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sandipan Das <[email protected]>
[ Upstream commit 07c60dda9c059c09f83d42a3ebda2e7cc1cf3bc2 ]
Branch Sampling (BRS) and Last Branch Record (LBR) are mutually exclusive hardware features, and users of both are tracked via cpuc->lbr_users.
When SVM is toggled on a CPU, the host perf events are reprogrammed to update the HostOnly filter bit (set when virtualization is enabled, cleared when it is disabled). On PerfMonV2-capable processors, this reprogramming is performed by calling amd_pmu_enable_all() to rewrite the event selectors. However, amd_pmu_enable_all() also calls amd_brs_enable_all(), which enables BRS whenever cpuc->lbr_users > 0. Having active LBR events satisfies this gating on processors that have LBR but not BRS. The kernel then tries to set the BRS enable bit in DebugExtnCfg (MSR 0xc000010f). Since that bit is deprecated on such hardware, the write results in a #GP:
Call Trace: <IRQ> amd_pmu_enable_all+0x1d/0x90 amd_pmu_disable_virt+0x62/0xb0 kvm_arch_disable_virtualization_cpu+0xa/0x40 [kvm] hardware_disable_nolock+0x1a/0x30 [kvm] __flush_smp_call_function_queue+0x9b/0x410 __sysvec_call_function+0x18/0xc0 sysvec_call_function+0x69/0x90 </IRQ> <TASK> asm_sysvec_call_function+0x16/0x20 RIP: 0010:cpuidle_enter_state+0xc4/0x450 ? cpuidle_enter_state+0xb7/0x450 cpuidle_enter+0x29/0x40 cpuidle_idle_call+0xf5/0x160 do_idle+0x7b/0xe0 cpu_startup_entry+0x26/0x30 start_secondary+0x115/0x140 secondary_startup_64_no_verify+0x194/0x19b </TASK>
Fix this by ensuring that BRS is not enabled from the event selector reprogramming path even when cpuc->lbr_users > 0.
--- arch/x86/events/amd/core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
arch/x86/events/amd/core.c +8 -4
@@ -750,13 +750,11 @@ static void amd_pmu_enable_event(struct perf_event *event)x86_pmu_enable_event (event); } -static void amd_pmu_enable_all (int added) +static void __amd_pmu_enable_all (void ) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);int idx; -amd_brs_enable_all (); -for_each_set_bit (idx, x86_pmu.cntr_mask,X86_PMC_IDX_MAX ) {/* only activate events which are marked as active */ if (!test_bit (idx, cpuc->active_mask))
@@ -771,6 +769,12 @@ static void amd_pmu_enable_all(int added) } } +static void amd_pmu_enable_all (int added) +{ +amd_brs_enable_all (); +__amd_pmu_enable_all (); +} +static void amd_pmu_v2_enable_event (struct perf_event *event) {struct hw_perf_event *hwc = &event->hw;
@@ -1557,7 +1561,7 @@ static inline void amd_pmu_reload_virt(void)* set global enable bits once again */ amd_pmu_v2_disable_all (); -amd_pmu_enable_all (0 ); +__amd_pmu_enable_all ();amd_pmu_v2_enable_all (0 );return ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 786/1276 gpio: mvebu: free generic chips on unbind
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rosen Penev <[email protected]>
[ Upstream commit b11c513ad943f35cf5e8007d3a56279c79b7ed4b ]
irq_alloc_domain_generic_chips() allocates generic chip data that must be freed via irq_domain_remove_generic_chips(). The devres action mvebu_gpio_remove_irq_domain() only called irq_domain_remove(), which only frees the generic chips if IRQ_DOMAIN_FLAG_DESTROY_GC is set. Call irq_domain_remove_generic_chips() explicitly before irq_domain_remove() instead.
--- drivers/gpio/gpio-mvebu.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpio-mvebu.c +1 -0
@@ -1116,6 +1116,7 @@ static void mvebu_gpio_remove_irq_domain(void *data) {struct irq_domain *domain = data; +irq_domain_remove_generic_chips (domain);irq_domain_remove (domain); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 787/1276 ipv4: igmp: Fix potential UAF in igmp_gq_start_timer()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 7b19c0f81ed1fdaec6bc522569be367199a9edf3 ]
A race condition exists between device teardown (inetdev_destroy) and incoming IGMP query processing (igmp_rcv), leading to a Use-After-Free in the IGMP timer callback.
During device destruction, inetdev_destroy() drops the primary reference to in_device, which can drop its refcount to 0. The actual freeing of in_device memory is deferred via RCU (using call_rcu()).
Concurrently, igmp_rcv() runs under RCU read lock and obtains the in_device pointer. Because the memory is RCU-protected, CPU-0 can safely dereference in_device even if its refcount has hit 0.
However, if CPU-0 calls igmp_gq_start_timer() and re-arms the timer, it attempts to acquire a reference using in_dev_hold(). This increments the refcount from 0 to 1, triggering a "refcount_t: addition on 0" warning. Since the in_device memory is still scheduled to be freed after the RCU grace period (as the free callback does not check the refcount again), the device is freed while the timer is still armed. When the timer expires, it accesses the freed memory, causing a kernel panic.
Fix this by using refcount_inc_not_zero() (via a new helper in_dev_hold_safe()) to prevent acquiring a reference if the device is already being destroyed. If the refcount is 0, we do not arm the timer.
A similar issue in IPv6 MLD is fixed in a subsequent patch.
--- include/linux/inetdevice.h | 5 +++++ net/ipv4/igmp.c | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
include/linux/inetdevice.h +5 -0
@@ -284,6 +284,11 @@ static inline void in_dev_put(struct in_device *idev)#define __in_dev_put (idev) refcount_dec(&(idev)->refcnt)#define in_dev_hold (idev) refcount_inc(&(idev)->refcnt) +static inline bool in_dev_hold_safe (struct in_device *idev) +{ +return refcount_inc_not_zero (&idev->refcnt); +} +#endif /* __KERNEL__ */ static __inline____be32 inet_make_mask (int logmask)
net/ipv4/igmp.c +9 -5
@@ -232,16 +232,20 @@ static void igmp_gq_start_timer(struct in_device *in_dev)return ; in_dev->mr_gq_running =1 ; -if (!mod_timer (&in_dev->mr_gq_timer, exp)) -in_dev_hold (in_dev); +if (in_dev_hold_safe (in_dev)) { +if (mod_timer (&in_dev->mr_gq_timer, exp)) +in_dev_put (in_dev); + } }static void igmp_ifc_start_timer (struct in_device *in_dev,int delay) { -int tv =get_random_u32_below (delay); +if (in_dev_hold_safe (in_dev)) { +int tv =get_random_u32_below (delay); -if (!mod_timer (&in_dev->mr_ifc_timer, jiffies+tv+2 )) -in_dev_hold (in_dev); +if (mod_timer (&in_dev->mr_ifc_timer, jiffies + tv +2 )) +in_dev_put (in_dev); + } }static void igmp_mod_timer (struct ip_mc_list *im,int max_delay)
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 788/1276 ipv6: mcast: Replace locking comments with lockdep annotations.
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 818ae1a5ecb41d82ad180a99c39111f051894d90 ]
Commit 63ed8de4be81 ("mld: add mc_lock for protecting per-interface mld data") added the same comments regarding locking to many functions.
Let's replace the comments with lockdep annotation, which is more helpful.
Note that we just remove the comment for mld_clear_zeros() and mld_send_cr(), where mc_dereference() is used in the entry of the function.
While at it, a comment for __ipv6_sock_mc_join() is moved back to the correct place.
Stable-dep-of: 9b26518b6896 ("ipv6: mcast: Fix potential UAF in MLD delayed work")
--- net/ipv6/mcast.c | 125 +++++++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 54 deletions(-)
net/ipv6/mcast.c +71 -54
@@ -105,9 +105,9 @@ static int __ipv6_dev_mc_inc(struct net_device *dev,int sysctl_mld_max_msf__read_mostly =IPV6_MLD_MAX_MSF ;int sysctl_mld_qrv__read_mostly =MLD_QRV_DEFAULT ; -/* -* socket join on multicast group -*/ +#define mc_assert_locked (idev) \ + lockdep_assert_held(&(idev)->mc_lock) +#define mc_dereference (e, idev) \ rcu_dereference_protected(e, lockdep_is_held(&(idev)->mc_lock))
@@ -166,6 +166,9 @@ static int unsolicited_report_interval(struct inet6_dev *idev)return iv >0 ? iv :1 ; } +/* +* socket join on multicast group +*/ static int __ipv6_sock_mc_join (struct sock *sk,int ifindex,const struct in6_addr *addr,unsigned int mode) {
@@ -665,12 +668,13 @@ bool inet6_mc_check(const struct sock *sk, const struct in6_addr *mc_addr,return rv; } -/* called with mc_lock */ static void igmp6_group_added (struct ifmcaddr6 *mc) {struct net_device *dev = mc->idev->dev;char buf[MAX_ADDR_LEN ]; +mc_assert_locked (mc->idev); +if (IPV6_ADDR_MC_SCOPE (&mc->mca_addr) <IPV6_ADDR_SCOPE_LINKLOCAL )return ;
@@ -700,12 +704,13 @@ static void igmp6_group_added(struct ifmcaddr6 *mc)mld_ifc_event (mc->idev); } -/* called with mc_lock */ static void igmp6_group_dropped (struct ifmcaddr6 *mc) {struct net_device *dev = mc->idev->dev;char buf[MAX_ADDR_LEN ]; +mc_assert_locked (mc->idev); +if (IPV6_ADDR_MC_SCOPE (&mc->mca_addr) <IPV6_ADDR_SCOPE_LINKLOCAL )return ;
@@ -726,14 +731,13 @@ static void igmp6_group_dropped(struct ifmcaddr6 *mc)refcount_dec (&mc->mca_refcnt); } -/* -* deleted ifmcaddr6 manipulation -* called with mc_lock -*/ +/* deleted ifmcaddr6 manipulation */ static void mld_add_delrec (struct inet6_dev *idev,struct ifmcaddr6 *im) {struct ifmcaddr6 *pmc; +mc_assert_locked (idev); +/* this is an "ifmcaddr6" for convenience; only the fields below * are actually used. In particular, the refcnt and users are not * used for management of the delete list. Using the same structure
@@ -767,13 +771,14 @@ static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)rcu_assign_pointer (idev->mc_tomb, pmc); } -/* called with mc_lock */ static void mld_del_delrec (struct inet6_dev *idev,struct ifmcaddr6 *im) {struct ip6_sf_list *psf, *sources, *tomb;struct in6_addr *pmca = &im->mca_addr;struct ifmcaddr6 *pmc, *pmc_prev; +mc_assert_locked (idev); + pmc_prev =NULL ;for_each_mc_tomb (idev, pmc) {if (ipv6_addr_equal (&pmc->mca_addr, pmca))
@@ -810,11 +815,12 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) } } -/* called with mc_lock */ static void mld_clear_delrec (struct inet6_dev *idev) {struct ifmcaddr6 *pmc, *nextpmc; +mc_assert_locked (idev); + pmc =mc_dereference (idev->mc_tomb, idev);RCU_INIT_POINTER (idev->mc_tomb,NULL );
@@ -871,13 +877,14 @@ static void ma_put(struct ifmcaddr6 *mc) } } -/* called with mc_lock */ static struct ifmcaddr6 *mca_alloc (struct inet6_dev *idev,const struct in6_addr *addr,unsigned int mode) {struct ifmcaddr6 *mc; +mc_assert_locked (idev); + mc =kzalloc (sizeof (*mc),GFP_KERNEL );if (!mc)return NULL ;
@@ -1047,46 +1054,51 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,return rv; } -/* called with mc_lock */ static void mld_gq_start_work (struct inet6_dev *idev) {unsigned long tv =get_random_u32_below (idev->mc_maxdelay); +mc_assert_locked (idev); + idev->mc_gq_running =1 ;if (!mod_delayed_work (mld_wq, &idev->mc_gq_work, tv +2 ))in6_dev_hold (idev); } -/* called with mc_lock */ static void mld_gq_stop_work (struct inet6_dev *idev) { +mc_assert_locked (idev); + idev->mc_gq_running =0 ;if (cancel_delayed_work (&idev->mc_gq_work))__in6_dev_put (idev); } -/* called with mc_lock */ static void mld_ifc_start_work (struct inet6_dev *idev,unsigned long delay) {unsigned long tv =get_random_u32_below (delay); +mc_assert_locked (idev); +if (!mod_delayed_work (mld_wq, &idev->mc_ifc_work, tv +2 ))in6_dev_hold (idev); } -/* called with mc_lock */ static void mld_ifc_stop_work (struct inet6_dev *idev) { +mc_assert_locked (idev); + idev->mc_ifc_count =0 ;if (cancel_delayed_work (&idev->mc_ifc_work))__in6_dev_put (idev); } -/* called with mc_lock */ static void mld_dad_start_work (struct inet6_dev *idev,unsigned long delay) {unsigned long tv =get_random_u32_below (delay); +mc_assert_locked (idev); +if (!mod_delayed_work (mld_wq, &idev->mc_dad_work, tv +2 ))in6_dev_hold (idev); }
@@ -1111,14 +1123,13 @@ static void mld_report_stop_work(struct inet6_dev *idev)__in6_dev_put (idev); } -/* -* IGMP handling (alias multicast ICMPv6 messages) -* called with mc_lock -*/ +/* IGMP handling (alias multicast ICMPv6 messages) */ static void igmp6_group_queried (struct ifmcaddr6 *ma,unsigned long resptime) {unsigned long delay = resptime; +mc_assert_locked (ma->idev); +/* Do not start work for these addresses */ if (ipv6_addr_is_ll_all_nodes (&ma->mca_addr) ||IPV6_ADDR_MC_SCOPE (&ma->mca_addr) <IPV6_ADDR_SCOPE_LINKLOCAL )
@@ -1137,15 +1148,15 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime) ma->mca_flags |=MAF_TIMER_RUNNING ; } -/* mark EXCLUDE-mode sources -* called with mc_lock -*/ +/* mark EXCLUDE-mode sources */ static bool mld_xmarksources (struct ifmcaddr6 *pmc,int nsrcs,const struct in6_addr *srcs) {struct ip6_sf_list *psf;int i, scount; +mc_assert_locked (pmc->idev); + scount =0 ;for_each_psf_mclock (pmc, psf) {if (scount == nsrcs)
@@ -1168,13 +1179,14 @@ static bool mld_xmarksources(struct ifmcaddr6 *pmc, int nsrcs,return true; } -/* called with mc_lock */ static bool mld_marksources (struct ifmcaddr6 *pmc,int nsrcs,const struct in6_addr *srcs) {struct ip6_sf_list *psf;int i, scount; +mc_assert_locked (pmc->idev); +if (pmc->mca_sfmode ==MCAST_EXCLUDE )return mld_xmarksources (pmc, nsrcs, srcs);
@@ -1869,7 +1881,6 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ifmcaddr6 *pmc,#define AVAILABLE (skb) ((skb) ? skb_availroom(skb) : 0) -/* called with mc_lock */ static struct sk_buff *add_grec (struct sk_buff *skb,struct ifmcaddr6 *pmc,int type,int gdeleted,int sdeleted,int crsend)
@@ -1883,6 +1894,8 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,struct mld2_report *pmr;unsigned int mtu; +mc_assert_locked (idev); +if (pmc->mca_flags &MAF_NOREPORT )return skb;
@@ -2001,12 +2014,13 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,return skb; } -/* called with mc_lock */ static void mld_send_report (struct inet6_dev *idev,struct ifmcaddr6 *pmc) {struct sk_buff *skb =NULL ;int type; +mc_assert_locked (idev); +if (!pmc) {for_each_mc_mclock (idev, pmc) {if (pmc->mca_flags &MAF_NOREPORT )
@@ -2028,10 +2042,7 @@ static void mld_send_report(struct inet6_dev *idev, struct ifmcaddr6 *pmc)mld_sendpack (skb); } -/* -* remove zero-count source records from a source filter list -* called with mc_lock -*/ +/* remove zero-count source records from a source filter list */ static void mld_clear_zeros (struct ip6_sf_list __rcu **ppsf,struct inet6_dev *idev) {struct ip6_sf_list *psf_prev, *psf_next, *psf;
@@ -2055,7 +2066,6 @@ static void mld_clear_zeros(struct ip6_sf_list __rcu **ppsf, struct inet6_dev *i } } -/* called with mc_lock */ static void mld_send_cr (struct inet6_dev *idev) {struct ifmcaddr6 *pmc, *pmc_prev, *pmc_next;
@@ -2219,13 +2229,14 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) goto out; } -/* called with mc_lock */ static void mld_send_initial_cr (struct inet6_dev *idev) { -struct sk_buff *skb;struct ifmcaddr6 *pmc; +struct sk_buff *skb;int type; +mc_assert_locked (idev); +if (mld_in_v1_mode (idev))return ;
@@ -2272,13 +2283,14 @@ static void mld_dad_work(struct work_struct *work)in6_dev_put (idev); } -/* called with mc_lock */ static int ip6_mc_del1_src (struct ifmcaddr6 *pmc,int sfmode, -const struct in6_addr *psfsrc) +const struct in6_addr *psfsrc) {struct ip6_sf_list *psf, *psf_prev;int rv =0 ; +mc_assert_locked (pmc->idev); + psf_prev =NULL ;for_each_psf_mclock (pmc, psf) {if (ipv6_addr_equal (&psf->sf_addr, psfsrc))
@@ -2315,7 +2327,6 @@ static int ip6_mc_del1_src(struct ifmcaddr6 *pmc, int sfmode,return rv; } -/* called with mc_lock */ static int ip6_mc_del_src (struct inet6_dev *idev,const struct in6_addr *pmca,int sfmode,int sfcount,const struct in6_addr *psfsrc,int delta)
@@ -2327,6 +2338,8 @@ static int ip6_mc_del_src(struct inet6_dev *idev, const struct in6_addr *pmca,if (!idev)return -ENODEV ; +mc_assert_locked (idev); +for_each_mc_mclock (idev, pmc) {if (ipv6_addr_equal (pmca, &pmc->mca_addr))break ;
@@ -2368,15 +2381,14 @@ static int ip6_mc_del_src(struct inet6_dev *idev, const struct in6_addr *pmca,return err; } -/* -* Add multicast single-source filter to the interface list -* called with mc_lock -*/ +/* Add multicast single-source filter to the interface list */ static int ip6_mc_add1_src (struct ifmcaddr6 *pmc,int sfmode, -const struct in6_addr *psfsrc) +const struct in6_addr *psfsrc) {struct ip6_sf_list *psf, *psf_prev; +mc_assert_locked (pmc->idev); + psf_prev =NULL ;for_each_psf_mclock (pmc, psf) {if (ipv6_addr_equal (&psf->sf_addr, psfsrc))
@@ -2399,11 +2411,12 @@ static int ip6_mc_add1_src(struct ifmcaddr6 *pmc, int sfmode,return 0 ; } -/* called with mc_lock */ static void sf_markstate (struct ifmcaddr6 *pmc) { -struct ip6_sf_list *psf;int mca_xcount = pmc->mca_sfcount[MCAST_EXCLUDE ]; +struct ip6_sf_list *psf; + +mc_assert_locked (pmc->idev);for_each_psf_mclock (pmc, psf) {if (pmc->mca_sfcount[MCAST_EXCLUDE ]) {
@@ -2416,14 +2429,15 @@ static void sf_markstate(struct ifmcaddr6 *pmc) } } -/* called with mc_lock */ static int sf_setstate (struct ifmcaddr6 *pmc) { -struct ip6_sf_list *psf, *dpsf;int mca_xcount = pmc->mca_sfcount[MCAST_EXCLUDE ]; +struct ip6_sf_list *psf, *dpsf;int qrv = pmc->idev->mc_qrv;int new_in, rv; +mc_assert_locked (pmc->idev); + rv =0 ;for_each_psf_mclock (pmc, psf) {if (pmc->mca_sfcount[MCAST_EXCLUDE ]) {
@@ -2482,10 +2496,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)return rv; } -/* -* Add multicast source filter list to the interface list -* called with mc_lock -*/ +/* Add multicast source filter list to the interface list */ static int ip6_mc_add_src (struct inet6_dev *idev,const struct in6_addr *pmca,int sfmode,int sfcount,const struct in6_addr *psfsrc,int delta)
@@ -2497,6 +2508,8 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,if (!idev)return -ENODEV ; +mc_assert_locked (idev); +for_each_mc_mclock (idev, pmc) {if (ipv6_addr_equal (pmca, &pmc->mca_addr))break ;
@@ -2542,11 +2555,12 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,return err; } -/* called with mc_lock */ static void ip6_mc_clear_src (struct ifmcaddr6 *pmc) {struct ip6_sf_list *psf, *nextpsf; +mc_assert_locked (pmc->idev); +for (psf =mc_dereference (pmc->mca_tomb, pmc->idev); psf; psf = nextpsf) {
@@ -2566,11 +2580,12 @@ static void ip6_mc_clear_src(struct ifmcaddr6 *pmc) pmc->mca_sfcount[MCAST_EXCLUDE ] =1 ; } -/* called with mc_lock */ static void igmp6_join_group (struct ifmcaddr6 *ma) {unsigned long delay; +mc_assert_locked (ma->idev); +if (ma->mca_flags &MAF_NOREPORT )return ;
@@ -2617,9 +2632,10 @@ static int ip6_mc_leave_src(struct sock *sk, struct ipv6_mc_socklist *iml,return err; } -/* called with mc_lock */ static void igmp6_leave_group (struct ifmcaddr6 *ma) { +mc_assert_locked (ma->idev); +if (mld_in_v1_mode (ma->idev)) {if (ma->mca_flags &MAF_LAST_REPORTER ) { igmp6_send(&ma->mca_addr, ma->idev->dev,
@@ -2664,9 +2680,10 @@ static void mld_ifc_work(struct work_struct *work)in6_dev_put (idev); } -/* called with mc_lock */ static void mld_ifc_event (struct inet6_dev *idev) { +mc_assert_locked (idev); +if (mld_in_v1_mode (idev))return ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 789/1276 ipv6: mcast: Fix potential UAF in MLD delayed work
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit 9b26518b6896a16b809b1e42986f4ebac7bccc1e ]
A race condition exists between device teardown and incoming MLD query processing, leading to a Use-After-Free in the MLD delayed work.
During device destruction, the primary reference to inet6_dev is dropped, which can drop its refcount to 0. The actual freeing of inet6_dev memory is deferred via RCU.
Concurrently, the packet receive path runs under RCU read lock and obtains the inet6_dev pointer. Because the memory is RCU-protected, CPU-0 can safely dereference inet6_dev even if its refcount has hit 0.
However, if CPU-0 calls igmp6_event_query() and schedules delayed work, it attempts to acquire a reference using in6_dev_hold(). This increments the refcount from 0 to 1, triggering a "refcount_t: addition on 0" warning. Since the inet6_dev memory is still scheduled to be freed after the RCU grace period, the device is freed while the work is still scheduled. When the work runs, it accesses the freed memory, causing a kernel panic.
Fix this by using refcount_inc_not_zero() (via a new helper in6_dev_hold_safe()) to prevent acquiring a reference if the device is already being destroyed. If the refcount is 0, we do not schedule the work.
--- include/net/addrconf.h | 5 +++++ net/ipv6/mcast.c | 40 ++++++++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 12 deletions(-)
include/net/addrconf.h +5 -0
@@ -423,6 +423,11 @@ static inline void in6_dev_hold(struct inet6_dev *idev)refcount_inc (&idev->refcnt); } +static inline bool in6_dev_hold_safe (struct inet6_dev *idev) +{ +return refcount_inc_not_zero (&idev->refcnt); +} +/* called with rcu_read_lock held */ static inline bool ip6_ignore_linkdown (const struct net_device *dev) {
net/ipv6/mcast.c +28 -12
@@ -1061,8 +1061,10 @@ static void mld_gq_start_work(struct inet6_dev *idev)mc_assert_locked (idev); idev->mc_gq_running =1 ; -if (!mod_delayed_work (mld_wq, &idev->mc_gq_work, tv +2 )) -in6_dev_hold (idev); +if (in6_dev_hold_safe (idev)) { +if (mod_delayed_work (mld_wq, &idev->mc_gq_work, tv +2 )) +in6_dev_put (idev); + } }static void mld_gq_stop_work (struct inet6_dev *idev)
@@ -1080,8 +1082,10 @@ static void mld_ifc_start_work(struct inet6_dev *idev, unsigned long delay)mc_assert_locked (idev); -if (!mod_delayed_work (mld_wq, &idev->mc_ifc_work, tv +2 )) -in6_dev_hold (idev); +if (in6_dev_hold_safe (idev)) { +if (mod_delayed_work (mld_wq, &idev->mc_ifc_work, tv +2 )) +in6_dev_put (idev); + } }static void mld_ifc_stop_work (struct inet6_dev *idev)
@@ -1099,8 +1103,10 @@ static void mld_dad_start_work(struct inet6_dev *idev, unsigned long delay)mc_assert_locked (idev); -if (!mod_delayed_work (mld_wq, &idev->mc_dad_work, tv +2 )) -in6_dev_hold (idev); +if (in6_dev_hold_safe (idev)) { +if (mod_delayed_work (mld_wq, &idev->mc_dad_work, tv +2 )) +in6_dev_put (idev); + } }static void mld_dad_stop_work (struct inet6_dev *idev)
@@ -1386,18 +1392,23 @@ static void mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld,void igmp6_event_query (struct sk_buff *skb) {struct inet6_dev *idev =__in6_dev_get (skb->dev); +bool put = false;if (!idev || idev->dead) goto out;spin_lock_bh (&idev->mc_query_lock); -if (skb_queue_len (&idev->mc_query_queue) <MLD_MAX_SKBS ) { +if (skb_queue_len (&idev->mc_query_queue) <MLD_MAX_SKBS && +in6_dev_hold_safe (idev)) {__skb_queue_tail (&idev->mc_query_queue, skb); -if (!mod_delayed_work (mld_wq, &idev->mc_query_work,0 )) -in6_dev_hold (idev); +if (mod_delayed_work (mld_wq, &idev->mc_query_work,0 )) + put = true; skb =NULL ; }spin_unlock_bh (&idev->mc_query_lock); + +if (put) +in6_dev_put (idev); out:kfree_skb (skb); }
@@ -1554,18 +1565,23 @@ static void mld_query_work(struct work_struct *work)void igmp6_event_report (struct sk_buff *skb) {struct inet6_dev *idev =__in6_dev_get (skb->dev); +bool put = false;if (!idev || idev->dead) goto out;spin_lock_bh (&idev->mc_report_lock); -if (skb_queue_len (&idev->mc_report_queue) <MLD_MAX_SKBS ) { +if (skb_queue_len (&idev->mc_report_queue) <MLD_MAX_SKBS && +in6_dev_hold_safe (idev)) {__skb_queue_tail (&idev->mc_report_queue, skb); -if (!mod_delayed_work (mld_wq, &idev->mc_report_work,0 )) -in6_dev_hold (idev); +if (mod_delayed_work (mld_wq, &idev->mc_report_work,0 )) + put = true; skb =NULL ; }spin_unlock_bh (&idev->mc_report_lock); + +if (put) +in6_dev_put (idev); out:kfree_skb (skb); }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 790/1276 netfilter: nft_lookup: fix catchall element handling with inverted lookups
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tamaki Yanagawa <[email protected]>
[ Upstream commit e6107a4c74b54cb33e3bce162a63048ae5a6b198 ]
nft_lookup_eval() decides whether a lookup matched (found) from the direct set lookup and priv->invert before falling back to the catchall element used by interval sets (e.g. nft_set_rbtree) for the open-ended default range. Since found is never recomputed after ext is replaced by the catchall lookup, inverted lookups (NFT_LOOKUP_F_INV, "!= @set") can wrongly match or wrongly skip the catchall element, producing the wrong verdict. Fold the catchall lookup into ext before computing found, matching the order already used by nft_objref_map_eval().
--- net/netfilter/nft_lookup.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/netfilter/nft_lookup.c +5 -5
@@ -103,13 +103,13 @@ void nft_lookup_eval(const struct nft_expr *expr,bool found; ext =nft_set_do_lookup (net, set, ®s->data[priv->sreg]); +if (!ext) + ext =nft_set_catchall_lookup (net, set); + found = !!ext ^ priv->invert;if (!found) { - ext =nft_set_catchall_lookup (net, set); -if (!ext) { - regs->verdict.code =NFT_BREAK ; -return ; - } + regs->verdict.code =NFT_BREAK ; +return ; }if (ext) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 791/1276 ipvs: pass parsed transport offset to state handlers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yizhou Zhao <[email protected]>
[ Upstream commit bae7ce7bafb59e42dc0e0e2999fdd9d1cffe3866 ]
IPVS callers already parse the packet into struct ip_vs_iphdr before updating connection state. For IPv6 this records the real transport-header offset after extension headers in iph.len.
Pass this parsed transport offset through ip_vs_set_state() and the protocol state_transition() callback so protocol handlers can use the same packet context as scheduling and NAT handling. This patch only changes the common callback plumbing and adapts the protocol callback signatures; TCP and SCTP start using the value in follow-up patches.
Stable-dep-of: 2500fa3958b1 ("ipvs: use parsed transport offset in TCP state lookup")
--- include/net/ip_vs.h | 3 ++- net/netfilter/ipvs/ip_vs_core.c | 10 +++++----- net/netfilter/ipvs/ip_vs_proto_sctp.c | 3 ++- net/netfilter/ipvs/ip_vs_proto_tcp.c | 3 ++- net/netfilter/ipvs/ip_vs_proto_udp.c | 3 ++- 5 files changed, 13 insertions(+), 9 deletions(-)
include/net/ip_vs.h +2 -1
@@ -516,7 +516,8 @@ struct ip_vs_protocol {void (*state_transition)(struct ip_vs_conn *cp,int direction,const struct sk_buff *skb, -struct ip_vs_proto_data *pd); +struct ip_vs_proto_data *pd, +unsigned int iph_len);int (*register_app)(struct netns_ipvs *ipvs,struct ip_vs_app *inc);
net/netfilter/ipvs/ip_vs_core.c +5 -5
@@ -220,10 +220,10 @@ ip_vs_conn_stats(struct ip_vs_conn *cp, struct ip_vs_service *svc)static inline void ip_vs_set_state (struct ip_vs_conn *cp,int direction,const struct sk_buff *skb, -struct ip_vs_proto_data *pd) +struct ip_vs_proto_data *pd,unsigned int iph_len) {if (likely (pd->pp->state_transition)) - pd->pp->state_transition (cp, direction, skb, pd); + pd->pp->state_transition (cp, direction, skb, pd, iph_len); } static inline int
@@ -625,7 +625,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,ip_vs_in_stats (cp, skb);/* set state */ -ip_vs_set_state (cp,IP_VS_DIR_INPUT , skb, pd); +ip_vs_set_state (cp,IP_VS_DIR_INPUT , skb, pd, iph->len);/* transmit the first SYN packet */ ret = cp->packet_xmit (skb, cp, pd->pp, iph);
@@ -1306,7 +1306,7 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, after_nat:ip_vs_out_stats (cp, skb); -ip_vs_set_state (cp,IP_VS_DIR_OUTPUT , skb, pd); +ip_vs_set_state (cp,IP_VS_DIR_OUTPUT , skb, pd, iph->len); skb->ipvs_property =1 ;if (!(cp->flags &IP_VS_CONN_F_NFCT ))ip_vs_notrack (skb);
@@ -2055,7 +2055,7 @@ ip_vs_in_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *stateIP_VS_DBG_PKT (11 , af, pp, skb, iph.off,"Incoming packet" );ip_vs_in_stats (cp, skb); -ip_vs_set_state (cp,IP_VS_DIR_INPUT , skb, pd); +ip_vs_set_state (cp,IP_VS_DIR_INPUT , skb, pd, iph.len);if (cp->packet_xmit) ret = cp->packet_xmit (skb, cp, pp, &iph);/* do not touch skb anymore */
net/netfilter/ipvs/ip_vs_proto_sctp.c +2 -1
@@ -468,7 +468,8 @@ set_sctp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp,static void sctp_state_transition (struct ip_vs_conn *cp,int direction, -const struct sk_buff *skb,struct ip_vs_proto_data *pd) +const struct sk_buff *skb,struct ip_vs_proto_data *pd, +unsigned int iph_len) {spin_lock_bh (&cp->lock);set_sctp_state (pd, cp, direction, skb);
net/netfilter/ipvs/ip_vs_proto_tcp.c +2 -1
@@ -580,7 +580,8 @@ set_tcp_state(struct ip_vs_proto_data *pd, struct ip_vs_conn *cp,static void tcp_state_transition (struct ip_vs_conn *cp,int direction,const struct sk_buff *skb, -struct ip_vs_proto_data *pd) +struct ip_vs_proto_data *pd, +unsigned int iph_len) {struct tcphdr _tcph, *th;
net/netfilter/ipvs/ip_vs_proto_udp.c +2 -1
@@ -445,7 +445,8 @@ static const char * udp_state_name(int state)static void udp_state_transition (struct ip_vs_conn *cp,int direction,const struct sk_buff *skb, -struct ip_vs_proto_data *pd) +struct ip_vs_proto_data *pd, +unsigned int iph_len) {if (unlikely (!pd)) {pr_err ("UDP no ns data\n" );
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 792/1276 ipvs: use parsed transport offset in TCP state lookup
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yizhou Zhao <[email protected]>
[ Upstream commit 2500fa3958b1ba51c2b065e39db1b04dfa7e23a2 ]
TCP state handling reparses the skb to find the TCP header. For IPv6 it uses sizeof(struct ipv6hdr), while the surrounding IPVS code already parsed the packet with ip_vs_fill_iph_skb() and has the real transport-header offset in iph.len.
This makes TCP state handling look at the wrong bytes when an IPv6 packet carries extension headers. Use the parsed transport offset passed down from ip_vs_set_state() when reading the TCP header.
For IPv4 and for IPv6 packets without extension headers, the passed offset matches the previous value.
--- net/netfilter/ipvs/ip_vs_proto_tcp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
net/netfilter/ipvs/ip_vs_proto_tcp.c +1 -7
@@ -585,13 +585,7 @@ tcp_state_transition(struct ip_vs_conn *cp, int direction, {struct tcphdr _tcph, *th; -#ifdef CONFIG_IP_VS_IPV6 -int ihl = cp->af ==AF_INET ?ip_hdrlen (skb) :sizeof (struct ipv6hdr ); -#else -int ihl =ip_hdrlen (skb); -#endif - - th =skb_header_pointer (skb, ihl,sizeof (_tcph), &_tcph); + th =skb_header_pointer (skb, iph_len,sizeof (_tcph), &_tcph);if (th ==NULL )return ;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 793/1276 ipvs: fix PMTU for GUE/GRE tunnel ICMP errors
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yizhou Zhao <[email protected]>
[ Upstream commit 6b335af0d0d1ff44ac579d106953bf19299e5233 ]
When an ICMP Fragmentation Needed error is received for a tunneled IPVS connection, ip_vs_in_icmp() recomputes the MTU that the original packet can use by subtracting the tunnel overhead from the reported next-hop MTU.
The current code always subtracts sizeof(struct iphdr), which is only the IPIP overhead. For GUE and GRE tunnels, ipvs_udp_decap() and ipvs_gre_decap() already compute the additional tunnel header length, but that value is scoped to the decapsulation block and is lost before the ICMP_FRAG_NEEDED handling. As a result, the ICMP error sent back to the client advertises an MTU that is too large, so PMTUD can fail to converge for GUE/GRE-tunneled real servers.
With a reported next-hop MTU of 1400, a GUE tunnel currently returns 1380 to the client. The correct value is 1368:
1400 - sizeof(struct iphdr) - sizeof(struct udphdr) - sizeof(struct guehdr)
Hoist the tunnel header length into the main ip_vs_in_icmp() scope and subtract sizeof(struct iphdr) + ulen in the Fragmentation Needed path. The IPIP path keeps ulen as 0, so its existing 1400 - 20 = 1380 result is unchanged.
Stable-dep-of: 3f7a535ff0fa ("ipvs: ensure inner headers in ICMP errors are in headroom")
--- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +3 -3
@@ -1589,6 +1589,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,bool tunnel, new_cp = false;union nf_inet_addr *raddr;char *outer_proto ="IPIP" ; +int ulen =0 ; *related =1 ;
@@ -1653,7 +1654,6 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,/* Error for our tunnel must arrive at LOCAL_IN */ (skb_rtable(skb)->rt_flags & RTCF_LOCAL)) {__u8 iproto; -int ulen;/* Non-first fragment has no UDP/GRE header */ if (unlikely (cih->frag_off &htons (IP_OFFSET )))
@@ -1758,8 +1758,8 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (dest_dst) mtu =dst_mtu (dest_dst->dst_cache); } -if (mtu >68 +sizeof (struct iphdr )) - mtu -=sizeof (struct iphdr ); +if (mtu >68 +sizeof (struct iphdr ) + ulen) + mtu -=sizeof (struct iphdr ) + ulen; info =htonl (mtu); }/* Strip outer IP, ICMP and IPIP/UDP/GRE, go to IP header of
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 794/1276 ipvs: ensure inner headers in ICMP errors are in headroom
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Julian Anastasov <[email protected]>
[ Upstream commit 3f7a535ff0fa627a0132803e4c2f903ceffcbc1c ]
Sashiko points out that after stripping the outer headers with pskb_pull() we should ensure the inner IP headers in ICMP errors from tunnels are present in the skb headroom for functions like ipv4_update_pmtu(), icmp_send() and IP_VS_DBG().
Also, add more checks for the length of the inner headers.
--- net/netfilter/ipvs/ip_vs_core.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +15 -6
@@ -1589,6 +1589,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,bool tunnel, new_cp = false;union nf_inet_addr *raddr;char *outer_proto ="IPIP" ; +unsigned int hlen_ipip;int ulen =0 ; *related =1 ;
@@ -1626,9 +1627,10 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,/* Now find the contained IP header */ offset +=sizeof (_icmph); cih =skb_header_pointer (skb, offset,sizeof (_ciph), &_ciph); -if (cih ==NULL ) +if (!(cih && cih->version ==4 && cih->ihl >=5 ))return NF_ACCEPT ;/* The packet looks wrong, ignore */ raddr = (union nf_inet_addr *)&cih->daddr; + hlen_ipip = cih->ihl *4 ;/* Special case for errors for IPIP/UDP/GRE tunnel packets */ tunnel = false;
@@ -1644,9 +1646,9 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,/* Only for known tunnel */ if (!dest || dest->tun_type !=IP_VS_CONN_F_TUNNEL_TYPE_IPIP )return NF_ACCEPT ; - offset += cih->ihl *4 ; + offset += hlen_ipip; cih =skb_header_pointer (skb, offset,sizeof (_ciph), &_ciph); -if (cih ==NULL ) +if (!(cih && cih->version ==4 && cih->ihl >=5 ))return NF_ACCEPT ;/* The packet looks wrong, ignore */ tunnel = true; } else if ((cih->protocol == IPPROTO_UDP || /* Can be UDP encap */
@@ -1658,7 +1660,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,/* Non-first fragment has no UDP/GRE header */ if (unlikely (cih->frag_off &htons (IP_OFFSET )))return NF_ACCEPT ; - offset2 = offset + cih->ihl *4 ; + offset2 = offset + hlen_ipip;if (cih->protocol ==IPPROTO_UDP ) { ulen =ipvs_udp_decap (ipvs, skb, offset2,AF_INET , raddr, &iproto);
@@ -1727,6 +1729,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related, }if (tunnel) { +unsigned int hlen_orig = cih->ihl *4 ;__be32 info = ic->un.gateway;__u8 type = ic->type;__u8 code = ic->code;
@@ -1743,6 +1746,9 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related, goto ignore_tunnel; offset2 -= ihl +sizeof (_icmph);skb_reset_network_header (skb); +/* Ensure the IP header is present in headroom */ +if (!pskb_may_pull (skb, hlen_ipip)) + goto ignore_tunnel;IP_VS_DBG (12 ,"ICMP for %s %pI4->%pI4: mtu=%u\n" , outer_proto, &ip_hdr (skb)->saddr, &ip_hdr (skb)->daddr, mtu);
@@ -1758,8 +1764,8 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (dest_dst) mtu =dst_mtu (dest_dst->dst_cache); } -if (mtu >68 +sizeof (struct iphdr ) + ulen) - mtu -=sizeof (struct iphdr ) + ulen; +if (mtu >68 + hlen_ipip + ulen) + mtu -= hlen_ipip + ulen; info =htonl (mtu); }/* Strip outer IP, ICMP and IPIP/UDP/GRE, go to IP header of
@@ -1768,6 +1774,9 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,if (pskb_pull (skb, offset2) ==NULL ) goto ignore_tunnel;skb_reset_network_header (skb); +/* Ensure the IP header is present in headroom */ +if (!pskb_may_pull (skb, hlen_orig)) + goto ignore_tunnel;IP_VS_DBG (12 ,"Sending ICMP for %pI4->%pI4: t=%u, c=%u, i=%u\n" , &ip_hdr (skb)->saddr, &ip_hdr (skb)->daddr, type, code,ntohl (info));
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 795/1276 s390/zcrypt: Remove the empty file
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rongguang Wei <[email protected]>
[ Upstream commit 575f87b9d4882b0d621192fdd754d7e09dbd5789 ]
The files has no real user because CEX2 and CEX3 device drivers are removed, also remove these empty files.
--- drivers/s390/crypto/zcrypt_cex2a.c | 0 drivers/s390/crypto/zcrypt_cex2a.h | 0 drivers/s390/crypto/zcrypt_cex2c.c | 0 drivers/s390/crypto/zcrypt_cex2c.h | 0 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 drivers/s390/crypto/zcrypt_cex2a.c delete mode 100644 drivers/s390/crypto/zcrypt_cex2a.h delete mode 100644 drivers/s390/crypto/zcrypt_cex2c.c delete mode 100644 drivers/s390/crypto/zcrypt_cex2c.h
drivers/s390/crypto/zcrypt_cex2a.c deleted +0 -0
drivers/s390/crypto/zcrypt_cex2a.h deleted +0 -0
drivers/s390/crypto/zcrypt_cex2c.c deleted +0 -0
drivers/s390/crypto/zcrypt_cex2c.h deleted +0 -0
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 796/1276 cifs: validate DFS referral string offsets
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Guangshuo Li <[email protected]>
[ Upstream commit 027a84ac6b50c12ef767c15abfc58aa865820e9e ]
parse_dfs_referrals() validates that the response header and referral array fit in the received buffer, but each referral also contains string offsets supplied by the server.
Those offsets are used to compute the DfsPath and NetworkAddress string pointers without checking whether they still point inside the response buffer. A malformed referral can therefore make the computed pointer exceed the end of the buffer. The resulting negative max_len is then passed to cifs_strndup_from_utf16(), and the non-Unicode path forwards it to kstrndup() as a size_t, allowing strnlen() to read out of bounds.
Validate each string offset before deriving the string pointer.
--- fs/smb/client/misc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/smb/client/misc.c +8 -0
@@ -1029,6 +1029,10 @@ parse_dfs_referrals(struct get_dfs_referral_rsp *rsp, u32 rsp_size, node->ref_flag =le16_to_cpu (ref->ReferralEntryFlags);/* copy DfsPath */ +if (le16_to_cpu (ref->DfsPathOffset) > data_end - (char *)ref) { + rc = -EINVAL ; + goto parse_DFS_referrals_exit; + } temp = (char *)ref +le16_to_cpu (ref->DfsPathOffset); max_len = data_end - temp; node->path_name = cifs_strndup_from_utf16(temp, max_len,
@@ -1039,6 +1043,10 @@ parse_dfs_referrals(struct get_dfs_referral_rsp *rsp, u32 rsp_size, }/* copy link target UNC */ +if (le16_to_cpu (ref->NetworkAddressOffset) > data_end - (char *)ref) { + rc = -EINVAL ; + goto parse_DFS_referrals_exit; + } temp = (char *)ref +le16_to_cpu (ref->NetworkAddressOffset); max_len = data_end - temp; node->node_name = cifs_strndup_from_utf16(temp, max_len,
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 797/1276 SUNRPC: release lower rpc_clnt if killed waiting for XPRT_LOCKED
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 29bacb096d43bd04062f6655e50ceeed27fe6d2f ]
xs_tcp_tls_setup_socket() creates a temporary "lower" rpc_clnt with rpc_create() to drive the inner TLS handshake, then waits for XPRT_LOCKED on its xprt with TASK_KILLABLE so a stuck handshake can be aborted by signal. When the wait is interrupted, the function jumps to out_unlock without releasing lower_clnt. The success path and the out_close error path both call rpc_shutdown_client(lower_clnt); only the killed-wait path skips it, leaking the clnt and its underlying xprt.
Call rpc_shutdown_client() on this path before joining out_unlock. xprt_release_write() is not needed here because XPRT_LOCKED was never acquired.
--- net/sunrpc/xprtsock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/sunrpc/xprtsock.c +4 -1
@@ -2732,8 +2732,11 @@ static void xs_tcp_tls_setup_socket(struct work_struct *work) lower_xprt =rcu_dereference (lower_clnt->cl_xprt);rcu_read_unlock (); -if (wait_on_bit_lock (&lower_xprt->state,XPRT_LOCKED ,TASK_KILLABLE )) +if (wait_on_bit_lock (&lower_xprt->state,XPRT_LOCKED ,TASK_KILLABLE )) { +/* XPRT_LOCKED was never acquired. */ +rpc_shutdown_client (lower_clnt); goto out_unlock; + } status =xs_tls_handshake_sync (lower_xprt, &upper_xprt->xprtsec);if (status) {
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 798/1276 SUNRPC: pin upper rpc_clnt across the TLS connect_worker
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuck Lever <[email protected]>
[ Upstream commit 46bc86c833956219bbfd246c1ffd832a479c5199 ]
The TLS connect path has a use-after-free: nothing pins the upper rpc_clnt across the delayed connect_worker. xs_connect() stores task->tk_client in sock_xprt::clnt as a raw pointer and queues the worker; for TLS-secured transports that worker is xs_tcp_tls_setup_socket(), which reads several fields out of the saved pointer (cl_timeout, cl_program, cl_prog, cl_vers, cl_cred, cl_stats) to construct the args for the inner handshake rpc_clnt.
The xprt does not reference the rpc_clnt; the rpc_clnt references the xprt. xs_destroy() does cancel the connect_worker, but it runs only when the xprt's refcount drops to zero, which cannot happen until the rpc_clnt releases its cl_xprt reference in rpc_free_client_work(). When a TLS handshake fails fatally (for example, an mTLS mount whose client cert does not match the server), the connecting task is woken with -EACCES and exits, the mount caller invokes rpc_shutdown_client(), and the upper rpc_clnt is freed before the queued connect_worker fires. xs_tcp_tls_setup_socket() then dereferences the freed clnt, producing the refcount_t underflow Michael Nemanov reported.
Take a reference on the upper rpc_clnt in xs_connect() for TLS transports via a new rpc_hold_client() helper, and drop it in the connect_worker's exit path with rpc_release_client(). The xprt_lock_connect() / xprt_unlock_connect() pairing already serialises xs_connect() with xs_tcp_tls_setup_socket(), so the take and release are balanced one-for-one.
The non-TLS connect worker (xs_tcp_setup_socket) never reads sock_xprt::clnt, so leave that path alone and avoid the clnt-holds-xprt-holds-clnt cycle that would otherwise prevent xprt destruction.
--- include/linux/sunrpc/clnt.h | 1 + net/sunrpc/clnt.c | 19 +++++++++++++++++-- net/sunrpc/xprtsock.c | 11 ++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-)
include/linux/sunrpc/clnt.h +1 -0
@@ -186,6 +186,7 @@ int rpc_switch_client_transport(struct rpc_clnt *, const struct rpc_timeout *); void rpc_shutdown_client(struct rpc_clnt *); +void rpc_hold_client (struct rpc_clnt *);void rpc_release_client (struct rpc_clnt *);void rpc_task_release_transport (struct rpc_task *);void rpc_task_release_client (struct rpc_task *);
net/sunrpc/clnt.c +17 -2
@@ -1026,8 +1026,23 @@ rpc_free_auth(struct rpc_clnt *clnt)return NULL ; } -/* -* Release reference to the RPC client +/** +* rpc_hold_client - acquire a reference on an rpc_clnt +* @clnt: rpc_clnt to pin +* +* Pairs with rpc_release_client(). +*/ +void rpc_hold_client (struct rpc_clnt *clnt) +{ +refcount_inc (&clnt->cl_count); +} + +/** +* rpc_release_client - release a reference on an rpc_clnt +* @clnt: rpc_clnt to release +* +* Pairs with rpc_hold_client(). The rpc_clnt's resources are +* freed once its reference count drops to zero. */ void rpc_release_client (struct rpc_clnt *clnt)
net/sunrpc/xprtsock.c +10 -1
@@ -2770,6 +2770,7 @@ static void xs_tcp_tls_setup_socket(struct work_struct *work) out_unlock:current_restore_flags (pflags,PF_MEMALLOC ); upper_transport->clnt =NULL ; +rpc_release_client (upper_clnt);xprt_unlock_connect (upper_xprt, upper_transport);return ;
@@ -2817,7 +2818,15 @@ static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task) }else dprintk ("RPC: xs_connect scheduled xprt %p\n" , xprt); - transport->clnt = task->tk_client; +/* +* Only the TLS connect_worker reads transport->clnt; pinning +* the upper rpc_clnt unconditionally would form a cycle with +* cl_xprt and prevent xprt destruction. +*/ +if (xprt->xprtsec.policy !=RPC_XPRTSEC_NONE ) { +rpc_hold_client (task->tk_client); + transport->clnt = task->tk_client; + }queue_delayed_work (xprtiod_workqueue, &transport->connect_worker, delay);
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 799/1276 dm era: fix NULL pointer dereference in metadata_open()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cao Guanghui <[email protected]>
[ Upstream commit 9ae672606c17891d90b282e3490b817620549599 ]
metadata_open() returns NULL when kzalloc_obj() fails, but the caller era_ctr() only checks IS_ERR(md). Since IS_ERR(NULL) returns false, the NULL pointer is treated as a valid result and later assigned to era->md, leading to a NULL pointer dereference when the metadata is accessed.
Fix this by returning ERR_PTR(-ENOMEM) on allocation failure, consistent with dm-cache-metadata.c, dm-thin-metadata.c, and dm-clone-metadata.c which all use ERR_PTR(-ENOMEM) for the same pattern.
--- drivers/md/dm-era-target.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/md/dm-era-target.c +4 -2
@@ -810,8 +810,10 @@ static struct era_metadata *metadata_open(struct block_device *bdev,int r;struct era_metadata *md =kzalloc (sizeof (*md),GFP_KERNEL ); -if (!md) -return NULL ; +if (!md) { +DMERR ("could not allocate metadata struct" ); +return ERR_PTR (-ENOMEM ); + } md->bdev = bdev; md->block_size = block_size;
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 800/1276 regulator: core: regulator_lock_two() should test for EDEADLK not EDEADLOCK
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Timur Tabi <[email protected]>
[ Upstream commit d38f8bd771c4999b797d7074b348cf201414bd34 ]
Compare against -EDEADLK, which is what ww_mutex_lock() actually returns and what every other deadlock check in this file already uses.
Function regulator_lock_two() acquires two regulators via regulator_lock_nested() -> ww_mutex_lock(). On contention, ww_mutex_lock() returns -EDEADLK, which is the caller's signal to drop the lock it holds and retry the acquisition in the canonical order.
However, regulator_lock_two() tests the return value against -EDEADLOCK rather than -EDEADLK. On most architectures, EDEADLK and EDEADLOCK are the same value, so the comparison happens to be correct and the bug is invisible. But on MIPS, SPARC, and PowerPC, those two errors have different values. The test is wrong: a genuine -EDEADLK backoff no longer matches -EDEADLOCK, so instead of unlocking and retrying, the code falls into WARN_ON(ret) and returns with only one of the two regulators locked.
In practice, this is a bug only on MIPS, because the regulator core is not built or used on the other two platforms.
In general, EDEADLK is preferred over EDEADLOCK for new code.
--- drivers/regulator/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/regulator/core.c +2 -2
@@ -232,7 +232,7 @@ static void regulator_lock_two(struct regulator_dev *rdev1, ret =regulator_lock_nested (rdev1, ww_ctx);WARN_ON (ret); ret =regulator_lock_nested (rdev2, ww_ctx); -if (ret != -EDEADLOCK ) { +if (ret != -EDEADLK ) {WARN_ON (ret); goto exit; }
@@ -248,7 +248,7 @@ static void regulator_lock_two(struct regulator_dev *rdev1,swap (held, contended); ret =regulator_lock_nested (contended, ww_ctx); -if (ret != -EDEADLOCK ) { +if (ret != -EDEADLK ) {WARN_ON (ret);break ; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerPATCH 801/1276 selftests/net: fix EVP_MD_CTX leak in tcp_mmap
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wang Yan <[email protected]>
[ Upstream commit f4ef35efbb49527293309f668ea73ec5de9b8e7a ]
In tcp_mmap.c, both child_thread() and main() allocate an EVP_MD_CTX via EVP_MD_CTX_new() when integrity checking is enabled, but neither function releases the context. child_thread() misses the free in its common cleanup block, and main() returns without freeing the context.
This results in a SHA256 context leak on every run that uses the ‑i (integrity) option. Add the missing EVP_MD_CTX_free() calls to the appropriate cleanup paths to fix the leak.
--- tools/testing/selftests/net/tcp_mmap.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/testing/selftests/net/tcp_mmap.c +4 -0
@@ -313,6 +313,8 @@ void *child_thread(void *arg) tcp_info_get_rcv_mss(fd)); } error: +if (ctx) +EVP_MD_CTX_free (ctx);munmap (buffer, buffer_sz);close (fd);if (zflg)
@@ -606,6 +608,8 @@ int main(int argc, char *argv[])EVP_DigestFinal_ex (ctx, digest, &digest_len);send (fd, digest, (size_t )SHA256_DIGEST_LENGTH ,0 ); } +if (ctx) +EVP_MD_CTX_free (ctx);close (fd);munmap (buffer, buffer_sz);return 0 ;
Signature · 1 line
2.53.0