Skip to content

Commit 8c67b44

Browse files
khusikakhusika
committed
Merge tag 'v6.1.132' into orange-pi-6.1-rk35xx
This is the 6.1.132 stable release * tag 'v6.1.132' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.132 xfs: give xfs_extfree_intent its own perag reference block, bfq: fix re-introduced UAF in bic_set_bfqq() mm/migrate: fix shmem xarray update during migration wifi: iwlwifi: mvm: ensure offloading TID queue exists fs/ntfs3: Change new sparse cluster processing drm/amdgpu: fix use-after-free bug arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S media: mediatek: vcodec: Fix VP8 stateless decoder smatch warning drm/mediatek: Fix coverity issue with unintentional integer overflow netfilter: nft_counter: Use u64_stats_t for statistic. mptcp: Fix data stream corruption in the address announcement drm/amd/display: Use HW lock mgr for PSR1 when only one eDP ksmbd: fix incorrect validation for num_aces field of smb_acl drm/amdgpu: Fix JPEG video caps max size for navi1x and raven drm/radeon: fix uninitialized size issue in radeon_vce_cs_parse() soc: qcom: pdr: Fix the potential deadlock batman-adv: Ignore own maximum aggregation size during RX xsk: fix an integer overflow in xp_create_and_assign_umem() efi/libstub: Avoid physical address 0x0 when doing random allocation ARM: shmobile: smp: Enforce shmobile_smp_* alignment proc: fix UAF in proc_get_inode() mmc: atmel-mci: Add missing clk_disable_unprepare() mmc: sdhci-brcmstb: add cqhci suspend/resume to PM ops arm64: dts: freescale: imx8mm-verdin-dahlia: add Microphone Jack to sound card regulator: check that dummy regulator has been probed before using it drm/v3d: Don't run jobs that have errors flagged in its fence can: flexcan: disable transceiver during system PM can: flexcan: only change CAN state when link up in system PM can: rcar_canfd: Fix page entries in the AFL list i2c: omap: fix IRQ storms Revert "gre: Fix IPv6 link-local address generation." net/neighbor: add missing policy for NDTPA_QUEUE_LENBYTES net: lwtunnel: fix recursion loops net: atm: fix use after free in lec_send() ipv6: Set errno after ip_fib_metrics_init() in ip6_route_info_create(). ipv6: Fix memleak of nhc_pcpu_rth_output in fib_check_nh_v6_gw(). Bluetooth: Fix error code in chan_alloc_skb_cb() RDMA/hns: Fix wrong value of max_sge_rd RDMA/hns: Fix a missing rollback in error path of hns_roce_create_qp_common() RDMA/hns: Fix unmatched condition in error path of alloc_user_qp_db() RDMA/hns: Fix soft lockup during bt pages loop RDMA/bnxt_re: Avoid clearing VLAN_ID mask in modify qp path ARM: dts: bcm2711: Don't mark timer regs unconfigured ARM: OMAP1: select CONFIG_GENERIC_IRQ_CHIP RDMA/bnxt_re: Add missing paranthesis in map_qp_id_to_tbl_indx ARM: dts: bcm2711: PL011 UARTs are actually r1p5 soc: imx8m: Unregister cpufreq and soc dev in cleanup path soc: imx8m: Use devm_* to simplify probe failure handling soc: imx8m: Remove global soc_uid xfrm_output: Force software GSO only in tunnel mode arm64: dts: freescale: tqma8mpql: Fix vqmmc-supply firmware: imx-scu: fix OF node leak in .probe() smb: client: fix potential UAF in cifs_dump_full_key() nvme-tcp: Fix a C2HTermReq error message HID: apple: disable Fn key handling on the Omoton KB066 smb: client: Fix match_session bug preventing session reuse smb3: add support for IAKerb arm64: mm: Populate vmemmap at the page level if not section aligned i2c: sis630: Fix an error handling path in sis630_probe() i2c: ali15x3: Fix an error handling path in ali15x3_probe() i2c: ali1535: Fix an error handling path in ali1535_probe() cifs: Fix integer overflow while processing closetimeo mount option cifs: Fix integer overflow while processing actimeo mount option cifs: Fix integer overflow while processing acdirmax mount option cifs: Fix integer overflow while processing acregmax mount option scripts: generate_rust_analyzer: add missing macros deps scripts: generate_rust_analyzer: provide `cfg`s for `core` and `alloc` scripts: `make rust-analyzer` for out-of-tree modules scripts: generate_rust_analyzer: Handle sub-modules with no Makefile ASoC: codecs: wm0010: Fix error handling path in wm0010_spi_probe() drm/gma500: Add NULL check for pci_gfx_root in mid_get_vbt_data() ASoC: ops: Consistently treat platform_max as control value leds: mlxreg: Use devm_mutex_init() for mutex initialization tcp: fix forever orphan socket caused by tcp_abort tcp: fix races in tcp_abort() lib/buildid: Handle memfd_secret() files in build_id_parse() rust: Disallow BTF generation with Rust + LTO qlcnic: fix memory leak issues in qlcnic_sriov_common.c ASoC: amd: yc: Support mic on another Lenovo ThinkPad E16 Gen 2 model clk: samsung: update PLL locktime for PLL142XX used on FSD platform drm/amd/display: Fix slab-use-after-free on hdcp_work drm/amd/display: Assign normalized_pix_clk when color depth = 14 drm/amd/display: Restore correct backlight brightness after a GPU reset drm/dp_mst: Fix locking when skipping CSN before topology probing drm/atomic: Filter out redundant DPMS calls x86/microcode/AMD: Fix out-of-bounds on systems with CPU-less NUMA nodes USB: serial: option: match on interface class for Telit FN990B USB: serial: option: fix Telit Cinterion FE990A name USB: serial: option: add Telit Cinterion FE990B compositions USB: serial: ftdi_sio: add support for Altera USB Blaster 3 Input: i8042 - swap old quirk combination with new quirk for more devices Input: i8042 - swap old quirk combination with new quirk for several devices Input: i8042 - add required quirks for missing old boardnames Input: i8042 - swap old quirk combination with new quirk for NHxxRZQ xfs: remove conditional building of rt geometry validator functions xfs: reset XFS_ATTR_INCOMPLETE filter on node removal xfs: update dir3 leaf block metadata after swap xfs: ensure logflagsp is initialized in xfs_bmap_del_extent_real xfs: fix perag leak when growfs fails xfs: add lock protection when remove perag from radix tree xfs: initialise di_crc in xfs_log_dinode xfs: force all buffers to be written during btree bulk load xfs: recompute growfsrtfree transaction reservation while growing rt volume xfs: remove unused fields from struct xbtree_ifakeroot xfs: don't allow overly small or large realtime volumes xfs: fix 32-bit truncation in xfs_compute_rextslog xfs: make rextslog computation consistent with mkfs xfs: don't leak recovered attri intent items xfs: consider minlen sized extents in xfs_rtallocate_extent_block xfs: convert rt bitmap extent lengths to xfs_rtbxlen_t xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h xfs: reserve less log space when recovering log intent items xfs: use deferred frees for btree block freeing xfs: fix bounds check in xfs_defer_agfl_block() xfs: validate block number being freed before adding to xefi xfs: pass per-ag references to xfs_free_extent xfs: pass the xfs_bmbt_irec directly through the log intent code xfs: fix confusing xfs_extent_item variable names xfs: pass xfs_extent_free_item directly through the log intent code xfs: pass refcount intent directly through the log intent code io_uring: fix corner case forgetting to vunmap io_uring: don't attempt to mmap larger than what the user asks for io_uring: get rid of remap_pfn_range() for mapping rings/sqes mm: add nommu variant of vm_insert_pages() io_uring: add ring freeing helper io_uring: return error pointer from io_mem_alloc() block: fix 'kmem_cache of name 'bio-108' already exists' drm/nouveau: Do not override forced connector status mptcp: safety check before fallback x86/irq: Define trace events conditionally perf/x86/intel: Use better start period for frequency mode fuse: don't truncate cached, mutated symlink ASoC: tas2764: Set the SDOUT polarity correctly ASoC: tas2764: Fix power control mask ASoC: tas2770: Fix volume scale nvme: only allow entering LIVE from CONNECTING state sctp: Fix undefined behavior in left shift operation nvmet-rdma: recheck queue state is LIVE in state lock in recv done nvme-tcp: add basic support for the C2HTermReq PDU nvme-pci: quirk Acer FA100 for non-uniqueue identifiers net: wwan: mhi_wwan_mbim: Silence sequence number glitch errors ASoC: SOF: Intel: hda: add softdep pre to snd-hda-codec-hdmi module ASoC: arizona/madera: use fsleep() in up/down DAPM event delays. ASoC: rsnd: adjust convert rate limitation ASoC: rsnd: don't indicate warning on rsnd_kctrl_accept_runtime() ALSA: hda/realtek: Limit mic boost on Positivo ARN50 Xen/swiotlb: mark xen_swiotlb_fixup() __init thermal/cpufreq_cooling: Remove structure member documentation s390/cio: Fix CHPID "configure" attribute caching platform/x86: thinkpad_acpi: Support for V9 DYTC platform profiles platform/x86: thinkpad_acpi: Fix invalid fan speed on ThinkPad X120e sched: Clarify wake_up_q()'s write to task->wake_q.next HID: apple: fix up the F6 key on the Omoton KB066 keyboard HID: hid-apple: Apple Magic Keyboard a3203 USB-C support HID: ignore non-functional sensor in HP 5MP Camera HID: intel-ish-hid: Send clock sync message immediately after reset HID: intel-ish-hid: fix the length of MNG_SYNC_FW_CLOCK in doorbell vboxsf: fix building with GCC 15 alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support smb: client: fix noisy when tree connecting to DFS interlink targets ACPI: resource: IRQ override for Eluktronics MECH-17 scsi: qla1280: Fix kernel oops when debug level > 2 scsi: core: Use GFP_NOIO to avoid circular locking dependency iscsi_ibft: Fix UBSAN shift-out-of-bounds warning in ibft_attr_show_nic() powercap: call put_device() on an error path in powercap_register_control_type() hrtimers: Mark is_migration_base() with __always_inline nvme-fc: go straight to connecting state when initializing net/mlx5e: Prevent bridge link show failure for non-eswitch-allowed devices net/mlx5: Bridge, fix the crash caused by LAG state check net: openvswitch: remove misbehaving actions length check gre: Fix IPv6 link-local address generation. netfilter: nft_exthdr: fix offset with ipv4_find_option() net_sched: Prevent creation of classes with TC_H_ROOT ipvs: prevent integer overflow in do_ip_vs_get_ctl() netfilter: nf_conncount: Fully initialize struct nf_conncount_tuple in insert_tree() bonding: fix incorrect MAC address setting to receive NS messages net: switchdev: Convert blocking notification chain to a raw one eth: bnxt: do not update checksum in bnxt_xdp_build_skb() net/mlx5: handle errors in mlx5_chains_create_table() Drivers: hv: vmbus: Don't release fb_mmio resource in vmbus_free_mmio() drm/hyperv: Fix address space leak when Hyper-V DRM device is removed netpoll: hold rcu read lock in __netpoll_send_skb() net: mctp i2c: Copy headers if cloned net: dsa: mv88e6xxx: Verify after ATU Load ops Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" Bluetooth: hci_event: Fix enabling passive scanning wifi: cfg80211: cancel wiphy_work before freeing wiphy sched: address a potential NULL pointer dereference in the GRED scheduler. netfilter: nf_conncount: garbage collection is not skipped when jiffies wrap around ice: fix memory leak in aRFS after reset netfilter: nft_ct: Use __refcount_inc() for per-CPU nft_ct_pcpu_template. pinctrl: bcm281xx: Fix incorrect regmap max_registers value fbdev: hyperv_fb: iounmap() the correct memory when removing a device fs/ntfs3: Fix shift-out-of-bounds in ntfs_fill_super hrtimer: Use and report correct timerslack values for realtime tasks sched/isolation: Prevent boot crash when the boot CPU is nohz_full clockevents/drivers/i8253: Fix stop sequence for timer 0 Signed-off-by: Khusika Dhamar Gusti <[email protected]>
2 parents 9ad73f9 + 8e60a71 commit 8c67b44

