Repository navigation
Rebase edera/mainline onto master @ 666539eecdf4 - #115
Closed
edera-rebase-app[bot] wants to merge 10000 commits into
Closed
edera-rebase-app[bot] wants to merge 10000 commits into
edera-rebase-app[bot] wants to merge 10000 commits into
Conversation
Since commit abed42f ("net/mlx5e: Conditionally create async ICOSQ"), the async ICOSQ is only created when an XDP program is attached or priv->ktls_rx_was_enabled is set. When TLS RX offload is enabled for the first time, mlx5e_ktls_set_feature_rx() sets the flag and reopens the channels so that they get the queue, but it ignores the return value of mlx5e_safe_reopen_channels(). If the reopen fails, mlx5e_safe_switch_params() keeps the old channels, which have no async ICOSQ, while NETIF_F_HW_TLS_RX is still reported as enabled. The next offloaded RX connection then dereferences the NULL c->async_icosq in post_rx_param_wqes(). Enabling the feature again does not help, as the flag is already set and the reopen is skipped. Propagate the error, clear the flag and destroy the accel TCP flow tables again, so that the feature stays disabled and the next attempt retries the reopen. Fixes: abed42f ("net/mlx5e: Conditionally create async ICOSQ") Signed-off-by: Xuanqiang Luo <luoxuanqiang@kylinos.cn> Reviewed-by: Simon Horman <horms@kernel.org> Reviewed-by: Saeed Mahameed <saeedm@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Link: https://patch.msgid.link/20261110101709.2589088-1-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
No extack reasons were given to unsupported TC actions. Set a reason on the default path before falling back, and drop the now-redundant initializer of `reason`, so the compiler warns on any future path that uses it without assigning one. Fixes: 8eb9e75 ("net: dsa: yt921x: Add ACL support") Signed-off-by: David Yang <mmyangfl@gmail.com> Link: https://patch.msgid.link/20261110104930.223598-2-mmyangfl@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
The hardware resolves one forward decision per ACL rule, but the translation accumulated every action, so a later action silently changed the verdict of the ones before it: an `action drop action trap` filter with skip_sw trapped packets to the CPU instead of dropping them. Resolve the list against its first terminal action, and ask for software assistance if any action follows the redirect action. Fixes: 8eb9e75 ("net: dsa: yt921x: Add ACL support") Signed-off-by: David Yang <mmyangfl@gmail.com> Link: https://patch.msgid.link/20261110104930.223598-3-mmyangfl@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
A flower filter on a block shared across ports is offloaded as one hardware rule per port, all carrying the same classifier cookie. Deletion looked a rule up by cookie alone and could take another port's copy: with skip_sw, a filter silently stopped being enforced on a still-bound port, while the detached port kept enforcing it. Delete the rule matching the port being unbound instead. Fixes: 8eb9e75 ("net: dsa: yt921x: Add ACL support") Signed-off-by: David Yang <mmyangfl@gmail.com> Link: https://patch.msgid.link/20261110104930.223598-4-mmyangfl@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
David Yang says: ==================== net: dsa: motorcomm: ACL fixup Various ACL defects. Found by LLM and manually verified (on YT9215). ==================== Link: https://patch.msgid.link/20261110104930.223598-1-mmyangfl@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
With IPv6 enabled, sk_saddr_any() checks sk_v6_rcv_saddr also for AF_INET sockets, where it is always zero. An IPv4 tunnel socket bound to a specific address (e.g. fou or geneve with "local") ends up in the GRO lookup fast path, although another socket may bind the same port on a different address: GRO then hands that socket's packets to the tunnel's gro_receive. Check the IPv6 address only for AF_INET6 sockets. Fixes: a36283e ("udp_tunnel: create a fastpath GRO lookup.") Signed-off-by: Antonio Quartulli <antonio@mandelbit.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com> Link: https://patch.msgid.link/20261110113306.3698438-1-antonio@mandelbit.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
When firmware reports a function as not LAG capable (lag_master=0 or num_lag_ports < 2), mlx5_lag_add_mdev() creates no LAG object for it. Enabling multiport E-Switch on such a device returns 0 from mlx5_lag_mpesw_queue_work(), so "devlink dev param set ... esw_multiport value true" reports success although nothing was enabled, and a following "devlink dev param show" still reports false. Return -EOPNOTSUPP instead. mlx5_lag_mpesw_disable() ignores the return value, so disabling keeps its current behavior. Fixes: a32327a ("net/mlx5: Lag, Control MultiPort E-Switch single FDB mode") Signed-off-by: Uri Dar <udar@nvidia.com> Reviewed-by: Shay Drori <shayd@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Reviewed-by: Daniel Machon <daniel.machon@microchip.com> Link: https://patch.msgid.link/20261110114350.2639891-1-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
…/linux/kernel/git/brgl/linux Pull power sequencing fixes from Bartosz Golaszewski: - fix a use-after-free bug and a serdev reference leak in pwrseq-pcie-m2 - increase WCN7850 power-up delay in pwrseq-qcom-wcn - make the API contract for pwrseq descriptor serialization clearer * tag 'pwrseq-fixes-for-v7.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: power: sequencing: pcie-m2: fix serdev controller reference leak power: sequencing: pcie-m2: use devm_mutex_init() power: sequencing: pcie-m2: fix use-after-free in pwrseq_pcie_m2_vregs_enable() power: sequencing: core: add a note on descriptor serialization power: sequencing: qcom-wcn: increase WCN7850 power-up delay
netif_close() must be called with RTNL held in addition to the netdev instance lock: __dev_close_many() asserts it, and the NETDEV_GOING_DOWN and NETDEV_DOWN notifier chains it runs rely on it for serialization. Commit 004b500 ("eth: bnxt: remove most dependencies on RTNL") replaced rtnl_lock() with netdev_lock() in bnxt_fw_reset_task() and bnxt_fw_reset(). That is sufficient for the paths that only tear the NIC down internally with __bnxt_close_nic(), but the abort paths close the netdev via bnxt_fw_reset_abort() -> netif_close(), and the error path in bnxt_fw_reset() calls netif_close() directly. Those now run without RTNL and trigger a WARN_ONCE() cascade when a firmware reset is aborted: RTNL: assertion failed at net/core/dev.c (1740) WARNING: net/core/dev.c:1740 at __dev_close_many+0x1be/0x1f0 Workqueue: bnxt_pf_wq bnxt_fw_reset_task [bnxt_en] Call Trace: netif_close_many+0xb5/0x190 netif_close+0xa2/0xd0 bnxt_fw_reset_task.cold+0x8d/0x213 [bnxt_en] process_one_work+0x19d/0x3a0 worker_thread+0x1af/0x320 kthread+0xe3/0x120 followed by the same assertion from call_netdevice_notifiers_info(), fib_rules_event(), inetdev_event(), rtnl_fill_ifinfo(), devlink_compat_phys_port_name_get() and ip_mc_down(). This was observed on a machine in real use with a BCM57504 (4 PFs, FW 236.1.153.0) running v7.1.6: the firmware crashed, announced a "Fatal firmware reset event" and then failed to come back within the advertised max wait, so bnxt_fw_reset_task() aborted the reset on all ports: bnxt_en 0000:c1:00.1 eno16905np1: Firmware reset aborted bnxt_en 0000:c1:00.1 eno16905np1: fw_health_status 0x448100 Take RTNL (before the netdev instance lock, matching the OPENING state which already uses rtnl_trylock()) in the fw_reset_abort path of bnxt_fw_reset_task() and route the POLL_VF abort through that same path. In bnxt_fw_reset(), only a PF can reach the bnxt_get_registered_vfs() error path that calls netif_close(), so take RTNL up front via bnxt_rtnl_lock_sp() when BNXT_PF(bp) is true and keep bnxt_lock_sp() on VFs. That avoids dropping the instance lock mid-reset (which would expose a transient BNXT_STATE_IN_FW_RESET and let a concurrent devlink health recover set BNXT_STATE_IN_SP_TASK), avoids racing with bnxt_sriov_configure() updating active_vfs outside RTNL, and keeps VFs from contending on RTNL during recovery while PFs already run on the single-threaded bnxt_pf_wq. The bug was found by inspecting the kernel log of the affected machine and the driver source; the fix was prepared with the help of an AI coding assistant (Gemini based) and reviewed by the submitter. It is build tested (allmodconfig with W=1, plus the same change on top of v7.1.6 built as a module for the affected BCM57504 host). The aborted reset path itself only runs when the firmware fails to return from a reset, which could not be reproduced on demand. Fixes: 004b500 ("eth: bnxt: remove most dependencies on RTNL") Cc: stable@vger.kernel.org Signed-off-by: Bryan Cochrane <bcochrane@google.com> Link: https://patch.msgid.link/20261110044235.204386-1-bcochrane@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
If userspace tries to update the GCS mode as part of signal return then we update the thread state but don't update GCSCRE0_EL1, meaning the change does not take effect. We may also get issues for other tasks on context switch since we suppress writes of the register if the two tasks have the same mode. Since no currently known userspace tries to use this functionality close this by ignoring any attempt to change the mode through signal return. The GCS mode for the current thread can be changed using the prctl() interface and will be preserved on signal return, allowing updates to the mode from the signal handler. Reported-by: Catalin Marinas <catalin.marinas@arm.com> Link: https://lore.kernel.org/r/as-8IqsbMbOBo5Oq@arm.com Suggested-by: Catalin Marinas <catalin.marinas@arm.com> Fixes: 16f47bb ("arm64/signal: Expose GCS state in signal frames") Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
virtio_net_hdr_tnl_from_skb() builds a wrong header for VLAN tagged UDP tunnel GSO packets. 1) When the skb carries a hwaccel VLAN tag, tun_put_user() inserts the 802.1Q header in the frame it copies to user space or vhost-net, and passes vlan_hlen = VLAN_HLEN. virtio_net_hdr_from_skb() adds vlan_hlen to csum_start, but inner_nh_offset and outer_th_offset do not account for it, and are 4 bytes short of the real inner L3 and outer UDP headers in the emitted frame. tun advertises NETIF_F_HW_VLAN_CTAG_TX and NETIF_F_HW_VLAN_STAG_TX in hw_enc_features, and its vlan_features keep the UDP tunnel GSO features, so this happens for example with a VLAN filtering bridge with a tagged port, or with a vlan device on top of a tap. 2) The outer family comes from skb->protocol, which is ETH_P_8021Q or ETH_P_8021AD when the VLAN tag is in the packet data, so a packet with an outer IPv6 header is reported as VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV4. This happens when __vlan_hwaccel_push_inside() inserted the tag because the device does not offload it: virtio_net never offloads VLAN insertion but keeps UDP tunnel GSO in its vlan_features, and tun does the same with VLAN TX offload disabled, or with QinQ (outer tag offloaded, inner tag in the data). The receiver sets inner_network_header and transport_header from these offsets, and checks them with the wrong outer family. A forwarded packet that gets segmented again uses the wrong inner headers, and a receiver checking the outer headers against the virtio header drops the packet. Add vlan_hlen to both offsets like csum_start, and take the outer family from vlan_get_protocol(), which skips VLAN tags in the data. Fixes: a2fb4bc ("net: implement virtio helpers to handle UDP GSO tunneling.") Reported-by: Sashiko <sashiko-bot@kernel.org> Closes: https://lore.kernel.org/netdev/179421814766.994134.3669228181251158303@kernel.org/ Closes: https://lore.kernel.org/netdev/179433950084.994134.15100186606737698605@kernel.org/ Signed-off-by: Eric Dumazet <edumazet@kernel.org> Link: https://patch.msgid.link/20261110213628.3476051-2-edumazet@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
With IFF_NAPI_FRAGS, tun_napi_alloc_frags() gets its skb from napi_get_frags(). If GRO merged the previous frame with GRO_MERGED_FREE, that skb was recycled by napi_reuse_skb(), which does not reset skb->protocol set by napi_frags_skb() for the previous frame. tun_get_user() calls tun_vnet_hdr_tnl_to_skb() before eth_type_trans(), so the virtio header checks see the protocol of the previous frame: GSO packets without VIRTIO_NET_HDR_F_NEEDS_CSUM are dissected with the wrong protocol. A following change checks the outer protocol of UDP tunnel GSO packets, which would then reject a valid frame when the two ethertypes differ. This needs GRO to hold packets across writes, and IFF_NAPI_FRAGS needs CAP_NET_ADMIN. Clear skb->protocol in tun_napi_alloc_frags(), like skbs allocated by tun_alloc_skb() or build_skb(). eth_type_trans() sets it later. Fixes: 90e33d4 ("tun: enable napi_gro_frags() for TUN/TAP driver") Reported-by: Sashiko <sashiko-bot@kernel.org> Closes: https://lore.kernel.org/netdev/179386753589.488856.11455181721004759454@kernel.org/ Suggested-by: Willem de Bruijn <willemb@google.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Signed-off-by: Eric Dumazet <edumazet@kernel.org> Link: https://patch.msgid.link/20261110213628.3476051-3-edumazet@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
virtio_net_hdr_tnl_to_skb() trusts the virtio header to describe a UDP tunnel over IPv4 or IPv6, but never checks that the frame actually carries such outer headers. Because VIRTIO_NET_HDR_F_NEEDS_CSUM is mandatory for tunnel GSO, __virtio_net_hdr_to_skb() skips the flow dissector, so virtio_net_hdr_match_proto() is never applied either. A guest (or a tap writer) can then inject a frame with an arbitrary outer ethertype, for example ETH_P_NSH, with SKB_GSO_UDP_TUNNEL set. The GSO stack then runs nsh_gso_segment() on top of the UDP tunnel segmentation, which assumes a different header layout. The result is segments with skb->data before skb->head, and a host crash in skb_under_panic() as soon as a later layer pushes a header: skbuff: skb_under_panic: ... put:4 ... dev:gretap1 kernel BUG at net/core/skbuff.c:215! skb_push __gre_xmit gre_tap_xmit ... tun_get_user Validate the outer headers with the parsing helpers from Michael's series "net: resolve uncommon partial checksums at ingress": - locate the L3 header: Ethernet with optional VLAN tags, or the network header set by the caller. skb->protocol is not trusted when it disagrees with the frame. - require the outer L3 protocol to match the declared tunnel type. - require the outer UDP header exactly at outer_th_offset, after IPv4 options or IPv6 extension headers, and reject fragments. Unlike the original helpers: - the callers tell whether the frame starts with an Ethernet header, with a new has_eth argument of virtio_net_hdr_tnl_to_skb(), instead of using the device type. tun frames packets from its IFF_TAP and IFF_TUN flags, and TUNSETLINK can set the device type to any value. virtio_net and tun_xdp_one() always pass true, tun_get_user() passes whether the device is IFF_TAP. - ipv6_find_hdr() stops at an AH header, as Willem suggested in the review of that series. Fixes: a2fb4bc ("net: implement virtio helpers to handle UDP GSO tunneling.") Reported-by: Hassan Sultan <hassansultan@google.com> Suggested-by: Willem de Bruijn <willemb@google.com> Link: https://lore.kernel.org/netdev/93d0e37c99711bebdf60c120af03010455c2f2e2.1793276116.git.mst@redhat.com/ Co-developed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Eric Dumazet <edumazet@kernel.org> Link: https://patch.msgid.link/20261110213628.3476051-4-edumazet@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
…ckets' Eric Dumazet says: ==================== net: virtio: validate outer protocol of UDP tunnel GSO packets virtio_net_hdr_tnl_to_skb() does not check that a UDP tunnel GSO packet really has outer IPv4/IPv6 and UDP headers matching the declared tunnel type. A guest, or any tap writer, can send a frame with another outer ethertype (NSH in the report), and the GSO stack then builds segments with skb->data before skb->head. The host crashes in skb_under_panic() as soon as a header is pushed. Patch 1 fixes the producer side, virtio_net_hdr_tnl_from_skb(), for VLAN tagged packets: - the tunnel offsets did not account for the VLAN tag tun inserts in the frame, and were 4 bytes short. - the outer family came from skb->protocol, which is the VLAN protocol when the tag is in the packet data, so an outer IPv6 header was reported as IPv4. Without it, patch 3 would drop such packets. Kernels without this fix still send such headers, so it should go to stable along with patch 3. Patch 2 clears a stale skb->protocol left on recycled NAPI frags skbs, which could make the checks of patch 3 reject valid frames. Patch 3 validates the outer headers, using the parsing helpers from Michael's series "net: resolve uncommon partial checksums at ingress", as Willem suggested. The callers tell whether frames start with an Ethernet header, as the device type of a tun device can be changed with TUNSETLINK. The rest of Michael's series (checksum validation and completion) is left to him. The selftests of v3 will follow in a separate series, with the fixes Sashiko found in them. ==================== Link: https://patch.msgid.link/20261110213628.3476051-1-edumazet@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
NiceHCK Octave is an OEM of TTGK TT39039F01-PROMAX[1] and supports DSD64/ DSD128/DSD256/DSD512[2]. It advertises the UAC2 RAW_DATA format on altsetting 4 of its playback interface, but without the DSD_RAW quirk flag the driver exposes it only as a SPECIAL format that cannot be used. Add QUIRK_FLAG_DSD_RAW for the device (USB ID 3302:39c3), so the altsetting is exposed as DSD_U32_BE, enabling native DSD playback. [1] https://www.audiosciencereview.com/forum/index.php?threads/nicehck-octave-dongle-dac.65535/post-2390027 [2] https://szttgk.com/product/HIFIAUDIOMODULE/846.html Signed-off-by: Shengyu Qu <wiagn@4d2.org> Link: https://patch.msgid.link/20261112173131.86655-1-wiagn@4d2.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Add the active email address for Hangbin Liu and map the old or rarely-used addresses to it. This prevents get_maintainer.pl from listing not actively used addresses as patch recipients. Signed-off-by: Hangbin Liu <liuhangbin@kylinos.cn> Link: https://patch.msgid.link/20261111-mailmap-v1-1-8ab349555808@kylinos.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org>
…ck_req().
When connection migration happens in tcp_v[46]_rcv(), a new
listener is passed to tcp_check_req().
When either of the following is true,
* the new listener queue is full and
net.ipv4.tcp_abort_on_overflow is set
* the packet has RST or (not stripped) SYN
tcp_check_req() sends RST and calls inet_csk_reqsk_queue_drop().
Here, the new listener is passed, and its qlen is decremented
wrongly while reqsk is tied to the old listener.
Once qlen underflows, inet_csk_reqsk_queue_is_full() always
return true, and the new listener stops serving.
Without the patch, this script times out while waiting for SYN+ACK
since the new listener drops SYN, but with the patch, 3WHS completes.
0 `sysctl -q net.ipv4.tcp_migrate_req=1`
+0 `sysctl -q net.ipv4.tcp_syncookies=0`
+0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
+0 setsockopt(3, SOL_SOCKET, SO_REUSEPORT, [1], 4) = 0
+0 bind(3, ..., ...) = 0
+0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 4
+0 setsockopt(4, SOL_SOCKET, SO_REUSEPORT, [1], 4) = 0
+0 bind(4, ..., ...) = 0
+0 listen(4, 128) = 0
+0 < S 0:0(0) win 32792 <mss 1000>
+0 > S. 0:0(0) ack 1 <...>
+0 listen(3, 128) = 0
+0 close(4) = 0
+.01 < R 1:1(0) win 0
+0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 5
+0 listen(5, 1) = 0
+.01 < S 0:0(0) win 32792 <mss 1000>
+0 > S. 0:0(0) ack 1 <...>
+0 < . 1:1(0) ack 1 win 32792
+0 fcntl(3, F_SETFL, O_RDWR|O_NONBLOCK) = 0
+0 accept(3, ..., ...) = 6
Let's pass req->rsk_listener instead.
Fixes: d4f2c86 ("tcp: Migrate TCP_NEW_SYN_RECV requests at receiving the final ACK.")
Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20261111020304.1532064-2-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
When SO_INQ is enabled on a listening AF_UNIX SOCK_STREAM socket, accepted sockets created by unix_stream_connect() do not inherit u->recvmsg_inq from the listener, unlike TCP_INQ, AF_VSOCK SO_INQ, and AF_UNIX SO_RIGHTS_NOTRUNC. As a result, recvmsg() on the accepted socket never puts an SCM_INQ control message unless SO_INQ is set again after accept(). Copy otheru->recvmsg_inq to newu->recvmsg_inq in unix_stream_connect() using READ_ONCE() to pair with the lockless WRITE_ONCE() in unix_setsockopt(). Found during LLM-assisted code review of unix_stream_connect() while comparing option inheritance between SO_INQ and SO_RIGHTS_NOTRUNC. Confirmed on UML (x86_64) by enabling SO_INQ on a listening AF_UNIX SOCK_STREAM socket before listen() and accept(), sending data from a connected client, and observing that recvmsg() on the accepted socket returned no SCM_INQ control message. Tested on UML (x86_64) against the reproducer, verifying that recvmsg() on the accepted socket now returns the expected SCM_INQ control message, and ran the tools/testing/selftests/net/af_unix/scm_inq selftest (all 6 test cases passed). Fixes: df30285 ("af_unix: Introduce SO_INQ.") Signed-off-by: Wenbo Sun <sunwenbo@cmss.chinamobile.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com> Link: https://patch.msgid.link/20261111023222.77227-1-sunwenbo@cmss.chinamobile.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
In amt_mldv1_leave_handler(), which handles IPv6 MLDv1 Done (ICMPV6_MGM_REDUCTION) messages, the source address is mistakenly extracted via ip_hdr(skb)->saddr into host.ip4 instead of copying the IPv6 source address from ipv6_hdr(skb)->saddr into host.ip6 as amt_mldv1_report_handler() does. Because amt_lookup_group() compares the full union amt_addr for v6 groups, looking up the group with a 32-bit IPv4 header slice fails to match the group entry created by amt_mldv1_report_handler(). As a result, amt_del_group() is not called when an MLDv1 listener leaves, and the AMT relay continues forwarding multicast traffic until the group timer expires. Use ipv6_hdr(skb) and copy ip6h->saddr into host.ip6 so that MLDv1 Done messages properly match and delete the corresponding IPv6 group. This issue was found via LLM-assisted code review, confirmed by reproducing the stale group forwarding in a User-Mode Linux (ARCH=um) environment, and verified in UML by testing that AMT relay multicast forwarding stops immediately after receiving an MLDv1 Done message. Fixes: b75f709 ("amt: add mld report message handler") Signed-off-by: Wenbo Sun <sunwenbo@cmss.chinamobile.com> Link: https://patch.msgid.link/20261111031147.105834-1-sunwenbo@cmss.chinamobile.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
A syzkaller reproducer assigning INT_MAX as a peer nsid triggers an idr_get_next() warning during netns cleanup. With panic_on_warn, this panics the kernel. alloc_netid() also overflows reqid + 1 for this nsid. Use idr_alloc_u32() for requested IDs and idr_get_next_ul() for cleanup so the cursor can advance past INT_MAX. QEMU/KVM reproduced the warning without kernel changes or fault injection. The same reproducer ran without warnings after this change. Kernel selftests were not run. Fixes: 7acee67 ("netns: optimize netns cleaning by batching unhash_nsid calls") Cc: stable@vger.kernel.org Signed-off-by: Zhao Gongyi <zhaogongyi@bytedance.com> Link: https://patch.msgid.link/20261111033525.65828-1-zhaogongyi@bytedance.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
cdc_ncm_ndp16() and cdc_ncm_ndp32() verify that the new NDP and the
datagram fit into the NTB with an unsigned subtraction:
if ((ctx->tx_curr_size - skb->len - reserve) < ctx->max_ndp_size)
return NULL;
Nothing guarantees that skb->len plus the reserve stays below
tx_curr_size, and when it does not the subtraction wraps around to a
huge value, the check passes, and the skb_put_zero() of max_ndp_size
bytes that follows overruns the NTB:
skbuff: skb_over_panic: text:ffff80000db33558 len:428 put:172
head:ffff0000c2c66100 tail:0x1ac end:0x140
kernel BUG at net/core/skbuff.c:200
skb_put_zero include/linux/skbuff.h:2595 [inline]
cdc_ncm_ndp16 drivers/net/usb/cdc_ncm.c:1132 [inline]
cdc_ncm_fill_tx_frame+0xdf0/0x30e0 drivers/net/usb/cdc_ncm.c:1309
Here tx_curr_size is 0x140 = 320, skb->len is already 256 and the
skb_put_zero() wants another 172 bytes.
Two device controlled settings make this reachable:
- dwNtbOutMaxSize = 320 caps tx_max at 320. The lower bound computed
in cdc_ncm_check_tx_max() is max_datagram_size + max_ndp_size + the
NTH header, but cdc_ncm_setup() clamps tx_max before
cdc_ncm_set_dgram_size() runs, so max_datagram_size is still 0 and
the bound is only max_ndp_size + the NTH header. It does not
reserve room for one datagram plus one NDP.
- wNdpOutAlignment = 256 is accepted by cdc_ncm_fix_modulus() as long
as it is smaller than tx_max, and cdc_ncm_align_tail() then pads the
12 byte NTH header up to 256 bytes right before this check.
An NDP can also be added to an NTB that already holds datagrams through
cdc_mbim_tx_fixup(), which uses a different signature per MBIM session.
On plain cdc_ncm the chain lookup in cdc_ncm_ndp16() returns the
existing NDP for the single signature, so there the create path is
normally reached for the first datagram of each NTB.
Rewrite the test as an addition, which cannot underflow and gives the
same answer whenever the original subtraction did not wrap.
Fixes: c78b7c5 ("net: cdc_ncm: refactoring for tx multiplexing")
Fixes: 0fa81b3 ("cdc_ncm: Implement the 32-bit version of NCM Transfer Block")
Reported-by: syzbot+1994e2ecf323ed90f255@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=1994e2ecf323ed90f255
Signed-off-by: Jiahao Xu <xujiahao@cmss.chinamobile.com>
Link: https://patch.msgid.link/20261111124156.637661-1-xujiahao@cmss.chinamobile.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Commit e3d95ad ("inet: avoid fastopen lock for regular accept()") made inet_csk_accept() check tfo_listener before taking fastopenq.lock to avoid taking the lock for connections that did not use Fast Open. reqsk_fastopen_remove() clears tfo_listener while holding fastopenq.lock, then reads req->sk. If inet_csk_accept() concurrently observes tfo_listener after it has been cleared, it skips fastopenq.lock and drops the last reference to the request_sock. This can free the request_sock while reqsk_fastopen_remove() is still using it. If the freed memory is reused for a new request_sock with req->sk == NULL, the reset path in reqsk_fastopen_remove() can append the new request_sock to the original listener's list of requests that caused an RST. After the new request_sock is freed, the next append writes through the stale rskq_rst_tail into freed memory. KASAN reported the following use-after-free when writing fastopenq->rskq_rst_tail->dl_next = req: BUG: KASAN: slab-use-after-free in reqsk_fastopen_remove+0x142/0x210 Write of size 8 at addr ffff888108230688 by task swapper/5/0 ... Call Trace: <IRQ> ... reqsk_fastopen_remove+0x142/0x210 tcp_check_req+0x96f/0xdd0 ... tcp_rcv_state_process+0x19c/0x26b0 ... tcp_v4_do_rcv+0x16e/0x490 tcp_v4_rcv+0x14a0/0x1af0 ... ip_protocol_deliver_rcu+0x39/0x1e0 ip_local_deliver_finish+0x124/0x1e0 ip_local_deliver+0xfb/0x1e0 ... </IRQ> To widen the race windows, mdelay(5) was added after newsk = req->sk, mdelay(20) after the if (req) reqsk_put(req) block, and mdelay(100) after tcp_rsk(req)->tfo_listener = false. The KASAN report above was reproduced with this kernel. For the lockless check, use tcp_sk(newsk)->syn_fastopen_child instead of tfo_listener, which reqsk_fastopen_remove() clears. syn_fastopen_child is a field of the Fast Open child TCP socket referenced by newsk, not of the request_sock. It is set before the child socket is added to the accept queue. The paths that call reqsk_fastopen_remove() in response to a remote ACK or RST do not clear this field. inet_csk_accept() uses this field to take fastopenq.lock only for Fast Open child sockets and rechecks tfo_listener while holding the lock. Connections that did not use Fast Open continue to avoid the lock. Fixes: e3d95ad ("inet: avoid fastopen lock for regular accept()") Cc: stable@vger.kernel.org Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com> Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com> Link: https://patch.msgid.link/avQKA_YTAThtbsYU@v4bel Signed-off-by: Jakub Kicinski <kuba@kernel.org>
The mentioned commit introduced support for upper protocol selectors (protocol & ports) to mlx5 IPsec offload. In crypto offload mode this causes offloaded TX SAs to stop matching traffic. In tx_add_rule(), setup_fte_upper_proto_match() is called for all offload types and programs a match on the upper protocol (TCP/UDP) and ports. For crypto offload, setup_fte_esp() is then called and sets ip_protocol to ESP. The resulting rule requires both ESP as the IP protocol and TCP/UDP ports, which no packet can satisfy, so TX crypto offload silently stops working for such SAs. In crypto offload mode the stack builds the ESP packet and the HW only encrypts it, so the SA rule should only match on the SPI. Move the setup_fte_upper_proto_match() call under the XFRM_DEV_OFFLOAD_PACKET case, where the rule matches the plaintext packet and upper protocol selectors apply. The other three callers are unaffected: rx_add_rule_sa_selector() is already only invoked for packet offload, and tx_add_policy() / rx_add_policy() are only reachable in packet offload mode, since xfrm policy offload is exclusively of type XFRM_DEV_OFFLOAD_PACKET. Fixes: a738518 ("net/mlx5e: IPsec, support upper protocol selector field offload") Signed-off-by: Cosmin Ratiu <cratiu@nvidia.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Link: https://patch.msgid.link/20261111081337.3129580-1-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
… failure mlx5e_attach_netdev() sets rx_mode_active before calling init_rx(), so any init_rx() failure after mlx5e_create_flow_steering() has succeeded makes mlx5e_destroy_flow_steering() trip WARN_ON_ONCE(fs->rx_mode_active) in mlx5e_del_vlan_rules(). Hit in internal regression testing, so kthread creation failed with -EINTR: WARNING: CPU: 3 PID: 170 at drivers/net/ethernet/mellanox/mlx5/core/en_fs.c:564 mlx5e_del_vlan_rules+0x295/0x2b0 [mlx5_core] mlx5e_destroy_flow_steering+0x34/0xc0 [mlx5_core] mlx5e_init_nic_rx+0x137/0x200 [mlx5_core] mlx5e_attach_netdev+0x105/0x360 [mlx5_core] Fix it by creating NIC flow steering with rx_mode_active cleared and setting it only after profile->init_rx() succeeds. This also lets the internal error paths of mlx5e_create_flow_steering() destroy partially created steering without warning. The flag is set in mlx5e_attach_netdev() rather than mlx5e_init_nic_rx() so that non-NIC profiles, such as representors, also get it set after a detach/attach cycle. Fixes: 8c7353b ("net/mlx5e: Fix VLAN cleanup flow") Signed-off-by: Alexei Lazar <alazar@nvidia.com> Signed-off-by: Gal Pressman <gal@nvidia.com> Reviewed-by: Shahar Shitrit <shshitrit@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Link: https://patch.msgid.link/20261111082142.3131746-1-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Commit 25108a8 ("net: phy: c45: add support for 1000BASE-T1 forced setup") made genphy_c45_pma_setup_forced() write the type selection field (bits 3:0) of the BASE-T1 PMA/PMD control register (1.2100) on every forced setup: 1000BASE-T1 for SPEED_1000, and 0 for everything else. 0 selects 100BASE-T1, so forcing a 10BASE-T1L PHY to 10 Mbit/s now also switches its PMA to 100BASE-T1, a mode it does not implement. Seen on an ADIN1110 (internal ADIN1100 PHY): after ethtool -s ethX autoneg off speed 10 master-slave forced-master 1.2100 reads 0xc000 instead of the 0xc002. Since the field is not restored by re-enabling autoneg, the PHY keeps the wrong type until the next forced setup or reset. Add a helper that returns the type selection value for the forced speed and the supported link modes: 100BASE-T1, 1000BASE-T1, and 10BASE-T1L or 10BASE-T1S for SPEED_10 depending on the supported 10 Mbit/s modes. Fail with -EINVAL when no type matches instead of writing 100BASE-T1. This also applies to forced 2.5G, 5G and 10G on BASE-T1 capable PHYs, for which there are no link modes yet. The field is called "type selection" in IEEE 802.3-2022 (45.2.1.214, Table 45-178). Keep the old STRAP names as aliases. Tested on EVAL-ADIN1110EBZ: with this change, forcing 10 Mbit/s writes 1.2100 = 0xc002 (10BASE-T1L) instead of the invalid 0xc000. Fixes: 25108a8 ("net: phy: c45: add support for 1000BASE-T1 forced setup") Signed-off-by: Iustin Stolniceanu <iustin.stolniceanu@analog.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://patch.msgid.link/20261111100053.345196-1-iustin.stolniceanu@analog.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
…nel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- zoned mode fixes
- fix counting active zones after activation
- redo zone reset after error
- update device lock range during mount and zone loading
to avoid lockdep warnings with device drivers (virtio)
- space accounting and extent buffer handling fixes
- fix keeping zstd workspace for the last level
- handle a real case of a subvolume with 0 refs in the SUBVOL_SYNC
ioctl
- properly handle case of zero num_stripes when reading chunk items
- exclude reloc tree from xarray as it is special and its key does
does not fit unsigned long on 32bit platforms
- in tree-checker, handle extent item tree owner depending on the
features (enabled in simple quota mode)
- fix bio control structure leak when checksumming fails
* tag 'for-7.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: fix bio counter and bioc leak when async checksumming fails
btrfs: tree-checker: reject extent owner ref without simple quota
btrfs: do not insert the data reloc tree into fs_roots_radix
btrfs: handle zero num_stripes in btrfs_chunk_item_size()
btrfs: reject refs=0 subvolume without DEAD in SUBVOL_SYNC_WAIT
btrfs: zstd: prevent leak of workspace below maximum level
btrfs: zoned: fix lockdep splat on mount
btrfs: zoned: don't wait for ordered extents in do_zone_finish()
btrfs: zoned: avoid underflow of space info bytes_zone_unusable
btrfs: zoned: requeue block group if zone reset bails out
btrfs: zoned: fix possible UAF in wait_eb_writebacks()
btrfs: zoned: only change active zone counter on successful (de)activation
TLS permits zero-length application_data records, and RFC 8446 suggests them for generating cover traffic. Nothing bounds how many of them a reader processes back to back, though. They advance neither loop bound in tls_sw_recvmsg() and tls_sw_read_sock(), so a peer streaming them faster than the reader decrypts them keeps it in the kernel for as long as they arrive. recvmsg() does not check for signals while records are ready, and its peek and async paths queue every empty record on rx_list. read_sock consumers like nvme-tcp hold the socket lock throughout and never get control back. Break the connection once a reader decrypts more than 128 consecutive empty data records without sleeping or returning to its caller in between, treating the burst as a protocol violation like a malformed record header. A stream of empty records which the reader keeps up with costs no more than any other traffic, so the count starts over on every read and whenever the reader waits for the next record. The strparser is stopped before it parses the next record, so the reader gets the error from tls_rx_rec_wait() and no later record is delivered. Returning to the caller and keeping the connection alive would need a way to wake read_sock consumers which installed their own sk_data_ready after the handshake, a lot of code for a peer that is either broken or malicious. Consume empty records in recvmsg() rather than queuing them on rx_list, so that repeated MSG_PEEK cannot pile them up past the per-read count. Decrypt them synchronously, too. Once a recvmsg() call has decrypted a record asynchronously, recv_end replaces the error with the result of process_rx_list(), so a call that saw only empty records returns 0, a false EOF, instead of the error or -EAGAIN. Reported-by: sashiko-bot <sashiko-bot@kernel.org> Closes: https://sashiko.dev/#/patchset/20260720-tcp-read-sock-v2-0-29545d034f3c@kernel.org?part=1 Closes: https://sashiko.dev/#/patchset/20260630191551.875664-1-cel@kernel.org?part=1 Link: https://lore.kernel.org/all/20261019-tls-follow-on-v6-0-ab01c4ecca0c@kernel.org/ Fixes: c46234e ("tls: RX path for ktls") Fixes: 3be28e2 ("net/tls: Consume empty data records in tls_sw_read_sock()") Reviewed-by: Chuck Lever <cel@kernel.org> Link: https://patch.msgid.link/20261111185522.2859004-2-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
A zero-length application_data record decrypts to full_len == 0, so tls_sw_splice_read() splices zero bytes and returns zero. A zero return from a splice read means EOF, and the caller tears down a connection that is still live. Consume the record and fetch the next one, as tls_sw_read_sock() does. The cap on consecutive empty records bounds the loop. When an empty record precedes a close_notify, splice(2) now returns -EINVAL from the control-record test instead of a false EOF. A splice that reaches an alert record already reports -EINVAL. Fixes: c46234e ("tls: RX path for ktls") Reported-by: Sabrina Dubroca <sd@queasysnail.net> Closes: https://lore.kernel.org/netdev/akaoXcfamBp8_mYe@krikkit/ Signed-off-by: Chuck Lever <cel@kernel.org> Link: https://patch.msgid.link/20261111185522.2859004-3-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
FIXTURE_SETUP(zero_len) returns early when ulp_sock_pair() reports that the TCP_ULP setsockopt failed, so on a kernel built without CONFIG_TLS the TLS_RX setsockopt never runs. TEST_F(zero_len, test) then sends its raw records over a plain TCP socket, which returns the ciphertext verbatim. All eight variants FAIL on a machine that lacks TLS, and those failures mask any real regression in the same run. Skip the test when the fixture recorded notls, as the other fixtures in this file do. Fixes: a61a3e9 ("selftests: tls: add tests for zero-length records") Signed-off-by: Chuck Lever <cel@kernel.org> Link: https://patch.msgid.link/20261111185522.2859004-4-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
The zero_len fixture injects raw pre-encrypted records over a socket carrying a TLS_RX key only, and some of those records are zero-length application_data records. Every variant reads the records back with recvmsg() without MSG_PEEK, so neither splice nor MSG_PEEK is tested against an empty record. Add zero_len_splice and zero_len_peek. A zero return from splice() means EOF, so zero_len_splice checks that a run of empty data records does not end a live connection. zero_len_peek checks that a peek reaches the payload behind a run of empty records and leaves the payload in place for the read that follows. When a payload does not follow the run, the peek must leave the socket unreadable. An unfixed kernel returns 0 from splice(), and after the peek poll() reports the socket readable. Signed-off-by: Chuck Lever <cel@kernel.org> Link: https://patch.msgid.link/20261111185522.2859004-5-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
gntdev_ioctl_map_grant_ref() calls copy_to_user() with priv->lock held. A fault in that copy takes mmap_lock, while gntdev_mmap() is called with mmap_lock held and takes priv->lock, so lockdep reports a circular dependency, and a thread mapping grants can deadlock against another thread of the same process mmapping the same gntdev fd. Read the index under the lock, take an extra reference on the map, and copy after unlocking. If the copy fails, take the map off the list only if an unmap ioctl has not already done so, then drop both references. Fixes: 45ca1af ("xen/gntdev: fix error handling in ioctl") Signed-off-by: Kavi <kavi@edera.dev>
xen_pgd_alloc() keeps the user pgd of a 64-bit PV mm in page->private of the kernel pgd page, and xen_pgd_free() frees it without clearing the pointer. page->private shares its slot with ptdesc->ptl, so when split ptlocks are allocated separately (lock debugging, PREEMPT_RT), pagetable_dtor() hands the freed user pgd to kmem_cache_free() as a ptlock. With SLUB consistency checks this warns "virt_to_cache: Object is not a Slab page!" on every mm teardown; without them it corrupts the slab. Clear page->private once the user pgd is freed. Signed-off-by: Kavi <kavi@edera.dev>
gntdev_ioctl_grant_copy() resets nr_ops and nr_pages on the batch it takes but not writeable, and a batch fresh from kmalloc() holds whatever was in that memory. If the first segment fails before gntdev_grant_copy_seg() sets writeable, gntdev_put_pages() loads the uninitialised bool, which UBSAN reports as an invalid load. No pages are pinned at that point, so nothing is unpinned with the wrong flag. Reset writeable with the counters. Signed-off-by: Kavi <kavi@edera.dev>
Since a6aa4eb ("xen/x86: add extra pages to unpopulated-alloc if available"), a domU built below its maximum hands the rest of its physmap to the unpopulated allocator at boot, so its balloon stays empty until the toolstack first resizes it. balloon_oom_notify() only deflates pages already on the balloon, so a freshly built domU kills a task instead of growing toward its maximum. When the balloon is empty, park one 2 MiB block from the unpopulated allocator on it and deflate that, as dom0's balloon does when it grows. The allocator allocates memory with its lock held, so the OOM path only tries the lock, through a new xen_try_alloc_unpopulated_blocks(). Signed-off-by: Kavi <kavi@edera.dev>
Send each pull request from a branch in this repository to edera-dev/linux-qa, which builds the change's kernels, boots them under Xen and reports back as the linux-qa commit status. Without LXQA_DISPATCH_TOKEN this does nothing.
gcc built with -fcf-protection, the default on Ubuntu and Fedora, starts its nested-function trampolines with endbr64, or endbr32 for 32-bit code. The EMUTRAMP matchers compare the bytes at the faulting address against trampolines that start with a mov, so none of these match and the task is killed with SIGSEGV. Skip a leading endbr before matching. The only relative target, the 32-bit jmp, is computed from the address after it. Signed-off-by: Kavi <kavi@edera.dev>
pcistub_device_release() frees dev_data and clears drvdata before calling xen_pcibk_config_free_dyn_fields() and xen_pcibk_config_free_dev(). Both look the fields up through drvdata, find NULL and return, so every release from pciback leaks the device's config field entries and their data. kmemleak reports them after the device is released. Free the fields first. Fixes: cd9db80 ("xen/pciback: Support pci_reset_function, aka FLR or D3 support.") Signed-off-by: Kavi <kavi@edera.dev>
…per-V The Hyper-V-on-Xen series translates GPADLs, SynIC pages, hypercall arguments and netvsc buffers to the machine (L1-physical) frames the L0 host expects, but hv_balloon was never taught about nested mode. It hands L0 page_to_pfn() ranges straight from dom0's pseudo-physical address space, in balloon responses, free-page reports and hot-add requests, and L0 reads each of those numbers as a Xen machine frame. On a PV dom0 nested on Hyper-V the device autoloads from the VMBus offer, Xen proxies POST_MESSAGE and SIGNAL_EVENT, and the dynamic memory protocol runs end to end. A DM_BALLOON_REQUEST from the host then has L0 reclaim whichever machine frames dom0's PFNs happen to name: Xen's own memory, another domain's, or unrelated dom0 memory, with no error anywhere. A hot-add does the reverse and calls add_memory() on a host range that dom0's physmap does not back, so dom0 oopses on first touch. Translating the ranges would not make this correct either. A PV dom0 does not own the machine memory it runs on, Xen does, and the memory an L1 VM returns to or takes from L0 has to be accounted for in Xen's heap, not handed over behind its back by one of its domains. Dynamic memory for the L1 VM is a job for Xen itself. Refuse the probe when nested on Xen, so the offer stays unbound and dom0 does not speak the protocol at all. Nothing changes when not nested: hyperv_nested_on_xen is a build-time false without CONFIG_XEN_PV. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
…t be bound hyperv_xen_vpci_root_domain() frees the named fwnode when creating the irq domain fails, but not when cpuhp_setup_state() fails afterwards: irq_domain_remove() does not free the fwnode its domain was created with, so that path leaked it. Free it there too. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
MPROTECT is enforced in map_deny_write_exec(), which mmap_region() and mprotect() call, but the brk path never does. do_brk_flags() ORs in VMA_DATA_DEFAULT_FLAGS, which carries VM_EXEC whenever the task's personality has READ_IMPLIES_EXEC, and personality(2) lets any task set that for itself: the ELF loader only clears it at exec. So under MPROTECT, where mmap(PROT_READ|PROT_WRITE) with READ_IMPLIES_EXEC is correctly refused, two syscalls still hand out a fresh writable and executable mapping: personality(READ_IMPLIES_EXEC); brk(cur + len); /* new RWX VMA; it does not merge with the RW heap */ Write code there and jump to it. The same path makes the bss tail of an executable PT_LOAD segment RWX, via vm_brk_flags(..., prot & PROT_EXEC) in the ELF loader, for the binary and its interpreter. Original PaX masked VM_EXEC and VM_MAYEXEC in do_brk() for exactly this reason. Do the same in do_brk_flags() when the mm runs under MPROTECT: strip the execute bits rather than fail, so brk(2) keeps working for such tasks and extensions still merge with the existing heap. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
The trampoline emulator was hooked at the top of do_user_addr_fault(), before the VMA lookup, and openpax_fault_is_trampoline() treats any instruction fetch fault as a candidate. So in every PAGEEXEC+EMUTRAMP task every instruction fetch fault, including each demand-paged, NUMA hinted or userfaultfd fetch of legitimate text, first did up to seven get_user() reads of the faulting code, and if that text happened to match one of the patterns it was emulated instead of being faulted in. PaX only ran the emulator from the bad-area path, for a fault that was otherwise about to kill the task. Move the hook to __bad_area_nosemaphore(), after the user-mode and X86_PF_USER checks and with interrupts enabled, so it runs only for an access the task's mappings do not permit: a fetch from non-executable memory. A fetch from executable memory that merely needs its page brought in is handled as an ordinary fault and never reaches it. A fetch from a non-executable page that is not yet populated now takes two faults, one to bring the page in and one to be emulated, instead of being emulated straight from the first; the result is the same. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
With OPENPAX_EMUTRAMP_DEFAULT the ELF loader sets PAXF_EMUTRAMP on every task. The emulator then lets any task with a write primitive into some readable memory and control of the instruction pointer load chosen values into two registers and jump to a chosen address, from the stack, the heap, .rodata or a noexec-mount file mapping, without any of that memory being executable; a bad target just faults again, so such sequences chain. That weakens PAGEEXEC and MPROTECT for every program on the system to help the few that still use stack or heap trampolines. PaX recommends enabling emulation per binary for this reason. Default the option to n and say so in its help text; the programs that need emulation get it with paxmark -E, through the user.pax.flags xattr. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
Commit 1b82771 ("iommu/dma: Don't reserve PCI windows under a paravirtual IOMMU") skips iova_reserve_pci_windows() for every device the Xen IOMMU driver owns, because the windows a guest sees are invented: pcifront hands out iomem_resource itself and a PVH guest with no host-bridge _CRS gets Linux's catch-all default. That holds for a guest. Dom0 sees the real host bridges, and their windows route to the real BARs of the devices behind them. A PVH dom0 device gets a translated DMA domain, and dma-iommu hands out IOVAs top-down below 4 GiB. The driver reserves only the MSI range, so once the space above it is used, IOVAs land inside the host-bridge window where sibling devices' BARs live. On a root port or switch without ACS a DMA to such an address is decoded as peer-to-peer and delivered to the sibling's BAR: it never reaches the IOMMU, so the transfer is lost and the sibling's registers are written. Xen enables ACS where it can, which redirects such requests upstream, but that is defence in depth, not a reason to skip the reservation. Have xen_iommu_manages_iova() answer false in the initial domain, so dom0 reserves its windows as on bare metal. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
… when modular include/xen/pci.h declares pcifront_machine_sbdf() as a real function whenever CONFIG_XEN_PCIDEV_FRONTEND is defined, which it is for =m as well as =y. XEN_IOMMU is a bool and calls it from built-in code, so XEN_IOMMU=y with XEN_PCIDEV_FRONTEND=m fails to link vmlinux. Declare the function only when pcifront is built in and give built-in callers the -ENODEV stub otherwise. The IOMMU driver with that stub would silently use a pcifront device's guest BDF, which means nothing to Xen, so also keep XEN_IOMMU from being configured with a modular pcifront rather than let it build into a driver that cannot name the devices it manages. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
xen_9pfs_front_ctl() answers a backend Rlerror with -(int)ecode, and the ecode is the backend's to choose. An ecode of 0 came back as 0 and any ecode above INT_MAX came back positive, and the function's contract is "reply length or negative errno", so a caller took either for a good reply of that length. xen_9pfs_front_suspend() then read total and next from beyond the short error reply and computed the chunk length from the bogus "reply length": an ecode of 0xfff00000 had it copy about 1 MiB of uninitialised buffer into a session chunk and later hand it to the backend in Tsession_restore, and 0x80000010 had it memcpy() some 2 GiB past the reply buffer. Take only a plausible errno from an Rlerror, 1..MAX_ERRNO, and answer anything else with -EPROTO, so a control request can only ever return a negative errno or a reply that carries the id and body it asked for. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
The Connected handler replays the fids saved at suspend from xenwatch, after do_suspend() has returned and processes run again. It checked priv->client once and then read priv->client->msize for every chunk, each of which waits up to 5 s on the backend. Meanwhile a umount or a fresh mount blocked on the still-disconnected frontend can be killed: p9_client_destroy() then runs p9_xen_close(), which clears priv->client with no lock the replay holds, and frees the client. The next chunk dereferences NULL, or the freed client, and xenwatch oopses, which stops all xenbus processing for the guest. Record the owning client and its msize when the session is saved, with userspace frozen and the client known to be alive, and have the replay use those. It compares priv->client with the owner by address only, before starting and before each chunk, and gives up if they differ: a client destroyed in between does not want its fids back, and nothing is dereferenced that could have gone away. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
xen_9pfs_front_suspend() freed the session saved by the previous suspend first thing, before checking whether the frontend is connected. A guest suspended again before the backend had reconnected it, which is what happens when a restore is retried or a saved domain is forked more than once, thus lost the fids it was carrying, and the eventual restore reset the session instead of replaying them. Only free the old session once there is a connected client whose fids replace it. A frontend the backend has not reconnected since the last suspend has nothing newer to save, and the Connected handler frees the session once it has been replayed, so what is kept is never stale. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
… page's xen_9pfs_front_free_rings() took the data pages' ring_order and grant refs from the intf page, which is shared with the backend and writable by it. Upstream only freed rings from remove(), with the backend gone; since the frontend reconnects after a restore it also frees them from xen_9pfs_front_disconnect() on every resume, while a backend that still serves the old rings may be running. A backend that rewrote ref[] had the frontend end foreign access on grant refs that belong to other devices, and one that rewrote ring_order had it walk past the array or free the wrong number of pages. Keep the refs in the ring as they are granted and use those, with the order the frontend chose, to tear the ring down. Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
xen_9pfs_front_ctl() stores the reply buffer and its capacity, then sets ctl_pending with a plain WRITE_ONCE(), and the response worker tests the flag with READ_ONCE() before copying into the buffer. Nothing orders the two, so on a weakly ordered machine the worker can see ctl_pending set while ctl_reply still names the previous call's buffer, a stack array or kvmalloc()ed memory that has been freed, and copy the reply into that. Publish the buffer with smp_store_release() and test the flag with smp_load_acquire(). Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
edera-rebase-app
Bot
requested review from
antoineco,
azenla,
bleggett,
kaniini,
sveith and
tycho
as code owners
November 17, 2026 07:15
2 of 4 tasks
commented
Nov 19, 2026
Author
|
Superseded by #120. |
edera-rebase-app
Bot
deleted the
rebase/edera-mainline/20261117-7ad1695c933c-666539eecdf4
branch
November 19, 2026 05:58
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Nightly rebase of
edera/mainline(7ad1695c933c) ontomaster(666539eecdf4), driven by Claude. Not pushed automatically because the checker found drift and a build failure and Claude's report asks for a decision. Run log.Important
Do not use the merge button: this branch replaces
edera/mainlinerather than merging into it. Approve the pull request to land it; the land workflow force-pushesedera/mainlineto the approved head, pinned to7ad1695c933c, and keeps a backup.Independent checks
Builds: failure (x86_64 vmlinux on the Edera host config and arm64 vmlinux, both with the Edera features built in; per-build results in the run).
The build failed and Claude's repair round (success) left no new branch; this is the unrepaired rebase.
7ad1695c933cbd59e1cfc08d864c07de0c7d666539eecdf4Commits whose hunk context moved (own +/- lines identical)
ea62ac9f1b0f iommu/xen: Add Xen PV-IOMMU driver→564fa331b3d7d8221bf28f22 x86/CPU/AMD: avoid printing reset reasons on Xen domU→644ee3e585a7bd1c0dba57c3 sysctl: wire up PaX softmode setting→9841c6cb480d849ed61740ea use maximum supported mmap rnd entropy by default→5a5b2e82cb645b1ff5bbc8cb 9p/xen: carry the 9P session across a restore→cfa61581f94785e1da02b838 9p/xen: end foreign access on the grant refs we granted, not the intf page's→35903485bd72Commits lost, added, or whose own +/- lines changed
f492e4d0cb26 9p/xen: reconnect to the backend on resume365523c9c55c 9p/xen: reconnect to the backend on resume3f7ca89e3d70 xen/gntdev: don't copy to user space under priv->lock (#79)5209f7143a73 xen/gntdev: don't copy to user space under priv->lock (#79)Drift (changed lines: upstream delta vs. actual change)
Claude's report
Summary
I rebased
edera/mainline(126 non-merge commits, old tip7ad1695c933c) from merge base864c07de0c7d(v7.2-rc5-26646-g864c07de0c7d) onto666539eecdf4(v7.2-rc5-43417-g666539eecdf4), a merge-window range of 15798 upstream commits. The result isrebase-resultatbd59e1cfc08d. All 126 downstream commits were replayed in order and none were dropped. Four commits conflicted and were resolved by hand: sysctl, arch/Kconfig, 9p/xen resume, and xen/gntdev. The x86_64 and arm64vmlinuxbuilds both pass. I expectverify-upstream-rebase.shto exit 1 (drift), not 0. Every drift line and every changed commit it lists comes from one of the four resolutions below; I ran it and checked this.Needs a decision
UNSURE:
xen/gntdev: don't copy to user space under priv->lock (#79)versus upstream7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap(Cc: stable). Both commits fix the same lockdep/deadlock bug ingntdev_ioctl_map_grant_ref()by droppingpriv->lockbeforecopy_to_user(). They differ only on the-EFAULTpath.gntdev_find_map_index(op.index, op.count), and unlinks and puts whatever it finds.refcount_inc(&map->users)before unlocking. On failure it unlinks the map only if that exact pointer is still onpriv->maps, then drops both references. On success it drops the extra reference.The two readings:
copy_to_userunderpriv->lock; re-lock before touching the list; a concurrent unmap is tolerated). It also cannot unlink a different map that reused the same index after a concurrent unmap and remap, which upstream's index lookup can.I committed (b). The final
drivers/xen/gntdev.cis byte-identical to the file on the old downstream tip, so this commit shows as changed in the checker and upstream's three-EFAULT-path lines appear as drift. If you prefer upstream's code, drop the downstream commit.e79780b9d1b6 xen/gntdev: reset the copy batch's writeable flagdoes not depend on it.UNSURE:
x86/CPU/AMD: avoid printing reset reasons on Xen domU(oldd8221bf28f22) is now probably dead code. Upstreamea51d1a4c31f x86/CPU/AMD: Don't print reset reason in VMs(Cc: stable) makesprint_s5_reset_status_mmio()return early whenX86_FEATURE_HYPERVISORis set (arch/x86/kernel/cpu/amd.c:1373). The downstream check (XENPV && !xen_initial_domain(),amd.c:1377) runs after it. The downstream commit replayed cleanly and I kept it unchanged. The two readings:#include <xen/xen.h>. Drop it in a follow-up.One behaviour note: upstream also suppresses the message on a Xen PV dom0 whenever dom0 sees the CPUID hypervisor bit, which I expect it normally does. The downstream patch had deliberately left dom0 printing. Nothing to do unless dom0 must keep printing the reset reason.
UNSURE: Upstream
228e21764b38 Drivers: hv: Run VMBus kexec cleanup from syscore shutdownchanges the kexec path. The VMBus kexec teardown (vmbus_initiate_unload, SynIC cpuhp removal) now runs fromhv_vmbus_syscore_shutdownwhenever a kexec is in progress, regardless of hypervisor type. Before, it ran only throughhv_machine_shutdown, which the downstream Xen PV dom0 nested-on-Hyper-V path never installed.hyperv_remove_xen_vmbus_irq().No code was changed. Decide whether the Xen VIRQ bridge should also be torn down there.
Conflicts resolved
sysctl: wire up PaX softmode setting,kernel/sysctl.c. Collided with443bea2f71c5 sysctl: consolidate CONFIG_SYSCTL into a single block in kernel/sysctl.c(andacd19f2c56f2), which movedsysctl_subsys_tableandsysctl_init_bases()into the single#ifdef CONFIG_SYSCTLblock. I re-added the downstreampax_table(underCONFIG_OPENPAX_SOFTMODE) and itsregister_sysctl_init("kernel/pax", pax_table)at the new location. The added lines are identical to the original commit. Only the position moved, so the drift is just the moved hunk.use maximum supported mmap rnd entropy by default,arch/Kconfig. Collided with8cdae75cebe0 arch/Kconfig: fix dead conditions by removing dead options, which removedARCH_MMAP_RND_BITS_DEFAULT/ARCH_MMAP_RND_COMPAT_BITS_DEFAULTand theirdefault ... if ...lines. I kept upstream's removal and applied only the downstream change,default ARCH_MMAP_RND_{,COMPAT_}BITS_MIN→_MAX. No arch references the removed symbols. The commit's own +/- lines are unchanged; only the hunk context moved.9p/xen: reconnect to the backend on resume,net/9p/trans_xen.c. Collided with two upstream commits:b3d07d64832c 9p/xen: Use array for data rings:ringsis now an embeddedrings[XEN_9PFS_NUM_RINGS]array, not akzalloc'd pointer.7b6f2e3c29fb 9p/xen: drain response work after unbinding IRQ(Fixes, Cc: stable):cancel_work_sync()now runs afterunbind_from_irqhandler().What I kept:
ring_order,rings_sem,connected) next to it.xen_9pfs_front_init(), the downstreamring_order/init_rwsem()setup, without the separate allocation.xen_9pfs_front_free_rings(), upstream's unbind-then-cancel ordering.xen_9pfs_front_free(), an unconditionalxen_9pfs_front_free_rings()with nokfree(priv->rings).xen_9pfs_front_disconnect()still schedules and flushes ring work before freeing the rings, and the freeing then unbinds before cancelling, so upstream's guarantee holds on the resume path too. Later downstream commits (9p/xen: grant each ring page by its own frame,...end foreign access on the grant refs we granted...) replayed cleanly on top. In the finalfree_ringsI confirmed the ordering is unbind →cancel_work_sync→ end grants → free.9p/xen: carry the 9P session across a restore,net/9p/trans_xen.c. Collided with two upstream commits:9b4cf60c6b73 9p/xen: validate the response size from the backend(Fixes, Cc: stable), inp9_xen_response().b3d07d64832c, in the alloc/free paths, again.Upstream's
h.size < sizeof(h) || h.size > queuedcheck is placed before the downstream control-reply branch (ring == priv->rings && h.tag == P9_NOTAG && ctl_pending), so a control reply is also size-checked before it is used. A rejected control reply ends the work, and the control waiter falls back to its existingwait_for_completion_timeout(), so nothing hangs.ring == priv->ringsstill means ring 0 with the array. The alloc/free hunks were fitted to the array as in the previous commit, withINIT_LIST_HEAD(&priv->session),init_completion(&priv->ctl_done)andxen_9pfs_front_session_free()kept. The commit's own +/- lines are unchanged; only the context moved.xen/gntdev: don't copy to user space under priv->lock (#79),drivers/xen/gntdev.c. Collided with7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap. I kept the downstream variant; see the first UNSURE item above.Dropped downstream commits
None.
Build fixes
None. The branch came back from the workflow's independent build as failed, but the failure could not be reproduced and was not caused by the branch; see Builds. The branch was left unchanged at
bd59e1cfc08d.There is one latent issue I did not change, because it already exists on the old tip
7ad1695c933cand the CI configs do not reach it.drivers/hv/vmbus_drv.c:1548and:3069callhyperv_remove_xen_vmbus_irq().include/asm-generic/mshyperv.hdeclareshyperv_setup_xen_vmbus_irq()and its stub but nothyperv_remove_xen_vmbus_irq(). An arm64 build withCONFIG_HYPERV_VMBUS=ywould therefore fail with an implicit declaration. The arm64 CI config has# CONFIG_HYPERV is not set. The fix belongs in the downstream commit that added the asm-generic declarations (drivers: hv: tear down the Xen VMBus interrupt bridge on unwind).Upstream commits that meet the series
Fixes (Fixes:/stable/CVE) are marked [fix]. "Intact" means I read the final tree and the fix's checks and ordering are present, and the downstream code added nearby is covered by them.
net/9p, fs/9p, include/net/9p:
4d183e6f1532 9p/xen: fix refcount leak in p9_xen_response() on wrong tag[fix]: intact;p9_req_put()on the wrong-tag path is present.9b4cf60c6b73 9p/xen: validate the response size from the backend[fix]: intact, and it now also guards the downstream control-reply branch (conflict above).7b6f2e3c29fb 9p/xen: drain response work after unbinding IRQ[fix]: intact inxen_9pfs_front_free_rings(), which teardown, resume-disconnect and reconnect-error all use.b3d07d64832c 9p/xen: Use array for data rings: adopted. No leftoverpriv->ringsNULL checks orkfree.241d46901226 9p: reject RERROR/RLERROR with zero errcode: intact inp9_check_errors(). The downstream control-request parser intrans_xen.calready rejectsecode == 0andecode > MAX_ERRNO, so the two agree.2acd800de882 9p: fix caches_show() out-of-bounds write[fix],7fb9bd365905 9p: fix privport option setting wrong RDMA field[fix]: intact infs/9p/v9fs.c; no overlap with the downstream shared-frontend code.9eb9b583ea35 9p: remove duplicated assignment in v9fs_fill_super(),8bb0279930cc 9p: skip intermediate directory entry name copy in p9dirent_read(),33625427a382 net/9p: add vsock transport,5852cdf0006f net/9p: fix typos in comments.drivers/xen:
7620a997e485 xen/gntdev: fix deadlock between map ioctl and mmap[fix]: the deadlock fix is intact through the downstream variant (UNSURE above).2b66f2cc7532 Xen/gnttab: improve error handling in gnttab_dma_{alloc,free}_pages()[fix],4ebb3b8d129c xen: don't allow gnttab_dma_[alloc|free]_pages() in PV guest,704f812cdab8 xen/grant-table: annotate on-stack work in gnttab_unmap_refs_sync()[fix],6eecb67b69af xen/grant-table: stop setting PG_private on pages for grant mapping,0af298e62e5c treewide: refresh kmalloc_obj() conversions: all intact. The downstreamgnttab_alloc_pages_node()(whichgnttab_alloc_pages()now wraps) never sets PG_private, and nothing underdrivers/xen,arch/x86/xenorinclude/xenusesPagePrivate.Xen backends/frontends:
a02926f7c89b xen-blkback: Avoid UAF when reading I/O statistics[fix]: intact.rings_lockcovers ring alloc, disconnect and the stats reader, and the downstream per-ring kthread/IRQ node placement works only on rings published under it.bfddc420afe8 xen-netback: defer xenvif_mcast_addr_list_free()[fix]: intact. The free happens only inbackend_disconnect()aftersynchronize_net(), and the downstream per-queue kthread/IRQ placement does not reintroduce the earlier free.0af298e62e5c(xen-blkfront.c,hv/channel.c): no interaction.x86:
ea51d1a4c31f x86/CPU/AMD: Don't print reset reason in VMs[fix]: intact; makes the downstream domU check redundant (UNSURE above).cf27412f19c9 x86/bugs: Mitigate TSA on AMD Zen5: no interaction with the downstream hunk.Hyper-V:
2690d4156b51 iommu/hyperv: Add para-virtualized IOMMU support for Hyper-V guest:hv_iommu_initis hooked only inhyperv_init(), not in the downstreamhyperv_init_nested_on_xen()path, so the nested-on-Xen dom0 does not turn on the Hyper-V pvIOMMU.118bdac10546 Drivers: hv: Add logical device ID registry for vPCI devices: the registry is set up inhv_common_init(), which the nested-on-Xen init also calls. It does not overlap the downstream vPCI MSI routing.228e21764b38 Drivers: hv: Run VMBus kexec cleanup from syscore shutdown: see UNSURE above.56fb075b77f8 mshv: Redesign hypervisor memory deposit logic,dd57772e36f7 Drivers: hv: vmbus: Check ACPI companion before use,d0ec95a8a4e7 hv_netvsc: Advertise the SR-IOV capability for CoCo VMs: no interaction. Nothing in the series uses removed helpers.IOMMU:
1ae140d0f272 iommu: Make iommu-dma helpers private: the downstreamxen-iommu.ccalls no iommu-dma helpers and already includesiommu-priv.h.dma-iommu.cnow includesiommu-priv.htwice (once from upstream, once from downstreamiommu/dma: Don't reserve PCI windows under a paravirtual IOMMU). That is harmless because the header has an include guard, but a follow-up could drop the downstream line.fdd81f15fc43 iommu/dma: Clean up redundant MSI cookie check,1c8f6308e557 iommu/dma: Catch scatterlist length overflows,641a9b9cc697 dma-mapping: use exact allocation for DMA pages,95d2fec40c48 dma-mapping: rename dma_opt_mapping_size(): intact. The downstreamxen_iommu_manages_iova()check iniova_reserve_iommu_regions()sits correctly.0bf031ba8c49 iommu: Add Broadcom BCM2712 IOMMU driver,42eed9bb9ca4 iommu: apple-dart: ...(Kconfig/Makefile): context only.mm (OpenPaX):
b1ee87802111,0193e8336802,4c2dec1dce36,168ed9c5d5ec,c386d799f423,769417e410dd,13fc99f46399,8146c6478224,ef694e2d2101,68cb098eadda,7135a05838e8,aa09311c40f6.dc0b17144d62,14a5c975b138,38564710f443,6a9ef02c60bf,72a993449cb0(removesVM_SPECIAL),44debd840ec9,c911e7ebebf5(renamesis_vm_hugetlb_page),94c86564538e,88d77002e1a1,99fd6bf43d5d,61e012ab9a1c,9201d0f5b9d5,d99c4a302c5a,7fdbc26b69c0,b7b4d8f37a4f,4852f3421456,6335c786299f,9cae38dc11da,86a779c53204,f85eb0656c40,c2d4ccfbba3f,e59c9a971a9f,fe73aa910ea5,4b019e056f6c,47e725702b0b,bbe5d3b3d402,69d38c792c53.All of these are intact in the final tree. The downstream PaX flags are a separate
mm_structfield accessed with bitops and never write VMA flags directly, so the atomic-VMA-flag fixes are unaffected. The downstream MPROTECT check (map_deny_write_exec) is still called frommmap_regionbefore the mmap hooks and from mprotect.VM_SPECIAL,is_vm_hugetlb_pageandfile_doesnt_need_getappear nowhere in the tree.Other:
0f4a9e682f7f xattr: always invoke cap_convert_nscap() for security.capability writes[fix]: intact. The downstream change only addspax_getxattr.278b2abf660a init/bootconfig: pass init arguments in documented order[fix],51e766bcd35e[fix],b82ed0e3a1da[fix],958c01049e0a,aabe6e1b36ce,677f83795fdf,2e83e2ce34ff: intact. The downstreampax_softmode=is a plain__setuphandler and is unaffected.443bea2f71c5,acd19f2c56f2(conflict above);242bac52294e,d08ab285b096,2bfbb09b505c: the downstreamproc_dointvecon anintis still valid.8cdae75cebe0(conflict above);35e340a47888 mm: userland pgtable freeing is RCU-safe now, remove leftover bits: context only.38828d44f31e,799203afd298,e3e7a85730a4,f000a06da2a5,28d5df7b7274,084100a1b579,10823ced2f18,8ebd2eb87f50,681f3b68f435,537ec2b15fdd,5728d3523f12,abaa0835b4f3,264d8fd2794f) touch unrelated entries. The downstreampax_softmode=entry applied cleanly.Builds
The workflow's first independent build of
bd59e1cfc08dwas reported as failed. In the repair round I found:build-x86_64.log), and it passed: it ends withkernel-build: x86_64 vmlinux built.teefrom the first line ofkernel-build.sh, so the arm64 job must have failed before the build step ran (checkout, bundle fetch, artifact download or toolchain install), not in the kernel build. The cause is in the Actions run, not on the branch.In the repair round I rebuilt both arches from fresh object directories at
bd59e1cfc08d, with no changes to the branch:kernel-build.sh, Edera host config from edera-dev/linux-kernel-oci@530e23bbf906;olddefconfigonly warned about five unrelated=msymbols that are invalid as modules).aarch64-linux-gnu-, the same toolchain the workflow installs; defconfig plus downstream features;CONFIG_HYPERVis not set, see the latent issue under Build fixes).verify-upstream-rebase.shgives the same result as before (exit 1, with the 2 changed commits and the drift explained under Conflicts resolved). There is no new drift.