From e2af2a6161bd7297b39481a0a841687914386df3 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Thu, 16 Aug 2018 12:20:46 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-4.15.0-32.35 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Stoiko Ivanov --- ...ble-overrides-for-missing-ACS-capabilities-4..patch | 4 ++-- ...9-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch | 10 +++++----- ...SAUCE-apparmor-fix-apparmor-mediating-locking.patch | 5 +---- ...up-non-directory-creation-in-SGID-directories.patch | 1 - 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 483ac38..088e143 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -54,10 +54,10 @@ Signed-off-by: Fabian Grünbichler 2 files changed, 110 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index c14cccce6272..b3aa6fcfe035 100644 +index e1c10a202abe..e40248310433 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -2971,6 +2971,15 @@ +@@ -3049,6 +3049,15 @@ nomsi [MSI] If the PCI_MSI kernel config parameter is enabled, this kernel boot option can be used to disable the use of MSI interrupts system-wide. diff --git a/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch b/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch index cc72250..eb49834 100644 --- a/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch +++ b/patches/kernel/0009-kvm-nVMX-Enforce-cpl-0-for-VMX-instructions.patch @@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index ddfb9914e105..d81ee9ed4e83 100644 +index 1a5617fc8b6a..5c8bd2d61080 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c -@@ -7402,6 +7402,12 @@ static int handle_vmon(struct kvm_vcpu *vcpu) +@@ -7575,6 +7575,12 @@ static int handle_vmon(struct kvm_vcpu *vcpu) return 1; } @@ -33,7 +33,7 @@ index ddfb9914e105..d81ee9ed4e83 100644 if (vmx->nested.vmxon) { nested_vmx_failValid(vcpu, VMXERR_VMXON_IN_VMX_ROOT_OPERATION); return kvm_skip_emulated_instruction(vcpu); -@@ -7461,6 +7467,11 @@ static int handle_vmon(struct kvm_vcpu *vcpu) +@@ -7634,6 +7640,11 @@ static int handle_vmon(struct kvm_vcpu *vcpu) */ static int nested_vmx_check_permission(struct kvm_vcpu *vcpu) { @@ -45,7 +45,7 @@ index ddfb9914e105..d81ee9ed4e83 100644 if (!to_vmx(vcpu)->nested.vmxon) { kvm_queue_exception(vcpu, UD_VECTOR); return 0; -@@ -7794,7 +7805,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu) +@@ -7967,7 +7978,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu) if (get_vmx_mem_address(vcpu, exit_qualification, vmx_instruction_info, true, &gva)) return 1; @@ -54,7 +54,7 @@ index ddfb9914e105..d81ee9ed4e83 100644 kvm_write_guest_virt_system(&vcpu->arch.emulate_ctxt, gva, &field_value, (is_long_mode(vcpu) ? 8 : 4), NULL); } -@@ -7937,7 +7948,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu) +@@ -8110,7 +8121,7 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu) if (get_vmx_mem_address(vcpu, exit_qualification, vmx_instruction_info, true, &vmcs_gva)) return 1; diff --git a/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch b/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch index 23c1c50..dc8c5ea 100644 --- a/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch +++ b/patches/kernel/0010-UBUNTU-SAUCE-apparmor-fix-apparmor-mediating-locking.patch @@ -19,7 +19,7 @@ Signed-off-by: John Johansen 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c -index a7b3f681b80e..eafad30a78d7 100644 +index 068a9f471f77..23f3d16d6b85 100644 --- a/security/apparmor/lib.c +++ b/security/apparmor/lib.c @@ -327,7 +327,7 @@ void aa_compute_perms(struct aa_dfa *dfa, unsigned int state, @@ -31,6 +31,3 @@ index a7b3f681b80e..eafad30a78d7 100644 perms->audit |= map_other(dfa_other_audit(dfa, state)); perms->quiet |= map_other(dfa_other_quiet(dfa, state)); // perms->xindex = dfa_user_xindex(dfa, state); --- -2.17.1 - diff --git a/patches/kernel/0011-Fix-up-non-directory-creation-in-SGID-directories.patch b/patches/kernel/0011-Fix-up-non-directory-creation-in-SGID-directories.patch index 22d15cb..2fc71a9 100644 --- a/patches/kernel/0011-Fix-up-non-directory-creation-in-SGID-directories.patch +++ b/patches/kernel/0011-Fix-up-non-directory-creation-in-SGID-directories.patch @@ -20,7 +20,6 @@ Cc: Al Viro Signed-off-by: Linus Torvalds (cherry picked from commit 0fa3ecd87848c9c93c2c828ef4c3a8ca36ce46c7) Signed-off-by: Stoiko Ivanov - --- fs/inode.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.39.2