* [PATCH wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement
@ 2019-04-16 0:36 Gustavo A. R. Silva
2019-04-16 3:36 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Gustavo A. R. Silva @ 2019-04-16 0:36 UTC (permalink / raw)
To: Ping-Ke Shih, Kalle Valo, David S. Miller
Cc: linux-wireless, netdev, linux-kernel, Gustavo A. R. Silva, Kees Cook
Add missing break statement in order to prevent the code from falling
through to case 0x1025, and erroneously setting rtlhal->oem_id to
RT_CID_819X_ACER when rtlefuse->eeprom_svid is equal to 0x10EC and
none of the cases in switch (rtlefuse->eeprom_smid) match.
This bug was found thanks to the ongoing efforts to enable
-Wimplicit-fallthrough.
Fixes: 238ad2ddf34b ("rtlwifi: rtl8723ae: Clean up the hardware info routine")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
index 6bab162e1bb8..655460f61bbc 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -1675,6 +1675,7 @@ static void _rtl8723e_read_adapter_info(struct ieee80211_hw *hw,
rtlhal->oem_id = RT_CID_819X_LENOVO;
break;
}
+ break;
case 0x1025:
rtlhal->oem_id = RT_CID_819X_ACER;
break;
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement
2019-04-16 0:36 [PATCH wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement Gustavo A. R. Silva
@ 2019-04-16 3:36 ` Kalle Valo
2019-04-16 15:08 ` Gustavo A. R. Silva
0 siblings, 1 reply; 5+ messages in thread
From: Kalle Valo @ 2019-04-16 3:36 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Ping-Ke Shih, David S. Miller, linux-wireless, netdev,
linux-kernel, Kees Cook
"Gustavo A. R. Silva" <gustavo@embeddedor.com> writes:
> Add missing break statement in order to prevent the code from falling
> through to case 0x1025, and erroneously setting rtlhal->oem_id to
> RT_CID_819X_ACER when rtlefuse->eeprom_svid is equal to 0x10EC and
> none of the cases in switch (rtlefuse->eeprom_smid) match.
>
> This bug was found thanks to the ongoing efforts to enable
> -Wimplicit-fallthrough.
>
> Fixes: 238ad2ddf34b ("rtlwifi: rtl8723ae: Clean up the hardware info routine")
> Cc: stable@vger.kernel.org
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
You have marked this for wireless-drivers but the commit is 2.5 years
old, so I think wireless-drivers-next is more approriate.
--
Kalle Valo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement
2019-04-16 3:36 ` Kalle Valo
@ 2019-04-16 15:08 ` Gustavo A. R. Silva
2019-04-16 15:58 ` Kalle Valo
0 siblings, 1 reply; 5+ messages in thread
From: Gustavo A. R. Silva @ 2019-04-16 15:08 UTC (permalink / raw)
To: Kalle Valo
Cc: Ping-Ke Shih, David S. Miller, linux-wireless, netdev,
linux-kernel, Kees Cook
On 4/15/19 10:36 PM, Kalle Valo wrote:
> "Gustavo A. R. Silva" <gustavo@embeddedor.com> writes:
>
>> Add missing break statement in order to prevent the code from falling
>> through to case 0x1025, and erroneously setting rtlhal->oem_id to
>> RT_CID_819X_ACER when rtlefuse->eeprom_svid is equal to 0x10EC and
>> none of the cases in switch (rtlefuse->eeprom_smid) match.
>>
>> This bug was found thanks to the ongoing efforts to enable
>> -Wimplicit-fallthrough.
>>
>> Fixes: 238ad2ddf34b ("rtlwifi: rtl8723ae: Clean up the hardware info routine")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>
> You have marked this for wireless-drivers but the commit is 2.5 years
> old, so I think wireless-drivers-next is more approriate.
>
Yeah. This can actually be applied to both of them. What I'd like is
to have this applied to stable, so I thought wireless-drivers was a
more straightforward way.
Anyway, I'll update the tag and respin.
Thanks
--
Gustavo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement
2019-04-16 15:08 ` Gustavo A. R. Silva
@ 2019-04-16 15:58 ` Kalle Valo
2019-04-16 16:03 ` Gustavo A. R. Silva
0 siblings, 1 reply; 5+ messages in thread
From: Kalle Valo @ 2019-04-16 15:58 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Ping-Ke Shih, David S. Miller, linux-wireless, netdev,
linux-kernel, Kees Cook
"Gustavo A. R. Silva" <gustavo@embeddedor.com> writes:
> On 4/15/19 10:36 PM, Kalle Valo wrote:
>> "Gustavo A. R. Silva" <gustavo@embeddedor.com> writes:
>>
>>> Add missing break statement in order to prevent the code from falling
>>> through to case 0x1025, and erroneously setting rtlhal->oem_id to
>>> RT_CID_819X_ACER when rtlefuse->eeprom_svid is equal to 0x10EC and
>>> none of the cases in switch (rtlefuse->eeprom_smid) match.
>>>
>>> This bug was found thanks to the ongoing efforts to enable
>>> -Wimplicit-fallthrough.
>>>
>>> Fixes: 238ad2ddf34b ("rtlwifi: rtl8723ae: Clean up the hardware info routine")
>>> Cc: stable@vger.kernel.org
>>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>>
>> You have marked this for wireless-drivers but the commit is 2.5 years
>> old, so I think wireless-drivers-next is more approriate.
>>
>
> Yeah. This can actually be applied to both of them. What I'd like is
> to have this applied to stable, so I thought wireless-drivers was a
> more straightforward way.
Sure, makes sense. But I just want to keep the number of patches going
to wireless-drivers to the minimum, I really want to avoid conflicts as
much as possible. That's why I'm keeping the bar high for w-d.
> Anyway, I'll update the tag and respin.
Thanks.
--
Kalle Valo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement
2019-04-16 15:58 ` Kalle Valo
@ 2019-04-16 16:03 ` Gustavo A. R. Silva
0 siblings, 0 replies; 5+ messages in thread
From: Gustavo A. R. Silva @ 2019-04-16 16:03 UTC (permalink / raw)
To: Kalle Valo
Cc: Ping-Ke Shih, David S. Miller, linux-wireless, netdev,
linux-kernel, Kees Cook
On 4/16/19 10:58 AM, Kalle Valo wrote:
>>> You have marked this for wireless-drivers but the commit is 2.5 years
>>> old, so I think wireless-drivers-next is more approriate.
>>>
>>
>> Yeah. This can actually be applied to both of them. What I'd like is
>> to have this applied to stable, so I thought wireless-drivers was a
>> more straightforward way.
>
> Sure, makes sense. But I just want to keep the number of patches going
> to wireless-drivers to the minimum, I really want to avoid conflicts as
> much as possible. That's why I'm keeping the bar high for w-d.
>
Yep. I've got it.
I just sent v2:
https://lore.kernel.org/patchwork/patch/1062748/
Thanks
--
Gustavo
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-04-16 16:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-16 0:36 [PATCH wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement Gustavo A. R. Silva
2019-04-16 3:36 ` Kalle Valo
2019-04-16 15:08 ` Gustavo A. R. Silva
2019-04-16 15:58 ` Kalle Valo
2019-04-16 16:03 ` Gustavo A. R. Silva
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).