diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-11-06 02:58:09 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-11-06 02:58:09 -0500 |
| commit | 78eb77a9cc3af73e3cd86a197b7c1f28fd840978 (patch) | |
| tree | 2cf5fb9935412e1a0fae2b25718aa84fc2e8412d /drivers/net/wireless/hostap/hostap_plx.c | |
| parent | a81c52a81d6dbe6a36bce18112da04f20b175192 (diff) | |
| parent | df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_plx.c')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_plx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c index 6dfa041be66..bc81b13a5a2 100644 --- a/drivers/net/wireless/hostap/hostap_plx.c +++ b/drivers/net/wireless/hostap/hostap_plx.c @@ -364,7 +364,7 @@ static int prism2_plx_check_cis(void __iomem *attr_mem, int attr_len, pos = 0; while (pos < CIS_MAX_LEN - 1 && cis[pos] != CISTPL_END) { - if (pos + cis[pos + 1] >= CIS_MAX_LEN) + if (pos + 2 + cis[pos + 1] > CIS_MAX_LEN) goto cis_error; switch (cis[pos]) { @@ -391,7 +391,7 @@ static int prism2_plx_check_cis(void __iomem *attr_mem, int attr_len, break; case CISTPL_MANFID: - if (cis[pos + 1] < 5) + if (cis[pos + 1] < 4) goto cis_error; manfid1 = cis[pos + 2] + (cis[pos + 3] << 8); manfid2 = cis[pos + 4] + (cis[pos + 5] << 8); |