* [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data()
@ 2020-06-19 14:29 Dan Carpenter
2020-06-22 14:51 ` Kalle Valo
2020-09-09 6:49 ` Kalle Valo
0 siblings, 2 replies; 5+ messages in thread
From: Dan Carpenter @ 2020-06-19 14:29 UTC (permalink / raw)
To: Kalle Valo, Karthikeyan Periyasamy
Cc: Jakub Kicinski, kernel-janitors, linux-wireless, ath11k
There is a success path where "ret" isn't initialized where we never
have a ATH11K_SPECTRAL_TAG_SCAN_SEARCH and then ret isn't initialized.
Fixes: 9d11b7bff950 ("ath11k: add support for spectral scan")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/wireless/ath/ath11k/spectral.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath11k/spectral.c b/drivers/net/wireless/ath/ath11k/spectral.c
index 1c5d65bb411f..bfbf905f7507 100644
--- a/drivers/net/wireless/ath/ath11k/spectral.c
+++ b/drivers/net/wireless/ath/ath11k/spectral.c
@@ -677,7 +677,7 @@ static int ath11k_spectral_process_data(struct ath11k *ar,
u32 data_len, i;
u8 sign, tag;
int tlv_len, sample_sz;
- int ret;
+ int ret = 0;
bool quit = false;
spin_lock_bh(&ar->spectral.lock);
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data()
2020-06-19 14:29 [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data() Dan Carpenter
@ 2020-06-22 14:51 ` Kalle Valo
2020-06-22 17:18 ` Dan Carpenter
2020-09-09 6:49 ` Kalle Valo
1 sibling, 1 reply; 5+ messages in thread
From: Kalle Valo @ 2020-06-22 14:51 UTC (permalink / raw)
To: Dan Carpenter
Cc: Karthikeyan Periyasamy, Jakub Kicinski, kernel-janitors,
linux-wireless, ath11k
Dan Carpenter <dan.carpenter@oracle.com> writes:
> There is a success path where "ret" isn't initialized where we never
> have a ATH11K_SPECTRAL_TAG_SCAN_SEARCH and then ret isn't initialized.
>
> Fixes: 9d11b7bff950 ("ath11k: add support for spectral scan")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/net/wireless/ath/ath11k/spectral.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/spectral.c b/drivers/net/wireless/ath/ath11k/spectral.c
> index 1c5d65bb411f..bfbf905f7507 100644
> --- a/drivers/net/wireless/ath/ath11k/spectral.c
> +++ b/drivers/net/wireless/ath/ath11k/spectral.c
> @@ -677,7 +677,7 @@ static int ath11k_spectral_process_data(struct ath11k *ar,
> u32 data_len, i;
> u8 sign, tag;
> int tlv_len, sample_sz;
> - int ret;
> + int ret = 0;
> bool quit = false;
I try to avoid initialising ret variables so I would like find another
way. What about doing this (completely untested!) in the end of the
function:
return 0;
err:
kfree(fft_sample);
unlock:
spin_unlock_bh(&ar->spectral.lock);
return ret;
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data()
2020-06-22 14:51 ` Kalle Valo
@ 2020-06-22 17:18 ` Dan Carpenter
2020-09-07 16:56 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2020-06-22 17:18 UTC (permalink / raw)
To: Kalle Valo
Cc: Karthikeyan Periyasamy, Jakub Kicinski, kernel-janitors,
linux-wireless, ath11k
On Mon, Jun 22, 2020 at 05:51:16PM +0300, Kalle Valo wrote:
> Dan Carpenter <dan.carpenter@oracle.com> writes:
>
> > There is a success path where "ret" isn't initialized where we never
> > have a ATH11K_SPECTRAL_TAG_SCAN_SEARCH and then ret isn't initialized.
> >
> > Fixes: 9d11b7bff950 ("ath11k: add support for spectral scan")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > drivers/net/wireless/ath/ath11k/spectral.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath11k/spectral.c b/drivers/net/wireless/ath/ath11k/spectral.c
> > index 1c5d65bb411f..bfbf905f7507 100644
> > --- a/drivers/net/wireless/ath/ath11k/spectral.c
> > +++ b/drivers/net/wireless/ath/ath11k/spectral.c
> > @@ -677,7 +677,7 @@ static int ath11k_spectral_process_data(struct ath11k *ar,
> > u32 data_len, i;
> > u8 sign, tag;
> > int tlv_len, sample_sz;
> > - int ret;
> > + int ret = 0;
> > bool quit = false;
>
> I try to avoid initialising ret variables so I would like find another
> way. What about doing this (completely untested!) in the end of the
> function:
>
> return 0;
>
> err:
> kfree(fft_sample);
> unlock:
> spin_unlock_bh(&ar->spectral.lock);
> return ret;
I normally avoid it as well... If I were to redo this patch, I would
probably do:
ret = 0;
err:
kfree(fft_sample);
unlock:
spin_unlock_bh(&ar->spectral.lock);
return ret;
Would that be better?
regards,
dan carpenter
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data()
2020-06-22 17:18 ` Dan Carpenter
@ 2020-09-07 16:56 ` Kalle Valo
0 siblings, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2020-09-07 16:56 UTC (permalink / raw)
To: Dan Carpenter
Cc: Karthikeyan Periyasamy, Jakub Kicinski, kernel-janitors,
linux-wireless, ath11k
Dan Carpenter <dan.carpenter@oracle.com> writes:
> On Mon, Jun 22, 2020 at 05:51:16PM +0300, Kalle Valo wrote:
>> Dan Carpenter <dan.carpenter@oracle.com> writes:
>>
>> > There is a success path where "ret" isn't initialized where we never
>> > have a ATH11K_SPECTRAL_TAG_SCAN_SEARCH and then ret isn't initialized.
>> >
>> > Fixes: 9d11b7bff950 ("ath11k: add support for spectral scan")
>> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>> > ---
>> > drivers/net/wireless/ath/ath11k/spectral.c | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/drivers/net/wireless/ath/ath11k/spectral.c b/drivers/net/wireless/ath/ath11k/spectral.c
>> > index 1c5d65bb411f..bfbf905f7507 100644
>> > --- a/drivers/net/wireless/ath/ath11k/spectral.c
>> > +++ b/drivers/net/wireless/ath/ath11k/spectral.c
>> > @@ -677,7 +677,7 @@ static int ath11k_spectral_process_data(struct ath11k *ar,
>> > u32 data_len, i;
>> > u8 sign, tag;
>> > int tlv_len, sample_sz;
>> > - int ret;
>> > + int ret = 0;
>> > bool quit = false;
>>
>> I try to avoid initialising ret variables so I would like find another
>> way. What about doing this (completely untested!) in the end of the
>> function:
>>
>> return 0;
>>
>> err:
>> kfree(fft_sample);
>> unlock:
>> spin_unlock_bh(&ar->spectral.lock);
>> return ret;
>
> I normally avoid it as well... If I were to redo this patch, I would
> probably do:
>
> ret = 0;
> err:
> kfree(fft_sample);
> unlock:
> spin_unlock_bh(&ar->spectral.lock);
> return ret;
>
> Would that be better?
Ah, my proposal was buggy. So yes, this is definitely better :) I
changed now the patch in the pending branch, please check:
https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&idX6f8e6779fa75ade112cb48606794e034e0ff1d
--
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data()
2020-06-19 14:29 [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data() Dan Carpenter
2020-06-22 14:51 ` Kalle Valo
@ 2020-09-09 6:49 ` Kalle Valo
1 sibling, 0 replies; 5+ messages in thread
From: Kalle Valo @ 2020-09-09 6:49 UTC (permalink / raw)
To: Dan Carpenter
Cc: Karthikeyan Periyasamy, Jakub Kicinski, ath11k, linux-wireless,
kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> wrote:
> There is a success path where "ret" isn't initialized where we never
> have a ATH11K_SPECTRAL_TAG_SCAN_SEARCH and then ret isn't initialized.
>
> Fixes: 9d11b7bff950 ("ath11k: add support for spectral scan")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Patch applied to ath-next branch of ath.git, thanks.
c7187acc3cd0 ath11k: fix uninitialized return in ath11k_spectral_process_data()
--
https://patchwork.kernel.org/patch/11614313/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-09 6:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-19 14:29 [PATCH net-next] ath11k: fix uninitialized return in ath11k_spectral_process_data() Dan Carpenter
2020-06-22 14:51 ` Kalle Valo
2020-06-22 17:18 ` Dan Carpenter
2020-09-07 16:56 ` Kalle Valo
2020-09-09 6:49 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).