From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
To: musl@lists.openwall.com
Cc: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
Subject: [musl] [PATCH] use __scc and unsigned long for socketcall
Date: Fri, 1 Jul 2022 11:09:10 -0400 [thread overview]
Message-ID: <20220701150910.347715-1-alex_y_xu@yahoo.ca> (raw)
In-Reply-To: <20220701150910.347715-1-alex_y_xu.ref@yahoo.ca>
otherwise, pointer arguments are sign-extended on x32, resulting in
EFAULT.
---
src/internal/syscall.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/internal/syscall.h b/src/internal/syscall.h
index 4f41e1dc..7c74775c 100644
--- a/src/internal/syscall.h
+++ b/src/internal/syscall.h
@@ -58,22 +58,22 @@ hidden long __syscall_ret(unsigned long),
#define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp,__VA_ARGS__)
#define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
-static inline long __alt_socketcall(int sys, int sock, int cp, long a, long b, long c, long d, long e, long f)
+static inline long __alt_socketcall(int sys, int sock, int cp, syscall_arg_t a, syscall_arg_t b, syscall_arg_t c, syscall_arg_t d, syscall_arg_t e, syscall_arg_t f)
{
long r;
if (cp) r = __syscall_cp(sys, a, b, c, d, e, f);
else r = __syscall(sys, a, b, c, d, e, f);
if (r != -ENOSYS) return r;
#ifdef SYS_socketcall
- if (cp) r = __syscall_cp(SYS_socketcall, sock, ((long[6]){a, b, c, d, e, f}));
- else r = __syscall(SYS_socketcall, sock, ((long[6]){a, b, c, d, e, f}));
+ if (cp) r = __syscall_cp(SYS_socketcall, sock, ((unsigned long[6]){a, b, c, d, e, f}));
+ else r = __syscall(SYS_socketcall, sock, ((unsigned long[6]){a, b, c, d, e, f}));
#endif
return r;
}
#define __socketcall(nm, a, b, c, d, e, f) __alt_socketcall(SYS_##nm, __SC_##nm, 0, \
- (long)(a), (long)(b), (long)(c), (long)(d), (long)(e), (long)(f))
+ __scc(a), __scc(b), __scc(c), __scc(d), __scc(e), __scc(f))
#define __socketcall_cp(nm, a, b, c, d, e, f) __alt_socketcall(SYS_##nm, __SC_##nm, 1, \
- (long)(a), (long)(b), (long)(c), (long)(d), (long)(e), (long)(f))
+ __scc(a), __scc(b), __scc(c), __scc(d), __scc(e), __scc(f))
/* fixup legacy 16-bit junk */
--
2.36.1
next parent reply other threads:[~2022-07-01 15:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220701150910.347715-1-alex_y_xu.ref@yahoo.ca>
2022-07-01 15:09 ` Alex Xu (Hello71) [this message]
2022-08-01 17:50 ` Rich Felker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220701150910.347715-1-alex_y_xu@yahoo.ca \
--to=alex_y_xu@yahoo.ca \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).