Skip to content

linux: error on invalid capabilities in config.json #2144

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

Open
Rajkaran-122 wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −10
Open

linux: error on invalid capabilities in config.json #2144

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
33 changes: 23 additions & 10 deletions src/libcrun/linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4296,18 +4296,16 @@ set_required_caps (struct all_caps_s *caps, uid_t uid, gid_t gid, int no_new_pri
}

static int
read_caps (unsigned long caps[2], char **values, size_t len)
read_caps (unsigned long caps[2], char **values, size_t len, libcrun_error_t *err)
{
#ifdef HAVE_CAP
size_t i;
for (i = 0; i < len; i++)
{
cap_value_t cap;
if (cap_from_name (values[i], &cap) < 0)
{
libcrun_warning ("unknown cap: `%s`", values[i]);
continue;
}
return crun_make_error (err, 0, "unknown capability `%s`", values[i]);

if (cap < 32)
caps[0] |= CAP_TO_MASK_0 (cap);
else
Expand Down Expand Up @@ -4342,14 +4340,29 @@ libcrun_set_caps (runtime_spec_schema_config_schema_process_capabilities *capabi
int no_new_privileges, libcrun_error_t *err)
{
struct all_caps_s caps = {};
int ret;

if (capabilities)
{
read_caps (caps.effective, capabilities->effective, capabilities->effective_len);
read_caps (caps.inheritable, capabilities->inheritable, capabilities->inheritable_len);
read_caps (caps.ambient, capabilities->ambient, capabilities->ambient_len);
read_caps (caps.bounding, capabilities->bounding, capabilities->bounding_len);
read_caps (caps.permitted, capabilities->permitted, capabilities->permitted_len);
ret = read_caps (caps.effective, capabilities->effective, capabilities->effective_len, err);
if (ret < 0)

@giuseppe giuseppe Jul 27, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these if (ret < 0) could benefit from being if (UNLIKELY (ret < 0))

return ret;

ret = read_caps (caps.inheritable, capabilities->inheritable, capabilities->inheritable_len, err);
if (ret < 0)
return ret;

ret = read_caps (caps.ambient, capabilities->ambient, capabilities->ambient_len, err);
if (ret < 0)
return ret;

ret = read_caps (caps.bounding, capabilities->bounding, capabilities->bounding_len, err);
if (ret < 0)
return ret;

ret = read_caps (caps.permitted, capabilities->permitted, capabilities->permitted_len, err);
if (ret < 0)
return ret;
}
return set_required_caps (&caps, uid, gid, no_new_privileges, err);
}
Expand Down