diff --git a/[refs] b/[refs] index f518e2ed6839..c63e434cae36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e94de8acbe524d919f1ea8807913d7b005e1578 +refs/heads/master: 1da083c9b23dafd6bcb08dcfec443e66e90efff0 diff --git a/trunk/fs/binfmt_flat.c b/trunk/fs/binfmt_flat.c index b8656225b34b..b6ab27ccf214 100644 --- a/trunk/fs/binfmt_flat.c +++ b/trunk/fs/binfmt_flat.c @@ -596,7 +596,7 @@ static int load_flat_file(struct linux_binprm * bprm, if (IS_ERR_VALUE(result)) { printk("Unable to read data+bss, errno %d\n", (int)-result); do_munmap(current->mm, textpos, text_len); - do_munmap(current->mm, realdatastart, data_len + extra); + do_munmap(current->mm, realdatastart, len); ret = result; goto err; }