This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v3.5 1/2] aarch64: Fix error return from __ioctl
- From: Richard Henderson <rth at twiddle dot net>
- To: libc-alpha at sourceware dot org
- Cc: marcus dot shawcroft at gmail dot com, Richard Henderson <rth at redhat dot com>
- Date: Thu, 29 May 2014 10:04:37 -0700
- Subject: [PATCH v3.5 1/2] aarch64: Fix error return from __ioctl
- Authentication-results: sourceware.org; auth=none
- References: <1401383078-32544-1-git-send-email-rth at twiddle dot net>
From: Richard Henderson <rth@redhat.com>
Forgotten in ca3cfa40c16ef34c74951a07a57cfcbcd58898b1
where the error branch was moved from PSEUDO_RET.
---
sysdeps/unix/sysv/linux/aarch64/ioctl.S | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/aarch64/ioctl.S b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
index 4443f5a..8920a20 100644
--- a/sysdeps/unix/sysv/linux/aarch64/ioctl.S
+++ b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
@@ -20,11 +20,12 @@
.text
ENTRY(__ioctl)
- movz x8, #__NR_ioctl
- sxtw x0, w0
- svc #0x0
- cmn x0, #0x1, lsl #12
- PSEUDO_RET
- PSEUDO_END (__ioctl)
+ mov x8, #__NR_ioctl
+ sxtw x0, w0
+ svc #0x0
+ cmn x0, #4095
+ b.cs .Lsyscall_error
+ ret
+PSEUDO_END (__ioctl)
weak_alias (__ioctl, ioctl)
--
1.9.3