1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 0f9381b69a3b..f76b2e0aba9d 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2251,7 +2251,7 @@ static int usb_enumerate_device_otg(struct usb_device *udev)
                 /* descriptor may appear anywhere in config */
                 err = __usb_get_extra_descriptor(udev->rawdescriptors[0],
                                 le16_to_cpu(udev->config[0].desc.wTotalLength),
-                                USB_DT_OTG, (void **) &desc);
+                                USB_DT_OTG, (void **) &desc, sizeof(*desc));
                 if (err || !(desc->bmAttributes & USB_OTG_HNP))
                         return 0;
 
@@ -5163,7 +5163,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
 /* Handle notifying userspace about hub over-current events */
 static void port_over_current_notify(struct usb_port *port_dev)
 {
-        static char *envp[] = { NULL, NULL, NULL };
+        char *envp[3];
         struct device *hub_dev;
         char *port_dev_path;
 
@@ -5187,6 +5187,7 @@ static void port_over_current_notify(struct usb_port *port_dev)
         if (!envp[1])
                 goto exit;
 
+        envp[2] = NULL;
         kobject_uevent_env(&hub_dev->kobj, KOBJ_CHANGE, envp);
 
         kfree(envp[1]);