Skip to contentSkip to conversation

Libertas: fix buffer overflow in lbs_get_essid()

PATCH In review Daniel Mack 4 participants 7 messages Dec 16, 2009 – Dec 17, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Libertas: fix buffer overflow in lbs_get_essid()

The libertas driver copies the SSID buffer back to the wireless core and appends a trailing NULL character for termination. This is

a) unnecessary because the buffer is allocated with kzalloc and is hence already NULLed when this function is called, and

b) for priv->curbssparams.ssid_len == 32, it writes back one byte too much which causes memory corruptions.

Fix this by removing the extra write.

Cc Dan Williams <[email protected]>
Cc Holger Schurig <[email protected]>
Cc John W. Linville <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Maithili Hinge <[email protected]>
Cc Kiran Divekar <[email protected]>
Cc Michael Hirsch <[email protected]>
---
 drivers/net/wireless/libertas/wext.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/wireless/libertas/wext.c +0 -2
index be837a0..01c738b 100644
@@ -1953,10 +1953,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
 	if (priv->connect_status == LBS_CONNECTED) {
 		memcpy(extra, priv->curbssparams.ssid,
 		       priv->curbssparams.ssid_len);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	} else {
 		memset(extra, 0, 32);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	}
 	/*
 	 * If none, we may want to get the one that was set
Signature · 1 line
1.6.3.3
#1 lore raw

(Sorry, had a typo in the linux-wireless list address, corrected now).

Quoted 46 lines · Daniel Mack

The libertas driver copies the SSID buffer back to the wireless core and appends a trailing NULL character for termination. This is

a) unnecessary because the buffer is allocated with kzalloc and is hence already NULLed when this function is called, and

b) for priv->curbssparams.ssid_len == 32, it writes back one byte too much which causes memory corruptions.

Fix this by removing the extra write.

Cc Dan Williams <[email protected]>
Cc Holger Schurig <[email protected]>
Cc John W. Linville <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Maithili Hinge <[email protected]>
Cc Kiran Divekar <[email protected]>
Cc Michael Hirsch <[email protected]>
---
 drivers/net/wireless/libertas/wext.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/wireless/libertas/wext.c +0 -2
index be837a0..01c738b 100644
@@ -1953,10 +1953,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
 	if (priv->connect_status == LBS_CONNECTED) {
 		memcpy(extra, priv->curbssparams.ssid,
 		       priv->curbssparams.ssid_len);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	} else {
 		memset(extra, 0, 32);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	}
 	/*
 	 * If none, we may want to get the one that was set
Signature · 1 line
1.6.3.3
Acked-by on v1 1/1
#3 lore raw
In reply to Daniel Mack
Quoted 10 lines · Daniel Mack

The libertas driver copies the SSID buffer back to the wireless core and appends a trailing NULL character for termination. This is

a) unnecessary because the buffer is allocated with kzalloc and is hence already NULLed when this function is called, and

b) for priv->curbssparams.ssid_len == 32, it writes back one byte too much which causes memory corruptions.

Fix this by removing the extra write.

Quoted 31 lines
Cc Dan Williams <[email protected]>
Cc Holger Schurig <[email protected]>
Cc John W. Linville <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Maithili Hinge <[email protected]>
Cc Kiran Divekar <[email protected]>
Cc Michael Hirsch <[email protected]>
---
 drivers/net/wireless/libertas/wext.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/wireless/libertas/wext.c +0 -2
index be837a0..01c738b 100644
@@ -1953,10 +1953,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
 	if (priv->connect_status == LBS_CONNECTED) {
 		memcpy(extra, priv->curbssparams.ssid,
 		       priv->curbssparams.ssid_len);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	} else {
 		memset(extra, 0, 32);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	}
 	/*
 	 * If none, we may want to get the one that was set
#4 lore raw
Quoted 7 lines · Dan Williams
Quoted 6 lines · Daniel Mack

The libertas driver copies the SSID buffer back to the wireless core and appends a trailing NULL character for termination. This is

a) unnecessary because the buffer is allocated with kzalloc and is hence already NULLed when this function is called, and

Quoted 6 lines
Quoted 4 lines

b) for priv->curbssparams.ssid_len == 32, it writes back one byte too much which causes memory corruptions.

Fix this by removing the extra write.

Thanks, everyone. Who will care to pick an queue this one?

Daniel

Quoted 32 lines
Quoted 31 lines
Cc Dan Williams <[email protected]>
Cc Holger Schurig <[email protected]>
Cc John W. Linville <[email protected]>
Cc Stephen Hemminger <[email protected]>
Cc Maithili Hinge <[email protected]>
Cc Kiran Divekar <[email protected]>
Cc Michael Hirsch <[email protected]>
---
 drivers/net/wireless/libertas/wext.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/wireless/libertas/wext.c +0 -2
index be837a0..01c738b 100644
@@ -1953,10 +1953,8 @@ static int lbs_get_essid(struct net_device *dev, struct iw_request_info *info,
 	if (priv->connect_status == LBS_CONNECTED) {
 		memcpy(extra, priv->curbssparams.ssid,
 		       priv->curbssparams.ssid_len);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	} else {
 		memset(extra, 0, 32);
-		extra[priv->curbssparams.ssid_len] = '\0';
 	}
 	/*
 	 * If none, we may want to get the one that was set
#5 lore raw
Quoted 8 lines · Daniel Mack
Quoted 7 lines · Dan Williams
Quoted 6 lines · Daniel Mack

The libertas driver copies the SSID buffer back to the wireless core and appends a trailing NULL character for termination. This is

a) unnecessary because the buffer is allocated with kzalloc and is hence already NULLed when this function is called, and

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

b) for priv->curbssparams.ssid_len == 32, it writes back one byte too much which causes memory corruptions.

Fix this by removing the extra write.

Thanks, everyone. Who will care to pick an queue this one?

Is there some reason it wouldn't be me?

John

Signature · 2 lines
John W. Linville                Someday the world will need a hero, and you
[email protected]                  might be all we have.  Be ready.
#6 lore raw
Quoted 12 lines · John W. Linville
Quoted 11 lines · Daniel Mack
Quoted 10 lines · Dan Williams
Quoted 9 lines · Daniel Mack

The libertas driver copies the SSID buffer back to the wireless core and appends a trailing NULL character for termination. This is

a) unnecessary because the buffer is allocated with kzalloc and is hence already NULLed when this function is called, and

b) for priv->curbssparams.ssid_len == 32, it writes back one byte too much which causes memory corruptions.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

Fix this by removing the extra write.

Thanks, everyone. Who will care to pick an queue this one?

Is there some reason it wouldn't be me?

No, it should be you. Please suck it into your 2.6.33 patchset and we'll cc to stable when it hits linus I guess.

Dan