2009-08-14 02:01:34

by Luis R. Rodriguez

[permalink] [raw]
Subject: [RFT] ar9170: downgrade BUG_ON() on unexpected mdpu

If someone pulls the harware out while RX'ing a lot of traffic
I would funky data may be passed, BUG_ON() seems pretty extreme
so lets just drop the frame as we do when the length does not
meet our criteria for processing.

Cc: Christian Lamparter <[email protected]>
Signed-off-by: Luis R. Rodriguez <[email protected]>
---

This one depends on my previous patch.

drivers/net/wireless/ath/ar9170/main.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index 75c317d..0bbbc36 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -1068,8 +1068,11 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len)
break;

default:
- BUG_ON(1);
- break;
+ if (ar9170_nag_limiter(ar))
+ printk(KERN_ERR "%s: rx'd unexpected "
+ "type of MPDU.\n",
+ wiphy_name(ar->hw->wiphy));
+ return;
}

if (unlikely(mpdu_len < FCS_LEN))
--
1.6.3.3



2009-08-14 09:50:48

by Christian Lamparter

[permalink] [raw]
Subject: Re: [RFT] ar9170: downgrade BUG_ON() on unexpected mdpu

On Friday 14 August 2009 04:01:35 Luis R. Rodriguez wrote:
> If someone pulls the harware out while RX'ing a lot of traffic
> I would funky data may be passed, BUG_ON() seems pretty extreme
> so lets just drop the frame as we do when the length does not
> meet our criteria for processing.
>
> Cc: Christian Lamparter <[email protected]>
> Signed-off-by: Luis R. Rodriguez <[email protected]>
> ---
>
> This one depends on my previous patch.
>
> drivers/net/wireless/ath/ar9170/main.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
> index 75c317d..0bbbc36 100644
> --- a/drivers/net/wireless/ath/ar9170/main.c
> +++ b/drivers/net/wireless/ath/ar9170/main.c
> @@ -1068,8 +1068,11 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len)
> break;
>
> default:
> - BUG_ON(1);
> - break;
> + if (ar9170_nag_limiter(ar))
> + printk(KERN_ERR "%s: rx'd unexpected "
> + "type of MPDU.\n",
> + wiphy_name(ar->hw->wiphy));
> + return;
> }

no, this is really impossible! really!

But let's take a closer look why should be so:

the switch goes like this:
> switch (mac->status & AR9170_RX_STATUS_MPDU_MASK) {
mac->status is a u8 and AND with AR9170_RX_STATUS_MPDU_MASK.

AR9170_RX_STATUS_MPDU_MASK (etc.) is #define in hw.h
and it's a 0x30 _mask_.

This leaves only four possibilities: 0x00, 0x10, 0x20, 0x30.

>case AR9170_RX_STATUS_MPDU_FIRST: (case 0x20:)
>case AR9170_RX_STATUS_MPDU_LAST: (case 0x10:)
>case AR9170_RX_STATUS_MPDU_MIDDLE: (case 0x30:)
>case AR9170_RX_STATUS_MPDU_SINGLE: (case 0x00:)

so the default case is a deadly dead code path here ;-).
And the reason why you see it was because some checker tool kept
complaining about unlikely _corner_ cases.

> if (unlikely(mpdu_len < FCS_LEN))

Regards,
Chr

2009-08-14 17:11:34

by Kalle Valo

[permalink] [raw]
Subject: Re: [RFT] ar9170: downgrade BUG_ON() on unexpected mdpu

Christian Lamparter <[email protected]> writes:

>> - BUG_ON(1);
>> - break;
>> + if (ar9170_nag_limiter(ar))
>> + printk(KERN_ERR "%s: rx'd unexpected "
>> + "type of MPDU.\n",
>> + wiphy_name(ar->hw->wiphy));
>> + return;
>> }
>
> no, this is really impossible! really!

A network driver should not have a BUG_ON(), stalling the whole system
is not acceptable. For example, with my current setup I would have no
idea why the system even crashed. WARN_ON() should be enough here.

--
Kalle Valo

2009-08-14 15:31:15

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [RFT] ar9170: downgrade BUG_ON() on unexpected mdpu

On Fri, Aug 14, 2009 at 2:50 AM, Christian Lamparter<[email protected]> wrote:
> On Friday 14 August 2009 04:01:35 Luis R. Rodriguez wrote:
>> If someone pulls the harware out while RX'ing a lot of traffic
>> I would funky data may be passed, BUG_ON() seems pretty extreme
>> so lets just drop the frame as we do when the length does not
>> meet our criteria for processing.
>>
>> Cc: Christian Lamparter <[email protected]>
>> Signed-off-by: Luis R. Rodriguez <[email protected]>
>> ---
>>
>> This one depends on my previous patch.
>>
>>  drivers/net/wireless/ath/ar9170/main.c |    7 +++++--
>>  1 files changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
>> index 75c317d..0bbbc36 100644
>> --- a/drivers/net/wireless/ath/ar9170/main.c
>> +++ b/drivers/net/wireless/ath/ar9170/main.c
>> @@ -1068,8 +1068,11 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len)
>>               break;
>>
>>       default:
>> -             BUG_ON(1);
>> -             break;
>> +             if (ar9170_nag_limiter(ar))
>> +                     printk(KERN_ERR "%s: rx'd unexpected "
>> +                            "type of MPDU.\n",
>> +                            wiphy_name(ar->hw->wiphy));
>> +             return;
>>       }
>
> no, this is really impossible! really!
>
> But let's take a closer look why should be so:
>
> the switch goes like this:
>> switch (mac->status & AR9170_RX_STATUS_MPDU_MASK) {
> mac->status is a u8 and AND with AR9170_RX_STATUS_MPDU_MASK.
>
> AR9170_RX_STATUS_MPDU_MASK (etc.) is #define in hw.h
> and it's a 0x30 _mask_.
>
> This leaves only four possibilities: 0x00, 0x10, 0x20, 0x30.
>
>>case AR9170_RX_STATUS_MPDU_FIRST: (case 0x20:)
>>case AR9170_RX_STATUS_MPDU_LAST: (case 0x10:)
>>case AR9170_RX_STATUS_MPDU_MIDDLE: (case 0x30:)
>>case AR9170_RX_STATUS_MPDU_SINGLE: (case 0x00:)
>
> so the default case is a deadly dead code path here ;-).
> And the reason why you see it was because some checker tool kept
> complaining about unlikely _corner_ cases.

heh thanks!

Luis