From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/14366 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: James Y Knight Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] Fix the use of sigaltstack to return to the saved main stack. Date: Tue, 9 Jul 2019 15:01:50 -0400 Message-ID: Reply-To: musl@lists.openwall.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000003c685058d44338a" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="131274"; mail-complaints-to="usenet@blaine.gmane.org" To: musl@lists.openwall.com Original-X-From: musl-return-14382-gllmg-musl=m.gmane.org@lists.openwall.com Tue Jul 09 21:02:33 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1hkvNo-000Y45-Gu for gllmg-musl@m.gmane.org; Tue, 09 Jul 2019 21:02:32 +0200 Original-Received: (qmail 28603 invoked by uid 550); 9 Jul 2019 19:02:30 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 28570 invoked from network); 9 Jul 2019 19:02:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=2kyI2iNCWqorTWi08L/gc6EMl1vNV6Yuz8+hRPPAaLw=; b=fRLhzskipDKl+5YJ8dkVoNLxUk3NbBTTE66r1AQUBU6HazRKLCYHSyimFOtVp04E3v holCrvSOUcct/6DoY4T3L6qLnGJfTURr6PdgUYuc3k/NYB8vOc1ZwvydUowt5V7FeL9a FadVrfdb406oQhNGnYDHSJhlQKzjg2bQ3PpvdTC0JlM8XBrTIzMAp7RjqKYpqxdah6YS bEov8ui+Kw/tAVLRKBFQOJPT742YE1c257re0GaWs3uYppUfR1uA1h2agcwAxNk4W2Lj sApgsFAQmOEYQX38QE1vFkY1tkIZu0Q3PQAnTxq1Y5RniBQ28hJbUL0eR9JstThox0tJ 25XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=2kyI2iNCWqorTWi08L/gc6EMl1vNV6Yuz8+hRPPAaLw=; b=Fq94XMutGmls/62Ss9ly6a7JX7emwY62+x97PhN7Z80zzP7LYuLVcBZ1WlEa4VYWEO RBBKoKP5x0qrKD2lvPNqP4/Rk03/Wjn4mGy+1M9ivdlhpAddmRtkwEswQlwFwqjhOML/ 7TsO5XdZ55CNPa/gstcWwpZsbPddVAKN3EegNoYYg3qwUm2FTMD5dlXTsi4op774s3wR i++qKHXJsZJZFCNgAlk8pCbruA6rSW2ACMjs06FIlfgmKc5GUGAc/OMmJC6KIBh4x51J CVTH8b1635nNQyzMgGS9xp7vtVUxNraMDsoa4icRgMwibGh2/mlJa7qWsVldfA1VCbBT Z4NA== X-Gm-Message-State: APjAAAXWvZI7yTg1nqkXOVvcV78HuToXoPvDnzfRK05O0YzZ/Id6uon3 ywLykW3WbHJtZWKULrgnQpsx4X20f1QEjof2fgZ4cPGlFJA= X-Google-Smtp-Source: APXvYqysdyNC8pzzUH2lQjhHKLHHfKMRJGlIgdZi9dvh9GBRtjp7xeqm5wSul3Ujmqp/JKMhH8MCoje+k/kTe/5krDw= X-Received: by 2002:ab0:699a:: with SMTP id t26mr5159011uaq.70.1562698936680; Tue, 09 Jul 2019 12:02:16 -0700 (PDT) Xref: news.gmane.org gmane.linux.lib.musl.general:14366 Archived-At: --00000000000003c685058d44338a Content-Type: multipart/alternative; boundary="00000000000003c67b058d443388" --00000000000003c67b058d443388 Content-Type: text/plain; charset="UTF-8" Previously, musl would reject the call, because the main stack has ss_size == 0 and ss_flags == SS_DISABLE. We could condition on ss_flags not containing SS_DISABLE, but instead, simply remove the ss_size check, as the kernel performs the same check, anyhow. [[Note: I've also included the corresponding patch to libc-tests. I'm not sure if this is OK, or if I should send it separately?]] --00000000000003c67b058d443388 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Previously, musl would reject the call, because the m= ain stack has
ss_size =3D=3D 0 and ss_flags =3D=3D SS_DISABLE.
=
We could condition on ss_flags not containing SS_DISABLE, but instead,<= br>simply remove the ss_size check, as the kernel performs the same check,<= br>anyhow.