File tree

225 files changed

+2536
-1520
lines changed

Some content is hidden

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

225 files changed

+2536
-1520
lines changed

‎Documentation/timers/no_hz.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,8 @@ adaptive-tick CPUs: At least one non-adaptive-tick CPU must remain
129129
online to handle timekeeping tasks in order to ensure that system
130130
calls like gettimeofday() returns accurate values on adaptive-tick CPUs.
131131
(This is not an issue for CONFIG_NO_HZ_IDLE=y because there are no running
132-
user processes to observe slight drifts in clock rate.) Therefore, the
133-
boot CPU is prohibited from entering adaptive-ticks mode. Specifying a
134-
"nohz_full=" mask that includes the boot CPU will result in a boot-time
135-
error message, and the boot CPU will be removed from the mask. Note that
136-
this means that your system must have at least two CPUs in order for
132+
user processes to observe slight drifts in clock rate.) Note that this
133+
means that your system must have at least two CPUs in order for
137134
CONFIG_NO_HZ_FULL=y to do anything for you.
138135

139136
Finally, adaptive-ticks CPUs must have their RCU callbacks offloaded.

‎Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 131
4+
SUBLEVEL = 132
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

@@ -1851,11 +1851,6 @@ rustfmt:
18511851
rustfmtcheck: rustfmt_flags = --check
18521852
rustfmtcheck: rustfmt
18531853

1854-
# IDE support targets
1855-
PHONY += rust-analyzer
1856-
rust-analyzer:
1857-
$(Q)$(MAKE) $(build)=rust $@
1858-
18591854
# Misc
18601855
# ---------------------------------------------------------------------------
18611856

@@ -1908,6 +1903,7 @@ help:
19081903
@echo ' modules - default target, build the module(s)'
19091904
@echo ' modules_install - install the module'
19101905
@echo ' clean - remove generated files in module directory only'
1906+
@echo ' rust-analyzer - generate rust-project.json rust-analyzer support file'
19111907
@echo ''
19121908

19131909
endif # KBUILD_EXTMOD
@@ -2044,6 +2040,11 @@ quiet_cmd_tags = GEN $@
20442040
tags TAGS cscope gtags: FORCE
20452041
$(call cmd,tags)
20462042

2043+
# IDE support targets
2044+
PHONY += rust-analyzer
2045+
rust-analyzer:
2046+
$(Q)$(MAKE) $(build)=rust $@
2047+
20472048
# Script to generate missing namespace dependencies
20482049
# ---------------------------------------------------------------------------
20492050

‎arch/alpha/include/asm/elf.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
7474
/*
7575
* This is used to ensure we don't load something for the wrong architecture.
7676
*/
77-
#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
77+
#define elf_check_arch(x) (((x)->e_machine == EM_ALPHA) && !((x)->e_flags & EF_ALPHA_32BIT))
7878

