diff options
| author | Sam Protsenko <semen.protsenko@linaro.org> | 2018-07-13 16:35:45 +0300 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2018-08-08 22:22:08 +0200 |
| commit | feaa7856f50ec5bbf843d533ee223aedd845452c (patch) | |
| tree | 0fde014a93df98bdb49e13a2d5b46b8b83d3cb42 /drivers | |
| parent | 92c7edae5eb2235bcfd19823cc00177d2463bd60 (diff) | |
dfu: Fix data abort in dfu_free_entities()
Commit 5d8fae79163e ("dfu: avoid memory leak") brings a regression which
described below. This patch is effectively reverting that commit, adding
corresponding comment to avoid such regressions in future.
In case of error in dfu_config_entities(), it frees "dfu" array, which
leads to "data abort" in dfu_free_entities(), which tries to free the
same array (and even tries to access it from linked list first). The
issue occurs e.g. when partition table on device does not match
$dfu_alt_info layout:
=> dfu 0 mmc 1
Couldn't find part #2 on mmc device #1
DFU entities configuration failed!
data abort
To fix this issue, do not free "dfu" array in dfu_config_entities(). It
will be freed later in dfu_free_entities().
Tested on BeagleBone Black (where this regression was originally found).
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dfu/dfu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index e7c91193b9..a3c09334b7 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -462,7 +462,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr) ret = dfu_fill_entity(&dfu[i], s, alt_num_cnt, interface, devstr); if (ret) { - free(dfu); + /* We will free "dfu" in dfu_free_entities() */ return -1; } |