3.2.95-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Arnd Bergmann <[email protected]>

We get a warning for the large stack usage in some configurations:

drivers/staging/vt6655/device_main.c: In function 'device_ioctl':
drivers/staging/vt6655/device_main.c:2974:1: warning: the frame size of 1304 
bytes is larger than 1024 bytes [-Wframe-larger-than=]

This is addressed in linux-3.19 with commit 67013f2c0e58 ("staging: vt6655:
mac80211 conversion add main mac80211 functions"), which obsoletes the
device_ioctl() function, but as that does not apply to stable kernels,
this picks an easier way out by using dynamic allocation.

The driver was merged in 2.6.31, and the fix applies to all versions
before 3.19.

Fixes: 5449c685a4b3 ("Staging: Add pristine upstream vt6655 driver sources")
Signed-off-by: Arnd Bergmann <[email protected]>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <[email protected]>
---
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -3387,9 +3387,12 @@ static int  device_ioctl(struct net_devi
 
        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_devi
                                    rc = -EFAULT;
                        }
             }
+               kfree(buffer);
         }
                break;
 

Reply via email to