--- /dev/null
+From 2d066ead3d6ef504c82551b12306e751d23ddb45 Mon Sep 17 00:00:00 2001
+From: Wei Gao <wegao@suse.com>
+Date: Sun, 14 Dec 2025 02:15:20 +0000
+Subject: [PATCH] listmount04.c: Update struct mnt_id_req support for kernel >= 6.18
+
+Kernel change from v6.18-rc7
+78f0e33cd6c93 ("fs/namespace: correctly handle errors returned by grab_requested_mnt_ns")
+causes the test failure with following error message:
+listmount04.c:128: TFAIL: invalid mnt_id_req.spare expected EINVAL: EBADF (9)
+
+The fix require following changes:
+
+* struct mnt_id_req got new member mnt_ns_fd in v6.18-rc7. That is
+fixed in a fallback defintion in lapi/. If the fallback is used is now
+done via typedef (that requires also update in statmount.h).
+
+* New kernels (>= 6.18) have also different errno. This is fixed by
+runtime check.
+
+Link: https://lore.kernel.org/ltp/20251214021541.3256-1-wegao@suse.com/
+Reviewed-by: Petr Vorel <pvorel@suse.cz>
+Reviewed-by: Li Wang <liwang@redhat.com>
+Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
+Signed-off-by: Wei Gao <wegao@suse.com>
+[ pvorel: Shorten TCONF, rewrite commit message ]
+Signed-off-by: Petr Vorel <pvorel@suse.cz>
+---
+ configure.ac | 2 +-
+ include/lapi/mount.h | 10 +++--
+ .../kernel/syscalls/listmount/listmount.h | 2 +-
+ .../kernel/syscalls/listmount/listmount04.c | 37 +++++++++++++++++--
+ .../kernel/syscalls/statmount/statmount.h | 2 +-
+ 5 files changed, 44 insertions(+), 9 deletions(-)
+
+Upstream-Status: Backport
+
+Index: ltp-20250930/configure.ac
+===================================================================
+--- ltp-20250930.orig/configure.ac
++++ ltp-20250930/configure.ac
+@@ -262,7 +262,7 @@ AC_CHECK_TYPES([struct cachestat_range],
+ AC_CHECK_TYPES([struct cachestat],,,[#include <sys/mman.h>])
+
+ # Defined in <linux/mount.h>, but include/lapi/mount.h includes <sys/mount.h> */
+-AC_CHECK_TYPES([struct mnt_id_req],,,[#include <sys/mount.h>])
++AC_CHECK_MEMBERS([struct mnt_id_req.mnt_ns_fd],,,[#include <sys/mount.h>])
+ AC_CHECK_TYPES([struct statmount],,,[#include <sys/mount.h>])
+ AC_CHECK_MEMBERS([struct statmount.mnt_ns_id],,,[#include <unistd.h>
+ #include <linux/mount.h>])
+Index: ltp-20250930/include/lapi/mount.h
+===================================================================
+--- ltp-20250930.orig/include/lapi/mount.h
++++ ltp-20250930/include/lapi/mount.h
+@@ -45,14 +45,18 @@
+ # define MS_NOSYMFOLLOW 256
+ #endif
+
+-#ifndef HAVE_STRUCT_MNT_ID_REQ
+-struct mnt_id_req {
++struct mnt_id_req_fallback {
+ uint32_t size;
+- uint32_t spare;
++ uint32_t mnt_ns_fd;
+ uint64_t mnt_id;
+ uint64_t param;
+ uint64_t mnt_ns_id;
+ };
++
++#ifndef HAVE_STRUCT_MNT_ID_REQ_MNT_NS_FD
++typedef struct mnt_id_req_fallback mnt_id_req;
++#else
++typedef struct mnt_id_req mnt_id_req;
+ #endif
+
+ #ifndef HAVE_STRUCT_STATMOUNT
+Index: ltp-20250930/testcases/kernel/syscalls/listmount/listmount.h
+===================================================================
+--- ltp-20250930.orig/testcases/kernel/syscalls/listmount/listmount.h
++++ ltp-20250930/testcases/kernel/syscalls/listmount/listmount.h
+@@ -15,7 +15,7 @@
+ static inline ssize_t listmount(uint64_t mnt_id, uint64_t last_mnt_id,
+ uint64_t list[], size_t num, unsigned int flags)
+ {
+- struct mnt_id_req req = {
++ mnt_id_req req = {
+ .size = MNT_ID_REQ_SIZE_VER0,
+ .mnt_id = mnt_id,
+ .param = last_mnt_id,
+Index: ltp-20250930/testcases/kernel/syscalls/listmount/listmount04.c
+===================================================================
+--- ltp-20250930.orig/testcases/kernel/syscalls/listmount/listmount04.c
++++ ltp-20250930/testcases/kernel/syscalls/listmount/listmount04.c
+@@ -14,14 +14,18 @@
+
+ #define _GNU_SOURCE
+
++#include "config.h"
+ #include "tst_test.h"
+ #include "lapi/mount.h"
+ #include "lapi/syscalls.h"
+
+ #define MNT_SIZE 32
++#define BEFORE_6_18 1
++#define AFTER_6_18 2
+
+-static struct mnt_id_req *request;
++static mnt_id_req *request;
+ static uint64_t mnt_ids[MNT_SIZE];
++static int kver;
+
+ static struct tcase {
+ int req_usage;
+@@ -34,6 +38,7 @@ static struct tcase {
+ uint64_t flags;
+ int exp_errno;
+ char *msg;
++ int kver;
+ } tcases[] = {
+ {
+ .req_usage = 0,
+@@ -79,6 +84,18 @@ static struct tcase {
+ .nr_mnt_ids = MNT_SIZE,
+ .exp_errno = EINVAL,
+ .msg = "invalid mnt_id_req.spare",
++ .kver = BEFORE_6_18,
++ },
++ {
++ .req_usage = 1,
++ .size = MNT_ID_REQ_SIZE_VER0,
++ .spare = -1,
++ .mnt_id = LSMT_ROOT,
++ .mnt_ids = mnt_ids,
++ .nr_mnt_ids = MNT_SIZE,
++ .exp_errno = EBADF,
++ .msg = "invalid mnt_id_req.mnt_ns_fd",
++ .kver = AFTER_6_18,
+ },
+ {
+ .req_usage = 1,
+@@ -113,7 +130,12 @@ static struct tcase {
+ static void run(unsigned int n)
+ {
+ struct tcase *tc = &tcases[n];
+- struct mnt_id_req *req = NULL;
++ mnt_id_req *req = NULL;
++
++ if (tc->kver && tc->kver != kver) {
++ tst_res(TCONF, "Test not suitable for current kernel version");
++ return;
++ }
+
+ memset(mnt_ids, 0, sizeof(mnt_ids));
+
+@@ -122,7 +144,7 @@ static void run(unsigned int n)
+ req->mnt_id = tc->mnt_id;
+ req->param = tc->param;
+ req->size = tc->size;
+- req->spare = tc->spare;
++ req->mnt_ns_fd = tc->spare;
+ }
+
+ TST_EXP_FAIL(tst_syscall(__NR_listmount, req, tc->mnt_ids,
+@@ -130,8 +152,17 @@ static void run(unsigned int n)
+ "%s", tc->msg);
+ }
+
++static void setup(void)
++{
++ if (tst_kvercmp(6, 18, 0) >= 0)
++ kver = AFTER_6_18;
++ else
++ kver = BEFORE_6_18;
++}
++
+ static struct tst_test test = {
+ .test = run,
++ .setup = setup,
+ .tcnt = ARRAY_SIZE(tcases),
+ .min_kver = "6.8",
+ .bufs = (struct tst_buffers []) {
+Index: ltp-20250930/testcases/kernel/syscalls/statmount/statmount.h
+===================================================================
+--- ltp-20250930.orig/testcases/kernel/syscalls/statmount/statmount.h
++++ ltp-20250930/testcases/kernel/syscalls/statmount/statmount.h
+@@ -16,7 +16,7 @@
+ static inline int statmount(uint64_t mnt_id, uint64_t mask, struct statmount *buf,
+ size_t bufsize, unsigned int flags)
+ {
+- struct mnt_id_req req = {
++ mnt_id_req req = {
+ .size = MNT_ID_REQ_SIZE_VER0,
+ .mnt_id = mnt_id,
+ .param = mask,
projects / thirdparty / openembedded / openembedded-core.git / commitdiff
