linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Maxim Zhukov <crazycdeveloper@gmail.com>
To: chi.minghao@zte.com.cn, varad.gautam@suse.com, arnd@arndb.de
Cc: akpm@linux-foundation.org, shakeelb@google.com,
	vasily.averin@linux.dev, manfred@colorfullife.com,
	dbueso@suse.de, linux-kernel@vger.kernel.org,
	Maxim Zhukov <mussitantesmortem@gmail.com>
Subject: [RFC PATCH 1/1] ipc, sem: fix backward compatibility with x86-32 kernels
Date: Sun, 15 May 2022 23:01:03 +0300	[thread overview]
Message-ID: <20220515200103.1408370-2-mussitantesmortem@gmail.com> (raw)
In-Reply-To: <20220515200103.1408370-1-mussitantesmortem@gmail.com>

Since with commit 275f22148e87 ("ipc: rename old-style shmctl/semctl/msgctl syscalls")
we have changed behavior:

ksys_semctl lost parse ipc version (ipc_parse_version), because the
new syscall works with IPC_64 only, but the parse function has some
side effect - it removes IPC_64 bit from `cmd`.

Some libc forced sends IPC_64 bit in semctl syscall[1][2][3], this leads to
a bug - X86-32 kernel does not have compat headers and does not
correctly parse received command (cmd) from semctl syscall: cmd have actual
command and IPC_64 bit, thus throw EINVAL error in ksys_semctl

This commit forcibly removes IPC_64 bit from the cmd for restore
backward compatibility.

[1]: https://elixir.bootlin.com/uclibc-ng/v1.0.40/source/libc/misc/sysvipc/sem.c#L58
[2]: https://elixir.bootlin.com/musl/v1.2.3/source/src/ipc/semctl.c#L48 -> https://elixir.bootlin.com/musl/v1.2.3/source/src/ipc/ipc.h#L22
[3]: https://elixir.bootlin.com/glibc/glibc-2.35/source/sysdeps/unix/sysv/linux/semctl.c#L124

Signed-off-by: Maxim Zhukov <mussitantesmortem@gmail.com>
---
 ipc/sem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipc/sem.c b/ipc/sem.c
index 0dbdb98fdf2d..824244170000 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1706,7 +1706,7 @@ static long ksys_semctl(int semid, int semnum, int cmd, unsigned long arg, int v
 
 SYSCALL_DEFINE4(semctl, int, semid, int, semnum, int, cmd, unsigned long, arg)
 {
-	return ksys_semctl(semid, semnum, cmd, arg, IPC_64);
+	return ksys_semctl(semid, semnum, cmd & (~IPC_64), arg, IPC_64);
 }
 
 #ifdef CONFIG_ARCH_WANT_IPC_PARSE_VERSION
-- 
2.36.1


  reply	other threads:[~2022-05-15 20:01 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-15 20:01 [RFC PATCH 0/1] Fix handling semctl on x86-32 kernels Maxim Zhukov
2022-05-15 20:01 ` Maxim Zhukov [this message]
2022-05-16 21:06   ` [RFC PATCH 1/1] ipc, sem: fix backward compatibility with " Andrew Morton
2022-05-16 22:07     ` Arnd Bergmann
2022-05-16 22:00   ` Arnd Bergmann

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=20220515200103.1408370-2-mussitantesmortem@gmail.com \
    --to=crazycdeveloper@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=chi.minghao@zte.com.cn \
    --cc=dbueso@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=manfred@colorfullife.com \
    --cc=mussitantesmortem@gmail.com \
    --cc=shakeelb@google.com \
    --cc=varad.gautam@suse.com \
    --cc=vasily.averin@linux.dev \
    /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.
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).