diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 11:51:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 11:51:59 -0700 |
| commit | 9e17632c0a146891c90a4353a160cfcf71f34b8f (patch) | |
| tree | 9ab52130a11cdc9cac5f4727b773badf1279555f /fs/binfmt_elf.c | |
| parent | 69370471d0b2fc3020c60f5473b1eef5977d165a (diff) | |
| parent | 2c4cb04300fa160e9d78335c74184c4e66a56437 (diff) | |
| download | linux-stable-9e17632c0a146891c90a4353a160cfcf71f34b8f.tar.gz linux-stable-9e17632c0a146891c90a4353a160cfcf71f34b8f.tar.bz2 linux-stable-9e17632c0a146891c90a4353a160cfcf71f34b8f.zip | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs cleanups from Al Viro:
"Assorted cleanups and fixes all over the place"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
coredump: only charge written data against RLIMIT_CORE
coredump: get rid of coredump_params->written
ecryptfs_lookup(): try either only encrypted or plaintext name
ecryptfs: avoid multiple aliases for directories
bpf: reject invalid names right in ->lookup()
__d_alloc(): treat NULL name as QSTR("/", 1)
mtd: switch ubi_open_volume_path() to vfs_stat()
mtd: switch open_mtd_by_chdev() to use of vfs_stat()
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 81381cc0dd17..56224ffa94d2 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -2273,7 +2273,7 @@ static int elf_core_dump(struct coredump_params *cprm) goto end_coredump; /* Align to page */ - if (!dump_skip(cprm, dataoff - cprm->written)) + if (!dump_skip(cprm, dataoff - cprm->file->f_pos)) goto end_coredump; for (i = 0, vma = first_vma(current, gate_vma); vma != NULL; |