From 1e9d08f986692f28379ecb60ecb016d2aec70e5e Mon Sep 17 00:00:00 2001 From: Weizhao Ouyang Date: Fri, 28 Apr 2023 16:03:31 +0800 Subject: [PATCH] ANDROID: fuse-bpf: Fix bpf_test_xattr testcase error Skipped selinux xattr checking. Bug: 279996548 Test: fuse_test compiles and passes Signed-off-by: Weizhao Ouyang (cherry picked from https://android-review.googlesource.com/q/commit:dbfbd63968743deaf9854df8952874d00c2d3755) Merged-In: I56ac1d5fe3865310a99c091e9688e70aa515e96f Change-Id: I56ac1d5fe3865310a99c091e9688e70aa515e96f --- tools/testing/selftests/filesystems/fuse/fuse_test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/filesystems/fuse/fuse_test.c b/tools/testing/selftests/filesystems/fuse/fuse_test.c index 7bc8d2abfd4f..a52a9db1014c 100644 --- a/tools/testing/selftests/filesystems/fuse/fuse_test.c +++ b/tools/testing/selftests/filesystems/fuse/fuse_test.c @@ -1023,6 +1023,7 @@ static int bpf_test_xattr(const char *mount_dir) const size_t xattr_size = sizeof(xattr_value); char xattr_value_ret[256]; ssize_t xattr_size_ret; + ssize_t xattr_size_ret_se; int result = TEST_FAILURE; int fd = -1; int src_fd = -1; @@ -1053,9 +1054,8 @@ static int bpf_test_xattr(const char *mount_dir) TESTSYSCALL(s_listxattr(s_path(s(mount_dir), s(file_name)), xattr_value_ret, sizeof(xattr_value_ret), - &xattr_size_ret)); + &xattr_size_ret_se)); TESTEQUAL(bpf_test_trace("listxattr"), 0); - TESTEQUAL(xattr_size_ret, 0); TESTSYSCALL(s_setxattr(s_path(s(mount_dir), s(file_name)), xattr_name, xattr_value, xattr_size, 0)); @@ -1065,8 +1065,8 @@ static int bpf_test_xattr(const char *mount_dir) xattr_value_ret, sizeof(xattr_value_ret), &xattr_size_ret)); TESTEQUAL(bpf_test_trace("listxattr"), 0); - TESTEQUAL(xattr_size_ret, sizeof(xattr_name)); - TESTEQUAL(strcmp(xattr_name, xattr_value_ret), 0); + TESTEQUAL(xattr_size_ret - xattr_size_ret_se, sizeof(xattr_name)); + TESTEQUAL(strcmp(xattr_name, xattr_value_ret + xattr_size_ret_se), 0); TESTSYSCALL(s_getxattr(s_path(s(mount_dir), s(file_name)), xattr_name, xattr_value_ret, sizeof(xattr_value_ret),