diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-10-27 10:49:53 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-10-27 10:49:53 -0400 |
| commit | ea38f2f9388111b2e0f202cae81c26629937dead (patch) | |
| tree | b6651dd350f764829e88c4d9da414ce0b895e8e4 /Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch | |
| parent | 793d04075c43db89f8925515999951df32179fe1 (diff) | |
| download | kernel-ea38f2f9388111b2e0f202cae81c26629937dead.tar.gz kernel-ea38f2f9388111b2e0f202cae81c26629937dead.tar.xz kernel-ea38f2f9388111b2e0f202cae81c26629937dead.zip | |
Refresh SB patchset to fix bisectability issue
Diffstat (limited to 'Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch')
| -rw-r--r-- | Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch index 7cd4eb574..24f1d5b5d 100644 --- a/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch +++ b/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch @@ -1,7 +1,7 @@ -From 3dfb34906e9e57e70bd497ee21e8d59325c841d2 Mon Sep 17 00:00:00 2001 +From 9f31204f829da97f99f7aacf30f0ddc26e456df7 Mon Sep 17 00:00:00 2001 From: Matthew Garrett <matthew.garrett@nebula.com> Date: Fri, 9 Mar 2012 09:28:15 -0500 -Subject: [PATCH] Restrict /dev/mem and /dev/kmem when module loading is +Subject: [PATCH 06/20] Restrict /dev/mem and /dev/kmem when module loading is restricted Allowing users to write to address space makes it possible for the kernel @@ -14,10 +14,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com> 1 file changed, 6 insertions(+) diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index 5bb1985..74ee6a4 100644 +index 7f1a7ab5850d..d6a6f05fbc1c 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c -@@ -163,6 +163,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf, +@@ -164,6 +164,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf, if (p != *ppos) return -EFBIG; @@ -27,7 +27,7 @@ index 5bb1985..74ee6a4 100644 if (!valid_phys_addr_range(p, count)) return -EFAULT; -@@ -515,6 +518,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, +@@ -516,6 +519,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, if (!pfn_valid(PFN_DOWN(p))) return -EIO; @@ -38,5 +38,5 @@ index 5bb1985..74ee6a4 100644 unsigned long to_write = min_t(unsigned long, count, (unsigned long)high_memory - p); -- -2.7.4 +2.9.3 |