diff options
author | James Morris <jmorris@namei.org> | 2010-05-18 08:57:00 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-05-18 08:57:00 +1000 |
commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /kernel/groups.c | |
parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
download | blackbird-op-linux-539c99fd7fc28f8db257c713c10fb4aceadf8887.tar.gz blackbird-op-linux-539c99fd7fc28f8db257c713c10fb4aceadf8887.zip |
Merge branch 'next' into for-linus
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) */ int set_groups(struct cred *new, struct group_info *group_info) { - int retval; - - retval = security_task_setgroups(group_info); - if (retval) - return retval; - put_group_info(new->group_info); groups_sort(group_info); get_group_info(group_info); |