diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2016-12-12 16:45:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 18:55:09 -0800 |
| commit | 39a10ac23cfdb6469550e1641a2bc2ed80663ceb (patch) | |
| tree | f3c7aa72dd5966dfb6c43fe563b092e9b453647d | |
| parent | f5887c71cf682a6c27e26cb83296d49729f62b3c (diff) | |
proc: kmalloc struct pde_opener
kzalloc is too much, half of the fields will be reinitialized anyway.
If proc file doesn't have ->release hook (some still do not), clearing
is unnecessary because it will be freed immediately.
Link: http://lkml.kernel.org/r/20161029155747.GC1246@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/proc/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index f623a3ca2746..57f548e2eb59 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -321,7 +321,7 @@ static int proc_reg_open(struct inode *inode, struct file *file) * by hand in remove_proc_entry(). For this, save opener's credentials * for later. */ - pdeo = kzalloc(sizeof(struct pde_opener), GFP_KERNEL); + pdeo = kmalloc(sizeof(struct pde_opener), GFP_KERNEL); if (!pdeo) return -ENOMEM; @@ -338,6 +338,8 @@ static int proc_reg_open(struct inode *inode, struct file *file) if (rv == 0 && release) { /* To know what to release. */ pdeo->file = file; + pdeo->closing = false; + pdeo->c = NULL; /* Strictly for "too late" ->release in proc_reg_release(). */ spin_lock(&pde->pde_unload_lock); list_add(&pdeo->lh, &pde->pde_openers); |