Skip to content

Skip SetMarkNeedsNetAdminOrRaw if SO_MARK doesn't need capabilities. #15245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Oct 8, 2026
Merged

Skip SetMarkNeedsNetAdminOrRaw if SO_MARK doesn't need capabilities. #15245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions test/syscalls/linux/socket_capability.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,13 @@ TEST(SocketTest, SetMarkNeedsNetAdminOrRaw) {

AutoCapability cap_admin(CAP_NET_ADMIN, false);
AutoCapability cap_raw(CAP_NET_RAW, false);
EXPECT_THAT(setsockopt(bound.get(), SOL_SOCKET, SO_MARK, &mark, sizeof(mark)),
SyscallFailsWithErrno(EPERM));
const int ret =
setsockopt(bound.get(), SOL_SOCKET, SO_MARK, &mark, sizeof(mark));
if (ret == 0 && GvisorPlatform() == Platform::kNative) {
// Some kernels or cgroup policies allow SO_MARK without these capabilities.
GTEST_SKIP() << "SO_MARK was allowed without CAP_NET_ADMIN or CAP_NET_RAW";
}
EXPECT_THAT(ret, SyscallFailsWithErrno(EPERM));

int get_mark = 0;
socklen_t optlen = sizeof(get_mark);
Expand Down
Loading