diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /fs/compat.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/compat.c b/fs/compat.c index 332a869d2c53..ed43e17a5dc6 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -1405,7 +1405,7 @@ int compat_do_execve(char * filename, | |||
| 1405 | /* execve success */ | 1405 | /* execve success */ |
| 1406 | security_bprm_free(bprm); | 1406 | security_bprm_free(bprm); |
| 1407 | acct_update_integrals(current); | 1407 | acct_update_integrals(current); |
| 1408 | kfree(bprm); | 1408 | free_bprm(bprm); |
| 1409 | return retval; | 1409 | return retval; |
| 1410 | } | 1410 | } |
| 1411 | 1411 | ||
| @@ -1424,7 +1424,7 @@ out_file: | |||
| 1424 | } | 1424 | } |
| 1425 | 1425 | ||
| 1426 | out_kfree: | 1426 | out_kfree: |
| 1427 | kfree(bprm); | 1427 | free_bprm(bprm); |
| 1428 | 1428 | ||
| 1429 | out_ret: | 1429 | out_ret: |
| 1430 | return retval; | 1430 | return retval; |
