On Tue 03-03-15 21:22:22, Tetsuo Handa wrote:
> Michal Hocko wrote:
> > diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > index ccf3436024bc..f351920fc293 100644
> > --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
> > @@ -1220,6 +1220,10 @@ static int set_filter_wr(struct adapter *adapter,
> > int fidx)
> > struct fw_filter_wr *fwr;
> > unsigned int ftid;
> >
> > + skb = alloc_skb(sizeof(*fwr), GFP_KERNEL);
> > + if (!skb)
> > + return -ENOMEM;
> > +
> > /* If the new filter requires loopback Destination MAC and/or VLAN
> > * rewriting then we need to allocate a Layer 2 Table (L2T) entry for
> > * the filter.
> > @@ -1227,19 +1231,21 @@ static int set_filter_wr(struct adapter *adapter,
> > int fidx)
> > if (f->fs.newdmac || f->fs.newvlan) {
> > /* allocate L2T entry for new filter */
> > f->l2t = t4_l2t_alloc_switching(adapter->l2t);
> > - if (f->l2t == NULL)
> > + if (f->l2t == NULL) {
> > + kfree(skb);
>
> I think we need to use kfree_skb() than kfree() for memory allocated by
> alloc_skb().
Definitely! Good point, thanks!
Andrew, I've noticed you have picked up the patch. Should I resend or
the below incremental one is good enough?
---
>From eee05867dd55efa236ba065a3e7b7eb6e6ea511d Mon Sep 17 00:00:00 2001
From: Michal Hocko <[email protected]>
Date: Tue, 3 Mar 2015 14:16:30 +0100
Subject: [PATCH] mmotm: cxgb4-drop-__gfp_nofail-allocation-fix
Use kfree_skb instead of kfree because the allocation is done by
alloc_skb.
Reported-by: Tetsuo Handa <[email protected]>
Signed-off-by: Michal Hocko <[email protected]>
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index f351920fc293..e1e5028a714c 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1232,14 +1232,14 @@ static int set_filter_wr(struct adapter *adapter, int
fidx)
/* allocate L2T entry for new filter */
f->l2t = t4_l2t_alloc_switching(adapter->l2t);
if (f->l2t == NULL) {
- kfree(skb);
+ kfree_skb(skb);
return -EAGAIN;
}
if (t4_l2t_set_switching(adapter, f->l2t, f->fs.vlan,
f->fs.eport, f->fs.dmac)) {
cxgb4_l2t_release(f->l2t);
f->l2t = NULL;
- kfree(skb);
+ kfree_skb(skb);
return -ENOMEM;
}
}
--
2.1.4
--
Michal Hocko
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