[[Note: I've also included the corres= ponding patch to libc-tests. I'm not sure if this is OK, or if I should= send it separately?]]
--00000000000003c67b058d443388-- --00000000000003c685058d44338a Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fix-the-use-of-sigaltstack-to-return-to-the-saved-ma.patch" Content-Disposition: attachment; filename="0001-Fix-the-use-of-sigaltstack-to-return-to-the-saved-ma.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jxw6hu670 RnJvbSBmZTcwYTUwOGZlOTQ1Y2IxYTQ0ZjhhNmJiZDg3ZWUyOTU2Mzc0NDdiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYW1lcyBZIEtuaWdodCA8anlrbmlnaHRAZ29vZ2xlLmNvbT4K RGF0ZTogVHVlLCA5IEp1bCAyMDE5IDE0OjU5OjAxIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gRml4 IHRoZSB1c2Ugb2Ygc2lnYWx0c3RhY2sgdG8gcmV0dXJuIHRvIHRoZSBzYXZlZCBtYWluIHN0YWNr LgoKUHJldmlvdXNseSwgbXVzbCB3b3VsZCByZWplY3QgdGhlIGNhbGwsIGJlY2F1c2UgdGhlIG1h aW4gc3RhY2sgaGFzCnNzX3NpemUgPT0gMCBhbmQgc3NfZmxhZ3MgPT0gU1NfRElTQUJMRS4KCldl IGNvdWxkIGNvbmRpdGlvbiBvbiBzc19mbGFncyBub3QgY29udGFpbmluZyBTU19ESVNBQkxFLCBi dXQgaW5zdGVhZCwKc2ltcGx5IHJlbW92ZSB0aGUgc3Nfc2l6ZSBjaGVjaywgYXMgdGhlIGtlcm5l bCBwZXJmb3JtcyB0aGUgc2FtZSBjaGVjaywKYW55aG93LgotLS0KIHNyYy9zaWduYWwvc2lnYWx0 c3RhY2suYyB8IDEyICsrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygr KSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvc2lnbmFsL3NpZ2FsdHN0YWNrLmMg Yi9zcmMvc2lnbmFsL3NpZ2FsdHN0YWNrLmMKaW5kZXggY2ZhM2Y1YzEuLmQ4ZThlYjBiIDEwMDY0 NAotLS0gYS9zcmMvc2lnbmFsL3NpZ2FsdHN0YWNrLmMKKysrIGIvc3JjL3NpZ25hbC9zaWdhbHRz dGFjay5jCkBAIC00LDE1ICs0LDkgQEAKIAogaW50IHNpZ2FsdHN0YWNrKGNvbnN0IHN0YWNrX3Qg KnJlc3RyaWN0IHNzLCBzdGFja190ICpyZXN0cmljdCBvbGQpCiB7Ci0JaWYgKHNzKSB7Ci0JCWlm IChzcy0+c3Nfc2l6ZSA8IE1JTlNJR1NUS1NaKSB7Ci0JCQllcnJubyA9IEVOT01FTTsKLQkJCXJl dHVybiAtMTsKLQkJfQotCQlpZiAoc3MtPnNzX2ZsYWdzICYgU1NfT05TVEFDSykgewotCQkJZXJy bm8gPSBFSU5WQUw7Ci0JCQlyZXR1cm4gLTE7Ci0JCX0KKwlpZiAoc3MgJiYgKHNzLT5zc19mbGFn cyAmIFNTX09OU1RBQ0spKSB7CisJCWVycm5vID0gRUlOVkFMOworCQlyZXR1cm4gLTE7CiAJfQog CXJldHVybiBzeXNjYWxsKFNZU19zaWdhbHRzdGFjaywgc3MsIG9sZCk7CiB9Ci0tIAoyLjIyLjAu NDEwLmdkOGZkYmUyMWI1LWdvb2cKCg== --00000000000003c685058d44338a Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Verify-that-returning-to-the-original-stack-doesn-t-.patch" Content-Disposition: attachment; filename="0001-Verify-that-returning-to-the-original-stack-doesn-t-.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jxw6k1b21 RnJvbSA5MjcyZWQ4NjY2ZjkzMGRjMmYyNGQwNWIxZmQyNDg1ODRiYmY0OTVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYW1lcyBZIEtuaWdodCA8anlrbmlnaHRAZ29vZ2xlLmNvbT4K RGF0ZTogVHVlLCA5IEp1bCAyMDE5IDE0OjMxOjI0IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gVmVy aWZ5IHRoYXQgcmV0dXJuaW5nIHRvIHRoZSBvcmlnaW5hbCBzdGFjayBkb2Vzbid0IHJldHVybiBh bgogZXJyb3IgKGUuZy4gRU5PTUVNKS4KCi0tLQogc3JjL3JlZ3Jlc3Npb24vc2lnYWx0c3RhY2su YyB8IDYgKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3NyYy9yZWdyZXNzaW9uL3NpZ2FsdHN0YWNrLmMgYi9zcmMvcmVn cmVzc2lvbi9zaWdhbHRzdGFjay5jCmluZGV4IGJmZGM0NGEuLjY4NDc0NTQgMTAwNjQ0Ci0tLSBh L3NyYy9yZWdyZXNzaW9uL3NpZ2FsdHN0YWNrLmMKKysrIGIvc3JjL3JlZ3Jlc3Npb24vc2lnYWx0 c3RhY2suYwpAQCAtMzAsNyArMzAsNyBAQCBzdGF0aWMgdm9pZCBoYW5kbGVyKGludCBzaWcpCiAK IGludCBtYWluKHZvaWQpCiB7Ci0Jc3RhY2tfdCBzczsKKwlzdGFja190IHNzLCBvbGRzczsKIAlz dHJ1Y3Qgc2lnYWN0aW9uIHNhOwogCiAJc3Muc3Nfc3AgPSBzdGFjazsKQEAgLTM5LDcgKzM5LDcg QEAgaW50IG1haW4odm9pZCkKIAlzYS5zYV9oYW5kbGVyID0gaGFuZGxlcjsKIAlzYS5zYV9mbGFn cyA9IFNBX09OU1RBQ0s7CiAKLQlUKHNpZ2FsdHN0YWNrKCZzcywgMCkpOworCVQoc2lnYWx0c3Rh Y2soJnNzLCAmb2xkc3MpKTsKIAlUKHNpZ2ZpbGxzZXQoJnNhLnNhX21hc2spKTsKIAlUKHNpZ2Fj dGlvbihTSUdVU1IxLCAmc2EsIDApKTsKIAlUKHJhaXNlKFNJR1VTUjEpKTsKQEAgLTU2LDcgKzU2 LDcgQEAgaW50IG1haW4odm9pZCkKIAkJdF9lcnJvcigic2lnYWx0c3RhY2sgd2l0aCBiYWQgc3Nf ZmxhZ3Mgc2hvdWxkIGhhdmUgZmFpbGVkIHdpdGggRUlOVkFMLCAiCiAJCQkiZ290ICVzXG4iLCBz dHJlcnJvcihlcnJubykpOwogCWVycm5vID0gMDsKLQlUKHNpZ2FsdHN0YWNrKDAsIDApKTsKKwlU KHNpZ2FsdHN0YWNrKG9sZHNzLCAwKSk7CiAKIAlyZXR1cm4gdF9zdGF0dXM7CiB9Ci0tIAoyLjIy LjAuNDEwLmdkOGZkYmUyMWI1LWdvb2cKCg== --00000000000003c685058d44338a--