mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Alexander Aring <alex.aring@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 13/29] of: make flatten independent of libfdt
Date: Wed, 27 Feb 2013 09:40:16 +0100	[thread overview]
Message-ID: <20130227084016.GL1906@pengutronix.de> (raw)
In-Reply-To: <20130226210519.GA4373@x61s.8.8.8.8>

On Tue, Feb 26, 2013 at 10:05:20PM +0100, Alexander Aring wrote:
> Hi Sascha,
> 
> On Tue, Feb 26, 2013 at 09:18:40PM +0100, Sascha Hauer wrote:
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  common/oftree.c   |    8 ++-
> >  drivers/of/base.c |  180 ++++++++++++++++++++++++++++++++++++++++++++---------
> >  include/of.h      |    4 +-
> >  3 files changed, 160 insertions(+), 32 deletions(-)
> > 
> > diff --git a/common/oftree.c b/common/oftree.c
> > index 0df5209..841d2c4 100644
> > --- a/common/oftree.c
> > +++ b/common/oftree.c
> > @@ -329,7 +329,13 @@ struct fdt_header *of_get_fixed_tree(struct fdt_header *fdt)
> >  	int size, align;
> >  
> >  	if (!fdt) {
> > -		fdt = internalfdt = of_flatten_dtb();
> > +		struct device_node *root_node;
> > +
> > +		root_node = of_get_root_node();
> > +		if (!root_node)
> > +			return NULL;
> > +
> > +		fdt = internalfdt = of_flatten_dtb(root_node);
> >  		if (!fdt)
> >  			return NULL;
> >  	}
> > diff --git a/drivers/of/base.c b/drivers/of/base.c
> > index d6ca949..cd463e9 100644
> > --- a/drivers/of/base.c
> > +++ b/drivers/of/base.c
> > @@ -1154,20 +1154,108 @@ err:
> >  	return ERR_PTR(ret);
> >  }
> >  
> > -static int __of_flatten_dtb(void *fdt, struct device_node *node)
> > +struct fdt {
> > +	void *dt;
> > +	uint32_t dt_nextofs;
> > +	uint32_t dt_size;
> > +	char *strings;
> > +	uint32_t str_nextofs;
> > +	uint32_t str_size;
> > +};
> > +
> > +static inline uint32_t dt_next_ofs(uint32_t curofs, uint32_t len)
> > +{
> > +	return ALIGN(curofs + len, 4);
> > +}
> > +
> > +static int lstrcpy(char *dest, const char *src)
> > +{
> > +	int len = 0;
> > +	int maxlen = 1023;
> > +
> > +	while (*src) {
> > +		*dest++ = *src++;
> > +		len++;
> > +		if (!maxlen)
> > +			return -ENOSPC;
> > +		maxlen--;
> > +	}
> > +
> > +	return len;
> > +}
> > +
> > +static int fdt_ensure_space(struct fdt *fdt, int dtsize)
> > +{
> > +	/*
> > +	 * We assume strings and names have a maximum length of 1024
> > +	 * whereas properties can be longer. We allocate new memory
> > +	 * if we have less than 1024 bytes (+ the property size left.
> > +	 */
> > +	if (fdt->str_size - fdt->str_nextofs < 1024) {
> > +		fdt->strings = realloc(fdt->strings, fdt->str_size * 2);
> > +		if (!fdt->strings)
> > +			return -ENOMEM;
> > +		fdt->str_size *= 2;
> > +	}
> > +
> > +	if (fdt->dt_size - fdt->dt_nextofs < 1024 + dtsize) {
> > +		fdt->dt = realloc(fdt->dt, fdt->dt_size * 2);
> > +		if (!fdt->dt)
> > +			return -ENOMEM;
> 
> Leaking memory here. We need to clean fdt->strings.

Nope. When fdt_ensure_space fails we will free both fdt->strings and
fdt->dt in the out_free: path in of_flatten_dtb().

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2013-02-27  8:40 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-26 20:18 [PATCH] remove libfdt Sascha Hauer
2013-02-26 20:18 ` [PATCH 01/29] of: unflatten: allocate root node explicitly Sascha Hauer
2013-02-26 20:18 ` [PATCH 02/29] of: export of_find_child Sascha Hauer
2013-02-26 20:18 ` [PATCH 03/29] of: removed unused variables Sascha Hauer
2013-02-26 20:18 ` [PATCH 04/29] of: Let of_find_node_by_path iterate over tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 05/29] of: remove allnodes list Sascha Hauer
2013-02-26 20:18 ` [PATCH 06/29] ARM bootm: Use of_get_fixed_tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 07/29] of: Add of_set_property and of_create_node Sascha Hauer
2013-02-26 20:18 ` [PATCH 08/29] of_node command: use of_create_node Sascha Hauer
2013-02-26 20:18 ` [PATCH 09/29] of: Add root node argument to of_find_node_by_path Sascha Hauer
2013-02-26 20:18 ` [PATCH 10/29] of: Add missing prototype for of_device_is_compatible Sascha Hauer
2013-02-26 20:18 ` [PATCH 11/29] of: let of_unflatten_dtb return the unflattened tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 12/29] of: make unflatten independent of libfdt Sascha Hauer
2013-02-26 20:18 ` [PATCH 13/29] of: make flatten " Sascha Hauer
2013-02-26 21:05   ` Alexander Aring
2013-02-27  8:40     ` Sascha Hauer [this message]
2013-02-27 19:52       ` Alexander Aring
2013-02-26 20:18 ` [PATCH 14/29] of/fdt: use optimized endianess conversion Sascha Hauer
2013-02-26 20:18 ` [PATCH 15/29] oftree command: Use of_print_nodes Sascha Hauer
2013-02-26 20:18 ` [PATCH 16/29] of: move OFTREE Kconfig option to drivers/of/ Sascha Hauer
2013-02-26 20:18 ` [PATCH 17/29] of: make OFDEVICE a user selectable option Sascha Hauer
2013-02-26 20:18 ` [PATCH 18/29] oftree command: retire CMD_OFTREE_PROBE Kconfig option Sascha Hauer
2013-02-26 20:18 ` [PATCH 19/29] of: move oftree Kconfig to the top of the drivers menu Sascha Hauer
2013-02-26 20:18 ` [PATCH 20/29] of: Pass barebox internal format devicetree to of_get_fixed_tree Sascha Hauer
2013-02-26 20:18 ` [PATCH 21/29] bootm: Use of_print_nodes instead of fdt_print Sascha Hauer
2013-02-26 20:18 ` [PATCH 22/29] of: move flat devicetree functions to separate file Sascha Hauer
2013-02-26 20:18 ` [PATCH 23/29] of: Add of property write functions for u32 Sascha Hauer
2013-02-26 20:18 ` [PATCH 24/29] of: make value of property in of_new_property optional Sascha Hauer
2013-02-26 20:18 ` [PATCH 25/29] of: Add missing prototype for size/address counting functions Sascha Hauer
2013-02-26 20:18 ` [PATCH 26/29] of: fixup unflattened devicetree Sascha Hauer
2013-02-26 20:18 ` [PATCH 27/29] of: remove unused libfdt Sascha Hauer
2013-02-26 20:18 ` [PATCH 28/29] of_* commands: print usage when insufficient arguments are given Sascha Hauer
2013-02-26 20:18 ` [PATCH 29/29] of_property command: Fix crash with empty property value Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130227084016.GL1906@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=alex.aring@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox