[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1215520235.9610.39.camel@johannes.berg>
Date: Tue, 08 Jul 2008 14:30:35 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Julius Volz <juliusv@...gle.com>
Cc: netdev@...r.kernel.org,
linux-wireless <linux-wireless@...r.kernel.org>
Subject: Re: [PATCH] net/wireless/nl80211.c: fix endless Netlink callback
loop.
> >> 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?
Good point. The only ways I can come up with add further to the already
quite deep indentation:
list_for_each_entry(...) {
if (idx > start)
if (nl80211_send_wiphy(...) < 0)
break;
idx++;
}
or hide the call into an if ():
list_for_each_entry(...) {
if (idx > start && nl80211_send_wiphy(...))
break;
idx++;
}
Not sure. I guess the code isn't touched often so your patch is fine.
johannes
Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)
Powered by blists - more mailing lists