From: Michal Hocko <mhocko@kernel.org>
To: Kees Cook <keescook@chromium.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Jiri Kosina <jkosina@suse.cz>, Al Viro <viro@zeniv.linux.org.uk>,
Oleg Nesterov <oleg@redhat.com>, Ingo Molnar <mingo@redhat.com>,
Baoquan He <bhe@redhat.com>, James Hogan <james.hogan@imgtec.com>,
linux-metag@vger.kernel.org
Subject: Re: [PATCH 1/2] fs, elf: drop MAP_FIXED usage from elf_map
Date: Mon, 16 Oct 2017 21:00:47 +0200 [thread overview]
Message-ID: <20171016190047.76ry2inllsacd3pv@dhcp22.suse.cz> (raw)
In-Reply-To: <CAGXu5jK8n4SCHniH85Wwtzw8QdoO1_1CMoiWqGnG-OBSwH2FRw@mail.gmail.com>
[CCing metag people for the metag elf_map implementation specific. The thread
starts here http://lkml.kernel.org/r/20171016134446.19910-1-mhocko@kernel.org]
On Mon 16-10-17 09:39:14, Kees Cook wrote:
> On Mon, Oct 16, 2017 at 6:44 AM, Michal Hocko <mhocko@kernel.org> wrote:
[...]
> > +static unsigned long elf_vm_mmap(struct file *filep, unsigned long addr,
> > + unsigned long size, int prot, int type, unsigned long off)
> > +{
> > + unsigned long map_addr;
> > +
> > + /*
> > + * If caller requests the mapping at a specific place, make sure we fail
> > + * rather than potentially clobber an existing mapping which can have
> > + * security consequences (e.g. smash over the stack area).
> > + */
> > + map_addr = vm_mmap(filep, addr, size, prot, type & ~MAP_FIXED, off);
> > + if (BAD_ADDR(map_addr))
> > + return map_addr;
> > +
> > + if ((type & MAP_FIXED) && map_addr != addr) {
> > + pr_info("Uhuuh, elf segement at %p requested but the memory is mapped already\n",
> > + (void*)addr);
>
> Is "info" loud enough? I actually think this should be a WARN_ONCE().
Does it make any sense to taint the kernel just because of this
condition? I can make it pr_error...
> > + return -EAGAIN;
> > + }
> > +
> > + return map_addr;
> > +}
> > +
> > static unsigned long elf_map(struct file *filep, unsigned long addr,
> > struct elf_phdr *eppnt, int prot, int type,
> > unsigned long total_size)
> > @@ -366,11 +389,11 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
>
> elf_map is redirected on metag -- it should probably have its vm_mmap
> calls adjust too.
Thanks for spotting this. I am not really familiar with metag. It seems
to clear MAP_FIXED already
tcm_tag = tcm_lookup_tag(addr);
if (tcm_tag != TCM_INVALID_TAG)
type &= ~MAP_FIXED;
So if there is a tag the flag is cleared. I do not understand this code
(and git log doesn't help) but why is this MAP_FIXED code really needed?
> > */
> > if (total_size) {
> > total_size = ELF_PAGEALIGN(total_size);
> > - map_addr = vm_mmap(filep, addr, total_size, prot, type, off);
> > + map_addr = elf_vm_mmap(filep, addr, total_size, prot, type, off);
> > if (!BAD_ADDR(map_addr))
> > vm_munmap(map_addr+size, total_size-size);
> > } else
> > - map_addr = vm_mmap(filep, addr, size, prot, type, off);
> > + map_addr = elf_vm_mmap(filep, addr, size, prot, type, off);
> >
> > return(map_addr);
> > }
> > @@ -1215,7 +1238,7 @@ static int load_elf_library(struct file *file)
> > eppnt++;
> >
> > /* Now use mmap to map the library into memory. */
> > - error = vm_mmap(file,
> > + error = elf_vm_mmap(file,
> > ELF_PAGESTART(eppnt->p_vaddr),
> > (eppnt->p_filesz +
> > ELF_PAGEOFFSET(eppnt->p_vaddr)),
> > --
> > 2.14.2
> >
>
> Otherwise, yeah, this should be good.
Thanks!
--
Michal Hocko
SUSE Labs
next prev parent reply other threads:[~2017-10-16 19:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-04 7:50 MAP_FIXED for ELF mappings Michal Hocko
2017-10-04 7:59 ` Michal Hocko
2017-10-04 15:03 ` Baoquan He
2017-10-04 15:11 ` Michal Hocko
2017-10-04 15:12 ` Baoquan He
2017-10-04 15:17 ` Michal Hocko
2017-10-04 15:37 ` Baoquan He
2017-10-04 17:12 ` Michal Hocko
2017-10-04 17:15 ` Linus Torvalds
2017-10-04 17:28 ` Michal Hocko
2017-10-05 16:33 ` Oleg Nesterov
2017-10-05 16:42 ` Michal Hocko
2017-10-16 13:44 ` [PATCH 0/2] fs, elf: get rid of MAP_FIXED from the loader Michal Hocko
2017-10-16 13:44 ` [PATCH 1/2] fs, elf: drop MAP_FIXED usage from elf_map Michal Hocko
2017-10-16 16:39 ` Kees Cook
2017-10-16 19:00 ` Michal Hocko [this message]
2017-10-16 20:02 ` James Hogan
2017-10-17 7:37 ` Michal Hocko
2017-10-17 8:35 ` James Hogan
2017-10-17 8:56 ` Michal Hocko
2017-10-17 12:26 ` Baoquan He
2017-10-17 12:56 ` Michal Hocko
2017-10-17 13:22 ` Baoquan He
2017-10-17 13:33 ` Michal Hocko
2017-10-17 13:42 ` Baoquan He
2017-10-16 13:44 ` [PATCH 2/2] fs, elf: drop MAP_FIXED from initial ET_DYN segment Michal Hocko
2017-10-16 16:44 ` Kees Cook
2017-10-16 18:43 ` Michal Hocko
2017-10-16 19:38 ` Kees Cook
2017-10-17 9:04 ` Michal Hocko
2017-10-17 20:01 ` Kees Cook
2017-10-19 11:20 ` Michal Hocko
2017-10-19 17:19 ` Kees Cook
2017-10-20 8:45 ` Michal Hocko
2017-10-20 14:12 ` Kees Cook
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=20171016190047.76ry2inllsacd3pv@dhcp22.suse.cz \
--to=mhocko@kernel.org \
--cc=bhe@redhat.com \
--cc=james.hogan@imgtec.com \
--cc=jkosina@suse.cz \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-metag@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=torvalds@linux-foundation.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®