Skip to content

Commit 8cf0b4b

Browse files
khusikakhusika
committed
Merge tag 'v6.1.130' into orange-pi-6.1-rk35xx
This is the 6.1.130 stable release * tag 'v6.1.130' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.130 media: mtk-vcodec: potential null pointer deference in SCP pfifo_tail_enqueue: Drop new packet when sch->limit == 0 Squashfs: check the inode number is not the invalid value of zero mm/memory: Use exception ip to search exception tables ptrace: Introduce exception_ip arch hook intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly amdgpu/pm/legacy: fix suspend/resume issues drm/amd/display: fixed integer types and null check locations riscv/futex: sign extend compare value in atomic cmpxchg sched/core: Prevent rescheduling when interrupts are disabled vmlinux.lds: Ensure that const vars with relocations are mapped R/O mptcp: reset when MPTCP opts are dropped after join mptcp: always handle address removal under msk socket lock phy: exynos5-usbdrd: fix MPLL_MULTIPLIER and SSC_REFCLKSEL masks in refclk phy: tegra: xusb: reset VBUS & ID OVERRIDE net: enetc: fix the off-by-one issue in enetc_map_tx_tso_buffs() net: enetc: correct the xdp_tx statistics net: enetc: update UDP checksum when updating originTimestamp field net: enetc: keep track of correct Tx BD count in enetc_map_tx_tso_buffs() net: enetc: fix the off-by-one issue in enetc_map_tx_buffs() usbnet: gl620a: fix endpoint checking in genelink_bind() i2c: npcm: disable interrupt enable bit before devm_request_irq drm/amd/display: Fix HPD after gpu reset drm/amd/display: Disable PSR-SU on eDP panels perf/core: Fix low freq setting via IOC_PERIOD perf/x86: Fix low freqency setting issue ALSA: usb-audio: Re-add sample rate quirk for Pioneer DJM-900NXS2 ftrace: Avoid potential division by zero in function_stat_show() tracing: Fix bad hist from corrupting named_triggers list phy: rockchip: naneng-combphy: compatible reset with old DT x86/CPU: Fix warm boot hang regression on AMD SC1100 SoC systems io_uring/net: save msg_control for compat uprobes: Reject the shared zeropage in uprobe_write_opcode() mm: Don't pin ZERO_PAGE in pin_user_pages() net: ipv6: fix dst ref loop on input in rpl lwt net: ipv6: rpl_iptunnel: mitigate 2-realloc issue net: ipv6: fix dst ref loop on input in seg6 lwt net: ipv6: seg6_iptunnel: mitigate 2-realloc issue include: net: add static inline dst_dev_overhead() to dst.h net/mlx5: IRQ, Fix null string in debug print net: mvpp2: cls: Fixed Non IP flow, with vlan tag flow defination. net: Clear old fragment checksum value in napi_reuse_skb tcp: Defer ts_recent changes until req is owned ipvs: Always clear ipvs_property flag in skb_scrub_packet() ASoC: es8328: fix route from DAC to output net: cadence: macb: Synchronize stats calculations ipvlan: ensure network headers are in skb linear part ipvlan: Prepare ipvlan_process_v4_outbound() to future .flowi4_tos conversion. ipv4: Convert ip_route_input() to dscp_t. ipv4: Convert icmp_route_lookup() to dscp_t. ipvlan: Unmask upper DSCP bits in ipvlan_process_v4_outbound() ipv4: icmp: Unmask upper DSCP bits in icmp_route_lookup() ipv4: icmp: Pass full DS field to ip_route_input() net/ipv4: add tracepoint for icmp_send net: set the minimum for net_hotdata.netdev_budget_usecs net: loopback: Avoid sending IP packets without an Ethernet header afs: Fix the server_list to unuse a displaced server rather than putting it afs: Make it possible to find the volumes that are using a server afs: remove variable nr_servers Bluetooth: L2CAP: Fix L2CAP_ECRED_CONN_RSP response ALSA: usb-audio: Avoid dropping MIDI events at closing multiple ports sunrpc: suppress warnings for unused procfs functions RDMA/mlx5: Fix bind QP error cleanup flow scsi: core: Clear driver private data when retrying request SUNRPC: Prevent looping due to rpc_signal_task() races SUNRPC: convert RPC_TASK_* constants to enum ovl: fix UAF in ovl_dentry_update_reval by moving dput() in ovl_link_up IB/mlx5: Set and get correct qp_num for a DCT QP netfilter: allow exp not to be removed in nf_ct_find_expectation spi: atmel-quadspi: Fix wrong register value written to MR spi: atmel-quadspi: Avoid overwriting delay register settings media: mediatek: vcodec: Fix H264 multi stateless decoder smatch warning block, bfq: fix bfqq uaf in bfq_limit_depth() block, bfq: split sync bfq_queues on a per-actuator basis x86/cpu/kvm: SRSO: Fix possible missing IBPB on VM-Exit ftrace: Do not add duplicate entries in subops manager ops ftrace: Correct preemption accounting for function tracing. EDAC/qcom: Correct interrupt enable register configuration smb: client: Add check for next_buffer in receive_encrypted_standard() mtd: rawnand: cadence: fix incorrect device in dma_unmap_single mtd: rawnand: cadence: use dma_map_resource for sdma address mtd: rawnand: cadence: fix error code in cadence_nand_init() mm,madvise,hugetlb: check for 0-length range after end address adjustment acct: block access to kernel internal filesystems acct: perform last write from workqueue ALSA: hda/conexant: Add quirk for HP ProBook 450 G4 mute LED ALSA: hda: Add error check for snd_ctl_rename_id() in snd_hda_create_dig_out_ctls() ASoC: fsl_micfil: Enable default case in micfil_set_quality() nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() drop_monitor: fix incorrect initialization order tee: optee: Fix supplicant wait loop drm/i915: Make sure all planes in use by the joiner have their crtc included drm/msm/dpu: Disable dither in phys encoder cleanup bpf: skip non exist keys in generic_map_lookup_batch nvme/ioctl: add missing space in err message drm/msm/dpu: Don't leak bits_per_component into random DSC_ENC fields nouveau/svm: fix missing folio unlock + put after make_device_exclusive_range() power: supply: da9150-fg: fix potential overflow bpf: Fix wrong copied_seq calculation strparser: Add read_sock callback bpf, test_run: Fix use-after-free issue in eth_skb_pkt_type() drm/rcar-du: dsi: Fix PHY lock bit check drm/tidss: Fix race condition while handling interrupt registers drm/tidss: Add simple K2G manual reset tcp: drop secpath at the same time as we currently drop dst net: axienet: Set mac_managed_pm arp: switch to dev_getbyhwaddr() in arp_req_set_public() net: Add non-RCU dev_getbyhwaddr() helper flow_dissector: Fix port range key handling in BPF conversion flow_dissector: Fix handling of mixed port and port-range keys geneve: Suppress list corruption splat in geneve_destroy_tunnels(). gtp: Suppress list corruption splat in gtp_net_exit_batch_rtnl(). ibmvnic: Don't reference skb after sending to VIOS ibmvnic: Add stat for tx direct vs tx batched ibmvnic: Introduce send sub-crq direct ibmvnic: Return error code on TX scrq flush fail ALSA: hda/cirrus: Correct the full scale volume set logic geneve: Fix use-after-free in geneve_find_dev(). powerpc/code-patching: Fix KASAN hit by not flagging text patching area as VM_ALLOC ALSA: hda/realtek: Fixup ALC225 depop procedure powerpc/64s: Rewrite __real_pte() and __rpte_to_hidx() as static inline powerpc/64s/mm: Move __real_pte stubs into hash-4k.h ASoC: rockchip: i2s-tdm: fix shift config for SND_SOC_DAIFMT_DSP_[AB] USB: gadget: f_midi: f_midi_complete to call queue_work usb: gadget: core: flush gadget workqueue after device removal USB: gadget: core: create sysfs link between udc and gadget media: uvcvideo: Remove dangling pointers media: uvcvideo: Only save async fh if success media: uvcvideo: Refactor iterators media: uvcvideo: Fix crash during unbind if gpio unit is in use media: Switch to use dev_err_probe() helper soc: mediatek: mtk-devapc: Fix leaking IO map on driver remove soc/mediatek: mtk-devapc: Convert to platform remove callback returning void soc: mediatek: mtk-devapc: Fix leaking IO map on error paths soc: mediatek: mtk-devapc: Switch to devm_clk_get_enabled() tpm: Change to kvalloc() in eventlog/acpi.c tpm: Use managed allocation for bios event log arm64: dts: qcom: sm8450: Fix CDSP memory length arm64: dts: qcom: trim addresses to 8 digits arm64: dts: mediatek: mt8183: Disable DSI display output by default scsi: core: Do not retry I/Os during depopulation scsi: core: Handle depopulation and restoration in progress ASoC: renesas: rz-ssi: Add a check for negative sample_space clk: mediatek: mt2701-img: add missing dummy clk clk: mediatek: mt2701-bdp: add missing dummy clk clk: mediatek: mt2701-vdec: fix conversion to mtk_clk_simple_probe clk: mediatek: clk-mtk: Add dummy clock ops Bluetooth: qca: Fix poor RF performance for WCN6855 Bluetooth: qca: Update firmware-name to support board specific nvm Bluetooth: qca: Support downloading board id specific NVM for WCN7850 spi: atmel-qspi: Memory barriers after memory-mapped I/O spi: atmel-quadspi: Create `atmel_qspi_ops` to support newer SoC families spi: atmel-quadspi: switch to use modern name spi: atmel-quadspi: Add support for configuring CS timing memcg: fix soft lockup in the OOM process mm: update mark_victim tracepoints fields md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime md/md-bitmap: add 'sync_size' into struct md_bitmap_stats md/md-cluster: fix spares warnings for __le64 md/md-bitmap: replace md_bitmap_status() with a new helper md_bitmap_get_stats() arm64: mte: Do not allow PROT_MTE on MAP_HUGETLB user mappings Signed-off-by: Khusika Dhamar Gusti <[email protected]> Conflicts: drivers/phy/rockchip/phy-rockchip-naneng-combphy.c drivers/tee/optee/supp.c
2 parents 6f93a6f + 6ae7ac5 commit 8cf0b4b

