| Subject | Re: [PATCH 187/270] net/wireless: ipw2200: Fix panic occurring in ipw_handle_promiscuous_tx() | From | Ben Hutchings <> | Date | Tue, 27 Nov 2012 15:58:51 +0000 |
| |
On Mon, 2012-11-26 at 14:57 -0200, Herton Ronaldo Krzesinski wrote: > 3.5.7u1 -stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Stanislav Yakovlev <stas.yakovlev@gmail.com> > > commit bf11315eeda510ea4fc1a2bf972d8155d31d89b4 upstream. > > The driver does not count space of radiotap fields when allocating skb for > radiotap packet. This leads to kernel panic with the following call trace: > > ... > [67607.676067] [<c152f90f>] error_code+0x67/0x6c > [67607.676067] [<c142f831>] ? skb_put+0x91/0xa0 > [67607.676067] [<f8cf5e5b>] ? ipw_handle_promiscuous_tx+0x16b/0x2d0 [ipw2200] > [67607.676067] [<f8cf5e5b>] ipw_handle_promiscuous_tx+0x16b/0x2d0 [ipw2200] > [67607.676067] [<f8cf899b>] ipw_net_hard_start_xmit+0x8b/0x90 [ipw2200] > [67607.676067] [<f8741c5a>] libipw_xmit+0x55a/0x980 [libipw] > [67607.676067] [<c143d3e8>] dev_hard_start_xmit+0x218/0x4d0 > ... > > This bug was found by VittGam. > https://bugzilla.kernel.org/show_bug.cgi?id=43255 > > Signed-off-by: Stanislav Yakovlev <stas.yakovlev@gmail.com> > Signed-off-by: John W. Linville <linville@tuxdriver.com> > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
This is missing from 3.4; it may just need de-fuzzing to apply.
Ben.
> --- > drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c > index 0036737..1f2edf2 100644 > --- a/drivers/net/wireless/ipw2x00/ipw2200.c > +++ b/drivers/net/wireless/ipw2x00/ipw2200.c > @@ -10470,7 +10470,7 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv, > } else > len = src->len; > > - dst = alloc_skb(len + sizeof(*rt_hdr), GFP_ATOMIC); > + dst = alloc_skb(len + sizeof(*rt_hdr) + sizeof(u16)*2, GFP_ATOMIC); > if (!dst) > continue; >
-- Ben Hutchings Never attribute to conspiracy what can adequately be explained by stupidity. [unhandled content-type:application/pgp-signature] |