diff options
| author | Ulrich Ölmann <u.oelmann@pengutronix.de> | 2019-09-30 09:26:01 +0200 |
|---|---|---|
| committer | Roland Hieber <rhi@pengutronix.de> | 2019-10-11 16:49:38 +0200 |
| commit | ef7355cccc3a17bf09bb2a4f75de3f9ed360f97c (patch) | |
| tree | 0176baff96c7dd2901b1f8a78a0bc54bd7f45174 | |
| parent | 634317cc91202304c1477a6d738d7c7691b80419 (diff) | |
| download | dt-utils-ef7355cccc3a17bf09bb2a4f75de3f9ed360f97c.tar.gz dt-utils-ef7355cccc3a17bf09bb2a4f75de3f9ed360f97c.tar.xz | |
state: Fix lseek error check in state_backend_bucket_direct_read()
This ports the following barebox commit:
| commit 219b954a11e82afbbd7b6ef13d8c5ba94a5b0ff3
| Author: Andrey Smirnov <andrew.smirnov@gmail.com>
| Date: Wed Mar 6 23:49:21 2019 -0800
|
| state: Fix lseek error check in state_backend_bucket_direct_read()
|
| 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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/barebox-state/backend_bucket_direct.c b/src/barebox-state/backend_bucket_direct.c index dc00de0..efa13ce 100644 --- a/src/barebox-state/backend_bucket_direct.c +++ b/src/barebox-state/backend_bucket_direct.c @@ -56,10 +56,9 @@ static int state_backend_bucket_direct_read(struct state_backend_storage_bucket void *buf; int ret; - 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; } ret = read_full(direct->fd, &meta, sizeof(meta)); if (ret < 0) { @@ -72,10 +71,11 @@ static int state_backend_bucket_direct_read(struct state_backend_storage_bucket if (meta.magic != ~0 && !!meta.magic) bucket->wrong_magic = 1; read_len = direct->max_size; - 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; } } |