* [PATCH] memcmp: fix comparison on short read
@ 2017-03-01 14:50 Uwe Kleine-König
2017-03-02 7:40 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2017-03-01 14:50 UTC (permalink / raw)
To: barebox
read() might return less than $count bytes which is only an upper limit.
The user is supposed to repeat the command to fill a buffer completely.
So use the convenience wrapper read_full in memcmp.
This fixes memcmp on /dev/nand0 on an Armada XP.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
commands/memcmp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/commands/memcmp.c b/commands/memcmp.c
index ce044df0d935..a00fddbc825f 100644
--- a/commands/memcmp.c
+++ b/commands/memcmp.c
@@ -91,13 +91,13 @@ static int do_memcmp(int argc, char *argv[])
now = min((loff_t)RW_BUF_SIZE, count);
- r1 = read(sourcefd, mem_rw_buf, now);
+ r1 = read_full(sourcefd, mem_rw_buf, now);
if (r1 < 0) {
perror("read");
goto out;
}
- r2 = read(destfd, rw_buf1, now);
+ r2 = read_full(destfd, rw_buf1, now);
if (r2 < 0) {
perror("read");
goto out;
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] memcmp: fix comparison on short read
2017-03-01 14:50 [PATCH] memcmp: fix comparison on short read Uwe Kleine-König
@ 2017-03-02 7:40 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2017-03-02 7:40 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: barebox
On Wed, Mar 01, 2017 at 03:50:04PM +0100, Uwe Kleine-König wrote:
> read() might return less than $count bytes which is only an upper limit.
> The user is supposed to repeat the command to fill a buffer completely.
>
> So use the convenience wrapper read_full in memcmp.
>
> This fixes memcmp on /dev/nand0 on an Armada XP.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> commands/memcmp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/commands/memcmp.c b/commands/memcmp.c
> index ce044df0d935..a00fddbc825f 100644
> --- a/commands/memcmp.c
> +++ b/commands/memcmp.c
> @@ -91,13 +91,13 @@ static int do_memcmp(int argc, char *argv[])
>
> now = min((loff_t)RW_BUF_SIZE, count);
>
> - r1 = read(sourcefd, mem_rw_buf, now);
> + r1 = read_full(sourcefd, mem_rw_buf, now);
> if (r1 < 0) {
> perror("read");
> goto out;
> }
>
> - r2 = read(destfd, rw_buf1, now);
> + r2 = read_full(destfd, rw_buf1, now);
> if (r2 < 0) {
> perror("read");
> goto out;
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-02 7:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-01 14:50 [PATCH] memcmp: fix comparison on short read Uwe Kleine-König
2017-03-02 7:40 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox