From patchwork Mon Dec 13 15:20:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 48874 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 721963857C66 for ; Mon, 13 Dec 2021 15:21:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 721963857C66 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639408899; bh=zLp+5ahmErH21J0bEKJRgCX1qpVAnt8QnEaOHS+SolE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=EH13iTJgN3S9DF3GjhoVMVRA/BMa8t7u9q1MrRHp2oTkuWtDjKuDaYv1/uT7t6tUs 0nXeFWe07EXRpjB2GdWn8BT+I/lgRFWFIObO0AQBJB15JUvBcWt6UBLFZdrJfW59tx pNwkxeppDEoC6iDWCxcPpxXTb0EPa3Wf6xFWg2Ec= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id B69463857C71 for ; Mon, 13 Dec 2021 15:20:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B69463857C71 Received: by mail-pl1-x62a.google.com with SMTP id q17so11371009plr.11 for ; Mon, 13 Dec 2021 07:20:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=zLp+5ahmErH21J0bEKJRgCX1qpVAnt8QnEaOHS+SolE=; b=2Tss4LOcJl2Gge5wgi0YdsMqQZ4UANswWUV4vOkVLmo1PJsFQ6ciQQmosj/C7nHqFJ bD4Ep5jIGvIVO/1HuXWAcKZKOblOp8DFR0qVG+L03dc4jUyH+sZdYn4jwM2cceVc6I0v LTtKO5TD0/RsAODzce/+ztzGnRvqcAC7sNTIyT9z3Vu7xE2z90CSFv4DzRHwLCFURrEz dG93rypxJDbGYZB+938nHpTXQHjfOGZl/MSpHaxa2M7b2YAP4SZ57RlFU6fMXCSYxFIB GaPoSfGnNlF2E74858HiRO9JjtnVaI018aT+o7dbxDWjUOMSTcOLSg79SeEMA+fL4wwd LzBA== X-Gm-Message-State: AOAM532mVbu/wWYsey9ObBvHHyoih0zZWJiqMxwBzi77I05rERdBr9A/ sNd3fkva8QA7SwdkFTEsWRA9TUS513c= X-Google-Smtp-Source: ABdhPJxiDbsUBut1G0cYrARZdxeUyOanhd63SBkggIEbypDHFIetAESDbY5QUND3WJlaTHYHjn1/GQ== X-Received: by 2002:a17:90a:ea04:: with SMTP id w4mr15595201pjy.61.1639408858598; Mon, 13 Dec 2021 07:20:58 -0800 (PST) Received: from gnu-cfl-2.localdomain ([172.58.35.133]) by smtp.gmail.com with ESMTPSA id s8sm12216195pfe.196.2021.12.13.07.20.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Dec 2021 07:20:58 -0800 (PST) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 1F3A7420136 for ; Mon, 13 Dec 2021 07:20:57 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] elf: Align argument of __munmap to page size [BZ #28676] Date: Mon, 13 Dec 2021 07:20:57 -0800 Message-Id: <20211213152057.151438-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3029.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" On Linux/x86-64, for elf/tst-align3, we now get munmap(0x7f88f9401000, 1126424) = 0 instead of munmap(0x7f1615200018, 544768) = -1 EINVAL (Invalid argument) --- elf/dl-map-segments.h | 1 + 1 file changed, 1 insertion(+) diff --git a/elf/dl-map-segments.h b/elf/dl-map-segments.h index 70a4c40695..54e606aa87 100644 --- a/elf/dl-map-segments.h +++ b/elf/dl-map-segments.h @@ -55,6 +55,7 @@ _dl_map_segment (const struct loadcmd *c, ElfW(Addr) mappref, if (delta) __munmap ((void *) map_start, delta); ElfW(Addr) map_end = map_start_aligned + maplength; + map_end = ALIGN_UP (map_end, GLRO(dl_pagesize)); delta = map_start + maplen - map_end; if (delta) __munmap ((void *) map_end, delta);