diff options
| author | Martin Hundebøll | 2020-11-30 12:11:32 +0100 |
|---|---|---|
| committer | Tom Rini | 2021-01-22 16:58:55 -0500 |
| commit | 09779488a924dbc4eb3b4ae145632f22b7f5a36c (patch) | |
| tree | 5818c7c13a61bc92e4b4271fd8bb76c919179c31 /tools/env | |
| parent | 603e26f76346a36594eda78daa2b7d95ce96b497 (diff) | |
tools: env: return error if ubi_update_start() fails
The UBI_IOCVOLUP ioctl can fail if exclusive access to the volume isn't
obtained. If this happens, the flush operation doesn't return error,
leaving the caller without knowledge of missing flush.
Fix this by forwarding the error (-1) from ubi_update_start().
Fixes: 34255b92e6e ("tools: env: Add support for direct read/write UBI volumes")
Signed-off-by: Martin Hundebøll <martin@geanix.com>
Diffstat (limited to 'tools/env')
| -rw-r--r-- | tools/env/fw_env.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 66cb9d2a25e..2a61a5d6f04 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1208,7 +1208,7 @@ static int flash_write(int fd_current, int fd_target, int dev_target) if (IS_UBI(dev_target)) { if (ubi_update_start(fd_target, CUR_ENVSIZE) < 0) - return 0; + return -1; return ubi_write(fd_target, environment.image, CUR_ENVSIZE); } |