This is the 4.14.65 stable release

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlt33UUACgkQONu9yGCS
 aT5+Jg/5ARrBb+hPxds4ropIgj9KC4yzmKWNYsT90v2byZoHWg7OJFr+Ho90l84v
 /S0pGgkZpOPNFqpw8ps9nIajCn992Nsp6vUFlotoF0UTI+V1nQ1ReyAx9TJWhO+n
 +zSdhjiNxmXzcOjuJv5JhoIHmNEr787Du0QU3tNNNJXoh8G+vFreuphAOkk6diBn
 5w8aai0iwyTVM10NzpMB7QKavryfs18aq136c/xhJ2qGK4b/eXXCGu5HnTPu3fNB
 TrbNYHZddklOo07MmnofuAp/gQeWK2yEFP2vU0N/Yqq1MUIP3Eey1dywRSC6uazx
 a1vYrbKNuhcojr8+4rBsNMFtlKOCi3O+nEFSnfGzY6hHXqQ85Bd0JGyxDTGUuKHS
 3sJ8yLKxsderfZuh+tZhAmRmj6GakU2zIiNkm8wX1oNfOqTNrG59e6XiWb1tSHfS
 oXyssdBA4G/4SjXtYqYIhDl3khM7IoczwlwYMmkfG1z2C49NQ/wxXsog/rtlbFht
 52FFyvqi81Z47c08QDEeYQGpBzzidY3YU6E7ZTobFdhpxRGkpl/8ZHPL3rz3sBrz
 LbcK9fzLJWtgeas/c8wWn1Uu6EgzKhJObZhIsgXVZhURI8dIrsZufWIsM6s4H1jY
 T0QVwcr+YihIkJnPa1inuJKoBUB/d012uoRgwUeLeYhNXuZksc0=
 =KKVs
 -----END PGP SIGNATURE-----

Merge 4.14.65 into android-4.14-p

Changes in 4.14.65
	x86/speculation/l1tf: Exempt zeroed PTEs from inversion
	Linux 4.14.65

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tirimbino
Greg Kroah-Hartman 7 years ago
commit 696369ecc9
  1. 2
      Makefile
  2. 11
      arch/x86/include/asm/pgtable-invert.h

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 64
SUBLEVEL = 65
EXTRAVERSION =
NAME = Petit Gorille

@ -4,9 +4,18 @@
#ifndef __ASSEMBLY__
/*
* A clear pte value is special, and doesn't get inverted.
*
* Note that even users that only pass a pgprot_t (rather
* than a full pte) won't trigger the special zero case,
* because even PAGE_NONE has _PAGE_PROTNONE | _PAGE_ACCESSED
* set. So the all zero case really is limited to just the
* cleared page table entry case.
*/
static inline bool __pte_needs_invert(u64 val)
{
return !(val & _PAGE_PRESENT);
return val && !(val & _PAGE_PRESENT);
}
/* Get a mask to xor with the page table entry to get the correct pfn. */

Loading…
Cancel
Save