Merge branches 'sched/rt' and 'sched/urgent' into sched/core

[linux-2.6-omap-h63xx.git] / security / keys / keyctl.c

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index e9335e1c6cf50726b3d18f67e069f285a8e5b84e..b1ec3b4ee17df919101b3aee3e3853f4b4ea75bb 100644 (file)
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -270,6 +270,7 @@ long keyctl_join_session_keyring(const char __user *_name)
 
        /* join the session */
        ret = join_session_keyring(name);
+       kfree(name);
 
  error:
        return ret;