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

Commit e5b7307b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.204 into android-4.19-stable 



Changes in 4.19.204
	KVM: SVM: Fix off-by-one indexing when nullifying last used SEV VMCB
	tracing: Reject string operand in the histogram expression
	bpf: Inherit expanded/patched seen count from old aux data
	bpf: Do not mark insn as seen under speculative path verification
	bpf: Fix leakage under speculation on mispredicted branches
	bpf, selftests: Adjust few selftest outcomes wrt unreachable code
	KVM: X86: MMU: Use the correct inherited permissions to get shadow page
	USB:ehci:fix Kunpeng920 ehci hardware problem
	ppp: Fix generating ppp unit id when ifname is not specified
	ovl: prevent private clone if bind mount is not allowed
	net: xilinx_emaclite: Do not print real IOMEM pointer
	Linux 4.19.204

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I976cb68d2906fa68add207bca749a1964378c916
parents 78a4d032 59456c9c

Documentation/virtual/kvm/mmu.txt

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ Shadow pages contain the following information: 
    shadow pages) so role.quadrant takes values in the range 0..3.  Each

    quadrant maps 1GB virtual address space.

  role.access:

    Inherited guest access permissions in the form uwx.  Note execute

    permission is positive, not negative.

    Inherited guest access permissions from the parent ptes in the form uwx.

    Note execute permission is positive, not negative.

  role.invalid:

    The page is invalid and should not be used.  It is a root page that is

    currently pinned (by a cpu hardware register pointing to it); once it is

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 203

SUBLEVEL = 204

EXTRAVERSION =

NAME = "People's Front"

arch/x86/kvm/paging_tmpl.h

+9 −5
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ struct guest_walker { 
	gpa_t pte_gpa[PT_MAX_FULL_LEVELS];

	pt_element_t __user *ptep_user[PT_MAX_FULL_LEVELS];

	bool pte_writable[PT_MAX_FULL_LEVELS];

	unsigned pt_access;

	unsigned pte_access;

	unsigned int pt_access[PT_MAX_FULL_LEVELS];

	unsigned int pte_access;

	gfn_t gfn;

	struct x86_exception fault;

};
@@ -388,13 +388,15 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, 
		}



		walker->ptes[walker->level - 1] = pte;



		/* Convert to ACC_*_MASK flags for struct guest_walker.  */

		walker->pt_access[walker->level - 1] = FNAME(gpte_access)(pt_access ^ walk_nx_mask);

	} while (!is_last_gpte(mmu, walker->level, pte));



	pte_pkey = FNAME(gpte_pkeys)(vcpu, pte);

	accessed_dirty = have_ad ? pte_access & PT_GUEST_ACCESSED_MASK : 0;



	/* Convert to ACC_*_MASK flags for struct guest_walker.  */

	walker->pt_access = FNAME(gpte_access)(pt_access ^ walk_nx_mask);

	walker->pte_access = FNAME(gpte_access)(pte_access ^ walk_nx_mask);

	errcode = permission_fault(vcpu, mmu, walker->pte_access, pte_pkey, access);

	if (unlikely(errcode))
@@ -433,7 +435,8 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, 
	}



	pgprintk("%s: pte %llx pte_access %x pt_access %x\n",

		 __func__, (u64)pte, walker->pte_access, walker->pt_access);

		 __func__, (u64)pte, walker->pte_access,

		 walker->pt_access[walker->level - 1]);

	return 1;



error:
@@ -602,7 +605,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gpa_t addr, 
{

	struct kvm_mmu_page *sp = NULL;

	struct kvm_shadow_walk_iterator it;

	unsigned direct_access, access = gw->pt_access;

	unsigned int direct_access, access;

	int top_level, ret;

	gfn_t gfn, base_gfn;
@@ -634,6 +637,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gpa_t addr, 
		sp = NULL;

		if (!is_shadow_present_pte(*it.sptep)) {

			table_gfn = gw->table_gfn[it.level - 2];

			access = gw->pt_access[it.level - 2];

			sp = kvm_mmu_get_page(vcpu, table_gfn, addr, it.level-1,

					      false, access);

		}

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ static void __sev_asid_free(int asid) 


	for_each_possible_cpu(cpu) {

		sd = per_cpu(svm_data, cpu);

		sd->sev_vmcbs[pos] = NULL;

		sd->sev_vmcbs[asid] = NULL;

	}

}

drivers/net/ethernet/xilinx/xilinx_emaclite.c

+2 −3
Original line number Diff line number Diff line
@@ -1177,9 +1177,8 @@ static int xemaclite_of_probe(struct platform_device *ofdev) 
	}



	dev_info(dev,

		 "Xilinx EmacLite at 0x%08X mapped to 0x%08X, irq=%d\n",

		 (unsigned int __force)ndev->mem_start,

		 (unsigned int __force)lp->base_addr, ndev->irq);

		 "Xilinx EmacLite at 0x%08X mapped to 0x%p, irq=%d\n",

		 (unsigned int __force)ndev->mem_start, lp->base_addr, ndev->irq);

	return 0;



error: