diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-21 09:14:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-21 09:14:56 -0700 |
| commit | eb3869c6ea51f807e4bf7692a896b6deb3d0c17e (patch) | |
| tree | 19190c4d606df73958c402e8bda893d0637f534e /include | |
| parent | b874c55ee2559afbb29c8499eff623b647456218 (diff) | |
| parent | 708d96ef1bc028e36cb6cfc51dad1b1384629637 (diff) | |
Merge "wcnss: Fix buffer overflow in wcnss_prealloc_get"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/wcnss_wlan.h | 2 | ||||
| -rw-r--r-- | include/net/cnss_prealloc.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/wcnss_wlan.h b/include/linux/wcnss_wlan.h index 7389fff7da51..06c652cfb6af 100644 --- a/include/linux/wcnss_wlan.h +++ b/include/linux/wcnss_wlan.h @@ -119,7 +119,7 @@ int wcnss_get_wlan_mac_address(char mac_addr[WLAN_MAC_ADDR_SIZE]); void wcnss_allow_suspend(void); void wcnss_prevent_suspend(void); int wcnss_hardware_type(void); -void *wcnss_prealloc_get(unsigned int size); +void *wcnss_prealloc_get(size_t size); int wcnss_prealloc_put(void *ptr); void wcnss_reset_fiq(bool clk_chk_en); void wcnss_suspend_notify(void); diff --git a/include/net/cnss_prealloc.h b/include/net/cnss_prealloc.h index 734b4b69ecbb..39d080a8b184 100644 --- a/include/net/cnss_prealloc.h +++ b/include/net/cnss_prealloc.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -15,7 +15,7 @@ #define WCNSS_PRE_ALLOC_GET_THRESHOLD (4*1024) -extern void *wcnss_prealloc_get(unsigned int size); +extern void *wcnss_prealloc_get(size_t size); extern int wcnss_prealloc_put(void *ptr); extern int wcnss_pre_alloc_reset(void); void wcnss_prealloc_check_memory_leak(void); |