pull-request: can 2013-04-09

pull-request: can 2013-04-09

[Marc Kleine-Budde]

Hello David,

here's a fix for the v3.9 release cycle, if not too late:

Wei Yongjun contributes a patch for the can-gw protocoll. The patch fixes the
memory allocated with kmem_cache_alloc(), is now freed using kmem_cache_free(),
not kfree().

regards,
Marc

---

The following changes since commit c802d759623acbd6e1ee9fbdabae89159a513913:

  netrom: fix invalid use of sizeof in nr_recvmsg() (2013-04-08 22:49:23 -0400)

are available in the git repository at:

  git://gitorious.org/linux-can/linux-can.git fixes-for-3.9

for you to fetch changes up to 3480a2125923e4b7a56d79efc76743089bf273fc:

  can: gw: use kmem_cache_free() instead of kfree() (2013-04-09 09:58:44 +0200)

----------------------------------------------------------------
Wei Yongjun (1):
      can: gw: use kmem_cache_free() instead of kfree()

 net/can/gw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[PATCH] can: gw: use kmem_cache_free() instead of kfree()

[Marc Kleine-Budde]

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Memory allocated by kmem_cache_alloc() should be freed using
kmem_cache_free(), not kfree().

Cc: linux-stable <stable@vger.kernel.org> # >= v3.2
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 net/can/gw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/can/gw.c b/net/can/gw.c
index 2d117dc..117814a 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -466,7 +466,7 @@ static int cgw_notifier(struct notifier_block *nb,
 			if (gwj->src.dev == dev || gwj->dst.dev == dev) {
 				hlist_del(&gwj->list);
 				cgw_unregister_filter(gwj);
-				kfree(gwj);
+				kmem_cache_free(cgw_cache, gwj);
 			}
 		}
 	}
@@ -864,7 +864,7 @@ static void cgw_remove_all_jobs(void)
 	hlist_for_each_entry_safe(gwj, nx, &cgw_list, list) {
 		hlist_del(&gwj->list);
 		cgw_unregister_filter(gwj);
-		kfree(gwj);
+		kmem_cache_free(cgw_cache, gwj);
 	}
 }
 
@@ -920,7 +920,7 @@ static int cgw_remove_job(struct sk_buff *skb,  struct nlmsghdr *nlh, void *arg)
 
 		hlist_del(&gwj->list);
 		cgw_unregister_filter(gwj);
-		kfree(gwj);
+		kmem_cache_free(cgw_cache, gwj);
 		err = 0;
 		break;
 	}
-- 
1.8.2.rc2

Re: pull-request: can 2013-04-09

[David Miller]

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Tue,  9 Apr 2013 10:13:34 +0200

> here's a fix for the v3.9 release cycle, if not too late:
> 
> Wei Yongjun contributes a patch for the can-gw protocoll. The patch fixes the
> memory allocated with kmem_cache_alloc(), is now freed using kmem_cache_free(),
> not kfree().

Pulled, thanks Marc.