summaryrefslogtreecommitdiffstats
path: root/Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-16 10:01:09 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-16 10:01:09 -0500
commitf1193f2c7556c2f1a74c3b6f16320a6d899806d9 (patch)
tree6a6107b0e900f3eb78cf61ba8ceeda44a6307ba3 /Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch
parent87b2a17d8cd45e1bb04d49c89ae7af476bcd917c (diff)
downloadkernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.gz
kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.xz
kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.zip
Linux v3.19-6676-g1fa185ebcbce
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.patch4
1 files changed, 2 insertions, 2 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 08417c18d..0727adee8 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
@@ -13,7 +13,7 @@ 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 bd117a1019f7..b59b3eb6674e 100644
+index efe38c1bc234..16b8af1188e1 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -167,6 +167,9 @@ static ssize_t write_mem(struct file *file, const char __user *buf,
@@ -26,7 +26,7 @@ index bd117a1019f7..b59b3eb6674e 100644
if (!valid_phys_addr_range(p, count))
return -EFAULT;
-@@ -516,6 +519,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
+@@ -513,6 +516,9 @@ static ssize_t write_kmem(struct file *file, const char __user *buf,
char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */
int err = 0;