From 5b1eb026f5fd2df0590b7e8f6f79e9d57861a850 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Wed, 8 Aug 2012 16:49:48 +0400 Subject: [PATCH] --- yaml --- r: 325821 b: refs/heads/master c: e58ba01e2cfe7b7d54d28f78c7af3cff4d5419a3 h: refs/heads/master i: 325819: a6f4bdb6f7b64bb3c248b942fdef5b5d251b1e27 v: v3 --- [refs] | 2 +- trunk/drivers/usb/wusbcore/security.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b7461b2404bd..91257a13648e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4d37aeb373a5edceecc1dadc76fabbe8bc18e44 +refs/heads/master: e58ba01e2cfe7b7d54d28f78c7af3cff4d5419a3 diff --git a/trunk/drivers/usb/wusbcore/security.c b/trunk/drivers/usb/wusbcore/security.c index fa810a83e830..dd88441c8f78 100644 --- a/trunk/drivers/usb/wusbcore/security.c +++ b/trunk/drivers/usb/wusbcore/security.c @@ -202,7 +202,7 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc, { int result, bytes, secd_size; struct device *dev = &usb_dev->dev; - struct usb_security_descriptor *secd; + struct usb_security_descriptor *secd, *new_secd; const struct usb_encryption_descriptor *etd, *ccm1_etd = NULL; const void *itr, *top; char buf[64]; @@ -221,11 +221,12 @@ int wusb_dev_sec_add(struct wusbhc *wusbhc, goto out; } secd_size = le16_to_cpu(secd->wTotalLength); - secd = krealloc(secd, secd_size, GFP_KERNEL); - if (secd == NULL) { + new_secd = krealloc(secd, secd_size, GFP_KERNEL); + if (new_secd == NULL) { dev_err(dev, "Can't allocate space for security descriptors\n"); goto out; } + secd = new_secd; result = usb_get_descriptor(usb_dev, USB_DT_SECURITY, 0, secd, secd_size); if (result < secd_size) {