OSDN Git Service
(root)
/
linux-kernel-docs
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[linux-kernel-docs/linux-2.6.git]
/
fs
/
compat.c
diff --git
a/fs/compat.c
b/fs/compat.c
index
139dc93
..
ed43e17
100644
(file)
--- a/
fs/compat.c
+++ b/
fs/compat.c
@@
-24,6
+24,7
@@
#include <linux/fcntl.h>
#include <linux/namei.h>
#include <linux/file.h>
#include <linux/fcntl.h>
#include <linux/namei.h>
#include <linux/file.h>
+#include <linux/fdtable.h>
#include <linux/vfs.h>
#include <linux/ioctl.h>
#include <linux/init.h>
#include <linux/vfs.h>
#include <linux/ioctl.h>
#include <linux/init.h>
@@
-1404,7
+1405,7
@@
int compat_do_execve(char * filename,
/* execve success */
security_bprm_free(bprm);
acct_update_integrals(current);
/* execve success */
security_bprm_free(bprm);
acct_update_integrals(current);
-
kfree
(bprm);
+
free_bprm
(bprm);
return retval;
}
return retval;
}
@@
-1423,7
+1424,7
@@
out_file:
}
out_kfree:
}
out_kfree:
-
kfree
(bprm);
+
free_bprm
(bprm);
out_ret:
return retval;
out_ret:
return retval;