diff options
| author | Linus Torvalds | 2016-05-18 20:51:59 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-18 20:51:59 +0200 |
| commit | 9e17632c0a146891c90a4353a160cfcf71f34b8f (patch) | |
| tree | 9ab52130a11cdc9cac5f4727b773badf1279555f /fs/binfmt_elf_fdpic.c | |
| parent | Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | coredump: only charge written data against RLIMIT_CORE (diff) | |
| download | kernel-qcow2-linux-9e17632c0a146891c90a4353a160cfcf71f34b8f.tar.gz kernel-qcow2-linux-9e17632c0a146891c90a4353a160cfcf71f34b8f.tar.xz kernel-qcow2-linux-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_fdpic.c')
| -rw-r--r-- | fs/binfmt_elf_fdpic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 083ea2bc60ab..71ade0e556b7 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -1787,7 +1787,7 @@ static int elf_fdpic_core_dump(struct coredump_params *cprm) goto end_coredump; } - if (!dump_skip(cprm, dataoff - cprm->written)) + if (!dump_skip(cprm, dataoff - cprm->file->f_pos)) goto end_coredump; if (!elf_fdpic_dump_segments(cprm)) |