38c184f1b4
This upgrade fixes the CVEs listed below. We refresh the patches against the new kernel source. The patch 15 is now included in new version, so I drop it in the new patch. CVE bug: CVE-2019-11810:kernel: a NULL pointer dereference in drivers/scsi/megaraid/megaraid_sas_base.c leading to DoS CVE bug: CVE-2019-11811: kernel: use-after-free in IPMI Edit CVE bug: CVE-2019-14835: kernel: vhost-net: guest to host kernel escape during migration Closes-Bug: 1849206 Closes-Bug: 1849209 Closes-Bug: 1847817 Change-Id: I217cf8684e31dacea627c33462e5e4b6e089c38f Depends-On: https://review.opendev.org/#/c/695355/ Signed-off-by: Robin Lu <bin1.lu@intel.com>
36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From 66936b9bfda2fa11019bf45298047c7365fdacb4 Mon Sep 17 00:00:00 2001
|
|
From: Bart Wensley <barton.wensley@windriver.com>
|
|
Date: Mon, 8 Jul 2019 13:32:44 -0500
|
|
Subject: [PATCH 1/1] compile fix for disabling CONFIG_MEMCG_KMEM
|
|
|
|
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
|
|
---
|
|
mm/memcontrol.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
|
|
index 175fef9..e475427 100644
|
|
--- a/mm/memcontrol.c
|
|
+++ b/mm/memcontrol.c
|
|
@@ -2995,6 +2995,8 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg,
|
|
memcg_check_events(memcg, page);
|
|
}
|
|
|
|
+static DEFINE_MUTEX(memcg_limit_mutex);
|
|
+
|
|
#ifdef CONFIG_MEMCG_KMEM
|
|
/*
|
|
* The memcg_slab_mutex is held whenever a per memcg kmem cache is created or
|
|
@@ -3375,8 +3377,6 @@ static inline void memcg_resume_kmem_account(void)
|
|
current->memcg_kmem_skip_account--;
|
|
}
|
|
|
|
-static DEFINE_MUTEX(memcg_limit_mutex);
|
|
-
|
|
int __kmem_cache_destroy_memcg_children(struct kmem_cache *s)
|
|
{
|
|
struct kmem_cache *c;
|
|
--
|
|
1.8.3.1
|
|
|