7979
/*
8080
* These are used to set parameters in the core dumps.
@@ -145,10 +145,6 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);
145145
: amask (AMASK_CIX) ? "ev6" : "ev67"); \
146146
})
147147

148-
#define SET_PERSONALITY(EX) \
149-
set_personality(((EX).e_flags & EF_ALPHA_32BIT) \
150-
? PER_LINUX_32BIT : PER_LINUX)
151-
152148
extern int alpha_l1i_cacheshape;
153149
extern int alpha_l1d_cacheshape;
154150
extern int alpha_l2_cacheshape;

‎arch/alpha/include/asm/pgtable.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
322322

323323
extern void paging_init(void);
324324

325-
/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */
325+
/* We have our own get_unmapped_area */
326326
#define HAVE_ARCH_UNMAPPED_AREA
327327

328328
#endif /* _ALPHA_PGTABLE_H */

‎arch/alpha/include/asm/processor.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,19 @@
88
#ifndef __ASM_ALPHA_PROCESSOR_H
99
#define __ASM_ALPHA_PROCESSOR_H
1010

11-
#include <linux/personality.h> /* for ADDR_LIMIT_32BIT */
12-
1311
/*
1412
* We have a 42-bit user address space: 4TB user VM...
1513
*/
1614
#define TASK_SIZE (0x40000000000UL)
1715

18-
#define STACK_TOP \
19-
(current->personality & ADDR_LIMIT_32BIT ? 0x80000000 : 0x00120000000UL)
16+
#define STACK_TOP (0x00120000000UL)
2017

2118
#define STACK_TOP_MAX 0x00120000000UL
2219

2320
/* This decides where the kernel will search for a free chunk of vm
2421
* space during mmap's.
2522
*/
26-
#define TASK_UNMAPPED_BASE \
27-
((current->personality & ADDR_LIMIT_32BIT) ? 0x40000000 : TASK_SIZE / 2)
23+
#define TASK_UNMAPPED_BASE (TASK_SIZE / 2)
2824

2925
/* This is dead. Everything has been moved to thread_info. */
3026
struct thread_struct { };

