diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 19:58:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-27 19:58:39 -0700 |
| commit | 14970f204b1993af7459d5bd34aaff38dfee6670 (patch) | |
| tree | 1103cabe48e2a51fd6a62052600bd1b0cee7cc3e /fs | |
| parent | 67463e54beb63114965c3d2c7cb81d1d524e2697 (diff) | |
| parent | 8e819101ce6fcc58801c9a813ea99c4da0255eef (diff) | |
| download | op-kernel-dev-14970f204b1993af7459d5bd34aaff38dfee6670.zip op-kernel-dev-14970f204b1993af7459d5bd34aaff38dfee6670.tar.gz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"20 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
drivers/misc/sgi-gru/grumain.c: remove bogus 0x prefix from printk
cris/arch-v32: cryptocop: print a hex number after a 0x prefix
ipack: print a hex number after a 0x prefix
block: DAC960: print a hex number after a 0x prefix
fs: exofs: print a hex number after a 0x prefix
lib/genalloc.c: start search from start of chunk
mm: memcontrol: do not recurse in direct reclaim
CREDITS: update credit information for Martin Kepplinger
proc: fix NULL dereference when reading /proc/<pid>/auxv
mm: kmemleak: ensure that the task stack is not freed during scanning
lib/stackdepot.c: bump stackdepot capacity from 16MB to 128MB
latent_entropy: raise CONFIG_FRAME_WARN by default
kconfig.h: remove config_enabled() macro
ipc: account for kmem usage on mqueue and msg
mm/slab: improve performance of gathering slabinfo stats
mm: page_alloc: use KERN_CONT where appropriate
mm/list_lru.c: avoid error-path NULL pointer deref
h8300: fix syscall restarting
kcov: properly check if we are in an interrupt
mm/slab: fix kmemcg cache creation delayed issue
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/exofs/dir.c | 2 | ||||
| -rw-r--r-- | fs/proc/base.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/exofs/dir.c b/fs/exofs/dir.c index 79101651..42f9a0a 100644 --- a/fs/exofs/dir.c +++ b/fs/exofs/dir.c @@ -137,7 +137,7 @@ Espan: bad_entry: EXOFS_ERR( "ERROR [exofs_check_page]: bad entry in directory(0x%lx): %s - " - "offset=%lu, inode=0x%llu, rec_len=%d, name_len=%d\n", + "offset=%lu, inode=0x%llx, rec_len=%d, name_len=%d\n", dir->i_ino, error, (page->index<<PAGE_SHIFT)+offs, _LLU(le64_to_cpu(p->inode_no)), rec_len, p->name_len); diff --git a/fs/proc/base.c b/fs/proc/base.c index adfc5b4..ca651ac 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1012,6 +1012,9 @@ static ssize_t auxv_read(struct file *file, char __user *buf, { struct mm_struct *mm = file->private_data; unsigned int nwords = 0; + + if (!mm) + return 0; do { nwords += 2; } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */ |
