* [2.6.25 patch] fix broken error handling in ieee80211_sta_process_addba_request()
@ 2008-02-19 22:58 Adrian Bunk
2008-02-20 6:46 ` Jarek Poplawski
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Bunk @ 2008-02-19 22:58 UTC (permalink / raw)
To: Ron Rindjunsky, John W. Linville, David S. Miller; +Cc: netdev, linux-kernel
The Coverity checker spotted this buggy error handling added by
commit 07db218396650933abff3c5c1ad1e2a6e0cfedeb.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
6003e3d899a8fd6425ff509363b776f8807df25d diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 2019b4f..094565e 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -1116,9 +1116,10 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev,
/* prepare reordering buffer */
tid_agg_rx->reorder_buf =
kmalloc(buf_size * sizeof(struct sk_buf *), GFP_ATOMIC);
- if ((!tid_agg_rx->reorder_buf) && net_ratelimit()) {
- printk(KERN_ERR "can not allocate reordering buffer "
- "to tid %d\n", tid);
+ if (!tid_agg_rx->reorder_buf) {
+ if (net_ratelimit())
+ printk(KERN_ERR "can not allocate reordering buffer "
+ "to tid %d\n", tid);
goto end;
}
memset(tid_agg_rx->reorder_buf, 0,
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [2.6.25 patch] fix broken error handling in ieee80211_sta_process_addba_request()
2008-02-19 22:58 [2.6.25 patch] fix broken error handling in ieee80211_sta_process_addba_request() Adrian Bunk
@ 2008-02-20 6:46 ` Jarek Poplawski
2008-02-20 8:38 ` Tomas Winkler
0 siblings, 1 reply; 3+ messages in thread
From: Jarek Poplawski @ 2008-02-20 6:46 UTC (permalink / raw)
To: Adrian Bunk
Cc: Ron Rindjunsky, John W. Linville, David S. Miller, netdev,
linux-kernel
On 19-02-2008 23:58, Adrian Bunk wrote:
...
> --- a/net/mac80211/ieee80211_sta.c
> +++ b/net/mac80211/ieee80211_sta.c
> @@ -1116,9 +1116,10 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev,
...
> + printk(KERN_ERR "can not allocate reordering buffer "
+ printk(KERN_ERR "cannot allocate reordering buffer "
Probably this can be fixed during the commit.
Jarek P.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [2.6.25 patch] fix broken error handling in ieee80211_sta_process_addba_request()
2008-02-20 6:46 ` Jarek Poplawski
@ 2008-02-20 8:38 ` Tomas Winkler
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Winkler @ 2008-02-20 8:38 UTC (permalink / raw)
To: Jarek Poplawski
Cc: Adrian Bunk, Ron Rindjunsky, John W. Linville, David S. Miller,
netdev, linux-kernel
On Feb 20, 2008 8:46 AM, Jarek Poplawski <jarkao2@gmail.com> wrote:
> On 19-02-2008 23:58, Adrian Bunk wrote:
> ...
> > --- a/net/mac80211/ieee80211_sta.c
> > +++ b/net/mac80211/ieee80211_sta.c
> > @@ -1116,9 +1116,10 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev,
> ...
> > + printk(KERN_ERR "can not allocate reordering buffer "
>
> + printk(KERN_ERR "cannot allocate reordering buffer "
>
> Probably this can be fixed during the commit.
>
> Jarek P
.
ACK: both patches.
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-02-20 8:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-19 22:58 [2.6.25 patch] fix broken error handling in ieee80211_sta_process_addba_request() Adrian Bunk
2008-02-20 6:46 ` Jarek Poplawski
2008-02-20 8:38 ` Tomas Winkler
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).