From: Geraldo Netto <geraldonetto@gmail.com>
To: musl@lists.openwall.com
Subject: fread() - possible division by zero
Date: Wed, 14 Feb 2018 16:50:44 -0200 [thread overview]
Message-ID: <CACepeQ8NfqPG1Ea2t7FNocF+-pdYOJzHNTwJMw8z6mPhkP5mkQ@mail.gmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1129 bytes --]
Dear Friends,
It seems we may have the same division by zero issue on fread():
This is the original code:
size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f)
{
unsigned char *dest = destv;
size_t len = size*nmemb, l = len, k;
if (!size) nmemb = 0;
FLOCK(f);
f->mode |= f->mode-1;
if (f->rend - f->rpos > 0) {
/* First exhaust the buffer. */
k = MIN(f->rend - f->rpos, l);
memcpy(dest, f->rpos, k);
f->rpos += k;
dest += k;
l -= k;
}
/* Read the remainder directly */
for (; l; l-=k, dest+=k) {
k = __toread(f) ? 0 : f->read(f, dest, l);
if (k+1<=1) {
FUNLOCK(f);
return (len-l)/size;
}
}
FUNLOCK(f);
return nmemb;
}
It seems we need to check the variable size on return because if size is
zero
We'll have a division by zero and a segmentation fault
I'm sending the attached patch that changes the return as follows:
return (len-l)/(size != 0 ? size : 1);
I don't know if this is the correct approach, so, feel free to
change/let me know how to fix :)
Hope it helps
Kind Regards,
Geraldo Netto
Sapere Aude => Non dvcor, dvco
http://exdev.sf.net/
[-- Attachment #1.2: Type: text/html, Size: 1715 bytes --]
[-- Attachment #2: 0001-fread-avoid-possible-division-by-zero-when-size-0.patch --]
[-- Type: application/octet-stream, Size: 755 bytes --]
From 8acbbd4c8c768ec7a718f1040f45d7dfceb97283 Mon Sep 17 00:00:00 2001
From: geraldo netto <geraldonetto@gmail.com>
Date: Wed, 14 Feb 2018 16:46:13 -0200
Subject: [PATCH] fread(): avoid possible division by zero when size = 0
Signed-off-by: geraldo netto <geraldonetto@gmail.com>
---
src/stdio/fread.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/stdio/fread.c b/src/stdio/fread.c
index aef75f7..1085d2a 100644
--- a/src/stdio/fread.c
+++ b/src/stdio/fread.c
@@ -27,7 +27,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f)
k = __toread(f) ? 0 : f->read(f, dest, l);
if (k+1<=1) {
FUNLOCK(f);
- return (len-l)/size;
+ return (len-l)/(size != 0 ? size : 1);
}
}
--
2.7.4
next reply other threads:[~2018-02-14 18:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 18:50 Geraldo Netto [this message]
2018-02-14 19:45 ` Markus Wichmann
2018-02-14 21:23 ` Szabolcs Nagy
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=CACepeQ8NfqPG1Ea2t7FNocF+-pdYOJzHNTwJMw8z6mPhkP5mkQ@mail.gmail.com \
--to=geraldonetto@gmail.com \
--cc=musl@lists.openwall.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).