Re: [PATCH 3/6] wl1251: Update wl->nvs_len after wl->nvs is valid

From	Pavel Machek <pavel@ucw.cz>
Newsgroups	linux.kernel
Subject	Re: [PATCH 3/6] wl1251: Update wl->nvs_len after wl->nvs is valid
Date	2016-12-24 19:10 +0100
Message-ID	<sRYVz-1Rj-9@gated-at.bofh.it> (permalink)
References	<sRXPQ-Xz-5@gated-at.bofh.it> <sRXPQ-Xz-21@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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 <pavel@ucw.cz>


> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> ---
>  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

Thread

[PATCH 0/6] wl1251: Fix MAC address for Nokia N900 Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 18:00 +0100
  [PATCH 2/6] wl1251: Use request_firmware_prefer_user() for loading NVS calibration data Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 18:00 +0100
    Re: [PATCH 2/6] wl1251: Use request_firmware_prefer_user() for  loading NVS calibration data Arend Van Spriel <arend.vanspriel@broadcom.com> - 2016-12-25 21:20 +0100
      Re: [PATCH 2/6] wl1251: Use request_firmware_prefer_user() for loading NVS calibration data Pali Rohár <pali.rohar@gmail.com> - 2016-12-25 21:50 +0100
        Re: [PATCH 2/6] wl1251: Use request_firmware_prefer_user() for  loading NVS calibration data Pavel Machek <pavel@ucw.cz> - 2016-12-26 16:50 +0100
          Re: [PATCH 2/6] wl1251: Use request_firmware_prefer_user() for loading NVS calibration data Pali Rohár <pali.rohar@gmail.com> - 2016-12-26 17:10 +0100
      Re: [PATCH 2/6] wl1251: Use request_firmware_prefer_user() for  loading NVS calibration data Pavel Machek <pavel@ucw.cz> - 2016-12-26 17:40 +0100
  [PATCH 1/6] firmware: Add request_firmware_prefer_user() function Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 18:00 +0100
  [PATCH 3/6] wl1251: Update wl->nvs_len after wl->nvs is valid Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 18:00 +0100
    Re: [PATCH 3/6] wl1251: Update wl->nvs_len after wl->nvs is valid Pavel Machek <pavel@ucw.cz> - 2016-12-24 19:10 +0100
  [PATCH 4/6] wl1251: Generate random MAC address only if driver does not have valid Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 18:10 +0100
    Re: [PATCH 4/6] wl1251: Generate random MAC address only if driver  does not have valid Pavel Machek <pavel@ucw.cz> - 2016-12-24 19:10 +0100
      Re: [PATCH 4/6] wl1251: Generate random MAC address only if driver does not have valid Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 19:40 +0100
  [PATCH 5/6] wl1251: Parse and use MAC address from supplied NVS data Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 18:10 +0100
    Re: [PATCH 5/6] wl1251: Parse and use MAC address from supplied NVS  data Pavel Machek <pavel@ucw.cz> - 2016-12-24 19:20 +0100
      Re: [PATCH 5/6] wl1251: Parse and use MAC address from supplied NVS data Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 19:50 +0100
  [PATCH 6/6] wl1251: Set generated MAC address back to NVS data Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 18:10 +0100
    Re: [PATCH 6/6] wl1251: Set generated MAC address back to NVS data Pavel Machek <pavel@ucw.cz> - 2016-12-24 19:20 +0100
      Re: [PATCH 6/6] wl1251: Set generated MAC address back to NVS data Pali Rohár <pali.rohar@gmail.com> - 2016-12-24 19:50 +0100

csiph-web