aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWei Yongjun2013-04-09 01:16:04 -0500
committerGreg Kroah-Hartman2013-04-12 11:52:12 -0500
commitafe4e1436f37d43bc90442f6829685e6e8322ca8 (patch)
tree145a3181a86ae18965ee2909988ffe7c7ca18592 /net
parent2a85fc20da763b9bb3ec2b959a3c282026b9888d (diff)
downloadkernel-video-afe4e1436f37d43bc90442f6829685e6e8322ca8.tar.gz
kernel-video-afe4e1436f37d43bc90442f6829685e6e8322ca8.tar.xz
kernel-video-afe4e1436f37d43bc90442f6829685e6e8322ca8.zip
can: gw: use kmem_cache_free() instead of kfree()
commit 3480a2125923e4b7a56d79efc76743089bf273fc upstream. Memory allocated by kmem_cache_alloc() should be freed using kmem_cache_free(), not kfree(). 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/can/gw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/can/gw.c b/net/can/gw.c
index 574dda78eb0..28e7bdc9df8 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -436,7 +436,7 @@ static int cgw_notifier(struct notifier_block *nb,
436 if (gwj->src.dev == dev || gwj->dst.dev == dev) { 436 if (gwj->src.dev == dev || gwj->dst.dev == dev) {
437 hlist_del(&gwj->list); 437 hlist_del(&gwj->list);
438 cgw_unregister_filter(gwj); 438 cgw_unregister_filter(gwj);
439 kfree(gwj); 439 kmem_cache_free(cgw_cache, gwj);
440 } 440 }
441 } 441 }
442 } 442 }
@@ -829,7 +829,7 @@ static void cgw_remove_all_jobs(void)
829 hlist_for_each_entry_safe(gwj, n, nx, &cgw_list, list) { 829 hlist_for_each_entry_safe(gwj, n, nx, &cgw_list, list) {
830 hlist_del(&gwj->list); 830 hlist_del(&gwj->list);
831 cgw_unregister_filter(gwj); 831 cgw_unregister_filter(gwj);
832 kfree(gwj); 832 kmem_cache_free(cgw_cache, gwj);
833 } 833 }
834} 834}
835 835
@@ -885,7 +885,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
885 885
886 hlist_del(&gwj->list); 886 hlist_del(&gwj->list);
887 cgw_unregister_filter(gwj); 887 cgw_unregister_filter(gwj);
888 kfree(gwj); 888 kmem_cache_free(cgw_cache, gwj);
889 err = 0; 889 err = 0;
890 break; 890 break;
891 } 891 }