зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1508898 - Prepare the Linux sandbox's socketcall/ipc-call dispatch table for reformatting. r=gcp
The tables in SandboxFilterUtil.cpp should remain vertically aligned, but clang-format would disagree. This patch excludes that region from reformatting, and applies the other changes that clang-format would make there. Differential Revision: https://phabricator.services.mozilla.com/D12499 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
a60b0462be
Коммит
e9397cfcac
|
@ -63,9 +63,10 @@ SandboxPolicyBase::EvaluateSyscall(int aSysno) const {
|
|||
}
|
||||
#endif // ANDROID
|
||||
#endif // __NR_socketcall
|
||||
#define DISPATCH_SOCKETCALL(sysnum, socketnum) \
|
||||
case sysnum: \
|
||||
return EvaluateSocketCall(socketnum, true).valueOr(InvalidSyscall())
|
||||
// clang-format off
|
||||
#define DISPATCH_SOCKETCALL(sysnum, socketnum) \
|
||||
case sysnum: \
|
||||
return EvaluateSocketCall(socketnum, true).valueOr(InvalidSyscall())
|
||||
#ifdef __NR_socket
|
||||
DISPATCH_SOCKETCALL(__NR_socket, SYS_SOCKET);
|
||||
DISPATCH_SOCKETCALL(__NR_bind, SYS_BIND);
|
||||
|
@ -80,7 +81,7 @@ SandboxPolicyBase::EvaluateSyscall(int aSysno) const {
|
|||
#ifdef __NR_send
|
||||
DISPATCH_SOCKETCALL(__NR_send, SYS_SEND);
|
||||
DISPATCH_SOCKETCALL(__NR_recv, SYS_RECV);
|
||||
#endif // __NR_send
|
||||
#endif // __NR_send
|
||||
DISPATCH_SOCKETCALL(__NR_sendto, SYS_SENDTO);
|
||||
DISPATCH_SOCKETCALL(__NR_recvfrom, SYS_RECVFROM);
|
||||
DISPATCH_SOCKETCALL(__NR_shutdown, SYS_SHUTDOWN);
|
||||
|
@ -91,13 +92,13 @@ SandboxPolicyBase::EvaluateSyscall(int aSysno) const {
|
|||
DISPATCH_SOCKETCALL(__NR_accept4, SYS_ACCEPT4);
|
||||
DISPATCH_SOCKETCALL(__NR_recvmmsg, SYS_RECVMMSG);
|
||||
DISPATCH_SOCKETCALL(__NR_sendmmsg, SYS_SENDMMSG);
|
||||
#endif // __NR_socket
|
||||
#endif // __NR_socket
|
||||
#undef DISPATCH_SOCKETCALL
|
||||
#ifndef __NR_socketcall
|
||||
#ifndef ANDROID
|
||||
#define DISPATCH_SYSVCALL(sysnum, ipcnum) \
|
||||
case sysnum: \
|
||||
return EvaluateIpcCall(ipcnum).valueOr(InvalidSyscall())
|
||||
#define DISPATCH_SYSVCALL(sysnum, ipcnum) \
|
||||
case sysnum: \
|
||||
return EvaluateIpcCall(ipcnum).valueOr(InvalidSyscall())
|
||||
DISPATCH_SYSVCALL(__NR_semop, SEMOP);
|
||||
DISPATCH_SYSVCALL(__NR_semget, SEMGET);
|
||||
DISPATCH_SYSVCALL(__NR_semctl, SEMCTL);
|
||||
|
@ -111,8 +112,9 @@ SandboxPolicyBase::EvaluateSyscall(int aSysno) const {
|
|||
DISPATCH_SYSVCALL(__NR_shmget, SHMGET);
|
||||
DISPATCH_SYSVCALL(__NR_shmctl, SHMCTL);
|
||||
#undef DISPATCH_SYSVCALL
|
||||
#endif // ANDROID
|
||||
#endif // __NR_socketcall
|
||||
#endif // ANDROID
|
||||
#endif // __NR_socketcall
|
||||
// clang-format on
|
||||
default:
|
||||
return InvalidSyscall();
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче