aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Osipov <maxim.osipov@gmail.com>2010-08-21 14:54:06 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-03 17:33:40 -0700
commit037d3656adbd7e8cb848f01cf5dec423ed76bbe7 (patch)
treebe8a624843e7c7dd26c222fb1fd92951073d1be4
parent793f03aa7bda8f492e12ada3de711b4ad7f4d8d0 (diff)
downloadvexpress-lsk-037d3656adbd7e8cb848f01cf5dec423ed76bbe7.tar.gz
USB: Fix kernel oops with g_ether and Windows
Please find attached patch for https://bugzilla.kernel.org/show_bug.cgi?id=16023 problem. Signed-off-by: Maxim Osipov <maxim.osipov@gmail.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/rndis.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index ee337f72c64..972d5ddd1e1 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -293,9 +293,13 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
/* mandatory */
case OID_GEN_VENDOR_DESCRIPTION:
pr_debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
- length = strlen (rndis_per_dev_params [configNr].vendorDescr);
- memcpy (outbuf,
- rndis_per_dev_params [configNr].vendorDescr, length);
+ if ( rndis_per_dev_params [configNr].vendorDescr ) {
+ length = strlen (rndis_per_dev_params [configNr].vendorDescr);
+ memcpy (outbuf,
+ rndis_per_dev_params [configNr].vendorDescr, length);
+ } else {
+ outbuf[0] = 0;
+ }
retval = 0;
break;