Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2013-02-19 11:58:02 +0100
committerJiri Kosina <jkosina@suse.cz>2013-02-19 12:07:00 +0100
commit1576ecd8fc228efbffbc56b6720c168cecb90c76 (patch)
treedb4e223d52328ff3349fee8fdea836ae85318e70
parent33719337264dcfe5f72b402a82ffc8bbc1870e5f (diff)
- patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch:rpm-3.0.58-0.6.6
Refresh.
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch4
2 files changed, 8 insertions, 2 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 30b8e8c38e..f2b41d2f5f 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Feb 19 11:57:59 CET 2013 - mhocko@suse.cz
+
+- patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch:
+ Refresh.
+
+-------------------------------------------------------------------
Tue Feb 19 11:24:45 CET 2013 - mhocko@suse.cz
- patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch:
diff --git a/patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch b/patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch
index 7d9a974bd3..c085d9c51d 100644
--- a/patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch
+++ b/patches.fixes/ptrace-ensure-arch_ptrace-ptrace_request-can-never-r.patch
@@ -94,7 +94,7 @@ Acked-by: Michal Hocko <mhocko@suse.cz>
- spin_lock_irq(&child->sighand->siglock);
- WARN_ON_ONCE(task_is_stopped(child));
- if (task_is_traced(child) || kill)
-+ if (ignore_state || ptrace_freeze_traced(child))
++ if (kill || ptrace_freeze_traced(child))
ret = 0;
- spin_unlock_irq(&child->sighand->siglock);
}
@@ -102,7 +102,7 @@ Acked-by: Michal Hocko <mhocko@suse.cz>
- if (!ret && !kill)
- ret = wait_task_inactive(child, TASK_TRACED) ? 0 : -ESRCH;
-+ if (!ret && !ignore_state) {
++ if (!ret && !kill) {
+ if (!wait_task_inactive(child, __TASK_TRACED)) {
+ /*
+ * This can only happen if may_ptrace_stop() fails and