diff options
| author | Phillip Simbwa | 2010-12-29 21:01:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-01-20 21:01:23 +0100 |
| commit | 64911e4b133ff633563d6dd2b021fa1ca0608992 (patch) | |
| tree | 43b4983c00f37ae8bf3bfc8531fdbe5c352fa6ef /drivers/staging/ath6kl | |
| parent | staging: hv: Removed unneeded call to netif_stop_queue() in hv_netvsc (diff) | |
| download | kernel-qcow2-linux-64911e4b133ff633563d6dd2b021fa1ca0608992.tar.gz kernel-qcow2-linux-64911e4b133ff633563d6dd2b021fa1ca0608992.tar.xz kernel-qcow2-linux-64911e4b133ff633563d6dd2b021fa1ca0608992.zip | |
Staging: ath6kl: fix potential buffer overflow
Off by one
Signed-off-by: Phillip Simbwa <simbwa at gmail dot com>
Signed-off-by: Vipin Mehta <vmehta@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl')
| -rw-r--r-- | drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c index 0e298dba9fc8..29b8ab44ea47 100644 --- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c +++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c @@ -360,8 +360,8 @@ int PSSendOps(void *arg) status = 1; goto complete; } - len = (firmware->size > MAX_BDADDR_FORMAT_LENGTH)? MAX_BDADDR_FORMAT_LENGTH: firmware->size; - memcpy(config_bdaddr, firmware->data,len); + len = min(firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1); + memcpy(config_bdaddr, firmware->data, len); config_bdaddr[len] = '\0'; write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING); A_RELEASE_FIRMWARE(firmware); |