From fe5bd65c9153bee1b9e53a6b1b927dbfe266b9d8 Mon Sep 17 00:00:00 2001 From: Michael Buesch Date: Thu, 27 Dec 2007 22:15:11 +0100 Subject: [PATCH] --- yaml --- r: 79409 b: refs/heads/master c: 47f76ca3a34cd6571a2de39da2926123ca39a4c1 h: refs/heads/master i: 79407: 9b90bb67663c151c7d59b9fa662f9a62eed5c99d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/main.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0cba10060322..02178c5a6f3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 280d0e16bcbf5893505a0d0897f3ca1ddc0764fa +refs/heads/master: 47f76ca3a34cd6571a2de39da2926123ca39a4c1 diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c index 345ac3862e11..a15a45b789b1 100644 --- a/trunk/drivers/net/wireless/b43/main.c +++ b/trunk/drivers/net/wireless/b43/main.c @@ -1163,7 +1163,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev, u16 ram_offset, u16 shm_size_offset, u8 rate) { - int i, len; + unsigned int i, len, variable_len; const struct ieee80211_mgmt *bcn; const u8 *ie; bool tim_found = 0; @@ -1178,7 +1178,8 @@ static void b43_write_beacon_template(struct b43_wldev *dev, /* Find the position of the TIM and the DTIM_period value * and write them to SHM. */ ie = bcn->u.beacon.variable; - for (i = 0; i < len - 2; ) { + variable_len = len - offsetof(struct ieee80211_mgmt, u.beacon.variable); + for (i = 0; i < variable_len - 2; ) { uint8_t ie_id, ie_len; ie_id = ie[i]; @@ -1189,7 +1190,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev, /* This is the TIM Information Element */ /* Check whether the ie_len is in the beacon data range. */ - if (len < ie_len + 2 + i) + if (variable_len < ie_len + 2 + i) break; /* A valid TIM is at least 4 bytes long. */ if (ie_len < 4)