diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2013-06-06 15:14:33 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2013-06-06 15:14:33 +0200 |
| commit | 2ee7283650ceddabe45363e851c97ed2af73399d (patch) | |
| tree | f1f16f065b7ec022d35ce59b748e4fc3838a158c | |
| parent | c59bdf95bc2f1c1b33b984c763ee8c0449648d94 (diff) | |
| download | socket_wrapper-2ee7283650ceddabe45363e851c97ed2af73399d.tar.gz socket_wrapper-2ee7283650ceddabe45363e851c97ed2af73399d.tar.xz socket_wrapper-2ee7283650ceddabe45363e851c97ed2af73399d.zip | |
src: Fix argument passing to libc ioctl().
| -rw-r--r-- | src/socket_wrapper.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index ebb9473..a8acc7b 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -2336,21 +2336,27 @@ int setsockopt(int s, int level, int optname, static int swrap_ioctl(int s, unsigned long int r, va_list va) { struct socket_info *si = find_socket_info(s); + long int args[4]; int value; int rc; + int i; + + for (i = 0; i < 4; i++) { + args[i] = va_arg(va, long int); + } if (!si) { - rc = real_ioctl(s, r, va); + rc = real_ioctl(s, r, args[0], args[1], args[2], args[3]); va_end(va); return rc; } - rc = real_ioctl(s, r, va); + rc = real_ioctl(s, r, args[0], args[1], args[2], args[3]); switch (r) { case FIONREAD: - value = va_arg(va, int); + value = (int) args[0]; if (rc == -1 && errno != EAGAIN && errno != ENOBUFS) { swrap_dump_packet(si, NULL, SWRAP_PENDING_RST, NULL, 0); } else if (value == 0) { /* END OF FILE */ |