diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-25 02:38:26 -0400 |
| commit | b1e50ebcf24668e57f058deb48b0704b5391ed0f (patch) | |
| tree | 17e1b69b249d0738317b732186340c9dd053f1a1 /kernel/groups.c | |
| parent | 0c2a2ae32793e3500a15a449612485f5d17dd431 (diff) | |
| parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'kernel/groups.c')
| -rw-r--r-- | kernel/groups.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/groups.c b/kernel/groups.c index 2b45b2ee3964..53b1916c9492 100644 --- a/kernel/groups.c +++ b/kernel/groups.c | |||
| @@ -164,12 +164,6 @@ int groups_search(const struct group_info *group_info, gid_t grp) | |||
| 164 | */ | 164 | */ |
| 165 | int set_groups(struct cred *new, struct group_info *group_info) | 165 | int set_groups(struct cred *new, struct group_info *group_info) |
| 166 | { | 166 | { |
| 167 | int retval; | ||
| 168 | |||
| 169 | retval = security_task_setgroups(group_info); | ||
| 170 | if (retval) | ||
| 171 | return retval; | ||
| 172 | |||
| 173 | put_group_info(new->group_info); | 167 | put_group_info(new->group_info); |
| 174 | groups_sort(group_info); | 168 | groups_sort(group_info); |
| 175 | get_group_info(group_info); | 169 | get_group_info(group_info); |
