Re: [PATCH 3/6] wl1251: Update wl->nvs_len after wl->nvs is valid
From: Pavel Machek <hidden>
Date: 2016-12-24 18:02:16
Also in:
linux-wireless, lkml
On Sat 2016-12-24 17:52:58, Pali Rohár wrote:
In case kmemdup fails thne wl->nvs_len will contains invalid non-zero size. This patch fixes it.
If kmemdup fails, then wl->nvs_len will contain invalid non-zero size. ? This probably should go as first in series, as it is bugfix? Pavel Acked-by: Pavel Machek <redacted>
quoted hunk ↗ jump to hunk
Signed-off-by: Pali Rohár <redacted> --- drivers/net/wireless/ti/wl1251/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 24f8866..8971b64 100644 --- a/drivers/net/wireless/ti/wl1251/main.c +++ b/drivers/net/wireless/ti/wl1251/main.c@@ -124,8 +124,7 @@ static int wl1251_fetch_nvs(struct wl1251 *wl) goto out; } - wl->nvs_len = fw->size; - wl->nvs = kmemdup(fw->data, wl->nvs_len, GFP_KERNEL); + wl->nvs = kmemdup(fw->data, fw->size, GFP_KERNEL); if (!wl->nvs) { wl1251_error("could not allocate memory for the nvs file");@@ -133,6 +132,8 @@ static int wl1251_fetch_nvs(struct wl1251 *wl) goto out; } + wl->nvs_len = fw->size; + ret = 0; out:
-- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Attachments
- signature.asc [application/pgp-signature] 181 bytes