From: Michal Hocko <mhocko@kernel.org>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH 05/18] mm, elf: handle vm_brk error
Date: Tue, 26 Apr 2016 14:56:12 +0200 [thread overview]
Message-ID: <1461675385-5934-6-git-send-email-mhocko@kernel.org> (raw)
In-Reply-To: <1461675385-5934-1-git-send-email-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
load_elf_library doesn't handle vm_brk failure although nothing really
indicates it cannot do that because the function is allowed to fail
due to vm_mmap failures already. This might be not a problem now
but later patch will make vm_brk killable (resp. mmap_sem for write
waiting will become killable) and so the failure will be more probable.
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/binfmt_elf.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 81381cc0dd17..37455ee5aeec 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1176,8 +1176,11 @@ static int load_elf_library(struct file *file)
len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr +
ELF_MIN_ALIGN - 1);
bss = eppnt->p_memsz + eppnt->p_vaddr;
- if (bss > len)
- vm_brk(len, bss - len);
+ if (bss > len) {
+ error = vm_brk(len, bss - len);
+ if (BAD_ADDR(error))
+ goto out_free_ph;
+ }
error = 0;
out_free_ph:
--
2.8.0.rc3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org>
To: <linux-mm@kvack.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH 05/18] mm, elf: handle vm_brk error
Date: Tue, 26 Apr 2016 14:56:12 +0200 [thread overview]
Message-ID: <1461675385-5934-6-git-send-email-mhocko@kernel.org> (raw)
In-Reply-To: <1461675385-5934-1-git-send-email-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
load_elf_library doesn't handle vm_brk failure although nothing really
indicates it cannot do that because the function is allowed to fail
due to vm_mmap failures already. This might be not a problem now
but later patch will make vm_brk killable (resp. mmap_sem for write
waiting will become killable) and so the failure will be more probable.
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/binfmt_elf.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 81381cc0dd17..37455ee5aeec 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1176,8 +1176,11 @@ static int load_elf_library(struct file *file)
len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr +
ELF_MIN_ALIGN - 1);
bss = eppnt->p_memsz + eppnt->p_vaddr;
- if (bss > len)
- vm_brk(len, bss - len);
+ if (bss > len) {
+ error = vm_brk(len, bss - len);
+ if (BAD_ADDR(error))
+ goto out_free_ph;
+ }
error = 0;
out_free_ph:
--
2.8.0.rc3
next prev parent reply other threads:[~2016-04-26 12:56 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 12:56 [PATCH 0/18] change mmap_sem taken for write killable v2 Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 01/18] mm: Make mmap_sem for write waits killable for mm syscalls Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 02/18] mm: make vm_mmap killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 03/18] mm: make vm_munmap killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 04/18] mm, aout: handle vm_brk failures Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` Michal Hocko [this message]
2016-04-26 12:56 ` [PATCH 05/18] mm, elf: handle vm_brk error Michal Hocko
2016-04-26 12:56 ` [PATCH 06/18] mm: make vm_brk killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 07/18] mm, proc: make clear_refs killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 08/18] mm, fork: make dup_mmap wait for mmap_sem for write killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 09/18] ipc, shm: make shmem attach/detach wait for mmap_sem killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 10/18] vdso: make arch_setup_additional_pages wait for mmap_sem for write killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 11/18] coredump: make coredump_wait " Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 12/18] aio: make aio_setup_ring killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 13/18] exec: make exec path waiting for mmap_sem killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 14/18] prctl: make PR_SET_THP_DISABLE wait " Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 15:18 ` Alex Thorlton
2016-04-26 15:18 ` Alex Thorlton
2016-04-26 12:56 ` [PATCH 15/18] uprobes: wait for mmap_sem for write killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 16/18] drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 17/18] drm/radeon: make radeon_mn_get " Michal Hocko
2016-04-26 12:56 ` Michal Hocko
2016-04-26 12:56 ` [PATCH 18/18] drm/amdgpu: make amdgpu_mn_get " Michal Hocko
2016-04-26 12:56 ` Michal Hocko
-- strict thread matches above, loose matches on Subject: below --
2016-02-29 13:26 [PATCH 0/18] change mmap_sem taken for write killable Michal Hocko
2016-02-29 13:26 ` [PATCH 05/18] mm, elf: handle vm_brk error Michal Hocko
2016-02-29 13:26 ` Michal Hocko
2016-02-29 13:26 ` Michal Hocko
2016-03-11 10:35 ` Vlastimil Babka
2016-03-11 10:35 ` Vlastimil Babka
2016-03-11 10:35 ` Vlastimil Babka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461675385-5934-6-git-send-email-mhocko@kernel.org \
--to=mhocko@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=vbabka@suse.cz \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.