From: "Ulrich Ölmann" <u.oelmann@pengutronix.de> To: Pengutronix Public Open-Source-Development <oss-tools@pengutronix.de> Cc: "Ulrich Ölmann" <u.oelmann@pengutronix.de> Subject: [OSS-Tools] [PATCH dt-utils 01/13] state: Fix lseek error check in state_backend_bucket_direct_read() Date: Mon, 30 Sep 2019 09:26:01 +0200 [thread overview] Message-ID: <20190930072613.17956-2-u.oelmann@pengutronix.de> (raw) In-Reply-To: <20190930072613.17956-1-u.oelmann@pengutronix.de> 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> --- src/barebox-state/backend_bucket_direct.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/barebox-state/backend_bucket_direct.c b/src/barebox-state/backend_bucket_direct.c index dc00de0647a1..efa13ce0948a 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; } } -- 2.23.0 _______________________________________________ OSS-Tools mailing list OSS-Tools@pengutronix.de
next prev parent reply other threads:[~2019-09-30 7:26 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-30 7:26 [OSS-Tools] [PATCH dt-utils 00/13] Harmonize dt-utils' and barebox' shared code base Ulrich Ölmann 2019-09-30 7:26 ` Ulrich Ölmann [this message] 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 02/13] state: Fix lseek error check in state_backend_bucket_direct_write() Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 03/13] state: Fix lseek error check in state_mtd_peb_read() Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 04/13] state: Fix lseek error check in state_mtd_peb_write() Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 05/13] state: check length Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 06/13] state: backend_bucket_circular: mark block as bad if mtd_peb_torture() failed Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 07/13] state: drop unused code and declarations for non-existing functions Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 08/13] state: keep backward compatibility Ulrich Ölmann 2019-10-22 9:46 ` Roland Hieber 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 09/13] state: backend_storage: harmonize code with barebox Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 10/13] state: " Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 11/13] " Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 12/13] configure: remove build time option '--disable-logging' Ulrich Ölmann 2019-09-30 7:26 ` [OSS-Tools] [PATCH dt-utils 13/13] configure: remove build time option '--enable-debug' Ulrich Ölmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190930072613.17956-2-u.oelmann@pengutronix.de \ --to=u.oelmann@pengutronix.de \ --cc=oss-tools@pengutronix.de \ --subject='Re: [OSS-Tools] [PATCH dt-utils 01/13] state: Fix lseek error check in state_backend_bucket_direct_read()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox