2 files changed, 5 insertions, 3 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index e31903aadd..ace151fa48 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -314,7 +314,7 @@ static int may_ptrace_attach(struct task_struct *task)
              (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
                 goto out;
         rmb();
-        if (!task->mm->dumpable && !capable(CAP_SYS_PTRACE))
+        if (task->mm->dumpable != 1 && !capable(CAP_SYS_PTRACE))
                 goto out;
         if (security_ptrace(current, task))
                 goto out;
@@ -1113,7 +1113,9 @@ static int task_dumpable(struct task_struct *task)
         if (mm)
                 dumpable = mm->dumpable;
         task_unlock(task);
-        return dumpable;
+        if(dumpable == 1)
+                return 1;
+        return 0;
 }
 
 
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 63a9fbf1ac..94b570ad03 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -451,7 +451,7 @@ static int devices_read_proc(char *page, char **start, off_t off,
                                  int count, int *eof, void *data)
 {
         int len = get_chrdev_list(page);
-        len += get_blkdev_list(page+len);
+        len += get_blkdev_list(page+len, len);
         return proc_calc_metrics(page, start, off, count, eof, len);
 }