projects / packages / libcgroup.git / blame
| Commit | Line | Data |
|---|---|---|
| 51630b4e JB |
1 | diff --git a/src/config.c b/src/config.c |
| 2 | index 3ffa263..b5d51b3 100644 | |
| 3 | --- a/src/config.c | |
| 4 | +++ b/src/config.c | |
| 5 | @@ -326,7 +326,7 @@ int config_group_task_perm(char *perm_type, char *value, int flag) | |
| 9665627f AM |
6 | long val = atoi(value); |
| 7 | char buffer[CGROUP_BUFFER_LEN]; | |
| 8 | struct cgroup *config_cgroup; | |
| 9 | - int table_index; | |
| 10 | + int table_index, ret; | |
| 11 | ||
| 12 | switch (flag) { | |
| 13 | case CGROUP: | |
| 51630b4e | 14 | @@ -370,10 +370,10 @@ int config_group_task_perm(char *perm_type, char *value, int flag) |
| 9665627f AM |
15 | if (!group) |
| 16 | goto group_task_error; | |
| 17 | ||
| 18 | - getgrnam_r(value, group, buffer, | |
| 19 | + ret = getgrnam_r(value, group, buffer, | |
| 20 | CGROUP_BUFFER_LEN, &group_buffer); | |
| 21 | ||
| 22 | - if (group_buffer == NULL) { | |
| 23 | + if (ret != 0 || group_buffer == NULL) { | |
| 24 | free(group); | |
| 25 | goto group_task_error; | |
| 26 | } | |
| 51630b4e | 27 | @@ -439,7 +439,7 @@ int config_group_admin_perm(char *perm_type, char *value, int flag) |
| 9665627f AM |
28 | struct cgroup *config_cgroup; |
| 29 | long val = atoi(value); | |
| 30 | char buffer[CGROUP_BUFFER_LEN]; | |
| 31 | - int table_index; | |
| 32 | + int table_index, ret; | |
| 33 | ||
| 34 | switch (flag) { | |
| 35 | case CGROUP: | |
| 51630b4e | 36 | @@ -482,10 +482,10 @@ int config_group_admin_perm(char *perm_type, char *value, int flag) |
| 9665627f AM |
37 | if (!group) |
| 38 | goto admin_error; | |
| 39 | ||
| 40 | - getgrnam_r(value, group, buffer, | |
| 41 | + ret = getgrnam_r(value, group, buffer, | |
| 42 | CGROUP_BUFFER_LEN, &group_buffer); | |
| 43 | ||
| 44 | - if (group_buffer == NULL) { | |
| 45 | + if (ret != 0 || group_buffer == NULL) { | |
| 46 | free(group); | |
| 47 | goto admin_error; | |
| 48 | } | |
| 51630b4e JB |
49 | diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c |
| 50 | index 4cef53e..90920d1 100644 | |
| 51 | --- a/src/daemon/cgrulesengd.c | |
| 52 | +++ b/src/daemon/cgrulesengd.c | |
| 53 | @@ -654,7 +654,7 @@ close: | |
| 9665627f AM |
54 | |
| 55 | static int cgre_create_netlink_socket_process_msg(void) | |
| 56 | { | |
| 57 | - int sk_nl = 0, sk_unix = 0, sk_max; | |
| 58 | + int sk_nl = -1, sk_unix = -1, sk_max; | |
| 59 | struct sockaddr_nl my_nla; | |
| 60 | char buff[BUFF_SIZE]; | |
| 61 | int rc = -1; | |
| 51630b4e JB |
62 | diff --git a/src/tools/lscgroup.c b/src/tools/lscgroup.c |
| 63 | index bfb1724..d15a0c2 100644 | |
| 64 | --- a/src/tools/lscgroup.c | |
| 65 | +++ b/src/tools/lscgroup.c | |
| 66 | @@ -96,11 +96,11 @@ static int display_controller_data(char *input_path, char *controller, char *nam | |
| 9665627f AM |
67 | if (ret != 0) |
| 68 | return ret; | |
| 69 | ||
| 70 | - strncpy(cgroup_dir_path, info.full_path, FILENAME_MAX); | |
| 71 | + strncpy(cgroup_dir_path, info.full_path, FILENAME_MAX - 1); | |
| 72 | /* remove problematic '/' characters from cgroup directory path*/ | |
| 73 | trim_filepath(cgroup_dir_path); | |
| 74 | ||
| 75 | - strncpy(input_dir_path, input_path, FILENAME_MAX); | |
| 76 | + strncpy(input_dir_path, input_path, FILENAME_MAX - 1); | |
| 77 | ||
| 78 | /* remove problematic '/' characters from input directory path*/ | |
| 79 | trim_filepath(input_dir_path); |