From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: broken __kernel_mode_t affecting some big endian archs
Date: Thu, 14 Jun 2018 22:00:23 -0400 [thread overview]
Message-ID: <20180615020023.GM1392@brightrain.aerifal.cx> (raw)
In-Reply-To: <20180614005442.GK1392@brightrain.aerifal.cx>
[-- Attachment #1: Type: text/plain, Size: 1396 bytes --]
On Wed, Jun 13, 2018 at 08:54:42PM -0400, Rich Felker wrote:
> It's been semi-known for a long time (I say semi-, because nobody's
> had the setup to test most of them well, or at least nobody I'm
> communicating with regularly) that some archs are failing libc-test
> sysvipc tests. I think I've tracked down the root cause.
>
> Linux defined __kernel_mode_t as short on some old archs, and used it
> in place of mode_t in the ipc_perm structure. The field is padded out
> to 32 bits, so on little endian archs it's no problem for us to just
> (as we do) ignore the incorrect type and declare the structure with
> mode_t, as POSIX requires. However on big-endian archs, the padding is
> on the wrong side and this trick doesn't work.
>
> On MIPS we fixed a similar issue in struct stat, where dev_t was
> incorrectly padded, with a fixup in syscall_arch.h. However this time
> a large number of archs are affected, and patching them all up
> individually seems nasty.
>
> My leaning is to have syscall_arch.h expose a macro indicating the
> bug, and have msgctl, semctl, and shmctl each do the fixup if it's
> set.
>
> FWIW the affected archs seem to be (only in big endian variants):
> - ARM
> - M68k (in-progress port)
> - Microblaze
> - SH
> - Sparc (future port)
>
> Thoughts?
Here's a draft of the fix, just for shmctl and not including the
SHM_STAT or SHM_STAT_ALL operations.
Rich
[-- Attachment #2: shmfix.diff --]
[-- Type: text/plain, Size: 791 bytes --]
diff --git a/src/ipc/shmctl.c b/src/ipc/shmctl.c
index e2879f2..3659807 100644
--- a/src/ipc/shmctl.c
+++ b/src/ipc/shmctl.c
@@ -4,9 +4,24 @@
int shmctl(int id, int cmd, struct shmid_ds *buf)
{
+#ifdef SYSCALL_IPC_BROKEN_MODE
+ struct shmid_ds tmp;
+ if (cmd == IPC_SET) {
+ tmp = *buf;
+ tmp.shm_perm.mode *= 0x10000U;
+ buf = &tmp;
+ }
+#endif
#ifdef SYS_shmctl
- return syscall(SYS_shmctl, id, cmd | IPC_64, buf);
+ int r = __syscall(SYS_shmctl, id, cmd | IPC_64, buf);
#else
- return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0);
+ int r = __syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0);
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+ if (r < 0) return __syscall_ret(r);
+ if (cmd == IPC_STAT) {
+ buf->shm_perm.mode >>= 16;
+ }
+ return r;
#endif
}
next prev parent reply other threads:[~2018-06-15 2:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-14 0:54 Rich Felker
2018-06-14 11:19 ` Natanael Copa
2018-06-14 14:20 ` Rich Felker
2018-06-15 2:00 ` Rich Felker [this message]
2018-06-15 2:01 ` Rich Felker
2018-06-16 0:14 ` Szabolcs Nagy
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=20180615020023.GM1392@brightrain.aerifal.cx \
--to=dalias@libc.org \
--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).