[PATCH] orinoco: fix setting of 32 character ESSIDs

Patch from Thomas Schulz

Index: linux-2.6/drivers/net/wireless/orinoco.c
===================================================================

diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index d910b89e6482ea4e93cf39a1d89d4f433defd1d4..76875dac9d699335003cb07a63b0ad5549e5845b 100644 (file)
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -2907,13 +2907,14 @@ static int orinoco_ioctl_setessid(struct net_device *dev, struct iw_point *erq)
        memset(&essidbuf, 0, sizeof(essidbuf));
 
        if (erq->flags) {
-               if (erq->length > IW_ESSID_MAX_SIZE)
+               /* iwconfig includes the NUL in the specified length */
+               if (erq->length > IW_ESSID_MAX_SIZE+1)
                        return -E2BIG;
                
                if (copy_from_user(&essidbuf, erq->pointer, erq->length))
                        return -EFAULT;
 
-               essidbuf[erq->length] = '\0';
+               essidbuf[IW_ESSID_MAX_SIZE] = '\0';
        }
 
        if (orinoco_lock(priv, &flags) != 0)