Browse code
linux-secure: EMUTRAMP: use the prefix X86_
The prefix X86_ is used to make it consistent with the rest of the definitions in traps.h.
Fixes: 1067f03 ("x86/mm: Relocate page fault error codes to traps.h ")
Change-Id: I73ac11320ae21db1ff011b38cdc94bc1b9376b69
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/13788
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Keerthana K <keerthanak@vmware.com>
Loïc authored on 2021/03/26 22:05:51Showing 2 changed files
- SPECS/linux/linux-secure.spec
- SPECS/linux/secure/0001-NOWRITEEXEC-and-PAX-features-MPROTECT-EMUTRAMP.patch
| ... | ... |
@@ -11,7 +11,7 @@ |
| 11 | 11 |
Summary: Kernel |
| 12 | 12 |
Name: linux-secure |
| 13 | 13 |
Version: 5.10.4 |
| 14 |
-Release: 9%{?kat_build:.kat}%{?dist}
|
|
| 14 |
+Release: 10%{?kat_build:.kat}%{?dist}
|
|
| 15 | 15 |
License: GPLv2 |
| 16 | 16 |
URL: http://www.kernel.org/ |
| 17 | 17 |
Group: System Environment/Kernel |
| ... | ... |
@@ -290,6 +290,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
|
| 290 | 290 |
/usr/src/linux-headers-%{uname_r}
|
| 291 | 291 |
|
| 292 | 292 |
%changelog |
| 293 |
+* Thu Jun 24 2021 Loïc <4661917+HacKurx@users.noreply.github.com> 5.10.4-10 |
|
| 294 |
+- EMUTRAMP: use the prefix X86_ for error codes |
|
| 293 | 295 |
* Tue Apr 06 2021 Sharan Turlapati <sturlapati@vmware.com> 5.10.4-9 |
| 294 | 296 |
- Remove buf_info from device accessible structures in vmxnet3 |
| 295 | 297 |
* Mon Mar 01 2021 Srinidhi Rao <srinidhir@vmware.com> 5.10.4-8 |
| ... | ... |
@@ -63,9 +63,9 @@ index 6e3e8a1..42a1705 100644 |
| 63 | 63 |
+ if (v8086_mode(regs)) |
| 64 | 64 |
+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff); |
| 65 | 65 |
+ |
| 66 |
-+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) |
|
| 66 |
++ if ((__supported_pte_mask & _PAGE_NX) && (error_code & X86_PF_INSTR)) |
|
| 67 | 67 |
+ return true; |
| 68 |
-+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address) |
|
| 68 |
++ if (!(error_code & (X86_PF_PROT | X86_PF_WRITE)) && ip == address) |
|
| 69 | 69 |
+ return true; |
| 70 | 70 |
+ return false; |
| 71 | 71 |
+} |