Module Name: src Committed By: snj Date: Sat Sep 26 19:00:35 UTC 2009
Modified Files: src/sys/dev/usb [netbsd-5]: ugen.c Log Message: Pull up following revision(s) (requested by pooka in ticket #1017): sys/dev/usb/ugen.c: revision 1.104 ugen_get_cdesc() can return NULL. When this happens, return the karmic EINVAL error instead of crashing. To generate a diff of this commit: cvs rdiff -u -r1.99.8.1 -r1.99.8.2 src/sys/dev/usb/ugen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/ugen.c diff -u src/sys/dev/usb/ugen.c:1.99.8.1 src/sys/dev/usb/ugen.c:1.99.8.2 --- src/sys/dev/usb/ugen.c:1.99.8.1 Tue Mar 24 20:59:29 2009 +++ src/sys/dev/usb/ugen.c Sat Sep 26 19:00:35 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.99.8.1 2009/03/24 20:59:29 snj Exp $ */ +/* $NetBSD: ugen.c,v 1.99.8.2 2009/09/26 19:00:35 snj Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.99.8.1 2009/03/24 20:59:29 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.99.8.2 2009/09/26 19:00:35 snj Exp $"); #include "opt_ugen_bulk_ra_wb.h" #include "opt_compat_netbsd.h" @@ -1734,6 +1734,8 @@ int error; cdesc = ugen_get_cdesc(sc, fd->ufd_config_index, &len); + if (cdesc == NULL) + return (EINVAL); if (len > fd->ufd_size) len = fd->ufd_size; iov.iov_base = (void *)fd->ufd_data;