2010-02-01 19:19:19

by Christoph Hellwig

Subject: [PATCH 1/2]: mark ptrace_traceme static

It's not used outside of ptrace.c, so no need to allow access to it.

Signed-off-by: Christoph Hellwig <[email protected]>

Index: linux-2.6/include/linux/ptrace.h
===================================================================
--- linux-2.6.orig/include/linux/ptrace.h 2010-01-26 18:02:46.745004926 +0100
+++ linux-2.6/include/linux/ptrace.h 2010-01-26 18:02:51.759268161 +0100
@@ -81,7 +81,6 @@


extern long arch_ptrace(struct task_struct *child, long request, long addr, long data);
-extern int ptrace_traceme(void);
extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
extern int ptrace_attach(struct task_struct *tsk);
Index: linux-2.6/kernel/ptrace.c
===================================================================
--- linux-2.6.orig/kernel/ptrace.c 2010-01-26 18:02:55.627012005 +0100
+++ linux-2.6/kernel/ptrace.c 2010-01-26 18:04:22.163015407 +0100
@@ -220,7 +220,7 @@ out:
* Performs checks and sets PT_PTRACED.
* Should be used by all ptrace implementations for PTRACE_TRACEME.
*/
-int ptrace_traceme(void)
+static int ptrace_traceme(void)
{
int ret = -EPERM;

2010-02-01 20:08:52

by Roland McGrath

Subject: Re: [PATCH 1/2]: mark ptrace_traceme static

> It's not used outside of ptrace.c, so no need to allow access to it.

Acked-by: Roland McGrath <[email protected]>

2010-04-28 13:09:07

by Oleg Nesterov

Subject: Re: [PATCH 1/2]: mark ptrace_traceme static

On 04/28, Christoph Hellwig wrote:
>
> Any reason this never made it to Linus?

The patch is obviously fine, and iirc it was explicitly acked by Roland.

Probably you can resend it to Andrew?

> On Mon, Feb 01, 2010 at 08:18:55PM +0100, Christoph Hellwig wrote:
> > It's not used outside of ptrace.c, so no need to allow access to it.
> >
> > Signed-off-by: Christoph Hellwig <[email protected]>
> >
> > Index: linux-2.6/include/linux/ptrace.h
> > ===================================================================
> > --- linux-2.6.orig/include/linux/ptrace.h 2010-01-26 18:02:46.745004926 +0100
> > +++ linux-2.6/include/linux/ptrace.h 2010-01-26 18:02:51.759268161 +0100
> > @@ -81,7 +81,6 @@
> >
> >
> > extern long arch_ptrace(struct task_struct *child, long request, long addr, long data);
> > -extern int ptrace_traceme(void);
> > extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
> > extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
> > extern int ptrace_attach(struct task_struct *tsk);
> > Index: linux-2.6/kernel/ptrace.c
> > ===================================================================
> > --- linux-2.6.orig/kernel/ptrace.c 2010-01-26 18:02:55.627012005 +0100
> > +++ linux-2.6/kernel/ptrace.c 2010-01-26 18:04:22.163015407 +0100
> > @@ -220,7 +220,7 @@ out:
> > * Performs checks and sets PT_PTRACED.
> > * Should be used by all ptrace implementations for PTRACE_TRACEME.
> > */
> > -int ptrace_traceme(void)
> > +static int ptrace_traceme(void)
> > {
> > int ret = -EPERM;
> >
> ---end quoted text---

2010-04-28 11:46:02

by Christoph Hellwig

Subject: Re: [PATCH 1/2]: mark ptrace_traceme static

Any reason this never made it to Linus?

On Mon, Feb 01, 2010 at 08:18:55PM +0100, Christoph Hellwig wrote:
> It's not used outside of ptrace.c, so no need to allow access to it.
>
> Signed-off-by: Christoph Hellwig <[email protected]>
>
> Index: linux-2.6/include/linux/ptrace.h
> ===================================================================
> --- linux-2.6.orig/include/linux/ptrace.h 2010-01-26 18:02:46.745004926 +0100
> +++ linux-2.6/include/linux/ptrace.h 2010-01-26 18:02:51.759268161 +0100
> @@ -81,7 +81,6 @@
>
>
> extern long arch_ptrace(struct task_struct *child, long request, long addr, long data);
> -extern int ptrace_traceme(void);
> extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
> extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
> extern int ptrace_attach(struct task_struct *tsk);
> Index: linux-2.6/kernel/ptrace.c
> ===================================================================
> --- linux-2.6.orig/kernel/ptrace.c 2010-01-26 18:02:55.627012005 +0100
> +++ linux-2.6/kernel/ptrace.c 2010-01-26 18:04:22.163015407 +0100
> @@ -220,7 +220,7 @@ out:
> * Performs checks and sets PT_PTRACED.
> * Should be used by all ptrace implementations for PTRACE_TRACEME.
> */
> -int ptrace_traceme(void)
> +static int ptrace_traceme(void)
> {
> int ret = -EPERM;
>
---end quoted text---

2010-04-28 19:19:22

by Roland McGrath

Subject: Re: [PATCH 1/2]: mark ptrace_traceme static

> On 04/28, Christoph Hellwig wrote:
> >
> > Any reason this never made it to Linus?
>
> The patch is obviously fine, and iirc it was explicitly acked by Roland.

Yup. We don't have any canonical tree or submission forwarding path that
goes through us for ptrace stuff, we just post the ACKs. If Andrew/Linus
et al want us to, we can keep a tree of ptrace-related patches on the queue
to go in. But we haven't heretofore.


Thanks,
Roland