lkml.org 
[lkml]   [2010]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 3/7] drivers/mtd/nand/mpc5121_nfc.c: Add of_node_put to avoid memory leak
    On Sun, Aug 29, 2010 at 11:52:42AM +0200, Julia Lawall wrote:
    > Add a call to of_node_put in the error handling code following a call to
    > of_find_compatible_node.
    >
    > The semantic match that finds this problem is as follows:
    > (http://coccinelle.lip6.fr/)
    >
    > // <smpl>
    > @r exists@
    > local idexpression x;
    > expression E,E1;
    > statement S;
    > @@
    >
    > *x =
    > (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
    > )(...);
    > ...
    > if (x == NULL) S
    > <... when != x = E
    > *if (...) {
    > ... when != of_node_put(x)
    > when != if (...) { ... of_node_put(x); ... }
    > (
    > return <+...x...+>;
    > |
    > * return ...;
    > )
    > }
    > ...>
    > of_node_put(x);
    > // </smpl>
    >
    > Signed-off-by: Julia Lawall <julia@diku.dk>

    Acked-by: Wolfram Sang <w.sang@pengutronix.de>

    adding ppc-list to cc.

    >
    > ---
    > drivers/mtd/nand/mpc5121_nfc.c | 7 +++++--
    > 1 file changed, 5 insertions(+), 2 deletions(-)
    >
    > diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
    > index df0c1da..f4610bc 100644
    > --- a/drivers/mtd/nand/mpc5121_nfc.c
    > +++ b/drivers/mtd/nand/mpc5121_nfc.c
    > @@ -568,6 +568,7 @@ static int mpc5121_nfc_read_hw_config(struct mtd_info *mtd)
    > uint rcw_width;
    > uint rcwh;
    > uint romloc, ps;
    > + int ret = 0;
    >
    > rmnode = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-reset");
    > if (!rmnode) {
    > @@ -579,7 +580,8 @@ static int mpc5121_nfc_read_hw_config(struct mtd_info *mtd)
    > rm = of_iomap(rmnode, 0);
    > if (!rm) {
    > dev_err(prv->dev, "Error mapping reset module node!\n");
    > - return -EBUSY;
    > + ret = -EBUSY;
    > + goto out;
    > }
    >
    > rcwh = in_be32(&rm->rcwhr);
    > @@ -628,8 +630,9 @@ static int mpc5121_nfc_read_hw_config(struct mtd_info *mtd)
    > rcw_width * 8, rcw_pagesize,
    > rcw_sparesize);
    > iounmap(rm);
    > +out:
    > of_node_put(rmnode);
    > - return 0;
    > + return ret;
    > }
    >
    > /* Free driver resources */
    >
    > _______________________________________________
    > devicetree-discuss mailing list
    > devicetree-discuss@lists.ozlabs.org
    > https://lists.ozlabs.org/listinfo/devicetree-discuss

    --
    Pengutronix e.K. | Wolfram Sang |
    Industrial Linux Solutions | http://www.pengutronix.de/ |
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2010-08-29 17:51    [W:0.026 / U:186.676 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site