Re: [PATCH] net/wireless/nl80211.c: fix endless Netlink callback loop.

["Julius Volz" <juliusv@google.com>]

On Tue, Jul 8, 2008, Johannes Berg wrote:
>> Also, iterations where the filling of an element fails should not be counted as
>> completed, so idx should not be incremented in this case.
>
> Seems to be the case on both points, however,
>
>> --- a/net/wireless/nl80211.c
>> +++ b/net/wireless/nl80211.c
>> @@ -194,22 +194,24 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
>>  static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
>>  {
>>       int idx = 0;
>>       int start = cb->args[0];
>>       struct cfg80211_registered_device *dev;
>>
>>       mutex_lock(&cfg80211_drv_mutex);
>>       list_for_each_entry(dev, &cfg80211_drv_list, list) {
>> -             if (++idx < start)
>> +             if (++idx <= start)
>>                       continue;
>>               if (nl80211_send_wiphy(skb, NETLINK_CB(cb->skb).pid,
>>                                      cb->nlh->nlmsg_seq, NLM_F_MULTI,
>> -                                    dev) < 0)
>> +                                    dev) < 0) {
>> +                     idx--;
>>                       break;
>> +             }
>
> I see much of the problem stemming from incrementing 'idx' at the
> beginning of the loop, can't we just move it to the end?

idx still needs to be incremented in the 'continue' case, so that
alone wouldn't help. I'm not sure if there is a way to make this look
more intuitive?

Julius

-- 
Google Switzerland GmbH