1 --- linux/net/wireless/wext.j1.c 2007-07-09 13:19:22.000000000 -0700
2 +++ linux/net/wireless/wext.c 2007-07-09 13:19:59.000000000 -0700
3 @@ -741,39 +741,11 @@ static int ioctl_standard_call(struct ne
7 - int essid_compat = 0;
9 /* Calculate space needed by arguments. Always allocate
10 * for max space. Easier, and won't last long... */
11 extra_size = descr->max_tokens * descr->token_size;
13 - /* Check need for ESSID compatibility for WE < 21 */
19 - if (iwr->u.data.length == descr->max_tokens + 1)
21 - else if (IW_IS_SET(cmd) && (iwr->u.data.length != 0)) {
22 - char essid[IW_ESSID_MAX_SIZE + 1];
24 - err = copy_from_user(essid, iwr->u.data.pointer,
25 - iwr->u.data.length *
30 - if (essid[iwr->u.data.length - 1] == '\0')
38 - iwr->u.data.length -= essid_compat;
40 /* Check what user space is giving us */
42 /* Check NULL pointer */
43 @@ -811,7 +783,6 @@ static int ioctl_standard_call(struct ne
46 /* Create the kernel buffer */
47 - /* kzalloc ensures NULL-termination for essid_compat */
48 extra = kzalloc(extra_size, GFP_KERNEL);
51 @@ -830,8 +801,6 @@ static int ioctl_standard_call(struct ne
52 /* Call the handler */
53 ret = handler(dev, &info, &(iwr->u), extra);
55 - iwr->u.data.length += essid_compat;
57 /* If we have something to return to the user */
58 if (!ret && IW_IS_GET(cmd)) {
59 /* Check if there is enough buffer up there */