summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/exec.c3
-rw-r--r--include/linux/binfmts.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/exec.c b/fs/exec.c
index b152029f18f6..7768453dc986 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1268,7 +1268,6 @@ int do_execve(char * filename,
{
struct linux_binprm *bprm;
struct file *file;
- unsigned long env_p;
struct files_struct *displaced;
int retval;
@@ -1321,11 +1320,9 @@ int do_execve(char * filename,
if (retval < 0)
goto out;
- env_p = bprm->p;
retval = copy_strings(bprm->argc, argv, bprm);
if (retval < 0)
goto out;
- bprm->argv_len = env_p - bprm->p;
retval = search_binary_handler(bprm,regs);
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{
unsigned interp_flags;
unsigned interp_data;
unsigned long loader, exec;
- unsigned long argv_len;
};
#define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0