summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-06-18 10:48:14 +0300
committerJohn W. Linville <linville@tuxdriver.com>2012-06-19 14:56:26 -0400
commit7f59ebb5f34380696d16094fa1090485ec077fb1 (patch)
treeb4498e7b597da942afc77a907655034f25f7e433
parent73dc3b90232780462f3771901024a160559b4532 (diff)
downloadlinux-stable-7f59ebb5f34380696d16094fa1090485ec077fb1.tar.gz
linux-stable-7f59ebb5f34380696d16094fa1090485ec077fb1.tar.bz2
linux-stable-7f59ebb5f34380696d16094fa1090485ec077fb1.zip
airo: copying wrong data in airo_get_aplist()
"qual" used to be declared on the stack, but then in 998a5a7d6a ("airo: reduce stack memory footprint") we made it dynamically allocated. Unfortunately the memcpy() here was missed and it's still copying stack memory instead of the data that we want. In other words, "&qual" should be "qual". Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/airo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 520a4b2eb9cc..a747c632597a 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -7233,8 +7233,8 @@ static int airo_get_aplist(struct net_device *dev,
}
} else {
dwrq->flags = 1; /* Should be define'd */
- memcpy(extra + sizeof(struct sockaddr)*i,
- &qual, sizeof(struct iw_quality)*i);
+ memcpy(extra + sizeof(struct sockaddr) * i, qual,
+ sizeof(struct iw_quality) * i);
}
dwrq->length = i;