diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-13 11:00:04 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-13 11:00:04 -0500 |
commit | 87b2a17d8cd45e1bb04d49c89ae7af476bcd917c (patch) | |
tree | 24ce81def04974ec7f60322ad2528aebdc84e5b1 /Restrict-dev-mem-and-dev-kmem-when-module-loading-is.patch | |
parent | fe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8 (diff) | |
download | kernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.tar.gz kernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.tar.xz kernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.zip |
Linux v3.19-5015-gc7d7b9867155
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 | 4 |
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 dd42dbdf2..08417c18d 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 fc9637812d78..dde50e5bf527 100644 +index bd117a1019f7..b59b3eb6674e 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 fc9637812d78..dde50e5bf527 100644 if (!valid_phys_addr_range(p, count)) return -EFAULT; -@@ -505,6 +508,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, char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ int err = 0; |