wireless_tools/iw262_restore_full_essid.diff

   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
   4                 int     extra_size;
   5                 int     user_length = 0;
   6                 int     err;
   7 -               int     essid_compat = 0;
   8
   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;
  12
  13 -               /* Check need for ESSID compatibility for WE < 21 */
  14 -               switch (cmd) {
  15 -               case SIOCSIWESSID:
  16 -               case SIOCGIWESSID:
  17 -               case SIOCSIWNICKN:
  18 -               case SIOCGIWNICKN:
  19 -                       if (iwr->u.data.length == descr->max_tokens + 1)
  20 -                               essid_compat = 1;
  21 -                       else if (IW_IS_SET(cmd) && (iwr->u.data.length != 0)) {
  22 -                               char essid[IW_ESSID_MAX_SIZE + 1];
  23 -
  24 -                               err = copy_from_user(essid, iwr->u.data.pointer,
  25 -                                                    iwr->u.data.length *
  26 -                                                    descr->token_size);
  27 -                               if (err)
  28 -                                       return -EFAULT;
  29 -
  30 -                               if (essid[iwr->u.data.length - 1] == '\0')
  31 -                                       essid_compat = 1;
  32 -                       }
  33 -                       break;
  34 -               default:
  35 -                       break;
  36 -               }
  37 -
  38 -               iwr->u.data.length -= essid_compat;
  39 -
  40                 /* Check what user space is giving us */
  41                 if (IW_IS_SET(cmd)) {
  42                         /* Check NULL pointer */
  43 @@ -811,7 +783,6 @@ static int ioctl_standard_call(struct ne
  44                 }
  45
  46                 /* Create the kernel buffer */
  47 -               /*    kzalloc ensures NULL-termination for essid_compat */
  48                 extra = kzalloc(extra_size, GFP_KERNEL);
  49                 if (extra == NULL)
  50                         return -ENOMEM;
  51 @@ -830,8 +801,6 @@ static int ioctl_standard_call(struct ne
  52                 /* Call the handler */
  53                 ret = handler(dev, &info, &(iwr->u), extra);
  54
  55 -               iwr->u.data.length += essid_compat;
  56 -
  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 */