diff options
-rw-r--r-- | fs/exec.c | 3 | ||||
-rw-r--r-- | include/linux/binfmts.h | 1 |
2 files changed, 0 insertions, 4 deletions
@@ -1268,7 +1268,6 @@ int do_execve(char * filename, | |||
1268 | { | 1268 | { |
1269 | struct linux_binprm *bprm; | 1269 | struct linux_binprm *bprm; |
1270 | struct file *file; | 1270 | struct file *file; |
1271 | unsigned long env_p; | ||
1272 | struct files_struct *displaced; | 1271 | struct files_struct *displaced; |
1273 | int retval; | 1272 | int retval; |
1274 | 1273 | ||
@@ -1321,11 +1320,9 @@ int do_execve(char * filename, | |||
1321 | if (retval < 0) | 1320 | if (retval < 0) |
1322 | goto out; | 1321 | goto out; |
1323 | 1322 | ||
1324 | env_p = bprm->p; | ||
1325 | retval = copy_strings(bprm->argc, argv, bprm); | 1323 | retval = copy_strings(bprm->argc, argv, bprm); |
1326 | if (retval < 0) | 1324 | if (retval < 0) |
1327 | goto out; | 1325 | goto out; |
1328 | bprm->argv_len = env_p - bprm->p; | ||
1329 | 1326 | ||
1330 | retval = search_binary_handler(bprm,regs); | 1327 | retval = search_binary_handler(bprm,regs); |
1331 | if (retval >= 0) { | 1328 | if (retval >= 0) { |
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index b7fc55ec8d48..1dd756731c95 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h | |||
@@ -48,7 +48,6 @@ struct linux_binprm{ | |||
48 | unsigned interp_flags; | 48 | unsigned interp_flags; |
49 | unsigned interp_data; | 49 | unsigned interp_data; |
50 | unsigned long loader, exec; | 50 | unsigned long loader, exec; |
51 | unsigned long argv_len; | ||
52 | }; | 51 | }; |
53 | 52 | ||
54 | #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0 | 53 | #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0 |