diff options
| author | Ulrich Ölmann <u.oelmann@pengutronix.de> | 2019-09-30 09:26:02 +0200 |
|---|---|---|
| committer | Roland Hieber <rhi@pengutronix.de> | 2019-10-11 16:49:38 +0200 |
| commit | d59af7f22ab49c2d4c900584ca28d76bf921d068 (patch) | |
| tree | 8926f0154a2714946fb3e21ff27ac3fb0391bee3 | |
| parent | ef7355cccc3a17bf09bb2a4f75de3f9ed360f97c (diff) | |
| download | dt-utils-d59af7f22ab49c2d4c900584ca28d76bf921d068.tar.gz dt-utils-d59af7f22ab49c2d4c900584ca28d76bf921d068.tar.xz | |
state: Fix lseek error check in state_backend_bucket_direct_write()
This ports the following barebox commit:
| commit ec25ecfbcb47cb83b310b9e177a5b65de3781dec
| Author: Andrey Smirnov <andrew.smirnov@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.smirnov@gmail.com>
| Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
| -rw-r--r-- | src/barebox-state/backend_bucket_direct.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/barebox-state/backend_bucket_direct.c b/src/barebox-state/backend_bucket_direct.c index efa13ce..7e83578 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; |