diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-09 02:16:04 -0400 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-04-09 03:58:44 -0400 |
| commit | 3480a2125923e4b7a56d79efc76743089bf273fc (patch) | |
| tree | 6d2e241d497ef497aa637f8ee4a4b218c4161512 /net/can | |
| parent | c802d759623acbd6e1ee9fbdabae89159a513913 (diff) | |
can: gw: use kmem_cache_free() instead of kfree()
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>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/gw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/can/gw.c b/net/can/gw.c index 2d117dc5ebea..117814a7e73c 100644 --- a/net/can/gw.c +++ b/net/can/gw.c | |||
| @@ -466,7 +466,7 @@ static int cgw_notifier(struct notifier_block *nb, | |||
| 466 | if (gwj->src.dev == dev || gwj->dst.dev == dev) { | 466 | if (gwj->src.dev == dev || gwj->dst.dev == dev) { |
| 467 | hlist_del(&gwj->list); | 467 | hlist_del(&gwj->list); |
| 468 | cgw_unregister_filter(gwj); | 468 | cgw_unregister_filter(gwj); |
| 469 | kfree(gwj); | 469 | kmem_cache_free(cgw_cache, gwj); |
| 470 | } | 470 | } |
| 471 | } | 471 | } |
| 472 | } | 472 | } |
| @@ -864,7 +864,7 @@ static void cgw_remove_all_jobs(void) | |||
| 864 | hlist_for_each_entry_safe(gwj, nx, &cgw_list, list) { | 864 | hlist_for_each_entry_safe(gwj, nx, &cgw_list, list) { |
| 865 | hlist_del(&gwj->list); | 865 | hlist_del(&gwj->list); |
| 866 | cgw_unregister_filter(gwj); | 866 | cgw_unregister_filter(gwj); |
| 867 | kfree(gwj); | 867 | kmem_cache_free(cgw_cache, gwj); |
| 868 | } | 868 | } |
| 869 | } | 869 | } |
| 870 | 870 | ||
| @@ -920,7 +920,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
| 920 | 920 | ||
| 921 | hlist_del(&gwj->list); | 921 | hlist_del(&gwj->list); |
| 922 | cgw_unregister_filter(gwj); | 922 | cgw_unregister_filter(gwj); |
| 923 | kfree(gwj); | 923 | kmem_cache_free(cgw_cache, gwj); |
| 924 | err = 0; | 924 | err = 0; |
| 925 | break; | 925 | break; |
| 926 | } | 926 | } |
