Skip to content

Commit

Permalink
change log macro of error case from lxc_ambient_caps_up/down
Browse files Browse the repository at this point in the history
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
  • Loading branch information
2xsec authored and Christian Brauner committed Dec 10, 2018
1 parent a16d90b commit a1b60d3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
15 changes: 11 additions & 4 deletions src/lxc/caps.c
Expand Up @@ -114,7 +114,6 @@ int lxc_caps_up(void)
}

for (cap = 0; cap <= CAP_LAST_CAP; cap++) {

cap_flag_value_t flag;

ret = cap_get_flag(caps, cap, CAP_PERMITTED, &flag);
Expand Down Expand Up @@ -203,8 +202,10 @@ int lxc_ambient_caps_up(void)
}

cap_names = cap_to_text(caps, NULL);
if (!cap_names)
if (!cap_names) {
SYSWARN("Failed to convert capabilities %d", cap);
goto out;
}

TRACE("Raised %s in inheritable and ambient capability set", cap_names);

Expand Down Expand Up @@ -317,6 +318,7 @@ static int _real_caps_last_cap(void)
if ((n = read(fd, buf, 31)) >= 0) {
buf[n] = '\0';
errno = 0;

result = strtol(buf, &ptr, 10);
if (!ptr || (*ptr != '\0' && *ptr != '\n') || errno != 0)
result = -1;
Expand All @@ -329,7 +331,10 @@ static int _real_caps_last_cap(void)
* each capability indiviually from the kernel */
if (result < 0) {
int cap = 0;
while (prctl(PR_CAPBSET_READ, cap) >= 0) cap++;

while (prctl(PR_CAPBSET_READ, cap) >= 0)
cap++;

result = cap - 1;
}

Expand All @@ -339,7 +344,9 @@ static int _real_caps_last_cap(void)
int lxc_caps_last_cap(void)
{
static int last_cap = -1;
if (last_cap < 0) last_cap = _real_caps_last_cap();

if (last_cap < 0)
last_cap = _real_caps_last_cap();

return last_cap;
}
Expand Down
4 changes: 2 additions & 2 deletions src/lxc/start.c
Expand Up @@ -1091,7 +1091,7 @@ static int do_start(void *data)

ret = lxc_ambient_caps_up();
if (ret < 0) {
SYSERROR("Failed to raise ambient capabilities");
ERROR("Failed to raise ambient capabilities");
goto out_warn_father;
}

Expand Down Expand Up @@ -1359,7 +1359,7 @@ static int do_start(void *data)

ret = lxc_ambient_caps_down();
if (ret < 0) {
SYSERROR("Failed to clear ambient capabilities");
ERROR("Failed to clear ambient capabilities");
goto out_warn_father;
}

Expand Down

0 comments on commit a1b60d3

Please sign in to comment.