diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /security/keys/keyctl.c | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index e9335e1c6cf5..b1ec3b4ee17d 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
| @@ -270,6 +270,7 @@ long keyctl_join_session_keyring(const char __user *_name) | |||
| 270 | 270 | ||
| 271 | /* join the session */ | 271 | /* join the session */ |
| 272 | ret = join_session_keyring(name); | 272 | ret = join_session_keyring(name); |
| 273 | kfree(name); | ||
| 273 | 274 | ||
| 274 | error: | 275 | error: |
| 275 | return ret; | 276 | return ret; |