diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-09-26 08:30:40 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 20:36:04 +0200 |
| commit | 2fb40577b05a869904a8fcf7098d26f3c7809644 (patch) | |
| tree | 8d580ce6b1814c8a0d1f66f1fd12b618d917cab6 /drivers/net/wireless/wl3501_cs.c | |
| parent | mac80211: save tx params per sdata (diff) | |
| download | linux-2fb40577b05a869904a8fcf7098d26f3c7809644.tar.xz linux-2fb40577b05a869904a8fcf7098d26f3c7809644.zip | |
wl3501_cs: min_t() cast truncates high bits
wrqu->encoding.length comes from the network administrator. It's
size u16. We want to limit "tocopy" to the smallest value of either
"len_keys", "wrqu->encoding.length" or 100. But because .length
gets cast from u16 to u8 we might use a random, smaller value than
the was desired. It's probably not very serious, but we may as well
fix it.
Btw, this is from code auditing and not from testing. I don't know
if this affects anyone in real life.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl3501_cs.c')
| -rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 6bc7c92fbff7..98fbf54f6004 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c @@ -1781,7 +1781,7 @@ static int wl3501_get_encode(struct net_device *dev, keys, len_keys); if (rc) goto out; - tocopy = min_t(u8, len_keys, wrqu->encoding.length); + tocopy = min_t(u16, len_keys, wrqu->encoding.length); tocopy = min_t(u8, tocopy, 100); wrqu->encoding.length = tocopy; memcpy(extra, keys, tocopy); |