aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-09-03 20:12:43 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-06 21:29:17 -0400
commite8f7f43a4ad451ecfb2689985f99a9e276a08bba (patch)
tree013683284acf99afd3530a7751680fa0dab53bfc
parent1fd63041c49c5c6ed1fe58b7bccc2de462d51e2b (diff)
drivers/net/fs_enet/fs_enet-main.c: Add of_node_put to avoid memory leak
In this case, a device_node structure is stored in another structure that is then freed without first decrementing the reference count of the device_node structure. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression x; identifier f; position p1,p2; @@ x@p1->f = \(of_find_node_by_path\|of_find_node_by_name\|of_find_node_by_phandle\|of_get_parent\|of_get_next_parent\|of_get_next_child\|of_find_compatible_node\|of_match_node\|of_find_node_by_type\|of_find_node_with_property\|of_find_matching_node\|of_parse_phandle\|of_node_get\)(...); ... when != of_node_put(x) kfree@p2(x) @script:python@ p1 << r.p1; p2 << r.p2; @@ cocci.print_main("call",p1) cocci.print_secs("free",p2) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index d6e3111959a..d684f187de5 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1036,7 +1036,7 @@ static int __devinit fs_enet_probe(struct platform_device *ofdev,
1036 ndev = alloc_etherdev(privsize); 1036 ndev = alloc_etherdev(privsize);
1037 if (!ndev) { 1037 if (!ndev) {
1038 ret = -ENOMEM; 1038 ret = -ENOMEM;
1039 goto out_free_fpi; 1039 goto out_put;
1040 } 1040 }
1041 1041
1042 SET_NETDEV_DEV(ndev, &ofdev->dev); 1042 SET_NETDEV_DEV(ndev, &ofdev->dev);
@@ -1099,6 +1099,7 @@ out_cleanup_data:
1099out_free_dev: 1099out_free_dev:
1100 free_netdev(ndev); 1100 free_netdev(ndev);
1101 dev_set_drvdata(&ofdev->dev, NULL); 1101 dev_set_drvdata(&ofdev->dev, NULL);
1102out_put:
1102 of_node_put(fpi->phy_node); 1103 of_node_put(fpi->phy_node);
1103out_free_fpi: 1104out_free_fpi:
1104 kfree(fpi); 1105 kfree(fpi);