From 0713a4373f192319e86ca90bfdd6b6f7402d930f Mon Sep 17 00:00:00 2001 From: Android Tools Maintainers Date: Tue, 31 Jan 2023 07:58:29 +0000 Subject: [PATCH] non-x86 arches do not have PAGE_SIZE Forwarded: not-needed Gbp-Pq: Topic system/core Gbp-Pq: Name fix-build-on-non-x86.patch --- system/core/base/cmsg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/system/core/base/cmsg.cpp b/system/core/base/cmsg.cpp index 1fa873c8..6bc3a713 100644 --- a/system/core/base/cmsg.cpp +++ b/system/core/base/cmsg.cpp @@ -33,7 +33,8 @@ ssize_t SendFileDescriptorVector(borrowed_fd sockfd, const void* data, size_t le const std::vector& fds) { size_t cmsg_space = CMSG_SPACE(sizeof(int) * fds.size()); size_t cmsg_len = CMSG_LEN(sizeof(int) * fds.size()); - if (cmsg_space >= PAGE_SIZE) { + size_t pagesize = static_cast(sysconf(_SC_PAGE_SIZE)); + if (cmsg_space >= pagesize) { errno = ENOMEM; return -1; } @@ -75,7 +76,8 @@ ssize_t ReceiveFileDescriptorVector(borrowed_fd sockfd, void* data, size_t len, fds->clear(); size_t cmsg_space = CMSG_SPACE(sizeof(int) * max_fds); - if (cmsg_space >= PAGE_SIZE) { + size_t pagesize = static_cast(sysconf(_SC_PAGE_SIZE)); + if (cmsg_space >= pagesize) { errno = ENOMEM; return -1; } -- 2.30.2