Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69978aa0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Martin Schwidefsky:
 "Another two bug fixes:

   - ptrace partial write information leak

   - a guest page hinting regression introduced with v4.6"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/mm: Fix cmma unused transfer from pgste into pte
  s390/ptrace: Preserve previous registers for short regset write
parents 2b432150 0d6da872

arch/s390/kernel/ptrace.c

+8 −0
Original line number Diff line number Diff line
@@ -963,6 +963,11 @@ static int s390_fpregs_set(struct task_struct *target, 
	if (target == current)

		save_fpu_regs();



	if (MACHINE_HAS_VX)

		convert_vx_to_fp(fprs, target->thread.fpu.vxrs);

	else

		memcpy(&fprs, target->thread.fpu.fprs, sizeof(fprs));



	/* If setting FPC, must validate it first. */

	if (count > 0 && pos < offsetof(s390_fp_regs, fprs)) {

		u32 ufpc[2] = { target->thread.fpu.fpc, 0 };
@@ -1067,6 +1072,9 @@ static int s390_vxrs_low_set(struct task_struct *target, 
	if (target == current)

		save_fpu_regs();



	for (i = 0; i < __NUM_VXRS_LOW; i++)

		vxrs[i] = *((__u64 *)(target->thread.fpu.vxrs + i) + 1);



	rc = user_regset_copyin(&pos, &count, &kbuf, &ubuf, vxrs, 0, -1);

	if (rc == 0)

		for (i = 0; i < __NUM_VXRS_LOW; i++)

arch/s390/mm/pgtable.c

+4 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static inline pgste_t ptep_xchg_start(struct mm_struct *mm, 
	return pgste;

}



static inline void ptep_xchg_commit(struct mm_struct *mm,

static inline pte_t ptep_xchg_commit(struct mm_struct *mm,

				    unsigned long addr, pte_t *ptep,

				    pgste_t pgste, pte_t old, pte_t new)

{
@@ -220,6 +220,7 @@ static inline void ptep_xchg_commit(struct mm_struct *mm, 
	} else {

		*ptep = new;

	}

	return old;

}



pte_t ptep_xchg_direct(struct mm_struct *mm, unsigned long addr,
@@ -231,7 +232,7 @@ pte_t ptep_xchg_direct(struct mm_struct *mm, unsigned long addr, 
	preempt_disable();

	pgste = ptep_xchg_start(mm, addr, ptep);

	old = ptep_flush_direct(mm, addr, ptep);

	ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	old = ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	preempt_enable();

	return old;

}
@@ -246,7 +247,7 @@ pte_t ptep_xchg_lazy(struct mm_struct *mm, unsigned long addr, 
	preempt_disable();

	pgste = ptep_xchg_start(mm, addr, ptep);

	old = ptep_flush_lazy(mm, addr, ptep);

	ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	old = ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	preempt_enable();

	return old;

}