diff options
| -rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 17 | ||||
| -rw-r--r-- | kernels/linux-libre-rt/fix-CVE-2016-5195.patch | 90 |
2 files changed, 6 insertions, 101 deletions
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 7ab945cb8..09335f756 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre-rt _pkgbasever=4.8-gnu -_pkgver=4.8.2-gnu +_pkgver=4.8.6-gnu _rtbasever=4.8 -_rtpatchver=rt3 +_rtpatchver=rt5 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -22,7 +22,7 @@ _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*}_${_rtpatchver} pkgver=${_pkgver//-/_}.${_rtpatchver} pkgrel=1 -rcnrel=armv7-x3 +rcnrel=armv7-x4 arch=('i686' 'x86_64' 'armv7h') url="https://rt.wiki.kernel.org/" license=('GPL2') @@ -46,7 +46,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li # standard config files for mkinitcpio ramdisk 'linux.preset' 'change-default-console-loglevel.patch' - 'fix-CVE-2016-5195.patch' '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' # armv7h patches @@ -68,9 +67,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0014-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch') sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a' 'SKIP' - '4ea446eafe2764c5e5f1ec1c94dad428b78ba4f2e14ff8310f08454145011b46' + '35d6ed23a6a2fc10ef864cd06dfe9b0ea37f722961a75d7e34375c4b483de207' 'SKIP' - '43d91458034ac44f5aa9e91296b92e421b2d46a7762db054b553c5fe6bd6de28' + 'f0e1bc55ec0288e54e84cc35a9e16a9df93be3772fda58b654ece6260f12699a' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -83,10 +82,9 @@ sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a' '4f41fd9878ae11dd9927f05c491b0680555d1c8afd4e5bc496ebc064a5e4ccd1' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '23a5b972cbb3b7e0ec6e202435113319dd9498f05b5502d6ca972932a6ad6ae8' '0376bd5efa31d4e2a9d52558777cebd9f0941df8e1adab916c868bf0c05f2fc3' '351fd96be8cd5ebd0435c0a8a978673fc023e3b1026085e67f86d815b2285e25' - '075e3f6d7ef545d3ea624a6744d74aeba3962ae85263ce06e7e17462c5ecd16a' + '60220f4dbb85febaba6094ec876481c08a2ba5643974c3a91679df3225f97619' 'SKIP' 'ed9595e2736386e70f9c16ce2d933885bd2f298fa6f8e95dd10c93d99c8addf7' 'c17b6f6fe8c1949472d6f4421ca498dda386933e2640b8fe18e907fb9a1cdf11' @@ -169,9 +167,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix CVE-2016-5195 - patch -p1 -i "${srcdir}/fix-CVE-2016-5195.patch" - # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug patch -p1 -i "${srcdir}/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch" diff --git a/kernels/linux-libre-rt/fix-CVE-2016-5195.patch b/kernels/linux-libre-rt/fix-CVE-2016-5195.patch deleted file mode 100644 index 598af7f8d..000000000 --- a/kernels/linux-libre-rt/fix-CVE-2016-5195.patch +++ /dev/null @@ -1,90 +0,0 @@ -author Linus Torvalds <torvalds@linux-foundation.org> 2016-10-13 20:07:36 (GMT) -committer Linus Torvalds <torvalds@linux-foundation.org> 2016-10-18 21:13:29 (GMT) -commit 19be0eaffa3ac7d8eb6784ad9bdbc7d67ed8e619 (patch) -tree 9ed601a5726b067beb3e29414c469f88c499a63b -parent 6b25e21fa6f26d0f0d45f161d169029411c84286 (diff) -mm: remove gup_flags FOLL_WRITE games from __get_user_pages() -This is an ancient bug that was actually attempted to be fixed once -(badly) by me eleven years ago in commit 4ceb5db9757a ("Fix -get_user_pages() race for write access") but that was then undone due to -problems on s390 by commit f33ea7f404e5 ("fix get_user_pages bug"). - -In the meantime, the s390 situation has long been fixed, and we can now -fix it by checking the pte_dirty() bit properly (and do it better). The -s390 dirty bit was implemented in abf09bed3cce ("s390/mm: implement -software dirty bits") which made it into v3.9. Earlier kernels will -have to look at the page state itself. - -Also, the VM has become more scalable, and what used a purely -theoretical race back then has become easier to trigger. - -To fix it, we introduce a new internal FOLL_COW flag to mark the "yes, -we already did a COW" rather than play racy games with FOLL_WRITE that -is very fundamental, and then use the pte dirty flag to validate that -the FOLL_COW flag is still valid. - -Reported-and-tested-by: Phil "not Paul" Oester <kernel@linuxace.com> -Acked-by: Hugh Dickins <hughd@google.com> -Reviewed-by: Michal Hocko <mhocko@suse.com> -Cc: Andy Lutomirski <luto@kernel.org> -Cc: Kees Cook <keescook@chromium.org> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: Willy Tarreau <w@1wt.eu> -Cc: Nick Piggin <npiggin@gmail.com> -Cc: Greg Thelen <gthelen@google.com> -Cc: stable@vger.kernel.org -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> -Diffstat --rw-r--r-- include/linux/mm.h 1 --rw-r--r-- mm/gup.c 14 -2 files changed, 13 insertions, 2 deletions -diff --git a/include/linux/mm.h b/include/linux/mm.h -index e9caec6..ed85879 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -2232,6 +2232,7 @@ static inline struct page *follow_page(struct vm_area_struct *vma, - #define FOLL_TRIED 0x800 /* a retry, previous pass started an IO */ - #define FOLL_MLOCK 0x1000 /* lock present pages */ - #define FOLL_REMOTE 0x2000 /* we are working on non-current tsk/mm */ -+#define FOLL_COW 0x4000 /* internal GUP flag */ - - typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, - void *data); -diff --git a/mm/gup.c b/mm/gup.c -index 96b2b2f..22cc22e 100644 ---- a/mm/gup.c -+++ b/mm/gup.c -@@ -60,6 +60,16 @@ static int follow_pfn_pte(struct vm_area_struct *vma, unsigned long address, - return -EEXIST; - } - -+/* -+ * FOLL_FORCE can write to even unwritable pte's, but only -+ * after we've gone through a COW cycle and they are dirty. -+ */ -+static inline bool can_follow_write_pte(pte_t pte, unsigned int flags) -+{ -+ return pte_write(pte) || -+ ((flags & FOLL_FORCE) && (flags & FOLL_COW) && pte_dirty(pte)); -+} -+ - static struct page *follow_page_pte(struct vm_area_struct *vma, - unsigned long address, pmd_t *pmd, unsigned int flags) - { -@@ -95,7 +105,7 @@ retry: - } - if ((flags & FOLL_NUMA) && pte_protnone(pte)) - goto no_page; -- if ((flags & FOLL_WRITE) && !pte_write(pte)) { -+ if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, flags)) { - pte_unmap_unlock(ptep, ptl); - return NULL; - } -@@ -412,7 +422,7 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma, - * reCOWed by userspace write). - */ - if ((ret & VM_FAULT_WRITE) && !(vma->vm_flags & VM_WRITE)) -- *flags &= ~FOLL_WRITE; -+ *flags |= FOLL_COW; - return 0; - } |