Browse code
fix fXxattrat patch syscall conflict with copy_file_range and newer syscalls
Change-Id: I3b335b5beb5460d575280558538e1745fcc291a7
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5171
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Bo Gan authored on 2018/05/19 08:51:18Showing 2 changed files
| ... | ... |
@@ -5,24 +5,11 @@ Subject: [PATCH] Implement the f*xattrat family of functions |
| 5 | 5 |
|
| 6 | 6 |
Inspired by https://lkml.org/lkml/2014/1/21/266 |
| 7 | 7 |
--- |
| 8 |
- arch/x86/entry/syscalls/syscall_32.tbl | 4 ++ |
|
| 9 | 8 |
arch/x86/entry/syscalls/syscall_64.tbl | 4 ++ |
| 10 | 9 |
fs/xattr.c | 123 +++++++++++++++++++++++++++++++++ |
| 11 | 10 |
include/linux/syscalls.h | 11 ++- |
| 12 | 11 |
4 files changed, 141 insertions(+), 1 deletion(-) |
| 13 | 12 |
|
| 14 |
-diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl |
|
| 15 |
-index e62f440..11d05f9 100644 |
|
| 16 |
-+++ b/arch/x86/entry/syscalls/syscall_32.tbl |
|
| 17 |
-@@ -383,3 +383,7 @@ |
|
| 18 |
- 374 i386 userfaultfd sys_userfaultfd |
|
| 19 |
- 375 i386 membarrier sys_membarrier |
|
| 20 |
- 376 i386 mlock2 sys_mlock2 |
|
| 21 |
-+377 i386 fsetxattrat sys_fsetxattrat |
|
| 22 |
-+378 i386 fgetxattrat sys_fgetxattrat |
|
| 23 |
-+379 i386 flistxattrat sys_flistxattrat |
|
| 24 |
-+380 i386 fremovexattrat sys_fremovexattrat |
|
| 25 | 13 |
diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl |
| 26 | 14 |
index 314a90b..3c2dfa1 100644 |
| 27 | 15 |
--- a/arch/x86/entry/syscalls/syscall_64.tbl |
| ... | ... |
@@ -31,10 +18,10 @@ index 314a90b..3c2dfa1 100644 |
| 31 | 31 |
323 common userfaultfd sys_userfaultfd |
| 32 | 32 |
324 common membarrier sys_membarrier |
| 33 | 33 |
325 common mlock2 sys_mlock2 |
| 34 |
-+326 common fsetxattrat sys_fsetxattrat |
|
| 35 |
-+327 common fgetxattrat sys_fgetxattrat |
|
| 36 |
-+328 common flistxattrat sys_flistxattrat |
|
| 37 |
-+329 common fremovexattrat sys_fremovexattrat |
|
| 34 |
++508 common fsetxattrat sys_fsetxattrat |
|
| 35 |
++509 common fgetxattrat sys_fgetxattrat |
|
| 36 |
++510 common flistxattrat sys_flistxattrat |
|
| 37 |
++511 common fremovexattrat sys_fremovexattrat |
|
| 38 | 38 |
|
| 39 | 39 |
# |
| 40 | 40 |
# x32-specific system call numbers start at 512 to avoid cache impact |
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux-esx |
| 4 | 4 |
Version: 4.4.131 |
| 5 |
-Release: 2%{?dist}
|
|
| 5 |
+Release: 3%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| ... | ... |
@@ -238,6 +238,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
|
| 238 | 238 |
/usr/src/linux-headers-%{uname_r}
|
| 239 | 239 |
|
| 240 | 240 |
%changelog |
| 241 |
+* Fri May 18 2018 Bo Gan <ganb@vmware.com> 4.4.131-3 |
|
| 242 |
+- rebase fXxattrat syscall number to avoid conflict with new syscalls |
|
| 241 | 243 |
* Fri May 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.131-2 |
| 242 | 244 |
- Fix CVE-2018-8043, CVE-2017-18216, CVE-2018-8087, CVE-2017-18241. |
| 243 | 245 |
* Fri May 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.4.131-1 |