From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by sourceware.org (Postfix) with ESMTPS id C84363AA88A1 for ; Sat, 17 Dec 2022 16:52:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C84363AA88A1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x634.google.com with SMTP id l10so5187673plb.8 for ; Sat, 17 Dec 2022 08:52:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sIZLf7KyDHqTmjxXzDQOT9jd1kXcXrH1URbPuiptVrs=; b=ab2qRZ9uhgUzWJuU0KiF1wDdQdIZVJPPYiKI4OXzxqYsmD9E0m9YNXRiR97mYwz8O5 IFYSB2C8ivLWvXkhOCcNcYKqkOtiQigGr6WgaI/Mv7ALDLMy4HjeT0Ro2rhVFGdVTlhO XSldAk/HDcvtHmOzdeVAEXpQdf0EIWfzZXTdo+I4U+mFDNtf2PP3NbxXkb2TEy5Euu52 FULtk1/q0pGVzf5MXbhZf1SNLxX6vi2OSlHY+xtoMl2ktahFC1GgSAe173xXmelwlEV7 cj3VhCn8KQF0t5gNK9ABVb4hFcopS39vDkwsNdIgAlMKej2IHCBoxWX/bRTLP5P+NjlX a3Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sIZLf7KyDHqTmjxXzDQOT9jd1kXcXrH1URbPuiptVrs=; b=S7u6mU56hQMdCvS1G2g3B6f1Mx0eWHf/IcdR/LipM/eW7A8ZfX7PMJ6+kshVApAFfH mVfEpWHUVIZtYtmBirkEDd0CKTS87Jroav8uq1SAcq/VaCxdGm+x9QKtNdyW7XZ5fTvz rQcAK3D4BNkQ7GPL8V8ihQ40DTX2QoZXeaoxVCiwPwM+WA2QNEdOqwnxc8r32i3n4/n7 iW6yRY+Ia78VKs/2woOkQAyXRhA+HHHSHBmSYcGKQAK8/xNDL6e6cyQGA/f7CR5I54Xl kIuiglwSqSIUGgOqjwUuiPAKTszTY3GuZA0bNjqXP3bhejeFhfzB5M37TbZJZv5NJuD0 Hj+g== X-Gm-Message-State: ANoB5pn1IryePLIpXBuavyJP7G2jceU8ycrFkGcE09MKBBapR40Jzvkk kqnP+FChMDbtjZ80LMK+/o6z3igl/To= X-Google-Smtp-Source: AA0mqf4fYvOwbf8Oasbn46xd7J/rFcHOH/sq3b2iimrjjOtVxLTZ6+ssGYNQI9NAcw4x+qQiJ0+tUA== X-Received: by 2002:a17:90a:3188:b0:219:3e5f:2a65 with SMTP id j8-20020a17090a318800b002193e5f2a65mr37872181pjb.36.1671295959429; Sat, 17 Dec 2022 08:52:39 -0800 (PST) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id s92-20020a17090a2f6500b002191873187dsm6643229pjd.33.2022.12.17.08.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Dec 2022 08:52:38 -0800 (PST) From: Yonggang Luo To: elfutils-devel@sourceware.org Cc: Yonggang Luo Subject: [PATCH v2 03/16] Use configure to detect HAVE_DECL_MMAP and use it for system doesn't provide sys/mman.h Date: Sun, 18 Dec 2022 00:52:00 +0800 Message-Id: <20221217165213.152-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.36.1.windows.1 In-Reply-To: <20221217165213.152-1-luoyonggang@gmail.com> References: <20221217165213.152-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Signed-off-by: Yonggang Luo --- configure.ac | 1 + lib/crc32_file.c | 4 ++-- lib/system.h | 2 ++ libelf/elf32_updatefile.c | 3 ++- libelf/elf_begin.c | 5 ++++- libelf/elf_end.c | 2 ++ libelf/elf_update.c | 5 ++++- 7 files changed, 17 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 59be27ac..b84623fe 100644 --- a/configure.ac +++ b/configure.ac @@ -428,6 +428,7 @@ AC_CHECK_DECLS([memrchr, rawmemchr],[],[], [#define _GNU_SOURCE #include ]) AC_CHECK_DECLS([powerof2],[],[],[#include ]) +AC_CHECK_DECLS([mmap],[],[],[#include ]) AC_CHECK_DECLS([mempcpy],[],[], [#define _GNU_SOURCE #include ]) diff --git a/lib/crc32_file.c b/lib/crc32_file.c index f7607d0b..66833702 100644 --- a/lib/crc32_file.c +++ b/lib/crc32_file.c @@ -32,9 +32,7 @@ #include "libeu.h" #include -#include #include -#include #include "system.h" int @@ -45,6 +43,7 @@ crc32_file (int fd, uint32_t *resp) off_t off = 0; ssize_t count; +#if HAVE_DECL_MMAP struct stat st; if (fstat (fd, &st) == 0) { @@ -78,6 +77,7 @@ crc32_file (int fd, uint32_t *resp) munmap (mapped, mapsize); } } +#endif while ((count = TEMP_FAILURE_RETRY (pread (fd, buffer, sizeof buffer, off))) > 0) diff --git a/lib/system.h b/lib/system.h index bbbe06c4..561d3e03 100644 --- a/lib/system.h +++ b/lib/system.h @@ -42,7 +42,9 @@ /* System dependend headers */ #include #include +#if HAVE_DECL_MMAP #include +#endif #include #include diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c index 46afa1f4..8229fd26 100644 --- a/libelf/elf32_updatefile.c +++ b/libelf/elf32_updatefile.c @@ -96,7 +96,7 @@ sort_sections (Elf_Scn **scns, Elf_ScnList *list) qsort (scns, scnp - scns, sizeof (*scns), compare_sections); } - +#if HAVE_DECL_MMAP static inline void fill_mmap (size_t offset, char *last_position, char *scn_start, char *const shdr_start, char *const shdr_end) @@ -482,6 +482,7 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum) return 0; } +#endif /* Size of the buffer we use to generate the blocks of fill bytes. */ diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c index fe8c640a..6d31882e 100644 --- a/libelf/elf_begin.c +++ b/libelf/elf_begin.c @@ -645,10 +645,12 @@ static struct Elf * read_file (int fildes, int64_t offset, size_t maxsize, Elf_Cmd cmd, Elf *parent) { +#if HAVE_DECL_MMAP void *map_address = NULL; int use_mmap = (cmd == ELF_C_READ_MMAP || cmd == ELF_C_RDWR_MMAP || cmd == ELF_C_WRITE_MMAP || cmd == ELF_C_READ_MMAP_PRIVATE); +#endif if (parent == NULL) { @@ -669,7 +671,7 @@ read_file (int fildes, int64_t offset, size_t maxsize, /* The parent is already loaded. Use it. */ assert (maxsize != ~((size_t) 0)); } - +#if HAVE_DECL_MMAP if (use_mmap) { if (parent == NULL) @@ -713,6 +715,7 @@ read_file (int fildes, int64_t offset, size_t maxsize, return result; } +#endif /* Otherwise we have to do it the hard way. We read as much as necessary from the file whenever we need information which is not available. */ diff --git a/libelf/elf_end.c b/libelf/elf_end.c index 5c451f36..8023b216 100644 --- a/libelf/elf_end.c +++ b/libelf/elf_end.c @@ -222,8 +222,10 @@ elf_end (Elf *elf) /* The file was read or mapped for this descriptor. */ if ((elf->flags & ELF_F_MALLOCED) != 0) free (elf->map_address); +#if HAVE_DECL_MMAP else if ((elf->flags & ELF_F_MMAPPED) != 0) munmap (elf->map_address, elf->maximum_size); +#endif } rwlock_unlock (elf->lock); diff --git a/libelf/elf_update.c b/libelf/elf_update.c index 56af3a1c..e81eb6c9 100644 --- a/libelf/elf_update.c +++ b/libelf/elf_update.c @@ -64,7 +64,7 @@ write_file (Elf *elf, int64_t size, int change_bo, size_t shnum) __libelf_seterrno (ELF_E_WRITE_ERROR); return -1; } - +#if HAVE_DECL_MMAP /* Try to map the file if this isn't done yet. */ if (elf->map_address == NULL && elf->cmd == ELF_C_WRITE_MMAP) { @@ -125,6 +125,7 @@ write_file (Elf *elf, int64_t size, int change_bo, size_t shnum) size = -1; } else +#endif { /* The file is not mmaped. */ if ((class == ELFCLASS32 @@ -145,6 +146,7 @@ write_file (Elf *elf, int64_t size, int change_bo, size_t shnum) size = -1; } +#if HAVE_DECL_MMAP /* POSIX says that ftruncate and write may clear the S_ISUID and S_ISGID mode bits. So make sure we restore them afterwards if they were set. This is not atomic if someone else chmod's the file while we operate. */ @@ -156,6 +158,7 @@ write_file (Elf *elf, int64_t size, int change_bo, size_t shnum) __libelf_seterrno (ELF_E_WRITE_ERROR); size = -1; } +#endif if (size != -1 && elf->parent == NULL) elf->maximum_size = size; -- 2.36.1.windows.1