DeforaNetworks/zzuf
3
0
Fork 0
Code Releases Activity

* readv() implementation, thanks to Rémi Denis-Courmont.

Browse Source
This commit is contained in:
Sam Hocevar 2007-01-16 13:54:34 +00:00 committed by sam
parent 8bfb3da41f
commit 404b37f643
3 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AUTHORS
View File

@ -1,3 +1,8 @@
$Id$ $Id$
zzuf was written by Sam Hocevar <sam@zoy.org> main zzuf author:
Sam Hocevar <sam@zoy.org>
other contributors:
Rémi Denis-Courmont <rdenis#simphalempin:com> (readv support)

4
doc/zzuf.1
View File

@ -317,8 +317,8 @@ allocations, \fBzzuf\fR diverts and reimplements the following functions,
which can be private libc symbols, too: which can be private libc symbols, too:
.TP .TP
Unix file descriptor handling: Unix file descriptor handling:
\fBopen\fR(), \fBlseek\fR(), \fBread\fR(), \fBaccept\fR(), \fBsocket\fR(), \fBopen\fR(), \fBlseek\fR(), \fBread\fR(), \freadv\fR(), \fBaccept\fR(),
\fBclose\fR() \fBsocket\fR(), \fBclose\fR()
.TP .TP
Standard IO streams: Standard IO streams:
\fBfopen\fR(), \fBfreopen\fR(), \fBfseek\fR(), \fBfseeko\fR(), \fBrewind\fR(), \fBfopen\fR(), \fBfreopen\fR(), \fBfseek\fR(), \fBfseeko\fR(), \fBrewind\fR(),

53
src/load-fd.c
View File

@ -1,6 +1,7 @@
/* /*
* zzuf - general purpose fuzzer * zzuf - general purpose fuzzer
* Copyright (c) 2006 Sam Hocevar <sam@zoy.org> * Copyright (c) 2006, 2007 Sam Hocevar <sam@zoy.org>
* 2007 Rémi Denis-Courmont <rdenis#simphalempin:com>
* All Rights Reserved * All Rights Reserved
* *
* $Id$ * $Id$
@ -34,6 +35,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/uio.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdarg.h> #include <stdarg.h>
@ -59,6 +61,7 @@ static int (*accept_orig) (int sockfd, struct sockaddr *addr,
SOCKLEN_T *addrlen); SOCKLEN_T *addrlen);
static int (*socket_orig) (int domain, int type, int protocol); static int (*socket_orig) (int domain, int type, int protocol);
static ssize_t (*read_orig) (int fd, void *buf, size_t count); static ssize_t (*read_orig) (int fd, void *buf, size_t count);
static ssize_t (*readv_orig) (int fd, const struct iovec *iov, int count);
static off_t (*lseek_orig) (int fd, off_t offset, int whence); static off_t (*lseek_orig) (int fd, off_t offset, int whence);
#ifdef HAVE_LSEEK64 #ifdef HAVE_LSEEK64
static off64_t (*lseek64_orig) (int fd, off64_t offset, int whence); static off64_t (*lseek64_orig) (int fd, off64_t offset, int whence);
@ -162,6 +165,17 @@ int socket(int domain, int type, int protocol)
return ret; return ret;
} }
static void offset_check(int fd)
{
/* Sanity check, can be OK though (for instance with a character device) */
#ifdef HAVE_LSEEK64
if(lseek64_orig(fd, 0, SEEK_CUR) != _zz_getpos(fd))
#else
if(lseek_orig(fd, 0, SEEK_CUR) != _zz_getpos(fd))
#endif
debug("warning: offset inconsistency");
}
ssize_t read(int fd, void *buf, size_t count) ssize_t read(int fd, void *buf, size_t count)
{ {
int ret; int ret;
@ -188,14 +202,37 @@ ssize_t read(int fd, void *buf, size_t count)
else else
debug("read(%i, %p, %li) = %i", fd, buf, (long int)count, ret); debug("read(%i, %p, %li) = %i", fd, buf, (long int)count, ret);
/* Sanity check, can be OK though (for instance with a character device) */ offset_check(fd);
#ifdef HAVE_LSEEK64 return ret;
if(lseek64_orig(fd, 0, SEEK_CUR) != _zz_getpos(fd)) }
#else
if(lseek_orig(fd, 0, SEEK_CUR) != _zz_getpos(fd))
#endif
debug("warning: offset inconsistency");
ssize_t readv(int fd, const struct iovec *iov, int count)
{
ssize_t ret;
LOADSYM(readv);
ret = readv_orig(fd, iov, count);
if(!_zz_ready || !_zz_iswatched(fd) || _zz_disabled)
return ret;
debug("readv(%i, %p, %i) = %li", fd, iov, count, (long int)ret);
while(ret > 0)
{
void *b = iov->iov_base;
size_t len = iov->iov_len;
if(len > (size_t)ret)
len = ret;
_zz_fuzz(fd, b, len);
_zz_addpos(fd, len);
iov++;
ret -= len;
}
offset_check(fd);
return ret; return ret;
} }