[src/trunk]: src/sys/kern Don't return early when the incorrect size is passe...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e9cb0fcf4e4b
branches:  trunk
changeset: 333963:e9cb0fcf4e4b
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 24 02:34:04 2014 +0000

description:
Don't return early when the incorrect size is passed to some of the
ptrace actions. Leaves locks dangling and causes panics with lockdebug.
XXX: Pullup 7

diffstat:

 sys/kern/sys_process.c |  49 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 35 insertions(+), 14 deletions(-)

diffs (118 lines):

diff -r f10f0cc0d356 -r e9cb0fcf4e4b sys/kern/sys_process.c
--- a/sys/kern/sys_process.c    Mon Nov 24 01:27:07 2014 +0000
+++ b/sys/kern/sys_process.c    Mon Nov 24 02:34:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sys_process.c,v 1.164 2014/09/21 17:17:15 christos Exp $       */
+/*     $NetBSD: sys_process.c,v 1.165 2014/11/24 02:34:04 christos Exp $       */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_process.c,v 1.164 2014/09/21 17:17:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_process.c,v 1.165 2014/11/24 02:34:04 christos Exp $");
 
 #include "opt_ptrace.h"
 #include "opt_ktrace.h"
@@ -140,6 +140,13 @@
 #include <machine/reg.h>
 
 #ifdef PTRACE
+
+# ifdef DEBUG
+#  define DPRINTF(a) uprintf a
+# else
+#  define DPRINTF(a)
+# endif
+
 static kauth_listener_t ptrace_listener;
 
 static int
@@ -398,7 +405,7 @@
                 *          different signal delivery semantics),
                 */
                if (ISSET(t->p_slflag, PSL_FSTRACE)) {
-                       uprintf("file system traced\n");
+                       DPRINTF(("file system traced\n"));
                        error = EBUSY;
                        break;
                }
@@ -407,8 +414,8 @@
                 *      (3) it's not being traced by _you_, or
                 */
                if (t->p_pptr != p) {
-                       uprintf("parent %d != %d\n", t->p_pptr->p_pid,
-                           p->p_pid);
+                       DPRINTF(("parent %d != %d\n", t->p_pptr->p_pid,
+                           p->p_pid));
                        error = EBUSY;
                        break;
                }
@@ -417,8 +424,8 @@
                 *      (4) it's not currently stopped.
                 */
                if (t->p_stat != SSTOP || !t->p_waited /* XXXSMP */) {
-                       uprintf("stat %d flag %d\n", t->p_stat,
-                           !t->p_waited);
+                       DPRINTF(("stat %d flag %d\n", t->p_stat,
+                           !t->p_waited));
                        error = EBUSY;
                        break;
                }
@@ -770,17 +777,25 @@
                goto sendsig;
 
        case  PT_GET_EVENT_MASK:
-               if (SCARG(uap, data) != sizeof(pe))
-                       return EINVAL;
+               if (SCARG(uap, data) != sizeof(pe)) {
+                       DPRINTF(("ptrace(%d): %d != %zu\n", req,
+                           SCARG(uap, data), sizeof(pe)));
+                       error = EINVAL;
+                       break;
+               }
                memset(&pe, 0, sizeof(pe));
                pe.pe_set_event = ISSET(t->p_slflag, PSL_TRACEFORK) ? 
-                       PTRACE_FORK : 0;
+                   PTRACE_FORK : 0;
                error = copyout(&pe, SCARG(uap, addr), sizeof(pe));
                break;
 
        case  PT_SET_EVENT_MASK:
-               if (SCARG(uap, data) != sizeof(pe))
-                       return EINVAL;
+               if (SCARG(uap, data) != sizeof(pe)) {
+                       DPRINTF(("ptrace(%d): %d != %zu\n", req,
+                           SCARG(uap, data), sizeof(pe)));
+                       error = EINVAL;
+                       break;
+               }
                if ((error = copyin(SCARG(uap, addr), &pe, sizeof(pe))) != 0)
                        return error;
                if (pe.pe_set_event & PTRACE_FORK)
@@ -790,8 +805,12 @@
                break;
 
        case  PT_GET_PROCESS_STATE:
-               if (SCARG(uap, data) != sizeof(ps))
-                       return EINVAL;
+               if (SCARG(uap, data) != sizeof(ps)) {
+                       DPRINTF(("ptrace(%d): %d != %zu\n", req,
+                           SCARG(uap, data), sizeof(ps)));
+                       error = EINVAL;
+                       break;
+               }
                memset(&ps, 0, sizeof(ps));
                if (t->p_fpid) {
                        ps.pe_report_event = PTRACE_FORK;
@@ -802,6 +821,8 @@
 
        case PT_LWPINFO:
                if (SCARG(uap, data) != sizeof(pl)) {
+                       DPRINTF(("ptrace(%d): %d != %zu\n", req,
+                           SCARG(uap, data), sizeof(pl)));
                        error = EINVAL;
                        break;
                }