Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from coolsnowwolf:master #10

Open
wants to merge 108 commits into
base: master
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Nov 17, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Internet1235 and others added 30 commits January 24, 2025 17:42
PKG_CPE_ID was missing ":lrzsz"

Fixes: 6d6c4b21b5e22a9f1058db5b61521a298e00a5f0 (lrzsz: update to v0.12.21rc and fix a CVE)

Signed-off-by: Fabrice Fontaine <[email protected]>
Currently we're seeing random build failures, caused by autofoo being
called on very ancient bundled autofoo:

  cd . && aclocal
  aclocal.real: warning: autoconf input should be named 'configure.ac', not 'configure.in'
  acinclude.m4:2: warning: underquoted definition of AC_REPLACE_GNU_GETOPT
  acinclude.m4:2:   run info Automake 'Extending aclocal'
  acinclude.m4:2:   or see https://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal
  configure.in:106: error: automatic de-ANSI-fication support has been removed

For some reason that `touch` based neutralization introduced in commit
6d6c4b21b5e2 ("lrzsz: update to v0.12.21rc and fix a CVE") doesn't
always work.

So lets fix it by removing the autofoo bits from the bundled Makefile.in
and while at it remove processing of man and testsuite subdirs to save
some computing cycles.

Fixes: #25543
Fixes: 6d6c4b21b5e2 ("lrzsz: update to v0.12.21rc and fix a CVE")
Signed-off-by: Petr Štetiar <[email protected]>
…LEGACY_CLIENT_TRACKING option, and in kernel 6.12, if CONFIG_NFSD_LEGACY_CLIENT_TRACKING is still enabled, the following kernel panic may occur:

[   65.168486] ------------[ cut here ]------------
[   65.173115] kernel BUG at fs/nfsd/nfs4recover.c:534!
[   65.178085] Internal error: Oops - BUG: 00000000f2000800 [#1] SMP
[   65.184178] Modules linked in: fast_classifier shortcut_fe_cm sch_pie ath9k ath9k_common rtw88_8822cu rtw88_8822c rtw88_8822bu rtw88_8822b rtw88_8821cu rtw88_8821c rtl8192cu rtl8192c_common rtl_usb rt2800usb rt2800lib rt2500usb pppoe ppp_async mt7921u mt7921e mt7921_common mt76x0u mt76x0_common l2tp_ppp iwlmvm iwldvm carl9170 ath9k_hw ath5k ath11k_pci ath11k ath10k_pci ath10k_core ath snd_usb_audio rtw88_usb rtw88_core rtlwifi rt2x00usb rt2x00lib rsi_usb rsi_91x rndis_host rfcomm pppox ppp_mppe ppp_generic nft_fib_inet nf_flow_table_inet mt792x_usb mt792x_lib mt76x2u mt76x2_common mt76x02_usb mt76x02_lib mt7663u mt7663_usb_sdio_common mt7615_common mt7601u mt76_usb mt76_connac_lib mt76 mac80211 iwlwifi ipt_REJECT hidp hci_uart ebtable_nat ebtable_filter ebtable_broute cfg80211 cdc_ether btusb btrtl btrsi btqca btmtk btintel btbcm br_netfilter bnep bluetooth ax88179_178a xt_u32 xt_time xt_tcpudp xt_tcpmss xt_string xt_statistic xt_state xt_socket xt_recent xt_quota xt_policy xt_pkttype xt_physdev xt_owner xt_nat
[   65.184401]  xt_multiport xt_mark xt_mac xt_limit xt_length xt_iprange xt_hl xt_helper xt_hashlimit xt_esp xt_ecn xt_dscp xt_conntrack xt_connmark xt_connlimit xt_connlabel xt_connbytes xt_comment xt_cluster xt_cgroup xt_bpf xt_addrtype xt_TRACE xt_TPROXY xt_TEE xt_TCPMSS xt_REDIRECT xt_NFQUEUE xt_NFLOG xt_NETMAP xt_MASQUERADE xt_LOG xt_LED xt_HL xt_FULLCONENAT xt_FLOWOFFLOAD xt_DSCP xt_CT xt_CLASSIFY xt_CHECKSUM wireguard usbnet usblp usb_wwan ums_usbat ums_sddr55 ums_sddr09 ums_karma ums_jumpshot ums_isd200 ums_freecom ums_datafab ums_cypress ums_alauda ts_fsm ts_bm tcp_bbr sunxi_wdt snd_usbmidi_lib slhc rfkill r8152 qrtr_mhi qrtr qmi_helpers nft_reject_ipv6 nft_reject_ipv4 nft_reject_inet nft_reject_bridge nft_reject nft_redir nft_quota nft_queue nft_numgen nft_nat nft_meta_bridge nft_masq nft_log nft_limit nft_hash nft_fwd_netdev nft_flow_offload nft_fib_ipv6 nft_fib_ipv4 nft_fib nft_dup_netdev nft_ct nft_chain_nat nfnetlink_queue nfnetlink_log nf_tproxy_ipv6 nf_tproxy_ipv4 nf_tables nf_socket_ipv6 nf_socket_ipv4
[   65.273977]  nf_reject_ipv4 nf_nat_tftp nf_nat_snmp_basic nf_nat_sip nf_nat_pptp nf_nat_irc nf_nat_h323 nf_nat_ftp nf_nat_amanda nf_log_syslog nf_flow_table nf_dup_netdev nf_dup_ipv6 nf_dup_ipv4 nf_conntrack_tftp nf_conntrack_snmp nf_conntrack_sip nf_conntrack_pptp nf_conntrack_netlink nf_conntrack_irc nf_conntrack_h323 nf_conntrack_ftp nf_conntrack_broadcast nf_conntrack_bridge ts_kmp nf_conntrack_amanda nf_conncount mhi macvlan iptable_raw iptable_nat iptable_mangle iptable_filter ipt_rpfilter ipt_ah ipt_ECN ip6table_raw ip6t_rpfilter ip_tables ebtables ebt_vlan ebt_stp ebt_snat ebt_redirect ebt_pkttype ebt_nflog ebt_mark_m ebt_mark ebt_log ebt_limit ebt_ip6 ebt_ip ebt_dnat ebt_arpreply ebt_arp ebt_among ebt_802_3 e1000e cordic cdc_acm bridge ax88796b arptable_filter arpt_mangle arp_tables ntfs3 sch_teql sch_sfq sch_multiq sch_gred sch_fq sch_codel em_text em_nbyte em_meta em_cmp act_skbmod act_simple act_pedit act_csum act_connmark sch_tbf sch_ingress sch_htb sch_hfsc em_u32 cls_u32 cls_route cls_matchall cls_fw
[   65.364083]  cls_flow cls_basic act_skbedit act_mirred act_gact gpio_beeper xt_set ip_set_list_set ip_set_hash_netportnet ip_set_hash_netport ip_set_hash_netnet ip_set_hash_netiface ip_set_hash_net ip_set_hash_mac ip_set_hash_ipportnet ip_set_hash_ipportip ip_set_hash_ipport ip_set_hash_ipmark ip_set_hash_ipmac ip_set_hash_ip ip_set_bitmap_port ip_set_bitmap_ipmac ip_set_bitmap_ip ip_set nfnetlink ip6table_nat nf_nat ip6t_NPT ip6t_rt ip6t_mh ip6t_ipv6header ip6t_hbh ip6t_frag ip6t_eui64 ip6t_ah ip6table_mangle ip6table_filter ip6_tables ip6t_REJECT x_tables nf_reject_ipv6 nfsv4 nfsv3 nfsd nfs_acl nfs bonding tls ip_gre gre ifb dummy l2tp_netlink l2tp_core rpcsec_gss_krb5 auth_rpcgss veth tun snd_rawmidi snd_hwdep udf lockd sunrpc grace isofs hfsplus hfs cdrom cifs nls_ucs2_utils netfs cifs_md4 cifs_arc4 dns_resolver vxlan shortcut_fe_ipv6 shortcut_fe uhci_hcd fsl_mph_dr_of ehci_fsl dm_mirror dm_region_hash dm_log dm_crypt dm_mod ohci_platform sunxi xhci_sunxi ohci_hcd phy_generic
[   65.540641] CPU: 3 UID: 0 PID: 12137 Comm: rpc.nfsd Not tainted 6.12.12-flippy-93+ #6
[   65.548488] Hardware name: V-Plus Cloud (DT)
[   65.552771] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[   65.559729] pc : nfsd4_legacy_tracking_init+0x1d0/0x214 [nfsd]
[   65.565791] lr : nfsd4_legacy_tracking_init+0xb8/0x214 [nfsd]
[   65.571737] sp : ffff80008742bb10
[   65.575053] x29: ffff80008742bb20 x28: ffff000021bbb180 x27: ffff000007d27000
[   65.582192] x26: ffff80007a959c00 x25: ffff000007d27000 x24: ffff0000138a2f00
[   65.589326] x23: ffff000007d27000 x22: ffff80007a997378 x21: ffff80007a959000
[   65.596461] x20: ffff800082355780 x19: ffff80007a958ba0 x18: ffffffffffffffff
[   65.603596] x17: 20797265766f6365 x16: 7220657461747320 x15: 347653464e206568
[   65.610734] x14: 7420736120797265 x13: ffff800081ee6888 x12: 000000000000063c
[   65.617871] x11: 0000000000000214 x10: ffff800081f96888 x9 : ffff800081ee6888
[   65.625005] x8 : 00000000ffffdfff x7 : ffff800081f96888 x6 : 0000000000000001
[   65.632137] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000000000
[   65.639271] x2 : 0000000000000000 x1 : ffff000021bbb180 x0 : ffff00001b705a80
[   65.646407] Call trace:
[   65.648854]  nfsd4_legacy_tracking_init+0x1d0/0x214 [nfsd]
[   65.654567]  nfsd4_client_tracking_init+0x170/0x1b4 [nfsd]
[   65.660245]  nfs4_state_start_net+0x230/0x3a8 [nfsd]
[   65.665438]  nfsd_svc+0x190/0x2d0 [nfsd]
[   65.669584]  write_threads+0xb8/0x16c [nfsd]
[   65.674099]  nfsctl_transaction_write+0x58/0xac [nfsd]
[   65.679437]  vfs_write+0xd4/0x3e8
[   65.682766]  ksys_write+0x70/0x108
[   65.686173]  __arm64_sys_write+0x1c/0x28
[   65.690102]  invoke_syscall+0x48/0x110
[   65.693866]  el0_svc_common.constprop.0+0x40/0xe0
[   65.698576]  do_el0_svc+0x1c/0x28
[   65.701896]  el0_svc+0x34/0xf0
[   65.704958]  el0t_64_sync_handler+0x100/0x12c
[   65.709318]  el0t_64_sync+0x1a4/0x1a8
[   65.712992] Code: 9568b8a0 f9009a7f 2a1703f6 17ffffed (d4210000)
[   65.719083] ---[ end trace 0000000000000000 ]---
[   65.723697] note: rpc.nfsd[12137] exited with irqs disabled
[   65.733055] ------------[ cut here ]------------
[   65.737704] WARNING: CPU: 3 PID: 0 at kernel/context_tracking.c:128 ct_kernel_exit.constprop.0+0x98/0xa0
[   65.747194] Modules linked in: fast_classifier shortcut_fe_cm sch_pie ath9k ath9k_common rtw88_8822cu rtw88_8822c rtw88_8822bu rtw88_8822b rtw88_8821cu rtw88_8821c rtl8192cu rtl8192c_common rtl_usb rt2800usb rt2800lib rt2500usb pppoe ppp_async mt7921u mt7921e mt7921_common mt76x0u mt76x0_common l2tp_ppp iwlmvm iwldvm carl9170 ath9k_hw ath5k ath11k_pci ath11k ath10k_pci ath10k_core ath snd_usb_audio rtw88_usb rtw88_core rtlwifi rt2x00usb rt2x00lib rsi_usb rsi_91x rndis_host rfcomm pppox ppp_mppe ppp_generic nft_fib_inet nf_flow_table_inet mt792x_usb mt792x_lib mt76x2u mt76x2_common mt76x02_usb mt76x02_lib mt7663u mt7663_usb_sdio_common mt7615_common mt7601u mt76_usb mt76_connac_lib mt76 mac80211 iwlwifi ipt_REJECT hidp hci_uart ebtable_nat ebtable_filter ebtable_broute cfg80211 cdc_ether btusb btrtl btrsi btqca btmtk btintel btbcm br_netfilter bnep bluetooth ax88179_178a xt_u32 xt_time xt_tcpudp xt_tcpmss xt_string xt_statistic xt_state xt_socket xt_recent xt_quota xt_policy xt_pkttype xt_physdev xt_owner xt_nat
[   65.747433]  xt_multiport xt_mark xt_mac xt_limit xt_length xt_iprange xt_hl xt_helper xt_hashlimit xt_esp xt_ecn xt_dscp xt_conntrack xt_connmark xt_connlimit xt_connlabel xt_connbytes xt_comment xt_cluster xt_cgroup xt_bpf xt_addrtype xt_TRACE xt_TPROXY xt_TEE xt_TCPMSS xt_REDIRECT xt_NFQUEUE xt_NFLOG xt_NETMAP xt_MASQUERADE xt_LOG xt_LED xt_HL xt_FULLCONENAT xt_FLOWOFFLOAD xt_DSCP xt_CT xt_CLASSIFY xt_CHECKSUM wireguard usbnet usblp usb_wwan ums_usbat ums_sddr55 ums_sddr09 ums_karma ums_jumpshot ums_isd200 ums_freecom ums_datafab ums_cypress ums_alauda ts_fsm ts_bm tcp_bbr sunxi_wdt snd_usbmidi_lib slhc rfkill r8152 qrtr_mhi qrtr qmi_helpers nft_reject_ipv6 nft_reject_ipv4 nft_reject_inet nft_reject_bridge nft_reject nft_redir nft_quota nft_queue nft_numgen nft_nat nft_meta_bridge nft_masq nft_log nft_limit nft_hash nft_fwd_netdev nft_flow_offload nft_fib_ipv6 nft_fib_ipv4 nft_fib nft_dup_netdev nft_ct nft_chain_nat nfnetlink_queue nfnetlink_log nf_tproxy_ipv6 nf_tproxy_ipv4 nf_tables nf_socket_ipv6 nf_socket_ipv4
[   65.837050]  nf_reject_ipv4 nf_nat_tftp nf_nat_snmp_basic nf_nat_sip nf_nat_pptp nf_nat_irc nf_nat_h323 nf_nat_ftp nf_nat_amanda nf_log_syslog nf_flow_table nf_dup_netdev nf_dup_ipv6 nf_dup_ipv4 nf_conntrack_tftp nf_conntrack_snmp nf_conntrack_sip nf_conntrack_pptp nf_conntrack_netlink nf_conntrack_irc nf_conntrack_h323 nf_conntrack_ftp nf_conntrack_broadcast nf_conntrack_bridge ts_kmp nf_conntrack_amanda nf_conncount mhi macvlan iptable_raw iptable_nat iptable_mangle iptable_filter ipt_rpfilter ipt_ah ipt_ECN ip6table_raw ip6t_rpfilter ip_tables ebtables ebt_vlan ebt_stp ebt_snat ebt_redirect ebt_pkttype ebt_nflog ebt_mark_m ebt_mark ebt_log ebt_limit ebt_ip6 ebt_ip ebt_dnat ebt_arpreply ebt_arp ebt_among ebt_802_3 e1000e cordic cdc_acm bridge ax88796b arptable_filter arpt_mangle arp_tables ntfs3 sch_teql sch_sfq sch_multiq sch_gred sch_fq sch_codel em_text em_nbyte em_meta em_cmp act_skbmod act_simple act_pedit act_csum act_connmark sch_tbf sch_ingress sch_htb sch_hfsc em_u32 cls_u32 cls_route cls_matchall cls_fw
[   65.927178]  cls_flow cls_basic act_skbedit act_mirred act_gact gpio_beeper xt_set ip_set_list_set ip_set_hash_netportnet ip_set_hash_netport ip_set_hash_netnet ip_set_hash_netiface ip_set_hash_net ip_set_hash_mac ip_set_hash_ipportnet ip_set_hash_ipportip ip_set_hash_ipport ip_set_hash_ipmark ip_set_hash_ipmac ip_set_hash_ip ip_set_bitmap_port ip_set_bitmap_ipmac ip_set_bitmap_ip ip_set nfnetlink ip6table_nat nf_nat ip6t_NPT ip6t_rt ip6t_mh ip6t_ipv6header ip6t_hbh ip6t_frag ip6t_eui64 ip6t_ah ip6table_mangle ip6table_filter ip6_tables ip6t_REJECT x_tables nf_reject_ipv6 nfsv4 nfsv3 nfsd nfs_acl nfs bonding tls ip_gre gre ifb dummy l2tp_netlink l2tp_core rpcsec_gss_krb5 auth_rpcgss veth tun snd_rawmidi snd_hwdep udf lockd sunrpc grace isofs hfsplus hfs cdrom cifs nls_ucs2_utils netfs cifs_md4 cifs_arc4 dns_resolver vxlan shortcut_fe_ipv6 shortcut_fe uhci_hcd fsl_mph_dr_of ehci_fsl dm_mirror dm_region_hash dm_log dm_crypt dm_mod ohci_platform sunxi xhci_sunxi ohci_hcd phy_generic
[   66.103761] CPU: 3 UID: 0 PID: 0 Comm: swapper/3 Tainted: G      D            6.12.12-flippy-93+ #6
[   66.112816] Tainted: [D]=DIE
[   66.115698] Hardware name: V-Plus Cloud (DT)
[   66.119967] pstate: 200000c5 (nzCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[   66.126924] pc : ct_kernel_exit.constprop.0+0x98/0xa0
[   66.131985] lr : ct_idle_enter+0x10/0x1c
[   66.135913] sp : ffff80008242bdd0
[   66.139228] x29: ffff80008242bdd0 x28: 0000000000000000 x27: 0000000000000000
[   66.146365] x26: ffff000002a11080 x25: 0000000000000000 x24: 0000000000000000
[   66.153499] x23: 00000000000000c0 x22: ffff800081ebec30 x21: ffff000002a11080
[   66.160633] x20: ffff800081ebebe8 x19: ffff0000bffa9d40 x18: 0000000000000000
[   66.167768] x17: 0000000000000121 x16: 0000000000000000 x15: 0000000000000000
[   66.174903] x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000002
[   66.182036] x11: 0000000000000095 x10: 00000000000009f0 x9 : ffff80008242bd40
[   66.189169] x8 : ffff000002a11ad0 x7 : 000000000001d400 x6 : 000000001075b2d9
[   66.196315] x5 : 4000000000000002 x4 : ffff80003e128000 x3 : ffff80008242bdd0
[   66.203461] x2 : 4000000000000000 x1 : ffff800081e81d40 x0 : ffff800081e81d40
[   66.210596] Call trace:
[   66.213045]  ct_kernel_exit.constprop.0+0x98/0xa0
[   66.217758]  ct_idle_enter+0x10/0x1c
[   66.221347]  default_idle_call+0x20/0xec
[   66.225303]  do_idle+0x1d8/0x204
[   66.228559]  cpu_startup_entry+0x34/0x3c
[   66.232487]  secondary_start_kernel+0x128/0x140
[   66.237024]  __secondary_switched+0xb8/0xbc
[   66.241213] ---[ end trace 0000000000000000 ]---
Therefore, the client tracking mechanism of NFSv4 needs to be changed, that is, to use UMH upcall client tracking instead of legacy client tracking, and nfs-utils needs to enable nfsdcld.
nfs-utils: enable nfsdcld
…IG_NFSD_LEGACY_CLIENT_TRACKING option, and in kernel 6.12, if CONFIG_NFSD_LEGACY_CLIENT_TRACKING is still enabled, the following kernel panic may occur:"

This reverts commit b7c4407.
openssh: update to 9.9p1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.