From e0048df98645545c387e07be5a819d2e2d5ecf83 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Tue, 14 Mar 2023 11:16:53 +0800 Subject: [PATCH] libcephfs: fix ClearSetuid incorrectly using SETATTR_MODE mask Both the STATX_MODE and SETATTR_MODE equal 1, so the test didn't fail. Fixes: https://tracker.ceph.com/issues/58680 Signed-off-by: Xiubo Li (cherry picked from commit 463b932fff0ad85a35190dc613cbec04ecc39628) --- src/test/libcephfs/test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc index 7784834f5adf..2ca766ac28cd 100644 --- a/src/test/libcephfs/test.cc +++ b/src/test/libcephfs/test.cc @@ -2102,7 +2102,7 @@ TEST(LibCephFS, ClearSetuid) { stx.stx_gid = g; mode_t m = S_ISGID|S_ISUID|S_IRUSR|S_IWUSR; stx.stx_mode = m; - ASSERT_EQ(ceph_ll_setattr(cmount, in, &stx, CEPH_STATX_MODE|CEPH_SETATTR_UID|CEPH_SETATTR_GID, rootcred), 0); + ASSERT_EQ(ceph_ll_setattr(cmount, in, &stx, CEPH_SETATTR_MODE|CEPH_SETATTR_UID|CEPH_SETATTR_GID, rootcred), 0); ASSERT_EQ(ceph_ll_getattr(cmount, in, &stx, CEPH_STATX_MODE, 0, altcred), 0); ASSERT_EQ(stx.stx_mode&(mode_t)ALLPERMS, m); /* not dropped without exe bit */ -- 2.47.3