From: Michal Hocko <mhocko@kernel.org> To: LKML <linux-kernel@vger.kernel.org> Cc: "Andrew Morton" <akpm@linux-foundation.org>, linux-mm@kvack.org, "Alex Deucher" <alexander.deucher@amd.com>, "Alex Thorlton" <athorlton@sgi.com>, "Andrea Arcangeli" <aarcange@redhat.com>, "Andy Lutomirski" <luto@amacapital.net>, "Benjamin LaHaise" <bcrl@kvack.org>, "Christian König" <christian.koenig@amd.com>, "Daniel Vetter" <daniel.vetter@intel.com>, "Dave Hansen" <dave.hansen@linux.intel.com>, "David Airlie" <airlied@linux.ie>, "Davidlohr Bueso" <dave@stgolabs.net>, "David Rientjes" <rientjes@google.com>, "H . Peter Anvin" <hpa@zytor.com>, "Hugh Dickins" <hughd@google.com>, "Ingo Molnar" <mingo@kernel.org>, "Johannes Weiner" <hannes@cmpxchg.org>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>, "Konstantin Khlebnikov" <koct9i@gmail.com>, linux-arch@vger.kernel.org, "Mel Gorman" <mgorman@suse.de>, "Oleg Nesterov" <oleg@redhat.com>, "Peter Zijlstra" <peterz@infradead.or> Subject: [PATCH 04/18] mm, aout: handle vm_brk failures Date: Mon, 29 Feb 2016 14:26:43 +0100 [thread overview] Message-ID: <1456752417-9626-5-git-send-email-mhocko@kernel.org> (raw) In-Reply-To: <1456752417-9626-1-git-send-email-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> vm_brk is allowed to fail but load_aout_binary simply ignores the error and happily continues. I haven't noticed any problem from that in real life but later patches will make the failure more likely because vm_brk will become killable (resp. mmap_sem for write waiting will become killable) so we should be more careful now. The error handling should be quite straightforward because there are calls to vm_mmap which check the error properly already. The only notable exception is set_brk which is called after beyond_if label. But nothing indicates that we cannot move it above set_binfmt as the two do not depend on each other and fail before we do set_binfmt and alter reference counting. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Signed-off-by: Michal Hocko <mhocko@suse.com> --- arch/x86/ia32/ia32_aout.c | 22 +++++++++++++++------- fs/binfmt_aout.c | 9 +++++++-- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index ae6aad1d24f7..f5e737ff0022 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c @@ -116,13 +116,13 @@ static struct linux_binfmt aout_format = { .min_coredump = PAGE_SIZE }; -static void set_brk(unsigned long start, unsigned long end) +static unsigned long set_brk(unsigned long start, unsigned long end) { start = PAGE_ALIGN(start); end = PAGE_ALIGN(end); if (end <= start) - return; - vm_brk(start, end - start); + return start; + return vm_brk(start, end - start); } #ifdef CONFIG_COREDUMP @@ -349,7 +349,10 @@ static int load_aout_binary(struct linux_binprm *bprm) #endif if (!bprm->file->f_op->mmap || (fd_offset & ~PAGE_MASK) != 0) { - vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + error = vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + if (IS_ERR_VALUE(error)) + return error; + read_code(bprm->file, N_TXTADDR(ex), fd_offset, ex.a_text+ex.a_data); goto beyond_if; @@ -372,10 +375,13 @@ static int load_aout_binary(struct linux_binprm *bprm) if (error != N_DATADDR(ex)) return error; } + beyond_if: - set_binfmt(&aout_format); + error = set_brk(current->mm->start_brk, current->mm->brk); + if (IS_ERR_VALUE(error)) + return error; - set_brk(current->mm->start_brk, current->mm->brk); + set_binfmt(&aout_format); current->mm->start_stack = (unsigned long)create_aout_tables((char __user *)bprm->p, bprm); @@ -434,7 +440,9 @@ static int load_aout_library(struct file *file) error_time = jiffies; } #endif - vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + retval = vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + if (IS_ERR_VALUE(retval)) + goto out; read_code(file, start_addr, N_TXTOFF(ex), ex.a_text + ex.a_data); diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index 4c556680fa74..5fb075f05706 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -297,7 +297,10 @@ static int load_aout_binary(struct linux_binprm * bprm) } if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) { - vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + error = vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + if (IS_ERR_VALUE(error)) + return error; + read_code(bprm->file, N_TXTADDR(ex), fd_offset, ex.a_text + ex.a_data); goto beyond_if; @@ -378,7 +381,9 @@ static int load_aout_library(struct file *file) "N_TXTOFF is not page aligned. Please convert library: %pD\n", file); } - vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + retval = vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + if (IS_ERR_VALUE(retval)) + goto out; read_code(file, start_addr, N_TXTOFF(ex), ex.a_text + ex.a_data); -- 2.7.0 -- 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: LKML <linux-kernel@vger.kernel.org> Cc: "Andrew Morton" <akpm@linux-foundation.org>, linux-mm@kvack.org, "Alex Deucher" <alexander.deucher@amd.com>, "Alex Thorlton" <athorlton@sgi.com>, "Andrea Arcangeli" <aarcange@redhat.com>, "Andy Lutomirski" <luto@amacapital.net>, "Benjamin LaHaise" <bcrl@kvack.org>, "Christian König" <christian.koenig@amd.com>, "Daniel Vetter" <daniel.vetter@intel.com>, "Dave Hansen" <dave.hansen@linux.intel.com>, "David Airlie" <airlied@linux.ie>, "Davidlohr Bueso" <dave@stgolabs.net>, "David Rientjes" <rientjes@google.com>, "H . Peter Anvin" <hpa@zytor.com>, "Hugh Dickins" <hughd@google.com>, "Ingo Molnar" <mingo@kernel.org>, "Johannes Weiner" <hannes@cmpxchg.org>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>, "Konstantin Khlebnikov" <koct9i@gmail.com>, linux-arch@vger.kernel.org, "Mel Gorman" <mgorman@suse.de>, "Oleg Nesterov" <oleg@redhat.com>, "Peter Zijlstra" <peterz@infradead.org>, "Petr Cermak" <petrcermak@chromium.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Michal Hocko" <mhocko@suse.com>, "Ingo Molnar" <mingo@redhat.com>, "Alexander Viro" <viro@zeniv.linux.org.uk> Subject: [PATCH 04/18] mm, aout: handle vm_brk failures Date: Mon, 29 Feb 2016 14:26:43 +0100 [thread overview] Message-ID: <1456752417-9626-5-git-send-email-mhocko@kernel.org> (raw) Message-ID: <20160229132643.BU_qptufXWQQ-MJtJbafzkweRR7kbDZ6yaZOSJn322E@z> (raw) In-Reply-To: <1456752417-9626-1-git-send-email-mhocko@kernel.org> From: Michal Hocko <mhocko@suse.com> vm_brk is allowed to fail but load_aout_binary simply ignores the error and happily continues. I haven't noticed any problem from that in real life but later patches will make the failure more likely because vm_brk will become killable (resp. mmap_sem for write waiting will become killable) so we should be more careful now. The error handling should be quite straightforward because there are calls to vm_mmap which check the error properly already. The only notable exception is set_brk which is called after beyond_if label. But nothing indicates that we cannot move it above set_binfmt as the two do not depend on each other and fail before we do set_binfmt and alter reference counting. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Signed-off-by: Michal Hocko <mhocko@suse.com> --- arch/x86/ia32/ia32_aout.c | 22 +++++++++++++++------- fs/binfmt_aout.c | 9 +++++++-- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index ae6aad1d24f7..f5e737ff0022 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c @@ -116,13 +116,13 @@ static struct linux_binfmt aout_format = { .min_coredump = PAGE_SIZE }; -static void set_brk(unsigned long start, unsigned long end) +static unsigned long set_brk(unsigned long start, unsigned long end) { start = PAGE_ALIGN(start); end = PAGE_ALIGN(end); if (end <= start) - return; - vm_brk(start, end - start); + return start; + return vm_brk(start, end - start); } #ifdef CONFIG_COREDUMP @@ -349,7 +349,10 @@ static int load_aout_binary(struct linux_binprm *bprm) #endif if (!bprm->file->f_op->mmap || (fd_offset & ~PAGE_MASK) != 0) { - vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + error = vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + if (IS_ERR_VALUE(error)) + return error; + read_code(bprm->file, N_TXTADDR(ex), fd_offset, ex.a_text+ex.a_data); goto beyond_if; @@ -372,10 +375,13 @@ static int load_aout_binary(struct linux_binprm *bprm) if (error != N_DATADDR(ex)) return error; } + beyond_if: - set_binfmt(&aout_format); + error = set_brk(current->mm->start_brk, current->mm->brk); + if (IS_ERR_VALUE(error)) + return error; - set_brk(current->mm->start_brk, current->mm->brk); + set_binfmt(&aout_format); current->mm->start_stack = (unsigned long)create_aout_tables((char __user *)bprm->p, bprm); @@ -434,7 +440,9 @@ static int load_aout_library(struct file *file) error_time = jiffies; } #endif - vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + retval = vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + if (IS_ERR_VALUE(retval)) + goto out; read_code(file, start_addr, N_TXTOFF(ex), ex.a_text + ex.a_data); diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index 4c556680fa74..5fb075f05706 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -297,7 +297,10 @@ static int load_aout_binary(struct linux_binprm * bprm) } if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) { - vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + error = vm_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); + if (IS_ERR_VALUE(error)) + return error; + read_code(bprm->file, N_TXTADDR(ex), fd_offset, ex.a_text + ex.a_data); goto beyond_if; @@ -378,7 +381,9 @@ static int load_aout_library(struct file *file) "N_TXTOFF is not page aligned. Please convert library: %pD\n", file); } - vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + retval = vm_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); + if (IS_ERR_VALUE(retval)) + goto out; read_code(file, start_addr, N_TXTOFF(ex), ex.a_text + ex.a_data); -- 2.7.0
next prev parent reply other threads:[~2016-02-29 13:26 UTC|newest] Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-29 13:26 [PATCH 0/18] change mmap_sem taken for write killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 13:26 ` [PATCH 01/18] mm: Make mmap_sem for write waits killable for mm syscalls Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 13:44 ` kbuild test robot 2016-02-29 13:44 ` kbuild test robot 2016-02-29 13:44 ` kbuild test robot 2016-02-29 13:44 ` kbuild test robot 2016-03-10 15:47 ` Vlastimil Babka 2016-03-10 15:47 ` Vlastimil Babka 2016-03-10 15:56 ` Michal Hocko 2016-03-10 15:56 ` Michal Hocko 2016-02-29 13:26 ` [PATCH 02/18] mm: make vm_mmap killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-03-11 9:59 ` Vlastimil Babka 2016-03-11 9:59 ` Vlastimil Babka 2016-03-11 12:12 ` Michal Hocko 2016-03-11 12:12 ` Michal Hocko 2016-03-11 12:43 ` Vlastimil Babka 2016-03-11 12:43 ` Vlastimil Babka 2016-03-11 12:55 ` Michal Hocko 2016-03-11 12:55 ` Michal Hocko 2016-02-29 13:26 ` [PATCH 03/18] mm: make vm_munmap killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-03-11 10:06 ` Vlastimil Babka 2016-03-11 10:06 ` Vlastimil Babka 2016-03-11 12:32 ` Michal Hocko 2016-03-11 12:32 ` Michal Hocko 2016-02-29 13:26 ` Michal Hocko [this message] 2016-02-29 13:26 ` [PATCH 04/18] mm, aout: handle vm_brk failures Michal Hocko 2016-03-11 10:32 ` Vlastimil Babka 2016-03-11 10:32 ` Vlastimil Babka 2016-03-11 12:42 ` Michal Hocko 2016-03-11 12:42 ` 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-03-11 10:35 ` Vlastimil Babka 2016-03-11 10:35 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 06/18] mm: make vm_brk killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-03-11 10:44 ` Vlastimil Babka 2016-03-11 10:44 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 07/18] mm, proc: make clear_refs killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 13:47 ` kbuild test robot 2016-02-29 13:47 ` kbuild test robot 2016-02-29 17:38 ` Oleg Nesterov 2016-02-29 17:38 ` Oleg Nesterov 2016-02-29 17:53 ` Michal Hocko 2016-02-29 17:53 ` Michal Hocko 2016-02-29 17:58 ` Oleg Nesterov 2016-02-29 17:58 ` Oleg Nesterov 2016-02-29 18:02 ` Michal Hocko 2016-02-29 18:02 ` Michal Hocko 2016-02-29 13:26 ` [PATCH 08/18] mm, fork: make dup_mmap wait for mmap_sem for write killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 13:48 ` kbuild test robot 2016-02-29 13:48 ` kbuild test robot 2016-02-29 17:54 ` Oleg Nesterov 2016-02-29 17:54 ` Oleg Nesterov 2016-02-29 13:26 ` [PATCH 09/18] ipc, shm: make shmem attach/detach wait for mmap_sem killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-03-08 19:15 ` Davidlohr Bueso 2016-03-08 19:15 ` Davidlohr Bueso 2016-03-09 10:16 ` Michal Hocko 2016-03-09 10:16 ` Michal Hocko 2016-02-29 13:26 ` [PATCH 10/18] vdso: make arch_setup_additional_pages wait for mmap_sem for write killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 13:45 ` kbuild test robot 2016-02-29 13:45 ` kbuild test robot 2016-02-29 13:50 ` kbuild test robot 2016-02-29 13:50 ` kbuild test robot 2016-02-29 13:53 ` kbuild test robot 2016-02-29 13:53 ` kbuild test robot 2016-02-29 15:41 ` Andy Lutomirski 2016-02-29 15:41 ` Andy Lutomirski 2016-03-11 11:28 ` Vlastimil Babka 2016-03-11 11:28 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 11/18] coredump: make coredump_wait wait for mma_sem " Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 15:57 ` Oleg Nesterov 2016-02-29 15:57 ` Oleg Nesterov 2016-03-11 11:32 ` Vlastimil Babka 2016-03-11 11:32 ` Vlastimil Babka 2016-03-11 11:54 ` Vlastimil Babka 2016-03-11 11:54 ` Vlastimil Babka 2016-03-11 12:46 ` Michal Hocko 2016-03-11 12:46 ` Michal Hocko 2016-02-29 13:26 ` [PATCH 12/18] aio: make aio_setup_ring killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 16:17 ` Jeff Moyer 2016-02-29 16:17 ` Jeff Moyer 2016-03-11 11:57 ` Vlastimil Babka 2016-03-11 11:57 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 13/18] exec: make exec path waiting for mmap_sem killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 17:23 ` Oleg Nesterov 2016-02-29 17:23 ` Oleg Nesterov 2016-02-29 17:47 ` Michal Hocko 2016-02-29 17:47 ` Michal Hocko 2016-02-29 18:10 ` Oleg Nesterov 2016-02-29 18:10 ` Oleg Nesterov 2016-03-11 12:51 ` Vlastimil Babka 2016-03-11 12:51 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 14/18] prctl: make PR_SET_THP_DISABLE wait " Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-03-11 12:54 ` Vlastimil Babka 2016-03-11 12:54 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 15/18] uprobes: wait for mmap_sem for write killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 15:57 ` Oleg Nesterov 2016-02-29 15:57 ` Oleg Nesterov 2016-02-29 16:28 ` Michal Hocko 2016-02-29 16:28 ` Michal Hocko 2016-02-29 17:12 ` Oleg Nesterov 2016-02-29 17:12 ` Oleg Nesterov 2016-02-29 13:26 ` [PATCH 16/18] drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-03-11 15:23 ` Vlastimil Babka 2016-03-11 15:23 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 17/18] drm/radeon: make radeon_mn_get " Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-02-29 13:35 ` Christian König 2016-02-29 13:35 ` Christian König 2016-03-11 15:27 ` Vlastimil Babka 2016-03-11 15:27 ` Vlastimil Babka 2016-02-29 13:26 ` [PATCH 18/18] drm/amdgpu: make amdgpu_mn_get " Michal Hocko 2016-02-29 13:26 ` Michal Hocko 2016-03-11 15:29 ` Vlastimil Babka 2016-03-11 15:29 ` Vlastimil Babka 2016-02-29 13:31 ` [PATCH 0/18] change mmap_sem taken for write killable Michal Hocko 2016-02-29 13:31 ` Michal Hocko 2016-02-29 14:04 ` Kirill A. Shutemov 2016-02-29 14:04 ` Kirill A. Shutemov 2016-02-29 14:16 ` Michal Hocko 2016-02-29 14:16 ` Michal Hocko 2016-02-29 15:03 ` Kirill A. Shutemov 2016-02-29 15:03 ` Kirill A. Shutemov
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=1456752417-9626-5-git-send-email-mhocko@kernel.org \ --to=mhocko@kernel.org \ --cc=aarcange@redhat.com \ --cc=airlied@linux.ie \ --cc=akpm@linux-foundation.org \ --cc=alexander.deucher@amd.com \ --cc=athorlton@sgi.com \ --cc=bcrl@kvack.org \ --cc=christian.koenig@amd.com \ --cc=daniel.vetter@intel.com \ --cc=dave.hansen@linux.intel.com \ --cc=dave@stgolabs.net \ --cc=hannes@cmpxchg.org \ --cc=hpa@zytor.com \ --cc=hughd@google.com \ --cc=kirill.shutemov@linux.intel.com \ --cc=koct9i@gmail.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=luto@amacapital.net \ --cc=mgorman@suse.de \ --cc=mingo@kernel.org \ --cc=oleg@redhat.com \ --cc=peterz@infradead.or \ --cc=rientjes@google.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).