From 64c020d2befec5fe427ed325e1b6e75a72f067a8 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 14 May 2005 17:29:58 +0200 Subject: [PATCH] --- yaml --- r: 2121 b: refs/heads/master c: d0e3e87ff4516d1b9d7bc6734a99168838f79635 h: refs/heads/master i: 2119: 85b6921a55bf4ccf6894e6cf24c0b84e5f8dd7e3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e57030e894fc..268d539a8e11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b24d4582fd93f3654d0a0a89f85e95140efc7fd4 +refs/heads/master: d0e3e87ff4516d1b9d7bc6734a99168838f79635 diff --git a/trunk/drivers/net/wireless/orinoco.c b/trunk/drivers/net/wireless/orinoco.c index d910b89e6482..76875dac9d69 100644 --- a/trunk/drivers/net/wireless/orinoco.c +++ b/trunk/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)