From 320e1d002ed06fe0ffa950c9341e971db8ae6844 Mon Sep 17 00:00:00 2001
From: Lubos Dolezel <lubos@dolezel.info>
Date: Wed, 1 Mar 2017 17:14:12 +0100
Subject: [PATCH] Fix errno reporting for Linux specific syscalls

---
 src/kernel/emulation/linux/ext/clock_gettime.c     | 2 +-
 src/kernel/emulation/linux/ext/clock_nanosleep.c   | 2 +-
 src/kernel/emulation/linux/ext/epoll_create.c      | 2 +-
 src/kernel/emulation/linux/ext/epoll_create1.c     | 2 +-
 src/kernel/emulation/linux/ext/epoll_ctl.c         | 2 +-
 src/kernel/emulation/linux/ext/epoll_wait.c        | 2 +-
 src/kernel/emulation/linux/ext/eventfd.c           | 2 +-
 src/kernel/emulation/linux/ext/futex.c             | 2 +-
 src/kernel/emulation/linux/ext/inotify_add_watch.c | 2 +-
 src/kernel/emulation/linux/ext/inotify_init.c      | 2 +-
 src/kernel/emulation/linux/ext/inotify_init1.c     | 2 +-
 src/kernel/emulation/linux/ext/inotify_rm_watch.c  | 2 +-
 src/kernel/emulation/linux/ext/mremap.c            | 2 +-
 src/kernel/emulation/linux/ext/signalfd.c          | 2 +-
 src/kernel/emulation/linux/ext/syslog.c            | 2 +-
 src/kernel/emulation/linux/ext/timerfd_create.c    | 2 +-
 src/kernel/emulation/linux/ext/timerfd_gettime.c   | 2 +-
 src/kernel/emulation/linux/ext/timerfd_settime.c   | 2 +-
 src/kernel/emulation/linux/ext/uname.c             | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/kernel/emulation/linux/ext/clock_gettime.c b/src/kernel/emulation/linux/ext/clock_gettime.c
index 579bc1e8b..3969e39ec 100644
--- a/src/kernel/emulation/linux/ext/clock_gettime.c
+++ b/src/kernel/emulation/linux/ext/clock_gettime.c
@@ -13,7 +13,7 @@ int clock_gettime (int __clockid, struct timespec* __res)
 	rv = LINUX_SYSCALL(__NR_clock_gettime, __clockid, __res);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/clock_nanosleep.c b/src/kernel/emulation/linux/ext/clock_nanosleep.c
index 0d9174b76..a54a12a04 100644
--- a/src/kernel/emulation/linux/ext/clock_nanosleep.c
+++ b/src/kernel/emulation/linux/ext/clock_nanosleep.c
@@ -16,7 +16,7 @@ int clock_nanosleep (int __clockid, int __flags,
 			__req, __rem);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/epoll_create.c b/src/kernel/emulation/linux/ext/epoll_create.c
index a00838cd3..d7d69f6f8 100644
--- a/src/kernel/emulation/linux/ext/epoll_create.c
+++ b/src/kernel/emulation/linux/ext/epoll_create.c
@@ -13,7 +13,7 @@ int epoll_create (int __size)
 	rv = LINUX_SYSCALL(__NR_epoll_create, __size);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/epoll_create1.c b/src/kernel/emulation/linux/ext/epoll_create1.c
index 73e5ad7d4..a6e87c5cb 100644
--- a/src/kernel/emulation/linux/ext/epoll_create1.c
+++ b/src/kernel/emulation/linux/ext/epoll_create1.c
@@ -13,7 +13,7 @@ int epoll_create1 (int __flags)
 	rv = LINUX_SYSCALL(__NR_epoll_create1, __flags);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/epoll_ctl.c b/src/kernel/emulation/linux/ext/epoll_ctl.c
index 22b842dce..6edb3e7c5 100644
--- a/src/kernel/emulation/linux/ext/epoll_ctl.c
+++ b/src/kernel/emulation/linux/ext/epoll_ctl.c
@@ -15,7 +15,7 @@ int epoll_ctl (int __epfd, int __op, int __fd,
 			__event);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/epoll_wait.c b/src/kernel/emulation/linux/ext/epoll_wait.c
index b73190255..b452f98bb 100644
--- a/src/kernel/emulation/linux/ext/epoll_wait.c
+++ b/src/kernel/emulation/linux/ext/epoll_wait.c
@@ -15,7 +15,7 @@ int epoll_wait (int __epfd, struct epoll_event *__events,
 			__timeout);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/eventfd.c b/src/kernel/emulation/linux/ext/eventfd.c
index 91b76b17f..dde1b500c 100644
--- a/src/kernel/emulation/linux/ext/eventfd.c
+++ b/src/kernel/emulation/linux/ext/eventfd.c
@@ -14,7 +14,7 @@ int __linux_eventfd (int __count, int __flags)
 			__flags);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/futex.c b/src/kernel/emulation/linux/ext/futex.c