‎arch/alpha/kernel/osf_sys.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,8 +1213,7 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
12131213
return ret;
12141214
}
12151215

1216-
/* Get an address range which is currently unmapped. Similar to the
1217-
generic version except that we know how to honor ADDR_LIMIT_32BIT. */
1216+
/* Get an address range which is currently unmapped. */
12181217

12191218
static unsigned long
12201219
arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
@@ -1236,13 +1235,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
12361235
unsigned long len, unsigned long pgoff,
12371236
unsigned long flags)
12381237
{
1239-
unsigned long limit;
1240-
1241-
/* "32 bit" actually means 31 bit, since pointers sign extend. */
1242-
if (current->personality & ADDR_LIMIT_32BIT)
1243-
limit = 0x80000000;
1244-
else
1245-
limit = TASK_SIZE;
1238+
unsigned long limit = TASK_SIZE;
12461239

12471240
if (len > limit)
12481241
return -ENOMEM;

‎arch/arm/boot/dts/bcm2711.dtsi

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
clocks = <&clocks BCM2835_CLOCK_UART>,
135135
<&clocks BCM2835_CLOCK_VPU>;
136136
clock-names = "uartclk", "apb_pclk";
137-
arm,primecell-periphid = <0x00241011>;
137+
arm,primecell-periphid = <0x00341011>;
138138
status = "disabled";
139139
};
140140

@@ -145,7 +145,7 @@
145145
clocks = <&clocks BCM2835_CLOCK_UART>,
146146
<&clocks BCM2835_CLOCK_VPU>;
147147
clock-names = "uartclk", "apb_pclk";
148-
arm,primecell-periphid = <0x00241011>;
148+
arm,primecell-periphid = <0x00341011>;
149149
status = "disabled";
150150
};
151151

@@ -156,7 +156,7 @@
156156
clocks = <&clocks BCM2835_CLOCK_UART>,
157157
<&clocks BCM2835_CLOCK_VPU>;
158158
clock-names = "uartclk", "apb_pclk";
159-
arm,primecell-periphid = <0x00241011>;
159+
arm,primecell-periphid = <0x00341011>;
160160
status = "disabled";
161161
};
162162

@@ -167,7 +167,7 @@
167167
clocks = <&clocks BCM2835_CLOCK_UART>,
168168
<&clocks BCM2835_CLOCK_VPU>;
169169
clock-names = "uartclk", "apb_pclk";
170-
arm,primecell-periphid = <0x00241011>;
170+
arm,primecell-periphid = <0x00341011>;
171171
status = "disabled";
172172
};
173173

@@ -451,8 +451,6 @@
451451
IRQ_TYPE_LEVEL_LOW)>,
452452
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) |
453453
IRQ_TYPE_LEVEL_LOW)>;
454-
/* This only applies to the ARMv7 stub */
455-
arm,cpu-registers-not-fw-configured;
456454
};
457455

458456
cpus: cpus {
@@ -1154,6 +1152,7 @@
11541152
};
11551153

11561154
&uart0 {
1155+
arm,primecell-periphid = <0x00341011>;
11571156
interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
11581157
};
11591158

‎arch/arm/mach-omap1/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ menuconfig ARCH_OMAP1
99
select ARCH_OMAP
1010
select CLKSRC_MMIO
1111
select FORCE_PCI if PCCARD
12+
select GENERIC_IRQ_CHIP
1213
select GPIOLIB
1314
help
1415
Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)

‎arch/arm/mach-shmobile/headsmp.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ ENDPROC(shmobile_smp_sleep)
136136
.long shmobile_smp_arg - 1b
137137

138138
.bss
139+
.align 2
139140
.globl shmobile_smp_mpidr
140141
shmobile_smp_mpidr:
141142
.space NR_CPUS * 4

‎arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"Headphone Jack", "HPOUTR",
1717
"IN2L", "Line In Jack",
1818
"IN2R", "Line In Jack",
19-
"Headphone Jack", "MICBIAS",
20-
"IN1L", "Headphone Jack";
19+
"Microphone Jack", "MICBIAS",
20+
"IN1L", "Microphone Jack";
2121
simple-audio-card,widgets =
22-
"Microphone", "Headphone Jack",
22+
"Microphone", "Microphone Jack",
2323
"Headphone", "Headphone Jack",
2424
"Line", "Line In Jack";
2525

0 commit comments

Comments
 (0)