Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / staging / vt6655 / device_main.c

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 077c506..5765bb9 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -3387,9 +3387,12 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 
        case SIOCGIWAPLIST:
            {
-            char buffer[IW_MAX_AP * (sizeof(struct sockaddr) + sizeof(struct iw_quality))];
+               char *buffer = kzalloc(IW_MAX_AP * (sizeof(struct sockaddr) +
+                                      sizeof(struct iw_quality)), GFP_KERNEL);
 
-                   if (wrq->u.data.pointer) {
+               if (!buffer) {
+                       rc = -ENOMEM;
+               } else if (wrq->u.data.pointer) {
                        rc = iwctl_giwaplist(dev, NULL, &(wrq->u.data), buffer);
                        if (rc == 0) {
                     if (copy_to_user(wrq->u.data.pointer,
@@ -3399,6 +3402,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
                                    rc = -EFAULT;
                        }
             }
+               kfree(buffer);
         }
                break;