Merge ~paelzer/ubuntu/+source/qemu:fix-lp-1807743-timerfd-syscall-xenial into ubuntu/+source/qemu:ubuntu/xenial-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Test PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3562/+packages
Test ticket: https://bileto.ubuntu.com/#/ticket/3562

Bug test instruction on the bug in the SRU template.

[Christian Ehrhardt  (paelzer)]

tests are fine in https://bileto.ubuntu.com/excuses/3562/xenial.html
(open-iscsi is already a force-badtest)

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, tagged and uploaded for SRU

diff --git a/debian/changelog b/debian/changelog
index fe7e42e..cc37d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:2.5+dfsg-5ubuntu10.34) xenial; urgency=medium
+
+  * d/p/ubuntu/lp1807743-linux-user-timerfd.patch: fix define for
+    timerfd_create system call (LP: #1807743)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 12 Dec 2018 13:18:01 +0100
+
 qemu (1:2.5+dfsg-5ubuntu10.33) xenial-security; urgency=medium
 
   * SECURITY UPDATE: integer overflow in NE2000 NIC emulation
diff --git a/debian/patches/series b/debian/patches/series
index 41454ff..aaf2a21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -249,3 +249,4 @@ CVE-2018-17963.patch
 CVE-2018-18849.patch
 CVE-2018-19364-1.patch
 CVE-2018-19364-2.patch
+ubuntu/lp1807743-linux-user-timerfd.patch
diff --git a/debian/patches/ubuntu/lp1807743-linux-user-timerfd.patch b/debian/patches/ubuntu/lp1807743-linux-user-timerfd.patch
new file mode 100644
index 0000000..b0b1d96
--- /dev/null
+++ b/debian/patches/ubuntu/lp1807743-linux-user-timerfd.patch
@@ -0,0 +1,109 @@
+From 93a92d3bd649cd315db47b9fb5dcb6af657cc22c Mon Sep 17 00:00:00 2001
+From: Riku Voipio <[e-mail]>
+Date: Mon, 15 Feb 2016 15:38:40 +0200
+Subject: [PATCH] linux-user: correct timerfd_create syscall numbers
+
+x86, m68k, ppc, sh4 and sparc failed to enable timerfd, because they
+didn't have timerfd_create system call defined. Instead QEMU
+defined timerfd syscall. Checking with kernel sources, it appears
+kernel developers reused timerfd syscall number with timerfd_create,
+presumably since no userspace called the old syscall number.
+
+Reported-by: Laurent Vivier <[e-mail]>
+Reviewed-by: Laurent Vivier <[e-mail]>
+Signed-off-by: Riku Voipio <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=93a92d3bd649cd315db47b9fb5dcb6af657cc22c
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1807743
+Last-Update: 2018-12-12
+
+---
+ linux-user/i386/syscall_nr.h   | 2 +-
+ linux-user/m68k/syscall_nr.h   | 2 +-
+ linux-user/ppc/syscall_nr.h    | 2 +-
+ linux-user/sh4/syscall_nr.h    | 2 +-
+ linux-user/sparc/syscall_nr.h  | 2 +-
+ linux-user/x86_64/syscall_nr.h | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h
+index fa3f0b4a08..bc1bc233ed 100644
+--- a/linux-user/i386/syscall_nr.h
++++ b/linux-user/i386/syscall_nr.h
+@@ -324,7 +324,7 @@
+ #define TARGET_NR_epoll_pwait	319
+ #define TARGET_NR_utimensat		320
+ #define TARGET_NR_signalfd		321
+-#define TARGET_NR_timerfd		322
++#define TARGET_NR_timerfd_create	322
+ #define TARGET_NR_eventfd		323
+ #define TARGET_NR_fallocate		324
+ #define TARGET_NR_timerfd_settime	325
+diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h
+index a2daba034a..4b50fb29b6 100644
+--- a/linux-user/m68k/syscall_nr.h
++++ b/linux-user/m68k/syscall_nr.h
+@@ -317,7 +317,7 @@
+ #define TARGET_NR_epoll_pwait	315
+ #define TARGET_NR_utimensat		316
+ #define TARGET_NR_signalfd		317
+-#define TARGET_NR_timerfd		318
++#define TARGET_NR_timerfd_create	318
+ #define TARGET_NR_eventfd		319
+ #define TARGET_NR_fallocate		320
+ #define TARGET_NR_timerfd_settime	321
+diff --git a/linux-user/ppc/syscall_nr.h b/linux-user/ppc/syscall_nr.h
+index 0a5fd543e7..46ed8a68ce 100644
+--- a/linux-user/ppc/syscall_nr.h
++++ b/linux-user/ppc/syscall_nr.h
+@@ -319,7 +319,7 @@
+ #define TARGET_NR_epoll_pwait	303
+ #define TARGET_NR_utimensat		304
+ #define TARGET_NR_signalfd		305
+-#define TARGET_NR_timerfd		306
++#define TARGET_NR_timerfd_create	306
+ #define TARGET_NR_eventfd		307
+ #define TARGET_NR_sync_file_range2	308
+ #define TARGET_NR_fallocate		309
+diff --git a/linux-user/sh4/syscall_nr.h b/linux-user/sh4/syscall_nr.h
+index bdf8742c69..50099846d2 100644
+--- a/linux-user/sh4/syscall_nr.h
++++ b/linux-user/sh4/syscall_nr.h
+@@ -323,7 +323,7 @@
+ #define TARGET_NR_epoll_pwait	319
+ #define TARGET_NR_utimensat		320
+ #define TARGET_NR_signalfd		321
+-#define TARGET_NR_timerfd		322
++#define TARGET_NR_timerfd_create	322
+ #define TARGET_NR_eventfd		323
+ #define TARGET_NR_fallocate		324
+ #define TARGET_NR_timerfd_settime	325
+diff --git a/linux-user/sparc/syscall_nr.h b/linux-user/sparc/syscall_nr.h
+index 5b582a5a90..732b1052a4 100644
+--- a/linux-user/sparc/syscall_nr.h
++++ b/linux-user/sparc/syscall_nr.h
+@@ -278,7 +278,7 @@
+ #define TARGET_NR_epoll_pwait	309
+ #define TARGET_NR_utimensat		310
+ #define TARGET_NR_signalfd		311
+-#define TARGET_NR_timerfd		312
++#define TARGET_NR_timerfd_create	312
+ #define TARGET_NR_eventfd		313
+ #define TARGET_NR_fallocate		314
+ #define TARGET_NR_timerfd_settime	315
+diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h
+index f00fa2b783..16397b3e8f 100644
+--- a/linux-user/x86_64/syscall_nr.h
++++ b/linux-user/x86_64/syscall_nr.h
+@@ -281,7 +281,7 @@
+ #define TARGET_NR_utimensat		280
+ #define TARGET_NR_epoll_pwait	281
+ #define TARGET_NR_signalfd		282
+-#define TARGET_NR_timerfd		283
++#define TARGET_NR_timerfd_create	283
+ #define TARGET_NR_eventfd		284
+ #define TARGET_NR_fallocate		285
+ #define TARGET_NR_timerfd_settime	286
+-- 
+2.17.1
+