From: George Dunlap <george.dunlap@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Wei Liu <wei.liu2@citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
George Dunlap <george.dunlap@citrix.com>,
Julien Grall <julien.grall@arm.com>,
Jan Beulich <jbeulich@suse.com>,
Ian Jackson <ian.jackson@citrix.com>
Subject: [PATCH for-4.10] fuzz/x86_emulate: Fix afl-harness batch mode file pointer leak
Date: Fri, 13 Oct 2017 10:00:16 +0100 [thread overview]
Message-ID: <20171013090016.9042-1-george.dunlap@citrix.com> (raw)
Changeset XXXX introduced "batch mode" to afl-harness, which allowed
the handling of several inputs in sequence.
Unfortunately, it introduced a file pointer leak when the file was
larger than the maximum size. Restructure the code to always close fp
if we opened it.
Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---
Release exception justification:
- This is a bug fix. The problem is relatively minor, but the fix is relatively minor too.
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Julien Grall <julien.grall@arm.com>
---
tools/fuzz/x86_instruction_emulator/afl-harness.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/fuzz/x86_instruction_emulator/afl-harness.c b/tools/fuzz/x86_instruction_emulator/afl-harness.c
index d514468dd2..a2bae46d98 100644
--- a/tools/fuzz/x86_instruction_emulator/afl-harness.c
+++ b/tools/fuzz/x86_instruction_emulator/afl-harness.c
@@ -99,13 +99,17 @@ int main(int argc, char **argv)
exit(-1);
}
- if ( !feof(fp) )
+ /* Only run the test if the input file was smaller than INPUT_SIZE */
+ if ( feof(fp) )
+ {
+ LLVMFuzzerTestOneInput(input, size);
+ }
+ else
{
printf("Input too large\n");
/* Don't exit if we're doing batch processing */
if ( max == 1 )
exit(-1);
- continue;
}
if ( fp != stdin )
@@ -113,8 +117,6 @@ int main(int argc, char **argv)
fclose(fp);
fp = NULL;
}
-
- LLVMFuzzerTestOneInput(input, size);
}
return 0;
--
2.14.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next reply other threads:[~2017-10-13 9:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-13 9:00 George Dunlap [this message]
2017-10-13 9:06 ` [PATCH for-4.10] fuzz/x86_emulate: Fix afl-harness batch mode file pointer leak Jan Beulich
2017-10-13 9:10 ` George Dunlap
2017-10-13 9:20 ` Jan Beulich
2017-10-13 10:23 ` George Dunlap
2017-10-13 10:31 ` Jan Beulich
2017-10-13 10:36 ` George Dunlap
2017-10-13 9:12 ` George Dunlap
2017-10-17 13:39 ` Julien Grall
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=20171013090016.9042-1-george.dunlap@citrix.com \
--to=george.dunlap@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@citrix.com \
--cc=jbeulich@suse.com \
--cc=julien.grall@arm.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.