mirror of
https://salsa.debian.org/kernel-team/linux.git
synced 2026-01-16 23:12:23 +00:00
Merge branch '6.1-stable-updates' into 'debian/6.1/bookworm'
6.1 stable updates See merge request kernel-team/linux!1655
This commit is contained in:
Salvatore Bonaccorso
commit
c97ad9b223
5 changed files with 83 additions and 98 deletions
89
debian/changelog
vendored
89
debian/changelog
vendored
|
|
@ -1,4 +1,4 @@
|
|||
linux (6.1.152-1) UNRELEASED; urgency=medium
|
||||
linux (6.1.153-1) UNRELEASED; urgency=medium
|
||||
|
||||
* New upstream stable update:
|
||||
https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.149
|
||||
|
|
@ -620,6 +620,88 @@ linux (6.1.152-1) UNRELEASED; urgency=medium
|
|||
- x86/bugs: Move cpu_bugs_smt_update() down
|
||||
- x86/vmscape: Warn when STIBP is disabled with SMT
|
||||
- x86/vmscape: Add old Intel CPUs to affected list
|
||||
https://www.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.153
|
||||
- mm: introduce and use {pgd,p4d}_populate_kernel()
|
||||
- media: mediatek: vcodec: Fix a resource leak related to the scp device in
|
||||
FW initialization (CVE-2025-23160)
|
||||
- net: Fix null-ptr-deref by sock_lock_init_class_and_name() and rmmod.
|
||||
(CVE-2025-23143)
|
||||
- tracing: Do not add length to print format in synthetic events
|
||||
- flexfiles/pNFS: fix NULL checks on result of ff_layout_choose_ds_for_read
|
||||
- NFSv4: Don't clear capabilities that won't be reset
|
||||
- NFSv4: Clear the NFS_CAP_FS_LOCATIONS flag if it is not set
|
||||
- NFSv4: Clear the NFS_CAP_XATTR flag if not supported by the server
|
||||
- tracing: Fix tracing_marker may trigger page fault during preempt_disable
|
||||
- ftrace/samples: Fix function size computation
|
||||
- NFSv4/flexfiles: Fix layout merge mirror check.
|
||||
- tracing: Silence warning when chunk allocation fails in trace_pid_write
|
||||
- tcp_bpf: Call sk_msg_free() when tcp_bpf_send_verdict() fails to allocate
|
||||
psock->cork.
|
||||
- proc: fix type confusion in pde_set_flags()
|
||||
- [x86] KVM: x86: Move open-coded CPUID leaf 0x80000021 EAX bit propagation
|
||||
code
|
||||
- [x86] KVM: SVM: Return TSA_SQ_NO and TSA_L1_NO bits in __do_cpuid_func()
|
||||
- [x86] KVM: SVM: Set synthesized TSA CPUID flags
|
||||
- Revert "SUNRPC: Don't allow waiting for exiting tasks"
|
||||
- mptcp: sockopt: make sync_socket_options propagate SOCK_KEEPOPEN
|
||||
- ocfs2: fix recursive semaphore deadlock in fiemap call
|
||||
- net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO runtime PM
|
||||
wakeups
|
||||
- [armhf] mtd: rawnand: stm32_fmc2: avoid overlapping mappings on ECC buffer
|
||||
- [armhf] mtd: rawnand: stm32_fmc2: fix ECC overwrite
|
||||
- fuse: check if copy_file_range() returns larger than requested size
|
||||
- fuse: prevent overflow in copy_file_range return value
|
||||
- libceph: fix invalid accesses to ceph_connection_v1_info
|
||||
- mm/damon/sysfs: fix use-after-free in state_show()
|
||||
- mm/damon/reclaim: avoid divide-by-zero in damon_reclaim_apply_parameters()
|
||||
- mm/damon/lru_sort: avoid divide-by-zero in
|
||||
damon_lru_sort_apply_parameters()
|
||||
- mm/khugepaged: convert hpage_collapse_scan_pmd() to use folios
|
||||
- mm/khugepaged: fix the address passed to notifier on testing young
|
||||
- kernfs: Fix UAF in polling when open file is released
|
||||
- mm/memory-failure: fix VM_BUG_ON_PAGE(PagePoisoned(page)) when unpoison
|
||||
memory
|
||||
- Input: i8042 - add TUXEDO InfinityBook Pro Gen10 AMD to i8042 quirk table
|
||||
- Revert "net: usb: asix: ax88772: drop phylink use in PM to avoid MDIO
|
||||
runtime PM wakeups"
|
||||
- tty: hvc_console: Call hvc_kick in hvc_write unconditionally
|
||||
- dt-bindings: serial: brcm,bcm7271-uart: Constrain clocks
|
||||
- USB: serial: option: add Telit Cinterion FN990A w/audio compositions
|
||||
- USB: serial: option: add Telit Cinterion LE910C4-WWX new compositions
|
||||
- [arm64,armhf] net: fec: Fix possible NPD in
|
||||
fec_enet_phy_reset_after_clk_enable()
|
||||
- tunnels: reset the GSO metadata before reusing the skb
|
||||
- docs: networking: can: change bcm_msg_head frames member to support
|
||||
flexible array
|
||||
- igb: fix link test skipping when interface is admin down
|
||||
- i40e: fix IRQ freeing in i40e_vsi_request_irq_msix error path
|
||||
- can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when
|
||||
j1939_local_ecu_get() failed
|
||||
- can: j1939: j1939_local_ecu_get(): undo increment when
|
||||
j1939_local_ecu_get() fails
|
||||
- net: hsr: Disable promiscuous mode in offload mode
|
||||
- net: hsr: Add support for MC filtering at the slave device
|
||||
- net: hsr: Add VLAN CTAG filter support
|
||||
- hsr: use rtnl lock when iterating over ports
|
||||
- hsr: use hsr_for_each_port_rtnl in hsr_port_get_hsr
|
||||
- [amd64] dmaengine: idxd: Fix double free in idxd_setup_wqs()
|
||||
- [armhf] dmaengine: ti: edma: Fix memory allocation size for
|
||||
queue_priority_map
|
||||
- hrtimer: Remove unused function
|
||||
- hrtimer: Rename __hrtimer_hres_active() to hrtimer_hres_active()
|
||||
- hrtimers: Unconditionally update target CPU base after offline timer
|
||||
migration
|
||||
- USB: gadget: dummy-hcd: Fix locking bug in RT-enabled kernels
|
||||
- [arm64] dmaengine: qcom: bam_dma: Fix DT error handling for
|
||||
num-channels/ees
|
||||
- [arm64] phy: tegra: xusb: fix device and OF node leak at probe
|
||||
- [armhf] phy: ti-pipe3: fix device leak at unbind
|
||||
- drm/amdgpu: fix a memory leak in fence cleanup when unloading
|
||||
- [x86] drm/i915/power: fix size for for_each_set_bit() in abox iteration
|
||||
- [arm64] soc: qcom: mdt_loader: Fix error return values in
|
||||
mdt_header_valid()
|
||||
- [arm64] soc: qcom: mdt_loader: Deal with zero e_shentsize
|
||||
- net: hsr: hsr_slave: Fix the promiscuous mode in offload mode
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* Revert to using RSA for module signatures (Closes: #1114773)
|
||||
|
|
@ -631,11 +713,6 @@ linux (6.1.152-1) UNRELEASED; urgency=medium
|
|||
lintian tags.
|
||||
* d/salsa-ci.yml: Early move orig tarballs back where they can be cached
|
||||
|
||||
[ Salvatore Bonaccorso ]
|
||||
* NFSv4: Don't clear capabilities that won't be reset
|
||||
* NFSv4: Clear the NFS_CAP_FS_LOCATIONS flag if it is not set
|
||||
* NFSv4: Clear the NFS_CAP_XATTR flag if not supported by the server
|
||||
|
||||
-- Ben Hutchings <benh@debian.org> Tue, 09 Sep 2025 22:36:33 +0200
|
||||
|
||||
linux (6.1.148-1) bookworm; urgency=medium
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
Date: Fri, 29 Aug 2025 09:07:22 -0700
|
||||
Subject: NFSv4: Clear the NFS_CAP_FS_LOCATIONS flag if it is not set
|
||||
Origin: https://git.kernel.org/linus/dd5a8621b886b02f8341c5d4ea68eb2c552ebd3e
|
||||
|
||||
_nfs4_server_capabilities() is expected to clear any flags that are not
|
||||
supported by the server.
|
||||
|
||||
Fixes: 8a59bb93b7e3 ("NFSv4 store server support for fs_location attribute")
|
||||
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
---
|
||||
fs/nfs/nfs4proc.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/fs/nfs/nfs4proc.c
|
||||
+++ b/fs/nfs/nfs4proc.c
|
||||
@@ -3888,8 +3888,9 @@ static int _nfs4_server_capabilities(str
|
||||
res.attr_bitmask[2] &= FATTR4_WORD2_NFS42_MASK;
|
||||
}
|
||||
memcpy(server->attr_bitmask, res.attr_bitmask, sizeof(server->attr_bitmask));
|
||||
- server->caps &= ~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS |
|
||||
- NFS_CAP_SYMLINKS| NFS_CAP_SECURITY_LABEL);
|
||||
+ server->caps &=
|
||||
+ ~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS |
|
||||
+ NFS_CAP_SECURITY_LABEL | NFS_CAP_FS_LOCATIONS);
|
||||
server->fattr_valid = NFS_ATTR_FATTR_V4;
|
||||
if (res.attr_bitmask[0] & FATTR4_WORD0_ACL &&
|
||||
res.acl_bitmask & ACL4_SUPPORT_ALLOW_ACL)
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
Date: Fri, 29 Aug 2025 09:15:12 -0700
|
||||
Subject: NFSv4: Clear the NFS_CAP_XATTR flag if not supported by the server
|
||||
Origin: https://git.kernel.org/linus/4fb2b677fc1f70ee642c0beecc3cabf226ef5707
|
||||
|
||||
nfs_server_set_fsinfo() shouldn't assume that NFS_CAP_XATTR is unset
|
||||
on entry to the function.
|
||||
|
||||
Fixes: b78ef845c35d ("NFSv4.2: query the server for extended attribute support")
|
||||
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
---
|
||||
fs/nfs/client.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
|
||||
index 8fb4a950dd55..4e3dcc157a83 100644
|
||||
--- a/fs/nfs/client.c
|
||||
+++ b/fs/nfs/client.c
|
||||
@@ -888,6 +888,8 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,
|
||||
|
||||
if (fsinfo->xattr_support)
|
||||
server->caps |= NFS_CAP_XATTR;
|
||||
+ else
|
||||
+ server->caps &= ~NFS_CAP_XATTR;
|
||||
#endif
|
||||
}
|
||||
|
||||
--
|
||||
2.51.0
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
Date: Fri, 29 Aug 2025 09:02:16 -0700
|
||||
Subject: NFSv4: Don't clear capabilities that won't be reset
|
||||
Origin: https://git.kernel.org/linus/31f1a960ad1a14def94fa0b8c25d62b4c032813f
|
||||
Bug-Debian: https://bugs.debian.org/1114898
|
||||
|
||||
Don't clear the capabilities that are not going to get reset by the call
|
||||
to _nfs4_server_capabilities().
|
||||
|
||||
Reported-by: Scott Haiden <scott.b.haiden@gmail.com>
|
||||
Fixes: b01f21cacde9 ("NFS: Fix the setting of capabilities when automounting a new filesystem")
|
||||
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
|
||||
---
|
||||
fs/nfs/nfs4proc.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
|
||||
index 7d2b67e06cc3..5b92fcf45dd7 100644
|
||||
--- a/fs/nfs/nfs4proc.c
|
||||
+++ b/fs/nfs/nfs4proc.c
|
||||
@@ -4092,7 +4092,6 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
|
||||
};
|
||||
int err;
|
||||
|
||||
- nfs_server_set_init_caps(server);
|
||||
do {
|
||||
err = nfs4_handle_exception(server,
|
||||
_nfs4_server_capabilities(server, fhandle),
|
||||
--
|
||||
2.51.0
|
||||
|
||||
3
debian/patches/series
vendored
3
debian/patches/series
vendored
|
|
@ -102,9 +102,6 @@ features/arm64/quartz64/arm64-dts-rockchip-Add-SOQuartz-Model-A-baseboard.patch
|
|||
# Miscellaneous bug fixes
|
||||
bugfix/all/disable-some-marvell-phys.patch
|
||||
bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
|
||||
bugfix/all/NFSv4-Don-t-clear-capabilities-that-won-t-be-reset.patch
|
||||
bugfix/all/NFSv4-Clear-the-NFS_CAP_FS_LOCATIONS-flag-if-it-is-n.patch
|
||||
bugfix/all/NFSv4-Clear-the-NFS_CAP_XATTR-flag-if-not-supported-.patch
|
||||
|
||||
# Miscellaneous features
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue