From: Xiubo Li <xiubli@redhat.com>
Date: Tue, 14 Mar 2023 03:16:53 +0000 (+0800)
Subject: libcephfs: fix ClearSetuid incorrectly using SETATTR_MODE mask
X-Git-Tag: v18.1.2~8^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f2d541a2e8b642a082da648443c9d2cd81d6c9a;p=ceph.git

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 <xiubli@redhat.com>
(cherry picked from commit 463b932fff0ad85a35190dc613cbec04ecc39628)
---

diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc
index 5028f1ac44b8..acaa15a9758a 100644
--- a/src/test/libcephfs/test.cc
+++ b/src/test/libcephfs/test.cc
@@ -2116,7 +2116,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 */