File tree

176 files changed

+2135
-914
lines changed

Some content is hidden

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

176 files changed

+2135
-914
lines changed

‎Documentation/core-api/pin_user_pages.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@ pages:
113113
This also leads to limitations: there are only 31-10==21 bits available for a
114114
counter that increments 10 bits at a time.
115115

116+
* Because of that limitation, special handling is applied to the zero pages
117+
when using FOLL_PIN. We only pretend to pin a zero page - we don't alter its
118+
refcount or pincount at all (it is permanent, so there's no need). The
119+
unpinning functions also don't do anything to a zero page. This is
120+
transparent to the caller.
121+
116122
* Callers must specifically request "dma-pinned tracking of pages". In other
117123
words, just calling get_user_pages() will not suffice; a new set of functions,
118124
pin_user_page() and related, must be used.

‎Documentation/networking/strparser.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Functions
112112
Callbacks
113113
=========
114114

115-
There are six callbacks:
115+
There are seven callbacks:
116116

117117
::
118118

@@ -182,6 +182,13 @@ There are six callbacks:
182182
the length of the message. skb->len - offset may be greater
183183
then full_len since strparser does not trim the skb.
184184

185+
::
186+
187+
int (*read_sock)(struct strparser *strp, read_descriptor_t *desc,
188+
sk_read_actor_t recv_actor);
189+
190+
The read_sock callback is used by strparser instead of
191+
sock->ops->read_sock, if provided.
185192
::
186193

187194
int (*read_sock_done)(struct strparser *strp, int err);

‎Makefile

Lines changed: 1 addition & 1 deletion
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 = 129
4+
SUBLEVEL = 130
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/arm64/boot/dts/mediatek/mt8183.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,6 +1753,7 @@
17531753
resets = <&mmsys MT8183_MMSYS_SW0_RST_B_DISP_DSI0>;
17541754
phys = <&mipi_tx0>;
17551755
phy-names = "dphy";
1756+
status = "disabled";
17561757
};
17571758

17581759
mutex: mutex@14016000 {

‎arch/arm64/boot/dts/qcom/sm8350.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2226,7 +2226,7 @@
22262226

22272227
cdsp: remoteproc@98900000 {
22282228
compatible = "qcom,sm8350-cdsp-pas";
2229-
reg = <0 0x098900000 0 0x1400000>;
2229+
reg = <0 0x98900000 0 0x1400000>;
22302230

22312231
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
22322232
<&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,

‎arch/arm64/boot/dts/qcom/sm8450.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2093,7 +2093,7 @@
20932093

20942094
remoteproc_adsp: remoteproc@30000000 {
20952095
compatible = "qcom,sm8450-adsp-pas";
2096-
reg = <0 0x030000000 0 0x100>;
2096+
reg = <0 0x30000000 0 0x100>;
20972097

20982098
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
20992099
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
@@ -2159,7 +2159,7 @@
21592159

21602160
remoteproc_cdsp: remoteproc@32300000 {
21612161
compatible = "qcom,sm8450-cdsp-pas";
2162-
reg = <0 0x032300000 0 0x1400000>;
2162+
reg = <0 0x32300000 0 0x10000>;
21632163

21642164
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
21652165
<&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,

‎arch/arm64/include/asm/mman.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,12 @@ static inline unsigned long arch_calc_vm_flag_bits(struct file *file,
3131
* backed by tags-capable memory. The vm_flags may be overridden by a
3232
* filesystem supporting MTE (RAM-based).
3333
*/
34-
if (system_supports_mte() &&
35-
((flags & MAP_ANONYMOUS) || shmem_file(file)))
36-
return VM_MTE_ALLOWED;
34+
if (system_supports_mte()) {
35+
if ((flags & MAP_ANONYMOUS) && !(flags & MAP_HUGETLB))
36+
return VM_MTE_ALLOWED;
37+
if (shmem_file(file))
38+
return VM_MTE_ALLOWED;
39+
}
3740

3841
return 0;
3942
}

‎arch/mips/include/asm/ptrace.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ static inline long regs_return_value(struct pt_regs *regs)
155155
}
156156

157157
#define instruction_pointer(regs) ((regs)->cp0_epc)
158+
extern unsigned long exception_ip(struct pt_regs *regs);
159+
#define exception_ip(regs) exception_ip(regs)
158160
#define profile_pc(regs) instruction_pointer(regs)
159161

160162
extern asmlinkage long syscall_trace_enter(struct pt_regs *regs);

‎arch/mips/kernel/ptrace.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <linux/seccomp.h>
3232
#include <linux/ftrace.h>
3333

34+
#include <asm/branch.h>
3435
#include <asm/byteorder.h>
3536
#include <asm/cpu.h>
3637
#include <asm/cpu-info.h>
@@ -48,6 +49,12 @@
4849
#define CREATE_TRACE_POINTS
4950
#include <trace/events/syscalls.h>
5051

52+
unsigned long exception_ip(struct pt_regs *regs)
53+
{
54+
return exception_epc(regs);
55+
}
56+
EXPORT_SYMBOL(exception_ip);
57+
5158
/*
5259
* Called by kernel/ptrace.c when detaching..
5360
*

‎arch/powerpc/include/asm/book3s/64/hash-4k.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,34 @@ static inline int hash__hugepd_ok(hugepd_t hpd)
8989
}
9090
#endif
9191

92+
/*
93+
* With 4K page size the real_pte machinery is all nops.
94+
*/
95+
static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep, int offset)
96+
{
97+
return (real_pte_t){pte};
98+
}
99+
100+
#define __rpte_to_pte(r) ((r).pte)
101+
102+
static inline unsigned long __rpte_to_hidx(real_pte_t rpte, unsigned long index)
103+
{
104+
return pte_val(__rpte_to_pte(rpte)) >> H_PAGE_F_GIX_SHIFT;
105+
}
106+
107+
#define pte_iterate_hashed_subpages(rpte, psize, va, index, shift) \
108+
do { \
109+
index = 0; \
110+
shift = mmu_psize_defs[psize].shift; \
111+
112+
#define pte_iterate_hashed_end() } while(0)
113+
114+
/*
115+
* We expect this to be called only for user addresses or kernel virtual
116+
* addresses other than the linear mapping.
117+
*/
118+
#define pte_pagesize_index(mm, addr, pte) MMU_PAGE_4K
119+
92120
/*
93121
* 4K PTE format is different from 64K PTE format. Saving the hash_slot is just
94122
* a matter of returning the PTE bits that need to be modified. On 64K PTE,

0 commit comments

Comments
 (0)