From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 83966 invoked by alias); 1 Apr 2015 11:26:44 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 83957 invoked by uid 89); 1 Apr 2015 11:26:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=4.9 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,KAM_FROM_URIBL_PCCC,RCVD_IN_DNSWL_LOW,SPF_PASS,URIBL_SBL autolearn=no version=3.3.2 X-HELO: mail-ob0-f180.google.com Received: from mail-ob0-f180.google.com (HELO mail-ob0-f180.google.com) (209.85.214.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 01 Apr 2015 11:26:41 +0000 Received: by obvd1 with SMTP id d1so74105121obv.0 for ; Wed, 01 Apr 2015 04:26:39 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.60.133.49 with SMTP id oz17mr8795254oeb.58.1427887599855; Wed, 01 Apr 2015 04:26:39 -0700 (PDT) Received: by 10.76.54.14 with HTTP; Wed, 1 Apr 2015 04:26:39 -0700 (PDT) In-Reply-To: <20150401091156.GT26234@bubble.grove.modra.org> References: <20150328041540.GE26234@bubble.grove.modra.org> <20150329034858.GH26234@bubble.grove.modra.org> <20150330123934.GJ26234@bubble.grove.modra.org> <20150330141433.GL26234@bubble.grove.modra.org> <20150401091156.GT26234@bubble.grove.modra.org> Date: Wed, 01 Apr 2015 11:26:00 -0000 Message-ID: Subject: Re: Start of relro segment adjustment From: "H.J. Lu" To: Binutils Content-Type: multipart/mixed; boundary=047d7b4728622b49290512a7fd21 X-IsSubscribed: yes X-SW-Source: 2015-04/txt/msg00016.txt.bz2 --047d7b4728622b49290512a7fd21 Content-Type: text/plain; charset=UTF-8 Content-length: 1246 On Wed, Apr 1, 2015 at 2:11 AM, Alan Modra wrote: > Adjusting the start of the relro segment in order to make it end > exactly on a page boundary runs into difficulties when sections in the > relro segment are aligned; Adjusting the start by (next_page - end) > sometimes results in more than that adjustment occurring at the end, > overrunning the page boundary. So when that occurs we try a new lower > start position by masking the adjusted start with the maximum section > alignment. However, we didn't consider that this masked start address > may in fact be before the initial relro base, which is silly since > that can only increase padding at the relro end. > > I've also moved some calculations closer to where they are used, and > comments closer to the relevant statements. > > * ldlang.c (lang_size_sections): When alignment of sections > results in relro base adjustment being too large, don't go lower > than the initial value. > * ldexp.c (fold_binary ): Comment. > * scripttempl/elf.sc (DATA_SEGMENT_ALIGN): Omit SEGMENT_SIZE > alignment when SEGMENT_SIZE is the same as MAXPAGESIZE. > Thanks. I checked in this testcase. -- H.J. --047d7b4728622b49290512a7fd21 Content-Type: text/x-patch; charset=US-ASCII; name="0001-Add-a-testcase-for-PR-ld-18176.patch" Content-Disposition: attachment; filename="0001-Add-a-testcase-for-PR-ld-18176.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i7yndf9a0 Content-length: 7410 RnJvbSA4NzViNWI5ZDE0N2QzN2M5OWExODlhYTk1MzU0ZjliZWJkZDY0ZWY1 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhq bC50b29sc0BnbWFpbC5jb20+CkRhdGU6IFdlZCwgMSBBcHIgMjAxNSAwNDoy NDowNSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFkZCBhIHRlc3RjYXNlIGZv ciBQUiBsZC8xODE3NgoKCVBSIGxkLzE4MTc2CgkqIGxkLXg4Ni02NC9wcjE4 MTc2LmQ6IE5ldyBmaWxlLgoJKiBsZC14ODYtNjQvcHIxODE3Ni5zOiBMaWtl d2lzZS4KCSogbGQteDg2LTY0L3ByMTgxNzYudDogTGlrZXdpc2UuCgkqIGxk LXg4Ni02NC94ODYtNjQuZXhwOiBSdW4gcHIxODE3Ni4KLS0tCiBsZC9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgfCAgMSArCiBsZC90ZXN0c3Vp dGUvQ2hhbmdlTG9nICAgICAgICAgICAgfCAgOCArKysrKysKIGxkL3Rlc3Rz dWl0ZS9sZC14ODYtNjQvcHIxODE3Ni5kICB8ICA5ICsrKysrKysKIGxkL3Rl c3RzdWl0ZS9sZC14ODYtNjQvcHIxODE3Ni5zICB8IDUyICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwogbGQvdGVzdHN1aXRlL2xk LXg4Ni02NC9wcjE4MTc2LnQgIHwgMzkgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysKIGxkL3Rlc3RzdWl0ZS9sZC14ODYtNjQveDg2LTY0LmV4cCB8 ICAxICsKIDYgZmlsZXMgY2hhbmdlZCwgMTEwIGluc2VydGlvbnMoKykKIGNy ZWF0ZSBtb2RlIDEwMDY0NCBsZC90ZXN0c3VpdGUvbGQteDg2LTY0L3ByMTgx NzYuZAogY3JlYXRlIG1vZGUgMTAwNjQ0IGxkL3Rlc3RzdWl0ZS9sZC14ODYt NjQvcHIxODE3Ni5zCiBjcmVhdGUgbW9kZSAxMDA2NDQgbGQvdGVzdHN1aXRl L2xkLXg4Ni02NC9wcjE4MTc2LnQKCmRpZmYgLS1naXQgYS9sZC9DaGFuZ2VM b2cgYi9sZC9DaGFuZ2VMb2cKaW5kZXggNzE4Y2RiNi4uNjA4MmUyOCAxMDA2 NDQKLS0tIGEvbGQvQ2hhbmdlTG9nCisrKyBiL2xkL0NoYW5nZUxvZwpAQCAt NSw2ICs1LDcgQEAKIAogMjAxNS0wNC0wMSAgQWxhbiBNb2RyYSAgPGFtb2Ry YUBnbWFpbC5jb20+CiAKKwlQUiBsZC8xODE3NgogCSogbGRsYW5nLmMgKGxh bmdfc2l6ZV9zZWN0aW9ucyk6IFdoZW4gYWxpZ25tZW50IG9mIHNlY3Rpb25z CiAJcmVzdWx0cyBpbiByZWxybyBiYXNlIGFkanVzdG1lbnQgYmVpbmcgdG9v IGxhcmdlLCBkb24ndCBnbyBsb3dlcgogCXRoYW4gdGhlIGluaXRpYWwgdmFs dWUuCmRpZmYgLS1naXQgYS9sZC90ZXN0c3VpdGUvQ2hhbmdlTG9nIGIvbGQv dGVzdHN1aXRlL0NoYW5nZUxvZwppbmRleCA0N2JiNDg5Li5iMzVhYjNmIDEw MDY0NAotLS0gYS9sZC90ZXN0c3VpdGUvQ2hhbmdlTG9nCisrKyBiL2xkL3Rl c3RzdWl0ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMSBAQAorMjAxNS0wNC0w MSAgSC5KLiBMdSAgPGhvbmdqaXUubHVAaW50ZWwuY29tPgorCisJUFIgbGQv MTgxNzYKKwkqIGxkLXg4Ni02NC9wcjE4MTc2LmQ6IE5ldyBmaWxlLgorCSog bGQteDg2LTY0L3ByMTgxNzYuczogTGlrZXdpc2UuCisJKiBsZC14ODYtNjQv cHIxODE3Ni50OiBMaWtld2lzZS4KKwkqIGxkLXg4Ni02NC94ODYtNjQuZXhw OiBSdW4gcHIxODE3Ni4KKwogMjAxNS0wMy0zMSAgSC5KLiBMdSAgPGhvbmdq aXUubHVAaW50ZWwuY29tPgogCiAJKiBsZC1ib290c3RyYXAvYm9vdHN0cmFw LmV4cCAoZXh0cmFsaWJzKTogQWRkIC1sei4KZGlmZiAtLWdpdCBhL2xkL3Rl c3RzdWl0ZS9sZC14ODYtNjQvcHIxODE3Ni5kIGIvbGQvdGVzdHN1aXRlL2xk LXg4Ni02NC9wcjE4MTc2LmQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uM2EwODUzOQotLS0gL2Rldi9udWxsCisrKyBiL2xkL3Rlc3Rz dWl0ZS9sZC14ODYtNjQvcHIxODE3Ni5kCkBAIC0wLDAgKzEsOSBAQAorI25h bWU6IFBSIGxkLzE4MTc2CisjYXM6IC0tNjQKKyNsZDogLW1lbGZfeDg2XzY0 IC1zaGFyZWQgLXogcmVscm8gLVQgcHIxODE3Ni50IC16IG1heC1wYWdlLXNp emU9MHgyMDAwMDAgLXogY29tbW9uLXBhZ2Utc2l6ZT0weDEwMDAKKyNyZWFk ZWxmOiAtbCAtLXdpZGUKKyN0YXJnZXQ6IHg4Nl82NC0qLWxpbnV4KgorCisj Li4uCisgIEdOVV9SRUxSTyAgICAgIDB4MDRiZDA3IDB4MDAwMDAwMDAwMDI0 YmQwNyAweDAwMDAwMDAwMDAyNGJkMDcgMHgwMDIyZjkgMHgwMDIyZjkgUiAg IDB4MQorI3Bhc3MKZGlmZiAtLWdpdCBhL2xkL3Rlc3RzdWl0ZS9sZC14ODYt NjQvcHIxODE3Ni5zIGIvbGQvdGVzdHN1aXRlL2xkLXg4Ni02NC9wcjE4MTc2 LnMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNDA1MzU1 ZgotLS0gL2Rldi9udWxsCisrKyBiL2xkL3Rlc3RzdWl0ZS9sZC14ODYtNjQv cHIxODE3Ni5zCkBAIC0wLDAgKzEsNTIgQEAKKwkuc2VjdGlvbiAuaW5pdCwi YXgiLEBwcm9nYml0cworCS5wMmFsaWduIDIKKwkuc3BhY2UgMHgxYQorCS5z ZWN0aW9uIC50ZXh0LCJheCIsQHByb2diaXRzCisJLnAyYWxpZ24gNAorCS5z cGFjZSAweDNhYjk2CisJLnNlY3Rpb24gLmZpbmksImF4IixAcHJvZ2JpdHMK KwkucDJhbGlnbiAyCisJLnNwYWNlIDB4OQorCS5zZWN0aW9uIC5mb29faGRy LCJhIixAcHJvZ2JpdHMKKwkucDJhbGlnbiAyCisJLnNwYWNlIDB4ZDE0CisJ LnNlY3Rpb24gLmZvbywiYSIsQHByb2diaXRzCisJLnAyYWxpZ24gMworCS5z cGFjZSAweDRkNWMKKwkuc2VjdGlvbiAucm9kYXRhLCJhIixAcHJvZ2JpdHMK KwkucDJhbGlnbiA2CisJLnNwYWNlIDB4YTU0ZAorCS5zZWN0aW9uIC54eHgs ImEiLEBwcm9nYml0cworCS5zcGFjZSAweGY0MworCS5zZWN0aW9uIC55eXks ImF3IixAcHJvZ2JpdHMKKwkuc3BhY2UgMHgxCisJLnNlY3Rpb24gLmluaXRf YXJyYXksImF3IixAaW5pdF9hcnJheQorCS5wMmFsaWduIDMKKwkuc3BhY2Ug MHgxMAorCS5zZWN0aW9uIC5maW5pX2FycmF5LCJhdyIsQGZpbmlfYXJyYXkK KwkucDJhbGlnbiAzCisJLnNwYWNlIDB4OAorCS5zZWN0aW9uCS50ZGF0YSwi YXdUIiwlcHJvZ2JpdHMKKwkucDJhbGlnbiAzCisJLnNwYWNlIDB4NAorCS5z ZWN0aW9uCS50YnNzLCJhd1QiLCVub2JpdHMKKwkucDJhbGlnbiAzCisJLnNw YWNlIDB4NDAKKwkuc2VjdGlvbgkuZGF0YS5yZWwucm8sImF3IiwlcHJvZ2Jp dHMKKwkucDJhbGlnbiA2CisJLnNwYWNlIDB4MWI2MAorCS5zZWN0aW9uIC5q Y3IsImF3IixAcHJvZ2JpdHMKKwkucDJhbGlnbiAzCisJLnNwYWNlIDB4OAor CS5zZWN0aW9uIC5iYXIsImF3IixAcHJvZ2JpdHMKKwkucDJhbGlnbiAzCisJ LnNwYWNlIDB4NjQwCisJLnNlY3Rpb24JLmRhdGEsImF3IiwlcHJvZ2JpdHMK KwkucDJhbGlnbiA1CisJLnNwYWNlIDB4NzAKKwkuc2VjdGlvbgkuYnNzLCJh dyIsJW5vYml0cworCS5wMmFsaWduIDYKKwkuc3BhY2UgMHg4YTAKKwkuc2Vj dGlvbglCVVNfRVJST1JfTUFQLCJhdyIsJXByb2diaXRzCisJLnAyYWxpZ24g MworCS5zcGFjZSAweDIzMApkaWZmIC0tZ2l0IGEvbGQvdGVzdHN1aXRlL2xk LXg4Ni02NC9wcjE4MTc2LnQgYi9sZC90ZXN0c3VpdGUvbGQteDg2LTY0L3By MTgxNzYudApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40 ODBjMGNkCi0tLSAvZGV2L251bGwKKysrIGIvbGQvdGVzdHN1aXRlL2xkLXg4 Ni02NC9wcjE4MTc2LnQKQEAgLTAsMCArMSwzOSBAQAorU0VDVElPTlMKK3sK KyAgLyogUmVhZC1vbmx5IHNlY3Rpb25zLCBtZXJnZWQgaW50byB0ZXh0IHNl Z21lbnQ6ICovCisgIC4gPSBTRUdNRU5UX1NUQVJUKCJ0ZXh0LXNlZ21lbnQi LCAwKSArIFNJWkVPRl9IRUFERVJTOworICAuaGFzaCAgICAgICAgICAgOiB7 ICooLmhhc2gpIH0KKyAgLmdudS5oYXNoICAgICAgIDogeyAqKC5nbnUuaGFz aCkgfQorICAuZHluc3ltICAgICAgICAgOiB7ICooLmR5bnN5bSkgfQorICAu ZHluc3RyICAgICAgICAgOiB7ICooLmR5bnN0cikgfQorICAuaW5pdCAgICAg ICAgICAgOiB7ICooLmluaXQpIH0KKyAgLnRleHQgICAgICAgICAgIDogeyAq KC50ZXh0KSB9CisgIC5maW5pICAgICAgICAgICA6IHsgKiguZmluaSkgfQor ICAucm9kYXRhICAgICAgICAgOiB7ICooLnJvZGF0YSkgfQorICAuZm9vX2hk ciA6IHsgKiguZm9vX2hkcikgfQorICAuZm9vIDogeyAqKC5mb28pIH0KKyAg Lnh4eCA6IHsgKigueHh4KSB9CisgIC4gPSBBTElHTiAoQ09OU1RBTlQgKE1B WFBBR0VTSVpFKSkgLSAoKENPTlNUQU5UIChNQVhQQUdFU0laRSkgLSAuKSAm IChDT05TVEFOVCAoTUFYUEFHRVNJWkUpIC0gMSkpOyAuID0gREFUQV9TRUdN RU5UX0FMSUdOIChDT05TVEFOVCAoTUFYUEFHRVNJWkUpLCBDT05TVEFOVCAo Q09NTU9OUEFHRVNJWkUpKTsKKyAgLnl5eSA6IHsgKigueXl5KSB9CisgIC50 ZGF0YQkgIDogeyAqKC50ZGF0YSkgfQorICAudGJzcwkJICA6IHsgKigudGJz cykgfQorICAuaW5pdF9hcnJheSAgICAgOiB7ICooLmluaXRfYXJyYXkpIH0K KyAgLmZpbmlfYXJyYXkgICAgIDogeyAqKC5maW5pX2FycmF5KSB9CisgIC5q Y3IgICAgICAgICAgICA6IHsgKiguamNyKSB9CisgIC5kYXRhLnJlbC5ybyA6 IHsgKiguZGF0YS5yZWwucm8ubG9jYWwqIC5nbnUubGlua29uY2UuZC5yZWwu cm8ubG9jYWwuKikgKiguZGF0YS5yZWwucm8gLmRhdGEucmVsLnJvLiogLmdu dS5saW5rb25jZS5kLnJlbC5yby4qKSB9CisgIC5keW5hbWljICAgICAgICA6 IHsgKiguZHluYW1pYykgfQorICAuYmFyICAgICAgICAgICAgOiB7ICooLmJh cikgfQorICAuID0gREFUQV9TRUdNRU5UX1JFTFJPX0VORCAoU0laRU9GICgu Z290LnBsdCkgPj0gMjQgPyAyNCA6IDAsIC4pOworICAuZ290LnBsdCAgICAg ICAgOiB7ICooLmdvdC5wbHQpIH0KKyAgLmRhdGEgICAgICAgICAgIDogeyAq KC5kYXRhKSB9CisgIF9fYnNzX3N0YXJ0ID0gLjsKKyAgLmJzcyAgICAgICAg ICAgIDoKKyAgeworICAgKiguYnNzKQorICAgLiA9IEFMSUdOKC4gIT0gMCA/ IDY0IC8gOCA6IDEpOworICB9CisgIC4gPSBBTElHTig2NCAvIDgpOworICBf ZW5kID0gLjsgUFJPVklERSAoZW5kID0gLik7CisgIC4gPSBEQVRBX1NFR01F TlRfRU5EICguKTsKKyAgL0RJU0NBUkQvIDogeyAqKC4qKSB9Cit9CmRpZmYg LS1naXQgYS9sZC90ZXN0c3VpdGUvbGQteDg2LTY0L3g4Ni02NC5leHAgYi9s ZC90ZXN0c3VpdGUvbGQteDg2LTY0L3g4Ni02NC5leHAKaW5kZXggN2JjZWI3 Zi4uOTg1MTRlZCAxMDA2NDQKLS0tIGEvbGQvdGVzdHN1aXRlL2xkLXg4Ni02 NC94ODYtNjQuZXhwCisrKyBiL2xkL3Rlc3RzdWl0ZS9sZC14ODYtNjQveDg2 LTY0LmV4cApAQCAtMzE4LDYgKzMxOCw3IEBAIHJ1bl9kdW1wX3Rlc3QgIm1v djFkIgogcnVuX2R1bXBfdGVzdCAicHIxNzkzNS0xIgogcnVuX2R1bXBfdGVz dCAicHIxNzkzNS0yIgogcnVuX2R1bXBfdGVzdCAicHIxODE2MCIKK3J1bl9k dW1wX3Rlc3QgInByMTgxNzYiCiAKICMgTXVzdCBiZSBuYXRpdmUgd2l0aCB0 aGUgQyBjb21waWxlcgogaWYgeyBbaXNuYXRpdmVdICYmIFt3aGljaCAkQ0Nd ICE9IDAgfSB7Ci0tIAoyLjEuMAoK --047d7b4728622b49290512a7fd21--