Re: [PATCH]d80211: fix "iwconfig key [x]" behavior

[Hong Liu]

On Thu, 2006-09-21 at 23:51, Jiri Benc wrote:
> Hi,
> 
> sorry for the delay.
> 
> On Fri, 01 Sep 2006 11:37:57 +0800, Hong Liu wrote:
> > @@ -2925,7 +2932,8 @@ static int ieee80211_ioctl_giwencode(str
> >             return 0;
> >     }
> >  
> > -   erq->length = 0;
> > +   erq->length = min((int)erq->length, sdata->keys[idx]->keylen);
> > +   memcpy(key, sdata->keys[idx]->key, erq->length);
> >     erq->flags |= IW_ENCODE_ENABLED;
> >  
> >     return 0;
> 
> This is still not correct, erq->length should be set to the actual key
> length to allow WE to return -E2BIG in case of too small buffer.
> 
>       memcpy(key, sdata->keys[idx]->key,
>              min((int)erq->length, sdata->keys[idx]->keylen));
>       erq->length = sdata->keys[idx]->keylen;
> 
>  Jiri

Resend.

Thanks,
Hong


Signed-off-by: Hong Liu <[EMAIL PROTECTED]>

diff --git a/net/d80211/ieee80211_ioctl.c b/net/d80211/ieee80211_ioctl.c
index 89a58e3..bde0c43 100644
--- a/net/d80211/ieee80211_ioctl.c
+++ b/net/d80211/ieee80211_ioctl.c
@@ -2867,9 +2867,10 @@ static int ieee80211_ioctl_siwencode(str
                if (!sdata->default_key)
                        idx = 0;
                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
-                       if (sdata->default_key == sdata->keys[i])
+                       if (sdata->default_key == sdata->keys[i]) {
                                idx = i;
-                       break;
+                               break;
+                       }
                }
                if (idx < 0)
                        return -EINVAL;
@@ -2880,16 +2881,21 @@ static int ieee80211_ioctl_siwencode(str
                alg = ALG_NONE;
        else if (erq->length == 0) {
                /* No key data - just set the default TX key index */
-               sdata->default_key = sdata->keys[idx];
+               if (sdata->default_key != sdata->keys[idx]) {
+                       if (sdata->default_key)
+                               ieee80211_key_sysfs_remove_default(sdata);
+                       sdata->default_key = sdata->keys[idx];
+                       if (sdata->default_key)
+                               ieee80211_key_sysfs_add_default(sdata);
+               }
+               return 0;
        }
 
        return ieee80211_set_encryption(
                dev, bcaddr,
-               idx, erq->length == 0 ? ALG_NONE : ALG_WEP,
+               idx, alg,
                !sdata->default_key,
                NULL, keybuf, erq->length);
-
-       return 0;
 }
 
 
@@ -2908,9 +2914,10 @@ static int ieee80211_ioctl_giwencode(str
                if (!sdata->default_key)
                        idx = 0;
                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
-                       if (sdata->default_key == sdata->keys[i])
+                       if (sdata->default_key == sdata->keys[i]) {
                                idx = i;
-                       break;
+                               break;
+                       }
                }
                if (idx < 0)
                        return -EINVAL;
@@ -2925,7 +2932,9 @@ static int ieee80211_ioctl_giwencode(str
                return 0;
        }
 
-       erq->length = 0;
+       memcpy(key, sdata->keys[idx]->key,
+              min((int)erq->length, sdata->keys[idx]->keylen));
+       erq->length = sdata->keys[idx]->keylen;
        erq->flags |= IW_ENCODE_ENABLED;
 
        return 0;
@@ -3054,9 +3063,10 @@ static int ieee80211_ioctl_siwencodeext(
                if (!sdata->default_key)
                        idx = 0;
                else for (i = 0; i < NUM_DEFAULT_KEYS; i++) {
-                       if (sdata->default_key == sdata->keys[i])
+                       if (sdata->default_key == sdata->keys[i]) {
                                idx = i;
-                       break;
+                               break;
+                       }
                }
                if (idx < 0)
                        return -EINVAL;
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html