From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Fri, 13 Jul 2018 11:42:01 +0200 Subject: [U-Boot] [PATCH 2/3] dfu: Fix memory leak in dfu_init_env_entities() In-Reply-To: <20180712215253.4290-2-semen.protsenko@linaro.org> References: <20180712215253.4290-1-semen.protsenko@linaro.org> <20180712215253.4290-2-semen.protsenko@linaro.org> Message-ID: <20180713114201.546a6bc2@jawa> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Sam, > In case of error in dfu_init_env_entities(), env_bkp will leak. Fix it > by providing single return path. > > Signed-off-by: Sam Protsenko > --- > drivers/dfu/dfu.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c > index a3c09334b7..5b9abd685d 100644 > --- a/drivers/dfu/dfu.c > +++ b/drivers/dfu/dfu.c > @@ -56,7 +56,7 @@ int dfu_init_env_entities(char *interface, char > *devstr) { > const char *str_env; > char *env_bkp; > - int ret; > + int ret = 0; > > #ifdef CONFIG_SET_DFU_ALT_INFO > set_dfu_alt_info(interface, devstr); > @@ -71,11 +71,12 @@ int dfu_init_env_entities(char *interface, char > *devstr) ret = dfu_config_entities(env_bkp, interface, devstr); > if (ret) { > pr_err("DFU entities configuration failed!\n"); > - return ret; > + goto done; > } > > +done: > free(env_bkp); > - return 0; > + return ret; > } > > static unsigned char *dfu_buf; Acked-by: Lukasz Majewski Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 488 bytes Desc: OpenPGP digital signature URL: