Patchwork [wireless-drivers] rtlwifi: rtl8723ae: Fix missing break in switch statement

login
register
mail settings
Submitter Gustavo A. R. Silva
Date April 16, 2019, 12:36 a.m.
Message ID <20190416003626.GA16834@embeddedor>
Download mbox | patch
Permalink /patch/773755/
State New
Headers show

Comments

Gustavo A. R. Silva - April 16, 2019, 12:36 a.m.
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(+)
Kalle Valo - April 16, 2019, 3:36 a.m.
"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.
Gustavo A. R. Silva - April 16, 2019, 3:08 p.m.
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
Kalle Valo - April 16, 2019, 3:58 p.m.
"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.
Gustavo A. R. Silva - April 16, 2019, 4:03 p.m.
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

Patch

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;