All of lore.kernel.org
 help / color / mirror / Atom feed
From: Roland McGrath <roland-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Linus Torvalds
	<torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>,
	Andrew Morton
	<akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Cc: mtk.manpages-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	kernel list
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Ulrich Drepper <drepper-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
	Vegard Nossum
	<vegard.nossum-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	"linux-man-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
	<linux-man-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH] sys_waitid: return -EFAULT for NULL
Date: Tue, 13 Jan 2009 14:49:41 -0800 (PST)	[thread overview]
Message-ID: <20090113224941.36F19FC3DD@magilla.sf.frob.com> (raw)
In-Reply-To: Roland McGrath's message of  Tuesday, 13 January 2009 14:47:59 -0800 <20090113224759.7DFB7FC3DD-nL1rrgvulkc2UH6IwYuUx0EOCMrvLtNR@public.gmane.org>

It's always been invalid to call waitid() with a NULL pointer.  It was an
oversight that it was allowed (and acts like a wait4() call instead).

Signed-off-by: Roland McGrath <roland-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 kernel/exit.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/exit.c b/kernel/exit.c
index c7740fa..fa25790 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1760,6 +1760,8 @@ asmlinkage long sys_waitid(int which, pid_t upid,
 	enum pid_type type;
 	long ret;
 
+	if (unlikely(!infop))
+		return -EFAULT;
 	if (options & ~(WNOHANG|WNOWAIT|WEXITED|WSTOPPED|WCONTINUED))
 		return -EINVAL;
 	if (!(options & (WEXITED|WSTOPPED|WCONTINUED)))
--
To unsubscribe from this list: send the line "unsubscribe linux-man" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID (diff)
From: Roland McGrath <roland@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: mtk.manpages@gmail.com,
	"kernel list" <linux-kernel@vger.kernel.org>,
	"Ulrich Drepper" <drepper@redhat.com>,
	"Vegard Nossum" <vegard.nossum@gmail.com>,
	"linux-man@vger.kernel.org" <linux-man@vger.kernel.org>
Subject: [PATCH] sys_waitid: return -EFAULT for NULL
Date: Tue, 13 Jan 2009 14:49:41 -0800 (PST)	[thread overview]
Message-ID: <20090113224941.36F19FC3DD@magilla.sf.frob.com> (raw)
In-Reply-To: Roland McGrath's message of  Tuesday, 13 January 2009 14:47:59 -0800 <20090113224759.7DFB7FC3DD@magilla.sf.frob.com>

It's always been invalid to call waitid() with a NULL pointer.  It was an
oversight that it was allowed (and acts like a wait4() call instead).

Signed-off-by: Roland McGrath <roland@redhat.com>
---
 kernel/exit.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/exit.c b/kernel/exit.c
index c7740fa..fa25790 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1760,6 +1760,8 @@ asmlinkage long sys_waitid(int which, pid_t upid,
 	enum pid_type type;
 	long ret;
 
+	if (unlikely(!infop))
+		return -EFAULT;
 	if (options & ~(WNOHANG|WNOWAIT|WEXITED|WSTOPPED|WCONTINUED))
 		return -EINVAL;
 	if (!(options & (WEXITED|WSTOPPED|WCONTINUED)))

  parent reply	other threads:[~2009-01-13 22:49 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-13 22:36 waitid() return value strangeness when infop is NULL Michael Kerrisk
     [not found] ` <cfd18e0f0901131436ud2cf61bkf0e6b00f4b765bb5-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-01-13 22:38   ` Michael Kerrisk
2009-01-13 22:38     ` Michael Kerrisk
     [not found]     ` <cfd18e0f0901131438n232ba114n27ea2d7964d071de-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-01-13 22:43       ` Michael Kerrisk
2009-01-13 22:43         ` Michael Kerrisk
2009-01-13 22:47       ` Roland McGrath
2009-01-13 22:47         ` Roland McGrath
     [not found]         ` <20090113224759.7DFB7FC3DD-nL1rrgvulkc2UH6IwYuUx0EOCMrvLtNR@public.gmane.org>
2009-01-13 22:49           ` Roland McGrath [this message]
2009-01-13 22:49             ` [PATCH] sys_waitid: return -EFAULT for NULL Roland McGrath
     [not found]             ` <20090113224941.36F19FC3DD-nL1rrgvulkc2UH6IwYuUx0EOCMrvLtNR@public.gmane.org>
2009-01-13 23:14               ` Michael Kerrisk
2009-01-13 23:14                 ` Michael Kerrisk
     [not found]                 ` <cfd18e0f0901131514i2f7be7f1t2c6275c26dbb6874-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-01-13 23:24                   ` Andrew Morton
2009-01-13 23:24                     ` Andrew Morton
     [not found]                     ` <20090113152457.0d7685ad.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2009-01-13 23:36                       ` Michael Kerrisk
2009-01-13 23:36                         ` Michael Kerrisk
2009-01-13 23:47                       ` Roland McGrath
2009-01-13 23:47                         ` Roland McGrath
     [not found]                         ` <20090113234716.765A8FC3DD-nL1rrgvulkc2UH6IwYuUx0EOCMrvLtNR@public.gmane.org>
2009-01-14  0:13                           ` Michael Kerrisk
2009-01-14  0:13                             ` Michael Kerrisk
     [not found]                             ` <cfd18e0f0901131613l65bff51fo22e86a01ba2c0720-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-01-14  0:24                               ` Ulrich Drepper
2009-01-14  0:24                                 ` Ulrich Drepper
2009-01-14  0:33               ` Linus Torvalds
2009-01-14  0:33                 ` Linus Torvalds
     [not found]                 ` <alpine.LFD.2.00.0901131629220.6528-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2009-01-14  0:53                   ` Michael Kerrisk
2009-01-14  0:53                     ` Michael Kerrisk
     [not found]                     ` <cfd18e0f0901131653y76a827b5i906fadce63ada56b-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-01-14  0:57                       ` Linus Torvalds
2009-01-14  0:57                         ` Linus Torvalds
     [not found]                         ` <alpine.LFD.2.00.0901131655040.6528-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2009-01-14  1:39                           ` Michael Kerrisk
2009-01-14  1:39                             ` Michael Kerrisk
     [not found]                             ` <cfd18e0f0901131739v5119271flc28b5531604e682-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-01-14  2:10                               ` Linus Torvalds
2009-01-14  2:10                                 ` Linus Torvalds
     [not found]                                 ` <alpine.LFD.2.00.0901131808070.6528-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2009-01-14  2:28                                   ` Michael Kerrisk
2009-01-14  2:28                                     ` Michael Kerrisk
2009-01-13 22:47   ` waitid() return value strangeness when infop is NULL Roland McGrath

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090113224941.36F19FC3DD@magilla.sf.frob.com \
    --to=roland-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
    --cc=drepper-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-man-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=mtk.manpages-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
    --cc=vegard.nossum-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.