mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v3] ipc/msg: fix msg_qbytes truncation in IPC_SET
@ 2026-10-29 19:35 Shubhang Kaushik (Ampere)
  2026-11-10  2:00 ` Shubhang
  2026-11-16  6:34 ` Manfred Spraul
  0 siblings, 2 replies; 3+ messages in thread
From: Shubhang Kaushik (Ampere) @ 2026-10-29 19:35 UTC (permalink / raw)
  To: Shuah Khan, Lu Shuaibing, Andrew Morton, Shubhang Kaushik,
	Christopher Lameter (Ampere),
	Davidlohr Bueso, Manfred Spraul, Jan Koester
  Cc: linux-kernel, linux-kselftest, stable, Shubhang Kaushik (Ampere)

The msg_qbytes field in the struct msqid64_ds userspace ABI is an
unsigned long. Commit 889b331724c82 ("ipc/msg.c: consolidate all
xxxctl_down() functions") passes that value to msgctl_down() as an int.

On ABIs where unsigned long is wider than unsigned int, this narrows
msg_qbytes before validation and assignment. For example, an
unprivileged queue owner can request msg_qbytes = 0x100000000. The
conversion to int changes this value to zero, which passes the
msg_ctlmnb check. IPC_SET then succeeds and sets q_qbytes to zero
instead of rejecting the requested value with EPERM.

For callers with CAP_SYS_RESOURCE, values with bit 31 set are also
incorrectly sign-extended when assigned to q_qbytes. In particular,
UINT_MAX becomes ULONG_MAX rather than the requested UINT_MAX.

Keep msg_qbytes as unsigned long through validation and assignment.
Also preserve its type in ipcctl_obtain_check(), which passes it to the
unsigned-long audit field.

Add a regression test which drops CAP_SYS_RESOURCE and verifies that
IPC_SET with a value above UINT_MAX fails with EPERM where unsigned long
is wider than unsigned int. Skip the test when it is not, capabilities
are unavailable, or System V message queues are unavailable.

Fixes: 889b331724c82 ("ipc/msg.c: consolidate all xxxctl_down() functions")
Cc: stable@vger.kernel.org
Signed-off-by: Shubhang Kaushik (Ampere) <sh@gentwo.org>
---
Changes in v3:
  - Correct the analysis: msg_ctlmnb is unsigned int, so UINT_MAX is
    already rejected for unprivileged callers on the unfixed kernel.
  - Test an unprivileged 64-bit msg_qbytes value above UINT_MAX, which
    truncates to zero on the unfixed kernel.
  - Skip the test on 32-bit, where unsigned long cannot represent the
    regression value.
  - Remove the incorrect queue-limit-bypass and memory-exhaustion claims.

Link to v2: https://lore.kernel.org/r/20261027-ipc-msg-qbytes-v2-1-48d8f72f1359@gentwo.org
---
 ipc/msg.c                                   |  2 +-
 ipc/util.c                                  |  3 +-
 ipc/util.h                                  |  3 +-
 tools/testing/selftests/ipc/Makefile        |  2 +-
 tools/testing/selftests/ipc/msgctl_qbytes.c | 84 +++++++++++++++++++++++++++++
 5 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/ipc/msg.c b/ipc/msg.c
index 62996b97f0ac2137dfc2fa109394d6db1fcb4a0f..116126f1235cd6ce9b819cfd317ef039071b95ca 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -399,7 +399,7 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version)
  * NOTE: no locks must be held, the rwsem is taken inside this function.
  */
 static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
