clearlinux/graphene
2
0
Fork 0
mirror of https://github.com/clearlinux/graphene.git synced 2026-09-06 13:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[LibOS] Change ioctl(, int cmd) to ioctl(, unsigned long cmd)

Browse Source 
The second argument to ioctl is unsigned long, not int.
This commit is contained in:
Isaku Yamahata
2020-02-10 22:38:07 +01:00
committed by Michał Kowalczyk
parent 15e298ace9
commit d2d88e16fe
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibOS/shim/include/shim_table.h
+2 -2
View File
@@ -340,7 +340,7 @@ int shim_do_sigaction(int signum, const struct __kernel_sigaction* act,
struct __kernel_sigaction* oldact, size_t sigsetsize);
int shim_do_sigprocmask(int how, const __sigset_t* set, __sigset_t* oldset);
int shim_do_sigreturn(int __unused);
int shim_do_ioctl(int fd, int cmd, unsigned long arg);
int shim_do_ioctl(int fd, unsigned long cmd, unsigned long arg);
ssize_t shim_do_pread64(int fd, char* buf, size_t count, loff_t pos);
ssize_t shim_do_pwrite64(int fd, char* buf, size_t count, loff_t pos);
ssize_t shim_do_readv(int fd, const struct iovec* vec, int vlen);
@@ -522,7 +522,7 @@ int shim_rt_sigaction(int signum, const struct __kernel_sigaction* act,
struct __kernel_sigaction* oldact, size_t sigsetsize);
int shim_rt_sigprocmask(int how, const __sigset_t* set, __sigset_t* oldset);
int shim_rt_sigreturn(int __unused);
int shim_ioctl(int fd, int cmd, unsigned long arg);
int shim_ioctl(int fd, unsigned long cmd, unsigned long arg);
size_t shim_pread64(int fd, char* buf, size_t count, loff_t pos);
size_t shim_pwrite64(int fd, char* buf, size_t count, loff_t pos);
ssize_t shim_readv(int fd, const struct iovec* vec, int vlen);
LibOS/shim/src/shim_syscalls.c
+1 -1
View File
@@ -176,7 +176,7 @@ DEFINE_SHIM_SYSCALL(rt_sigprocmask, 3, shim_do_sigprocmask, int, int, how, const
DEFINE_SHIM_SYSCALL(rt_sigreturn, 1, shim_do_sigreturn, int, int, __unused)
/* ioctl: sys/shim_ioctl.c */
DEFINE_SHIM_SYSCALL(ioctl, 3, shim_do_ioctl, int, int, fd, int, cmd, unsigned long, arg)
DEFINE_SHIM_SYSCALL(ioctl, 3, shim_do_ioctl, int, int, fd, unsigned long, cmd, unsigned long, arg)
/* pread64 : sys/shim_open.c */
DEFINE_SHIM_SYSCALL(pread64, 4, shim_do_pread64, size_t, int, fd, char*, buf, size_t, count, loff_t,
LibOS/shim/src/sys/shim_ioctl.c
+1 -1
View File
@@ -303,7 +303,7 @@ void signal_io(IDTYPE target, void* arg) {
put_thread(thread);
}
int shim_do_ioctl(int fd, int cmd, unsigned long arg) {
int shim_do_ioctl(int fd, unsigned long cmd, unsigned long arg) {
struct shim_handle* hdl = get_fd_handle(fd, NULL, NULL);
if (!hdl)
return -EBADF;