Fix WE-21 Orinoco overflow issue...
Subsystems (3)
PATCH 1/1 Fix WE-21 Orinoco overflow issue...
Hi John,
This patch fixes the Orinoco driver overflow issue with
WE-21. This was discussed on the mailing list, the reporter confirmed that it fixes the issue and Andrew has already added this patch in tree.
Regards,
Jean
------------------------------------------------------------
drivers/net/wireless/orinoco.c renamed from drivers/net/wireless/orinoco.j1.c +9 -7
@@ -2456,6 +2456,7 @@ void free_orinocodev(struct net_device */* Wireless extensions */ /********************************************************************/ +/* Return : < 0 -> error code ; >= 0 -> length */ static int orinoco_hw_get_essid (struct orinoco_private *priv,int *active,char buf[IW_ESSID_MAX_SIZE +1 ]) {
@@ -2500,9 +2501,9 @@ static int orinoco_hw_get_essid(struct o len =le16_to_cpu (essidbuf.len);BUG_ON (len >IW_ESSID_MAX_SIZE ); -memset (buf,0 ,IW_ESSID_MAX_SIZE +1 ); +memset (buf,0 ,IW_ESSID_MAX_SIZE );memcpy (buf, p, len); - buf[len] ='\0' ; + err = len; fail_unlock:orinoco_unlock (priv, &flags);
@@ -3026,17 +3027,18 @@ static int orinoco_ioctl_getessid(structif (netif_running (dev)) { err =orinoco_hw_get_essid (priv, &active, essidbuf); -if (err) +if (err <0 )return err; + erq->length = err; }else {if (orinoco_lock (priv, &flags) !=0 )return -EBUSY ; -memcpy (essidbuf, priv->desired_essid,IW_ESSID_MAX_SIZE +1 ); +memcpy (essidbuf, priv->desired_essid,IW_ESSID_MAX_SIZE ); + erq->length =strlen (priv->desired_essid);orinoco_unlock (priv, &flags); } erq->flags =1 ; - erq->length =strlen (essidbuf);return 0 ; }
@@ -3074,10 +3076,10 @@ static int orinoco_ioctl_getnick(structif (orinoco_lock (priv, &flags) !=0 )return -EBUSY ; -memcpy (nickbuf, priv->nick,IW_ESSID_MAX_SIZE +1 ); +memcpy (nickbuf, priv->nick,IW_ESSID_MAX_SIZE );orinoco_unlock (priv, &flags); - nrq->length =strlen (nickbuf); + nrq->length =strlen (priv->nick);return 0 ; }