-			struct ipc64_perm *perm, int msg_qbytes)
+			struct ipc64_perm *perm, unsigned long msg_qbytes)
 {
 	struct kern_ipc_perm *ipcp;
 	struct msg_queue *msq;
diff --git a/ipc/util.c b/ipc/util.c
index 1737d776bc089e27495e810569bf302069db3712..c435b2d93a12e92e930358a8bc53a06314d065f5 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -718,7 +718,8 @@ int ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out)
  */
 struct kern_ipc_perm *ipcctl_obtain_check(struct ipc_namespace *ns,
 					struct ipc_ids *ids, int id, int cmd,
-					struct ipc64_perm *perm, int extra_perm)
+					struct ipc64_perm *perm,
+					unsigned long extra_perm)
 {
 	kuid_t euid;
 	int err = -EPERM;
diff --git a/ipc/util.h b/ipc/util.h
index a55d6cebe6d3b0974548a497fcb889248aed0f87..55a76f94667cd4bb248fbcea26323db8d2778a44 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -180,7 +180,8 @@ void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out);
 int ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out);
 struct kern_ipc_perm *ipcctl_obtain_check(struct ipc_namespace *ns,
 					     struct ipc_ids *ids, int id, int cmd,
-					     struct ipc64_perm *perm, int extra_perm);
+					     struct ipc64_perm *perm,
+					     unsigned long extra_perm);
 
 static inline void ipc_update_pid(struct pid **pos, struct pid *pid)
 {
diff --git a/tools/testing/selftests/ipc/Makefile b/tools/testing/selftests/ipc/Makefile
index fad10f2bb57b0f06f0c741fa89f0489f6952eba6..930a334747a6353c86bebe1f4a521aeee3fe8228 100644
--- a/tools/testing/selftests/ipc/Makefile
+++ b/tools/testing/selftests/ipc/Makefile
@@ -12,7 +12,7 @@ endif
 
 CFLAGS += $(KHDR_INCLUDES)
 
-TEST_GEN_PROGS := msgque
+TEST_GEN_PROGS := msgctl_qbytes msgque
 
 include ../lib.mk
 
diff --git a/tools/testing/selftests/ipc/msgctl_qbytes.c b/tools/testing/selftests/ipc/msgctl_qbytes.c
new file mode 100644
index 0000000000000000000000000000000000000000..5549229a25eb6852898fdb6cd8e89f9db78444dd
--- /dev/null
+++ b/tools/testing/selftests/ipc/msgctl_qbytes.c
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <errno.h>
+#include <limits.h>
+#include <linux/capability.h>
+#include <stdio.h>
+#include <sys/msg.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+
+#include "kselftest.h"
+
+static int drop_cap_sys_resource(void)
+{
+	struct __user_cap_header_struct hdr = {
+		.version = _LINUX_CAPABILITY_VERSION_3,
+	};
+	struct __user_cap_data_struct data[_LINUX_CAPABILITY_U32S_3];
+	unsigned int index = CAP_SYS_RESOURCE / 32;
+	__u32 mask = 1U << (CAP_SYS_RESOURCE % 32);
+
+	if (syscall(SYS_capget, &hdr, data))
+		return -1;
+
+	data[index].effective &= ~mask;
+	data[index].permitted &= ~mask;
+
+	return syscall(SYS_capset, &hdr, data);
+}
+
+int main(void)
+{
+	struct msqid_ds ds;
+	int msqid;
+	int ret;
+
+	ksft_print_header();
+	ksft_set_plan(1);
+
+#if ULONG_MAX <= UINT_MAX
+	ksft_exit_skip("requires unsigned long wider than unsigned int\n");
+#endif
+
+	if (drop_cap_sys_resource()) {
+		if (errno == ENOSYS)
+			ksft_exit_skip("capabilities are unavailable\n");
+		ksft_exit_fail_perror("drop CAP_SYS_RESOURCE");
+	}
+
+	msqid = msgget(IPC_PRIVATE, 0600);
+	if (msqid == -1) {
+		if (errno == ENOSYS)
+			ksft_exit_skip("System V message queues are unavailable\n");
+		ksft_exit_fail_perror("msgget");
+	}
+
+	ret = msgctl(msqid, IPC_STAT, &ds);
+	if (ret == -1) {
+		ksft_perror("msgctl(IPC_STAT)");
+		goto out_fail;
+	}
+
+	/*
+	 * Without CAP_SYS_RESOURCE, a value above UINT_MAX must be rejected
+	 * rather than truncated to zero.
+	 */
+	ds.msg_qbytes = (unsigned long)UINT_MAX + 1;
+	errno = 0;
+	ret = msgctl(msqid, IPC_SET, &ds);
+	if (ret == -1 && errno == EPERM) {
+		ksft_test_result_pass("IPC_SET rejects oversized msg_qbytes\n");
+		msgctl(msqid, IPC_RMID, NULL);
+		ksft_exit_pass();
+	}
+
+	if (ret == -1)
+		ksft_perror("msgctl(IPC_SET)");
+	else
+		ksft_print_msg("msgctl(IPC_SET) unexpectedly succeeded\n");
+
+out_fail:
+	msgctl(msqid, IPC_RMID, NULL);
+	ksft_test_result_fail("IPC_SET accepted oversized msg_qbytes\n");
+	ksft_exit_fail();
+}

---
base-commit: c339f4010dea8b0d754f84ace70cd1b089878ef8
change-id: 20261027-ipc-msg-qbytes-49b15931c5b6

Best regards,
-- 
Shubhang Kaushik (Ampere) <sh@gentwo.org>


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v3] ipc/msg: fix msg_qbytes truncation in IPC_SET
  2026-10-29 19:35 [PATCH v3] ipc/msg: fix msg_qbytes truncation in IPC_SET Shubhang Kaushik (Ampere)
