mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-27 14:58:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix ioctl() and FIONREAD for sockets on Windows

Browse source 
This change fixes an issue where using FIONREAD would cause control flow
to jump to null, due to a _weaken() reference that I refactored long ago
This commit is contained in:
Justine Tunney 2024-09-13 01:47:33 -07:00
parent 1260f9d0ed
commit 6b10f4d0b6
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
6 changed files with 77 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libc/calls/ioctl.c
View file

@ -38,6 +38,7 @@
#include "libc/nt/iphlpapi.h"
#include "libc/nt/runtime.h"
#include "libc/nt/struct/ipadapteraddresses.h"
#include "libc/nt/thunk/msabi.h"
#include "libc/nt/winsock.h"
#include "libc/runtime/runtime.h"
#include "libc/runtime/stack.h"
@ -59,6 +60,8 @@
#define MAX_UNICAST_ADDR 32
#define MAX_NAME_CLASH ((int)('z' - 'a')) /* Allow a..z */
__msabi extern typeof(__sys_ioctlsocket_nt) *const __imp_ioctlsocket;
static struct HostAdapterInfoNode {
struct HostAdapterInfoNode *next;
char name[IFNAMSIZ]; /* Obtained from FriendlyName */
@ -76,7 +79,7 @@ static int ioctl_default(int fd, unsigned long request, void *arg) {
} else if (__isfdopen(fd)) {
if (g_fds.p[fd].kind == kFdSocket) {
handle = g_fds.p[fd].handle;
if ((rc = _weaken(__sys_ioctlsocket_nt)(handle, request, arg)) != -1) {
if ((rc = __imp_ioctlsocket(handle, request, arg)) != -1) {
return rc;
} else {
return _weaken(__winsockerr)();
@ -97,7 +100,7 @@ static int ioctl_fionread(int fd, uint32_t *arg) {
} else if (__isfdopen(fd)) {
handle = g_fds.p[fd].handle;
if (g_fds.p[fd].kind == kFdSocket) {
if ((rc = _weaken(__sys_ioctlsocket_nt)(handle, FIONREAD, arg)) != -1) {
if ((rc = __imp_ioctlsocket(handle, FIONREAD, arg)) != -1) {
return rc;
} else {
return _weaken(__winsockerr)();

2
libc/sock/recv-nt.c
View file

@ -39,7 +39,7 @@ struct RecvArgs {
struct NtIovec iovnt[16];
};
static textwindows int sys_recv_nt_start(int64_t handle,
textwindows static int sys_recv_nt_start(int64_t handle,
struct NtOverlapped *overlap,
uint32_t *flags, void *arg) {
struct RecvArgs *args = arg;

2
libc/sock/recvfrom-nt.c
View file

@ -42,7 +42,7 @@ struct RecvFromArgs {
struct NtIovec iovnt[16];
};
static textwindows int sys_recvfrom_nt_start(int64_t handle,
textwindows static int sys_recvfrom_nt_start(int64_t handle,
struct NtOverlapped *overlap,
uint32_t *flags, void *arg) {
struct RecvFromArgs *args = arg;

2
libc/sock/send-nt.c
View file

@ -38,7 +38,7 @@ struct SendArgs {
struct NtIovec iovnt[16];
};
static textwindows int sys_send_nt_start(int64_t handle,
textwindows static int sys_send_nt_start(int64_t handle,
struct NtOverlapped *overlap,
uint32_t *flags, void *arg) {
struct SendArgs *args = arg;

4
libc/sysv/consts.sh
View file

@ -19,10 +19,6 @@
dir=libc/sysv/consts
. libc/sysv/gen.sh
# syscon errno EALREADY 114 114 37 37 37 37 37 10037 # connection already in progress; bsd consensus; WSAEALREADY; raised by connect(2), send(2), ip(7)
# syscon errno EINPROGRESS 115 115 36 36 36 36 36 10036 # bsd consensus; WSAEINPROGRESS; raised by connect(2) w/ O_NONBLOCK
# syscon errno EISCONN 106 106 56 56 56 56 56 10056 # socket is connected; bsd consensus; WSAEISCONN; raised by connect(2), send(2), unix(7), ip(7)
# The Fifth Bell System, Community Edition
# » catalogue of carnage
#