ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-12 07:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allocate real file descriptors for fuzz input with dup()

Browse Source 
--HG--
branch : fuzz
This commit is contained in:
Matt Johnston 2020-10-18 22:52:24 +08:00
parent 5567c238a7
commit 400c7c161f
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fuzz-wrapfd.c
View File

@ -7,8 +7,6 @@
#include "fuzz.h" #include "fuzz.h"
#define IOWRAP_MAXFD (FD_SETSIZE-1) #define IOWRAP_MAXFD (FD_SETSIZE-1)
// hopefully above any real fd...
static const int WRAPFD_STARTFD = 400;
static const int MAX_RANDOM_IN = 50000; static const int MAX_RANDOM_IN = 50000;
static const double CHANCE_CLOSE = 1.0 / 600; static const double CHANCE_CLOSE = 1.0 / 600;
static const double CHANCE_INTR = 1.0 / 900; static const double CHANCE_INTR = 1.0 / 900;
@ -23,13 +21,25 @@ struct fdwrap {
int closeout; int closeout;
}; };
static struct fdwrap wrap_fds[IOWRAP_MAXFD+1]; static struct fdwrap wrap_fds[IOWRAP_MAXFD+1] = {0};
static int wrapfd_maxfd = -1;
static unsigned short rand_state[3]; static unsigned short rand_state[3];
static buffer *input_buf; static buffer *input_buf;
static int devnull_fd = -1;
static void wrapfd_remove(int fd);
void wrapfd_setup(buffer *buf) { void wrapfd_setup(buffer *buf) {
TRACE(("wrapfd_setup")) TRACE(("wrapfd_setup"))
memset(wrap_fds, 0x0, sizeof(wrap_fds));
// clean old ones
int i;
for (i = 0; i <= wrapfd_maxfd; i++) {
if (wrap_fds[i].mode == COMMONBUF) {
wrapfd_remove(i);
}
}
wrapfd_maxfd = -1;
memset(rand_state, 0x0, sizeof(rand_state)); memset(rand_state, 0x0, sizeof(rand_state));
wrapfd_setseed(50); wrapfd_setseed(50);
@ -42,28 +52,29 @@ void wrapfd_setseed(uint32_t seed) {
} }
int wrapfd_new() { int wrapfd_new() {
int fd; if (devnull_fd == -1) {
// Find a spare file descriptor to use devnull_fd = open("/dev/null", O_RDONLY);
for (fd = WRAPFD_STARTFD; fd < IOWRAP_MAXFD; fd++) { assert(devnull_fd != -1);
if (wrap_fds[fd].mode == UNUSED) { }
// check real file descriptors haven't got as far as WRAPFD_STARTFD
assert(close(fd) == -1 && errno == EBADF); int fd = dup(devnull_fd);
assert(fd != -1);
assert(wrap_fds[fd].mode == UNUSED);
wrap_fds[fd].mode = COMMONBUF; wrap_fds[fd].mode = COMMONBUF;
wrap_fds[fd].closein = 0; wrap_fds[fd].closein = 0;
wrap_fds[fd].closeout = 0; wrap_fds[fd].closeout = 0;
wrapfd_maxfd = MAX(fd, wrapfd_maxfd);
return fd; return fd;
}
}
errno = EMFILE;
return -1;
} }
void wrapfd_remove(int fd) { static void wrapfd_remove(int fd) {
TRACE(("wrapfd_remove %d", fd)) TRACE(("wrapfd_remove %d", fd))
assert(fd >= 0); assert(fd >= 0);
assert(fd <= IOWRAP_MAXFD); assert(fd <= IOWRAP_MAXFD);
assert(wrap_fds[fd].mode != UNUSED); assert(wrap_fds[fd].mode != UNUSED);
wrap_fds[fd].mode = UNUSED; wrap_fds[fd].mode = UNUSED;
m_close(fd);
} }
int wrapfd_close(int fd) { int wrapfd_close(int fd) {
@ -162,8 +173,6 @@ int wrapfd_select(int nfds, fd_set *readfds, fd_set *writefds,
int ret = 0; int ret = 0;
int fdlist[IOWRAP_MAXFD+1]; int fdlist[IOWRAP_MAXFD+1];
memset(fdlist, 0x0, sizeof(fdlist));
if (!fuzz.wrapfds) { if (!fuzz.wrapfds) {
return select(nfds, readfds, writefds, exceptfds, timeout); return select(nfds, readfds, writefds, exceptfds, timeout);
} }