@ 2026-11-10  2:00 ` Shubhang
  2026-11-16  6:34 ` Manfred Spraul
  1 sibling, 0 replies; 3+ messages in thread
From: Shubhang @ 2026-11-10  2:00 UTC (permalink / raw)
  To: Shuah Khan, Lu Shuaibing, Andrew Morton, Shubhang Kaushik,
	Christopher Lameter (Ampere),
	Davidlohr Bueso, Manfred Spraul, Jan Koester, Cheng Yongkang
  Cc: linux-kernel, linux-kselftest, stable

Hello,

Gentle ping for v3. It addresses the issue identified in the v2 review,
and the targeted selftest passes on the patched kernel.

Please let me know if any further changes are needed.

Thanks,
Shubhang Kaushik

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v3] ipc/msg: fix msg_qbytes truncation in IPC_SET
  2026-10-29 19:35 [PATCH v3] ipc/msg: fix msg_qbytes truncation in IPC_SET Shubhang Kaushik (Ampere)
  2026-11-10  2:00 ` Shubhang
@ 2026-11-16  6:34 ` Manfred Spraul
  1 sibling, 0 replies; 3+ messages in thread
From: Manfred Spraul @ 2026-11-16  6:34 UTC (permalink / raw)
  To: Shubhang Kaushik (Ampere),
	Shuah Khan, Lu Shuaibing, Andrew Morton, Shubhang Kaushik,
	Christopher Lameter (Ampere),
	Davidlohr Bueso, Jan Koester
  Cc: linux-kernel, linux-kselftest, stable

Hi Shubhang,

