--- drivers/usb/gadget/rndis.c

+++ drivers/usb/gadget/rndis.c

@@ -291,9 +291,13 @@ gen_ndis_query_resp (int configNr, u32 O

/* 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;