Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6a13a24 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files

[PATCH] drivers/net/wireless: correct reported ssid lengths 



ESSIDs can technically include NULL characters.  Drivers should not be
adjusting the length of the ESSID before reporting it in their
SIOCGIWESSID handlers.  Breaks stuff like wpa_supplicant.  Note that ipw
drivers, which seem to currently be the "most correct", don't have this
problem.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a485cde6

drivers/net/wireless/airo.c

+1 −1
Original line number Diff line number Diff line
@@ -5783,7 +5783,7 @@ static int airo_get_essid(struct net_device *dev, 
	/* If none, we may want to get the one that was set */



	/* Push it out ! */

	dwrq->length = status_rid.SSIDlen + 1;

	dwrq->length = status_rid.SSIDlen;

	dwrq->flags = 1; /* active */



	return 0;

drivers/net/wireless/atmel.c

+2 −2
Original line number Diff line number Diff line
@@ -1718,11 +1718,11 @@ static int atmel_get_essid(struct net_device *dev, 
	if (priv->new_SSID_size != 0) {

		memcpy(extra, priv->new_SSID, priv->new_SSID_size);

		extra[priv->new_SSID_size] = '\0';

		dwrq->length = priv->new_SSID_size + 1;

		dwrq->length = priv->new_SSID_size;

	} else {

		memcpy(extra, priv->SSID, priv->SSID_size);

		extra[priv->SSID_size] = '\0';

		dwrq->length = priv->SSID_size + 1;

		dwrq->length = priv->SSID_size;

	}



	dwrq->flags = !priv->connect_to_any_BSS; /* active */

drivers/net/wireless/prism54/isl_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ prism54_get_essid(struct net_device *ndev, struct iw_request_info *info, 
	if (essid->length) {

		dwrq->flags = 1;	/* set ESSID to ON for Wireless Extensions */

		/* if it is to big, trunk it */

		dwrq->length = min(IW_ESSID_MAX_SIZE, essid->length + 1);

		dwrq->length = min(IW_ESSID_MAX_SIZE, essid->length);

	} else {

		dwrq->flags = 0;

		dwrq->length = 0;

drivers/net/wireless/ray_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ static int ray_get_essid(struct net_device *dev, 
	extra[IW_ESSID_MAX_SIZE] = '\0';



	/* Push it out ! */

	dwrq->length = strlen(extra) + 1;

	dwrq->length = strlen(extra);

	dwrq->flags = 1; /* active */



	return 0;

drivers/net/wireless/wavelan_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -2280,7 +2280,7 @@ static int wavelan_get_essid(struct net_device *dev, 
	extra[IW_ESSID_MAX_SIZE] = '\0';



	/* Set the length */

	wrqu->data.length = strlen(extra) + 1;

	wrqu->data.length = strlen(extra);



	return 0;

}