On 10/29/26 8:35 PM, Shubhang Kaushik (Ampere) wrote:
> The msg_qbytes field in the struct msqid64_ds userspace ABI is an
> unsigned long. Commit 889b331724c82 ("ipc/msg.c: consolidate all
> xxxctl_down() functions") passes that value to msgctl_down() as an int.
>
> On ABIs where unsigned long is wider than unsigned int, this narrows
> msg_qbytes before validation and assignment. For example, an
> unprivileged queue owner can request msg_qbytes = 0x100000000. The
> conversion to int changes this value to zero, which passes the
> msg_ctlmnb check. IPC_SET then succeeds and sets q_qbytes to zero
> instead of rejecting the requested value with EPERM.
>
> For callers with CAP_SYS_RESOURCE, values with bit 31 set are also
> incorrectly sign-extended when assigned to q_qbytes. In particular,
> UINT_MAX becomes ULONG_MAX rather than the requested UINT_MAX.
>
> Keep msg_qbytes as unsigned long through validation and assignment.
> Also preserve its type in ipcctl_obtain_check(), which passes it to the
> unsigned-long audit field.
>
> Add a regression test which drops CAP_SYS_RESOURCE and verifies that
> IPC_SET with a value above UINT_MAX fails with EPERM where unsigned long
> is wider than unsigned int. Skip the test when it is not, capabilities
> are unavailable, or System V message queues are unavailable.
>
> Fixes: 889b331724c82 ("ipc/msg.c: consolidate all xxxctl_down() functions")
> Cc: stable@vger.kernel.org
> Signed-off-by: Shubhang Kaushik (Ampere) <sh@gentwo.org>
Reviewed-by: Manfred Spraul <manfred@colorfullife.com>
> ---
> Changes in v3:
>    - Correct the analysis: msg_ctlmnb is unsigned int, so UINT_MAX is
>      already rejected for unprivileged callers on the unfixed kernel.
>    - Test an unprivileged 64-bit msg_qbytes value above UINT_MAX, which
>      truncates to zero on the unfixed kernel.

Thus:

The global (per namespace) limit msg_ctlmnb is limited to UINT_MAX.

On a 64-bit system, root can increase the per-queue limit to ULONG_MAX.

All per queue logic is now unsigned long based:

struct msqid64_ds t::unsigned long  msg_qbytes;
msgctl_down(,,unsigned long msg_qbytes)
struct msg_queue::unsigned long q_qbytes;

Ok from my side.


>    - Skip the test on 32-bit, where unsigned long cannot represent the
>      regression value.
>    - Remove the incorrect queue-limit-bypass and memory-exhaustion claims.
>
> Link to v2: https://lore.kernel.org/r/20261027-ipc-msg-qbytes-v2-1-48d8f72f1359@gentwo.org
> ---
>   ipc/msg.c                                   |  2 +-
>   ipc/util.c                                  |  3 +-
>   ipc/util.h                                  |  3 +-
>   tools/testing/selftests/ipc/Makefile        |  2 +-
>   tools/testing/selftests/ipc/msgctl_qbytes.c | 84 +++++++++++++++++++++++++++++
>   5 files changed, 90 insertions(+), 4 deletions(-)
>
> diff --git a/ipc/msg.c b/ipc/msg.c
> index 62996b97f0ac2137dfc2fa109394d6db1fcb4a0f..116126f1235cd6ce9b819cfd317ef039071b95ca 100644
> --- a/ipc/msg.c
> +++ b/ipc/msg.c
> @@ -399,7 +399,7 @@ copy_msqid_from_user(struct msqid64_ds *out, void __user *buf, int version)
>    * NOTE: no locks must be held, the rwsem is taken inside this function.
>    */
>   static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
> -			struct ipc64_perm *perm, int msg_qbytes)
> +			struct ipc64_perm *perm, unsigned long msg_qbytes)
>   {
>   	struct kern_ipc_perm *ipcp;
>   	struct msg_queue *msq;
> diff --git a/ipc/util.c b/ipc/util.c
> index 1737d776bc089e27495e810569bf302069db3712..c435b2d93a12e92e930358a8bc53a06314d065f5 100644
> --- a/ipc/util.c
> +++ b/ipc/util.c
> @@ -718,7 +718,8 @@ int ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out)
>    */
>   struct kern_ipc_perm *ipcctl_obtain_check(struct ipc_namespace *ns,
>   					struct ipc_ids *ids, int id, int cmd,
> -					struct ipc64_perm *perm, int extra_perm)
> +					struct ipc64_perm *perm,
> +					unsigned long extra_perm)
>   {
>   	kuid_t euid;
>   	int err = -EPERM;
> diff --git a/ipc/util.h b/ipc/util.h
> index a55d6cebe6d3b0974548a497fcb889248aed0f87..55a76f94667cd4bb248fbcea26323db8d2778a44 100644
> --- a/ipc/util.h
> +++ b/ipc/util.h
> @@ -180,7 +180,8 @@ void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out);
>   int ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out);
>   struct kern_ipc_perm *ipcctl_obtain_check(struct ipc_namespace *ns,
>   					     struct ipc_ids *ids, int id, int cmd,
> -					     struct ipc64_perm *perm, int extra_perm);
> +					     struct ipc64_perm *perm,
> +					     unsigned long extra_perm);
>   
>   static inline void ipc_update_pid(struct pid **pos, struct pid *pid)
>   {
> diff --git a/tools/testing/selftests/ipc/Makefile b/tools/testing/selftests/ipc/Makefile
> index fad10f2bb57b0f06f0c741fa89f0489f6952eba6..930a334747a6353c86bebe1f4a521aeee3fe8228 100644
> --- a/tools/testing/selftests/ipc/Makefile
> +++ b/tools/testing/selftests/ipc/Makefile
> @@ -12,7 +12,7 @@ endif
>   
>   CFLAGS += $(KHDR_INCLUDES)
>   
> -TEST_GEN_PROGS := msgque
> +TEST_GEN_PROGS := msgctl_qbytes msgque
>   
>   include ../lib.mk
>   
> diff --git a/tools/testing/selftests/ipc/msgctl_qbytes.c b/tools/testing/selftests/ipc/msgctl_qbytes.c
> new file mode 100644
> index 0000000000000000000000000000000000000000..5549229a25eb6852898fdb6cd8e89f9db78444dd
> --- /dev/null
> +++ b/tools/testing/selftests/ipc/msgctl_qbytes.c
> @@ -0,0 +1,84 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include <errno.h>
> +#include <limits.h>
> +#include <linux/capability.h>
> +#include <stdio.h>
> +#include <sys/msg.h>
> +#include <sys/syscall.h>
> +#include <unistd.h>
> +
> +#include "kselftest.h"
> +
> +static int drop_cap_sys_resource(void)
> +{
> +	struct __user_cap_header_struct hdr = {
> +		.version = _LINUX_CAPABILITY_VERSION_3,
> +	};
> +	struct __user_cap_data_struct data[_LINUX_CAPABILITY_U32S_3];
> +	unsigned int index = CAP_SYS_RESOURCE / 32;
> +	__u32 mask = 1U << (CAP_SYS_RESOURCE % 32);
> +
> +	if (syscall(SYS_capget, &hdr, data))
> +		return -1;
> +
> +	data[index].effective &= ~mask;
> +	data[index].permitted &= ~mask;
> +
> +	return syscall(SYS_capset, &hdr, data);
> +}
> +
> +int main(void)
> +{
> +	struct msqid_ds ds;
> +	int msqid;
> +	int ret;
> +
> +	ksft_print_header();
> +	ksft_set_plan(1);
> +
> +#if ULONG_MAX <= UINT_MAX
> +	ksft_exit_skip("requires unsigned long wider than unsigned int\n");
> +#endif
> +
> +	if (drop_cap_sys_resource()) {
> +		if (errno == ENOSYS)
> +			ksft_exit_skip("capabilities are unavailable\n");
> +		ksft_exit_fail_perror("drop CAP_SYS_RESOURCE");
> +	}
> +
> +	msqid = msgget(IPC_PRIVATE, 0600);
> +	if (msqid == -1) {
> +		if (errno == ENOSYS)
> +			ksft_exit_skip("System V message queues are unavailable\n");
> +		ksft_exit_fail_perror("msgget");
> +	}
> +
> +	ret = msgctl(msqid, IPC_STAT, &ds);
> +	if (ret == -1) {
> +		ksft_perror("msgctl(IPC_STAT)");
> +		goto out_fail;
> +	}
> +
> +	/*
> +	 * Without CAP_SYS_RESOURCE, a value above UINT_MAX must be rejected
> +	 * rather than truncated to zero.
> +	 */
> +	ds.msg_qbytes = (unsigned long)UINT_MAX + 1;
> +	errno = 0;
> +	ret = msgctl(msqid, IPC_SET, &ds);
> +	if (ret == -1 && errno == EPERM) {
> +		ksft_test_result_pass("IPC_SET rejects oversized msg_qbytes\n");
> +		msgctl(msqid, IPC_RMID, NULL);
> +		ksft_exit_pass();
> +	}
> +
> +	if (ret == -1)
> +		ksft_perror("msgctl(IPC_SET)");
> +	else
> +		ksft_print_msg("msgctl(IPC_SET) unexpectedly succeeded\n");
> +
> +out_fail:
> +	msgctl(msqid, IPC_RMID, NULL);
> +	ksft_test_result_fail("IPC_SET accepted oversized msg_qbytes\n");
> +	ksft_exit_fail();
> +}
>
> ---
> base-commit: c339f4010dea8b0d754f84ace70cd1b089878ef8
> change-id: 20261027-ipc-msg-qbytes-49b15931c5b6
>
> Best regards,



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-11-16  6:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-10-29 19:35 [PATCH v3] ipc/msg: fix msg_qbytes truncation in IPC_SET Shubhang Kaushik (Ampere)
2026-11-10  2:00 ` Shubhang
2026-11-16  6:34 ` Manfred Spraul

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®