Return -EINVAL for the bad size and for unrecognized NT_* type in
ptrace_regset() instead of -EIO.
Also update the comments for this ptrace interface with more clarifications.
Requested-by: Roland McGrath <[email protected]>
Requested-by: Oleg Nesterov <[email protected]>
Signed-off-by: Suresh Siddha <[email protected]>
---
include/linux/ptrace.h | 5 +++++
kernel/ptrace.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
Index: tip/kernel/ptrace.c
===================================================================
--- tip.orig/kernel/ptrace.c
+++ tip/kernel/ptrace.c
@@ -537,7 +537,7 @@ static int ptrace_regset(struct task_str
int regset_no;
if (!regset || (kiov->iov_len % regset->size) != 0)
- return -EIO;
+ return -EINVAL;
regset_no = regset - view->regsets;
kiov->iov_len = min(kiov->iov_len,
Index: tip/include/linux/ptrace.h
===================================================================
--- tip.orig/include/linux/ptrace.h
+++ tip/include/linux/ptrace.h
@@ -30,6 +30,11 @@
/*
* Generic ptrace interface that exports the architecture specific regsets
* using the corresponding NT_* types (which are also used in the core dump).
+ * Please note that the NT_PRSTATUS note type in a core dump contains a full
+ * 'struct elf_prstatus'. But the user_regset for NT_PRSTATUS contains just the
+ * elf_gregset_t that is the pr_reg field of 'struct elf_prstatus'. For all the
+ * other user_regset flavors, the user_regset layout and the ELF core dump note
+ * payload are exactly the same layout.
*
* This interface usage is as follows:
* struct iovec iov = { buf, len};
Acked-by: Roland McGrath <[email protected]>
Commit-ID: c6a0dd7ec6fb2d4927979ed4dc562fc5c122d826
Gitweb: http://git.kernel.org/tip/c6a0dd7ec6fb2d4927979ed4dc562fc5c122d826
Author: Suresh Siddha <[email protected]>
AuthorDate: Mon, 22 Feb 2010 14:51:32 -0800
Committer: H. Peter Anvin <[email protected]>
CommitDate: Tue, 23 Feb 2010 13:45:26 -0800
ptrace: Fix ptrace_regset() comments and diagnose errors specifically
Return -EINVAL for the bad size and for unrecognized NT_* type in
ptrace_regset() instead of -EIO.
Also update the comments for this ptrace interface with more clarifications.
Requested-by: Roland McGrath <[email protected]>
Requested-by: Oleg Nesterov <[email protected]>
Signed-off-by: Suresh Siddha <[email protected]>
LKML-Reference: <[email protected]>
Acked-by: Roland McGrath <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
include/linux/ptrace.h | 5 +++++
kernel/ptrace.c | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index dbfa821..c5eab89 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -30,6 +30,11 @@
/*
* Generic ptrace interface that exports the architecture specific regsets
* using the corresponding NT_* types (which are also used in the core dump).
+ * Please note that the NT_PRSTATUS note type in a core dump contains a full
+ * 'struct elf_prstatus'. But the user_regset for NT_PRSTATUS contains just the
+ * elf_gregset_t that is the pr_reg field of 'struct elf_prstatus'. For all the
+ * other user_regset flavors, the user_regset layout and the ELF core dump note
+ * payload are exactly the same layout.
*
* This interface usage is as follows:
* struct iovec iov = { buf, len};
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 13b4554..42ad8ae 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -537,7 +537,7 @@ static int ptrace_regset(struct task_struct *task, int req, unsigned int type,
int regset_no;
if (!regset || (kiov->iov_len % regset->size) != 0)
- return -EIO;
+ return -EINVAL;
regset_no = regset - view->regsets;
kiov->iov_len = min(kiov->iov_len,