index 5fd6aaf24..519d09c71 100644
--- a/src/kernel/emulation/linux/ext/futex.c
+++ b/src/kernel/emulation/linux/ext/futex.c
@@ -14,7 +14,7 @@ int __linux_futex (int *uaddr, int op, int val, const struct timespec *timeout,
 	rv = LINUX_SYSCALL(__NR_futex, uaddr, op, val, timeout, uaddr2, val3);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/inotify_add_watch.c b/src/kernel/emulation/linux/ext/inotify_add_watch.c
index c41796930..5ec4ea4b3 100644
--- a/src/kernel/emulation/linux/ext/inotify_add_watch.c
+++ b/src/kernel/emulation/linux/ext/inotify_add_watch.c
@@ -13,7 +13,7 @@ int inotify_add_watch (int __fd, const char *__name, uint32_t __mask)
 	rv = LINUX_SYSCALL(__NR_inotify_add_watch, __fd, __name, __mask);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/inotify_init.c b/src/kernel/emulation/linux/ext/inotify_init.c
index 73e68e867..6916c2834 100644
--- a/src/kernel/emulation/linux/ext/inotify_init.c
+++ b/src/kernel/emulation/linux/ext/inotify_init.c
@@ -13,7 +13,7 @@ int inotify_init (void)
 	rv = LINUX_SYSCALL(__NR_inotify_init);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/inotify_init1.c b/src/kernel/emulation/linux/ext/inotify_init1.c
index 30a479af4..068d77f5b 100644
--- a/src/kernel/emulation/linux/ext/inotify_init1.c
+++ b/src/kernel/emulation/linux/ext/inotify_init1.c
@@ -13,7 +13,7 @@ int inotify_init1 (int __flags)
 	rv = LINUX_SYSCALL(__NR_inotify_init1, __flags);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/inotify_rm_watch.c b/src/kernel/emulation/linux/ext/inotify_rm_watch.c
index b6f90cb7d..6302205d5 100644
--- a/src/kernel/emulation/linux/ext/inotify_rm_watch.c
+++ b/src/kernel/emulation/linux/ext/inotify_rm_watch.c
@@ -13,7 +13,7 @@ int inotify_rm_watch (int __fd, int __wd)
 	rv = LINUX_SYSCALL(__NR_inotify_rm_watch, __fd, __wd);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/mremap.c b/src/kernel/emulation/linux/ext/mremap.c
index c647cb1bb..74006dd99 100644
--- a/src/kernel/emulation/linux/ext/mremap.c
+++ b/src/kernel/emulation/linux/ext/mremap.c
@@ -13,7 +13,7 @@ int __linux_mremap(void* old_addr, unsigned long old_size, unsigned long new_siz
 	rv = LINUX_SYSCALL(__NR_mremap, old_addr, old_size, new_size, flags, new_address);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/signalfd.c b/src/kernel/emulation/linux/ext/signalfd.c
index dcf317648..ede0a8839 100644
--- a/src/kernel/emulation/linux/ext/signalfd.c
+++ b/src/kernel/emulation/linux/ext/signalfd.c
@@ -35,7 +35,7 @@ int signalfd (int __fd, const sigset_t *__mask, int __flags)
 #endif
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/syslog.c b/src/kernel/emulation/linux/ext/syslog.c
index 0c284488a..043efc3fd 100644
--- a/src/kernel/emulation/linux/ext/syslog.c
+++ b/src/kernel/emulation/linux/ext/syslog.c
@@ -13,7 +13,7 @@ int __linux_syslog (int type, char* bufp, int len)
 	rv = LINUX_SYSCALL(__NR_syslog, type, bufp, len);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/timerfd_create.c b/src/kernel/emulation/linux/ext/timerfd_create.c
index 0b5f9208f..96a591db2 100644
--- a/src/kernel/emulation/linux/ext/timerfd_create.c
+++ b/src/kernel/emulation/linux/ext/timerfd_create.c
@@ -13,7 +13,7 @@ int timerfd_create (int __clock_id, int __flags)
 	rv = LINUX_SYSCALL(__NR_timerfd_create, __clock_id, __flags);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/timerfd_gettime.c b/src/kernel/emulation/linux/ext/timerfd_gettime.c
index 6b60ffa11..2dc5178bc 100644
--- a/src/kernel/emulation/linux/ext/timerfd_gettime.c
+++ b/src/kernel/emulation/linux/ext/timerfd_gettime.c
@@ -13,7 +13,7 @@ int timerfd_gettime (int __fd, struct itimerspec* __otmr)
 	rv = LINUX_SYSCALL(__NR_timerfd_gettime, __fd, __otmr);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/timerfd_settime.c b/src/kernel/emulation/linux/ext/timerfd_settime.c
index 7fee71641..d333b475b 100644
--- a/src/kernel/emulation/linux/ext/timerfd_settime.c
+++ b/src/kernel/emulation/linux/ext/timerfd_settime.c
@@ -15,7 +15,7 @@ int timerfd_settime (int __fd, int __flags,
 	rv = LINUX_SYSCALL(__NR_timerfd_settime, __fd, __flags, __utmr, __otmr);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
diff --git a/src/kernel/emulation/linux/ext/uname.c b/src/kernel/emulation/linux/ext/uname.c
index aa25815d0..4c053b0d3 100644
--- a/src/kernel/emulation/linux/ext/uname.c
+++ b/src/kernel/emulation/linux/ext/uname.c
@@ -12,7 +12,7 @@ int __linux_uname(struct linux_utsname* p)
 	rv = LINUX_SYSCALL(__NR_uname, p);
 	if (rv < 0)
 	{
-		cerror(errno_linux_to_bsd(rv));
+		cerror(errno_linux_to_bsd(-rv));
 		return -1;
 	}
 
-- 
2.51.2