summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorws <ws@NetBSD.org>2008-03-08 18:46:18 +0000
committerws <ws@NetBSD.org>2008-03-08 18:46:18 +0000
commit27973cf78ee483254b4128b16b99281a4df49150 (patch)
tree86edda02e988487aafa17ebb36e3e999b9155873 /sys/dev
parent6f6f89d28ada794581f33f4db0b8d362a332058c (diff)
Don't leak information from kernel to userland.
(Well, the first 2 changes wouldn't really be neccessary, however, IMHO this makes it clearer why we don't leak.)
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usb.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index c3a406e9f99..f2cd5302ea5 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.107 2008/03/01 14:16:51 rmind Exp $ */
+/* $NetBSD: usb.c,v 1.108 2008/03/08 18:46:18 ws Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.107 2008/03/01 14:16:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.108 2008/03/08 18:46:18 ws Exp $");
#include "opt_compat_netbsd.h"
@@ -517,10 +517,10 @@ usbread(dev_t dev, struct uio *uio, int flag)
;
}
- error = uiomove((void *)ueo, uio->uio_resid, uio);
+ error = uiomove((void *)ueo, sizeof *ueo, uio);
} else
#endif
- error = uiomove((void *)ue, uio->uio_resid, uio);
+ error = uiomove((void *)ue, sizeof *ue, uio);
}
usb_free_event(ue);
#ifdef COMPAT_30
@@ -633,6 +633,8 @@ usbioctl(dev_t devt, u_long cmd, void *data, int flag, struct lwp *l)
error = EIO;
goto ret;
}
+ if (len > ur->ucr_actlen)
+ len = ur->ucr_actlen;
if (len != 0) {
if (uio.uio_rw == UIO_READ) {
error = uiomove(ptr, len, &uio);