Subject: + x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet.patch added to -mm tree
To: luto@xxxxxxxxxxxxxx,hpa@xxxxxxxxxxxxxxx,mingo@xxxxxxx,sasha.levin@xxxxxxxxxx,stable@xxxxxxxxxxxxxxx,tglx@xxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 14 May 2014 16:18:33 -0700
The patch titled
Subject: x86,vdso: fix an OOPS accessing the hpet mapping w/o an hpet
has been added to the -mm tree. Its filename is
x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Subject: x86,vdso: fix an OOPS accessing the hpet mapping w/o an hpet
The access should fail, but it shouldn't oops.
Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Reported-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [needs rework for 3.15 and earlier]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/vdso/vma.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN arch/x86/vdso/vma.c~x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet arch/x86/vdso/vma.c
--- a/arch/x86/vdso/vma.c~x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet
+++ a/arch/x86/vdso/vma.c
@@ -84,6 +84,8 @@ static unsigned long vdso_addr(unsigned
return addr;
}
+static struct page *no_pages[] = {NULL};
+
static int map_vdso(const struct vdso_image *image, bool calculate_addr)
{
struct mm_struct *mm = current->mm;
@@ -125,7 +127,7 @@ static int map_vdso(const struct vdso_im
addr + image->size,
image->sym_end_mapping - image->size,
VM_READ,
- NULL);
+ no_pages);
if (IS_ERR(vma)) {
ret = PTR_ERR(vma);
_
Patches currently in -mm which might be from luto@xxxxxxxxxxxxxx are
linux-next.patch
x86vdso-fix-an-oops-accessing-the-hpet-mapping-w-o-an-hpet.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html