diff options
author | Lukas Larsson <[email protected]> | 2018-10-29 09:19:31 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2018-10-29 09:19:31 +0100 |
commit | 949c0c810ae575e9e35998c72189b1d90e3ea075 (patch) | |
tree | 3b106e3344e126d30bf1e40c02b825128d758d59 /erts/emulator | |
parent | c37f7a2215646c85c1ae12303f07bc9bc27b75ae (diff) | |
parent | f2ca9d9cb14527fb5dd3016cbccd45355cc2a6c7 (diff) | |
download | otp-949c0c810ae575e9e35998c72189b1d90e3ea075.tar.gz otp-949c0c810ae575e9e35998c72189b1d90e3ea075.tar.bz2 otp-949c0c810ae575e9e35998c72189b1d90e3ea075.zip |
Merge branch 'jimdigriz/os_mon/fix_cpu_sup_android/OTP-15387' into maint
* jimdigriz/os_mon/fix_cpu_sup_android/OTP-15387:
Make Erlang's cpu_sup function better on Android
SELinux is another cause of MSG_CTRUNC
Diffstat (limited to 'erts/emulator')
-rw-r--r-- | erts/emulator/sys/unix/sys_uds.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys_uds.c b/erts/emulator/sys/unix/sys_uds.c index 39a4866065..c9f73622ba 100644 --- a/erts/emulator/sys/unix/sys_uds.c +++ b/erts/emulator/sys/unix/sys_uds.c @@ -88,8 +88,9 @@ sys_uds_readv(int fd, struct iovec *iov, size_t iov_len, if((msg.msg_flags & MSG_CTRUNC) == MSG_CTRUNC) { /* We assume that we have given enough space for any header - that are sent to us. So the only remaining reason to get - this flag set is if the caller has run out of file descriptors. + that are sent to us. So the only remaining reasons to get + this flag set is if the caller has run out of file descriptors + or an SELinux policy prunes the response (eg. O_APPEND on STDERR). */ errno = EMFILE; return -1; |