diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2010-10-11 10:02:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-11 15:06:43 -0700 |
| commit | 94dc5e778042daea25f2198884e2eb8f3bd350ed (patch) | |
| tree | 0c61cc30f04c7f3a183af5cab1360305488dae42 /drivers/staging/brcm80211/brcmfmac | |
| parent | d5642d3ba7b6609e93a688bb39bd5883a270e41f (diff) | |
| download | op-kernel-dev-94dc5e778042daea25f2198884e2eb8f3bd350ed.zip op-kernel-dev-94dc5e778042daea25f2198884e2eb8f3bd350ed.tar.gz | |
staging: brcm80211: s/unsigned char/size_t/ for min_t()
Avoid potential truncation.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 8343f7e..601921f 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -1280,7 +1280,7 @@ wl_iw_set_scan(struct net_device *dev, __func__, req->essid)); return -EBUSY; } else { - g_specific_ssid.SSID_len = min_t(unsigned char, + g_specific_ssid.SSID_len = min_t(size_t, sizeof(g_specific_ssid.SSID), req->essid_len); memcpy(g_specific_ssid.SSID, req->essid, @@ -1379,7 +1379,7 @@ wl_iw_iscan_set_scan(struct net_device *dev, if (wrqu->data.length == sizeof(struct iw_scan_req)) { if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { struct iw_scan_req *req = (struct iw_scan_req *)extra; - ssid.SSID_len = min_t(unsigned char, sizeof(ssid.SSID), + ssid.SSID_len = min_t(size_t, sizeof(ssid.SSID), req->essid_len); memcpy(ssid.SSID, req->essid, ssid.SSID_len); ssid.SSID_len = htod32(ssid.SSID_len); @@ -1907,10 +1907,10 @@ wl_iw_set_essid(struct net_device *dev, if (dwrq->length && extra) { #if WIRELESS_EXT > 20 - g_ssid.SSID_len = min_t(unsigned char, sizeof(g_ssid.SSID), + g_ssid.SSID_len = min_t(size_t, sizeof(g_ssid.SSID), dwrq->length); #else - g_ssid.SSID_len = min_t(unsigned char, sizeof(g_ssid.SSID), + g_ssid.SSID_len = min_t(size_t, sizeof(g_ssid.SSID), dwrq->length - 1); #endif memcpy(g_ssid.SSID, extra, g_ssid.SSID_len); |
