non-x86 arches do not have PAGE_SIZE
authorAndroid Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Fri, 20 Jan 2023 08:36:41 +0000 (08:36 +0000)
committerRoger Shimizu <rosh@debian.org>
Fri, 20 Jan 2023 08:36:41 +0000 (08:36 +0000)
Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-build-on-non-x86.patch

system/core/base/cmsg.cpp

index 1fa873c8229caf837b8ae0a95023a1f1034e3fc8..6bc3a713f5c3fe69d2676abae3bc3b1a6a2e0e01 100644 (file)
@@ -33,7 +33,8 @@ ssize_t SendFileDescriptorVector(borrowed_fd sockfd, const void* data, size_t le
                                  const std::vector<int>& 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<size_t>(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<size_t>(sysconf(_SC_PAGE_SIZE));
+  if (cmsg_space >= pagesize) {
     errno = ENOMEM;
     return -1;
   }