Unverified Commit ceb2f847 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13130 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.57-6.6.58 LTS Patches 

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.57..v6.6.58 | wc -l
124
100+20+4

Merged（20）：
btrfs: fix uninitialized pointer free in add_inode_ref()
btrfs: fix uninitialized pointer free on read_alloc_one_name() error
net: microchip: vcap api: Fix memory leaks in vcap_api_encode_rule_test()
irqchip/gic-v3-its: Fix VSYNC referencing an unmapped VPE on GIC v4.1
mm/mremap: fix move_normal_pmd/retract_page_tables race
mm/swapfile: skip HugeTLB pages for unuse_vma
xfs: match lock mode in xfs_buffered_write_iomap_begin()
xfs: make the seq argument to xfs_bmapi_convert_delalloc() optional
xfs: make xfs_bmapi_convert_delalloc() to allocate the target offset
xfs: convert delayed extents to unwritten when zeroing post eof blocks
xfs: fix unlink vs cluster buffer instantiation race
blk-rq-qos: fix crash on rq_qos_wait vs. rq_qos_wake_function race
Bluetooth: ISO: Fix multiple init when debugfs is disabled
vt: prevent kernel-infoleak in con_font_get()
parport: Proper fix for array out-of-bounds access
tty: n_gsm: Fix use-after-free in gsm_cleanup_mux
x86/bugs: Use code segment selector for VERW operand
pinctrl: stm32: check devm_kasprintf() returned value
tcp: fix mptcp DSS corruption due to large pmtu xmit
selftests: mptcp: join: change capture/checksum as bool

Conflicts（4）：
maple_tree: correct tree corruption on spanning store
irqchip/gic-v4: Don't allow a VMOVP on a dying VPE
selftests: mptcp: join: test for prohibited MPC to port-based endp
selftests: mptcp: remove duplicated variables 
 
Link:https://gitee.com/openeuler/kernel/pulls/13130

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 11b9cc9a e66ebce5

arch/arm64/include/asm/uprobes.h

+3 −5
Original line number Diff line number Diff line
@@ -10,11 +10,9 @@ 
#include <asm/insn.h>

#include <asm/probes.h>



#define MAX_UINSN_BYTES		AARCH64_INSN_SIZE



#define UPROBE_SWBP_INSN	cpu_to_le32(BRK64_OPCODE_UPROBES)

#define UPROBE_SWBP_INSN_SIZE	AARCH64_INSN_SIZE

#define UPROBE_XOL_SLOT_BYTES	MAX_UINSN_BYTES

#define UPROBE_XOL_SLOT_BYTES	AARCH64_INSN_SIZE



typedef __le32 uprobe_opcode_t;
@@ -23,8 +21,8 @@ struct arch_uprobe_task { 


struct arch_uprobe {

	union {

		u8 insn[MAX_UINSN_BYTES];

		u8 ixol[MAX_UINSN_BYTES];

		__le32 insn;

		__le32 ixol;

	};

	struct arch_probe_insn api;

	bool simulate;

arch/arm64/kernel/probes/decode-insn.c

+11 −5
Original line number Diff line number Diff line
@@ -99,10 +99,6 @@ arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api) 
	    aarch64_insn_is_blr(insn) ||

	    aarch64_insn_is_ret(insn)) {

		api->handler = simulate_br_blr_ret;

	} else if (aarch64_insn_is_ldr_lit(insn)) {

		api->handler = simulate_ldr_literal;

	} else if (aarch64_insn_is_ldrsw_lit(insn)) {

		api->handler = simulate_ldrsw_literal;

	} else {

		/*

		 * Instruction cannot be stepped out-of-line and we don't
@@ -140,6 +136,17 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi) 
	probe_opcode_t insn = le32_to_cpu(*addr);

	probe_opcode_t *scan_end = NULL;

	unsigned long size = 0, offset = 0;

	struct arch_probe_insn *api = &asi->api;



	if (aarch64_insn_is_ldr_lit(insn)) {

		api->handler = simulate_ldr_literal;

		decoded = INSN_GOOD_NO_SLOT;

	} else if (aarch64_insn_is_ldrsw_lit(insn)) {

		api->handler = simulate_ldrsw_literal;

		decoded = INSN_GOOD_NO_SLOT;

	} else {

		decoded = arm_probe_decode_insn(insn, &asi->api);

	}



	/*

	 * If there's a symbol defined in front of and near enough to
@@ -157,7 +164,6 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi) 
		else

			scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;

	}

	decoded = arm_probe_decode_insn(insn, &asi->api);



	if (decoded != INSN_REJECTED && scan_end)

		if (is_probed_address_atomic(addr - 1, scan_end))

arch/arm64/kernel/probes/simulate-insn.c

+7 −11
Original line number Diff line number Diff line
@@ -171,17 +171,15 @@ simulate_tbz_tbnz(u32 opcode, long addr, struct pt_regs *regs) 
void __kprobes

simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs)

{

	u64 *load_addr;

	unsigned long load_addr;

	int xn = opcode & 0x1f;

	int disp;



	disp = ldr_displacement(opcode);

	load_addr = (u64 *) (addr + disp);

	load_addr = addr + ldr_displacement(opcode);



	if (opcode & (1 << 30))	/* x0-x30 */

		set_x_reg(regs, xn, *load_addr);

		set_x_reg(regs, xn, READ_ONCE(*(u64 *)load_addr));

	else			/* w0-w30 */

		set_w_reg(regs, xn, *load_addr);

		set_w_reg(regs, xn, READ_ONCE(*(u32 *)load_addr));



	instruction_pointer_set(regs, instruction_pointer(regs) + 4);

}
@@ -189,14 +187,12 @@ simulate_ldr_literal(u32 opcode, long addr, struct pt_regs *regs) 
void __kprobes

simulate_ldrsw_literal(u32 opcode, long addr, struct pt_regs *regs)

{

	s32 *load_addr;

	unsigned long load_addr;

	int xn = opcode & 0x1f;

	int disp;



	disp = ldr_displacement(opcode);

	load_addr = (s32 *) (addr + disp);

	load_addr = addr + ldr_displacement(opcode);



	set_x_reg(regs, xn, *load_addr);

	set_x_reg(regs, xn, READ_ONCE(*(s32 *)load_addr));



	instruction_pointer_set(regs, instruction_pointer(regs) + 4);

}

arch/arm64/kernel/probes/uprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, 
	else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))

		return -EINVAL;



	insn = *(probe_opcode_t *)(&auprobe->insn[0]);

	insn = le32_to_cpu(auprobe->insn);



	switch (arm_probe_decode_insn(insn, &auprobe->api)) {

	case INSN_REJECTED:
@@ -108,7 +108,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs) 
	if (!auprobe->simulate)

		return false;



	insn = *(probe_opcode_t *)(&auprobe->insn[0]);

	insn = le32_to_cpu(auprobe->insn);

	addr = instruction_pointer(regs);



	if (auprobe->api.handler)

arch/s390/kvm/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int __diag_page_ref_service(struct kvm_vcpu *vcpu) 
	vcpu->stat.instruction_diagnose_258++;

	if (vcpu->run->s.regs.gprs[rx] & 7)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	rc = read_guest(vcpu, vcpu->run->s.regs.gprs[rx], rx, &parm, sizeof(parm));

	rc = read_guest_real(vcpu, vcpu->run->s.regs.gprs[rx], &parm, sizeof(parm));

	if (rc)

		return kvm_s390_inject_prog_cond(vcpu, rc);

	if (parm.parm_version != 2 || parm.parm_len < 5 || parm.code != 0x258)