This ports the following barebox commit:
| commit ec25ecfbcb47cb83b310b9e177a5b65de3781dec
| Author: Andrey Smirnov <andrew.smir...@gmail.com>
| Date: Wed Mar 6 23:49:22 2019 -0800
|
| state: Fix lseek error check in state_backend_bucket_direct_write()
|
| Don't use 'int' to store lseek()'s return value to avoid problems with
| large seek offsets. While at it, make sure to populate return error
| code from 'errno'.
|
| Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
| Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de>
---
src/barebox-state/backend_bucket_direct.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/barebox-state/backend_bucket_direct.c
b/src/barebox-state/backend_bucket_direct.c
index efa13ce0948a..7e83578edb0d 100644
--- a/src/barebox-state/backend_bucket_direct.c
+++ b/src/barebox-state/backend_bucket_direct.c
@@ -108,10 +108,9 @@ static int state_backend_bucket_direct_write(struct
state_backend_storage_bucket
if (len > direct->max_size - sizeof(meta))
return -E2BIG;
- ret = lseek(direct->fd, direct->offset, SEEK_SET);
- if (ret < 0) {
- dev_err(direct->dev, "Failed to seek file, %d\n", ret);
- return ret;
+ if (lseek(direct->fd, direct->offset, SEEK_SET) != direct->offset) {
+ dev_err(direct->dev, "Failed to seek file, %d\n", -errno);
+ return -errno;
}
meta.magic = direct_magic;
--
2.23.0
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
