diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-18 11:56:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-19 08:26:51 +0200 |
| commit | cb8cf33ce849f71f7fe1d717aa02b5669a54a19e (patch) | |
| tree | 6d6f9692573033e1b516a896a8fb1333f25d1a37 /common | |
| parent | 24a6b3f8eabf08b589a2860aee9b670fa88cd085 (diff) | |
| download | barebox-cb8cf33ce849f71f7fe1d717aa02b5669a54a19e.tar.gz barebox-cb8cf33ce849f71f7fe1d717aa02b5669a54a19e.tar.xz | |
fix erasing/protecting flashes with unspecified size
fixes: 81737c1 mtd: Fix erasing of devices >4GiB
Several places erased a complete flash partition passing ~0 as count to
erase(). With the above commit count to erase was changed from an unsigned
type to a signed type, so the (count > f->size - offset) check in
erase() no longer triggers and the ~0 count is no longer adjusted to the whole
device size. Among other things this results in saveenv failures on NOR
flashes.
This patch fixes this by introducing an explicit macro for erasing the
whole device which is tested for in erase(). All other negative values
are rejected.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reported-by: Giorgio <giorgio.nicole@arcor.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/environment.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/environment.c b/common/environment.c index 9cf44a0f06..be102db3d2 100644 --- a/common/environment.c +++ b/common/environment.c @@ -88,6 +88,7 @@ static int do_compare_file(const char *filename, const char *base) } #else +#define ERASE_SIZE_ALL 0 static inline int protect(int fd, size_t count, unsigned long offset, int prot) { return 0; @@ -329,7 +330,7 @@ int envfs_save(const char *filename, const char *dirname, unsigned flags) goto out; } - ret = erase(envfd, ~0, 0); + ret = erase(envfd, ERASE_SIZE_ALL, 0); /* ENOSYS and EOPNOTSUPP aren't errors here, many devices don't need it */ if (ret && errno != ENOSYS && errno != EOPNOTSUPP) { |