From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 3A47D3857C44; Sat, 18 Jul 2020 13:14:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3A47D3857C44 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Fix longjmp check for sigstate X-Act-Checkin: glibc X-Git-Author: Samuel Thibault X-Git-Refname: refs/heads/master X-Git-Oldrev: 115bcf921a52005b89ff2859ccae4a8fc6d6deed X-Git-Newrev: 5baad9a6f948b7822db3392097e7d79e9e018655 Message-Id: <20200718131404.3A47D3857C44@sourceware.org> Date: Sat, 18 Jul 2020 13:14:04 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2020 13:14:04 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5baad9a6f948b7822db3392097e7d79e9e018655 commit 5baad9a6f948b7822db3392097e7d79e9e018655 Author: Samuel Thibault Date: Sat Jul 18 15:12:56 2020 +0200 hurd: Fix longjmp check for sigstate * sysdeps/mach/hurd/i386/____longjmp_chk.S,__longjmp.S: Properly check for sigstate being NULL. Diff: --- sysdeps/mach/hurd/i386/____longjmp_chk.S | 2 +- sysdeps/mach/hurd/i386/__longjmp.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/mach/hurd/i386/____longjmp_chk.S b/sysdeps/mach/hurd/i386/____longjmp_chk.S index 5131386c60..a746a4f2ba 100644 --- a/sysdeps/mach/hurd/i386/____longjmp_chk.S +++ b/sysdeps/mach/hurd/i386/____longjmp_chk.S @@ -67,7 +67,7 @@ ENTRY (____longjmp_chk) movl %gs:SIGSTATE_OFFSET, %edi testl %edi, %edi - jnz .Lok /* sigstate not initialized yet */ + jz .Lok /* sigstate not initialized yet */ testl $SS_ONSTACK, (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_FLAGS__OFFSET)(%edi) jnz .Lonstack diff --git a/sysdeps/mach/hurd/i386/__longjmp.S b/sysdeps/mach/hurd/i386/__longjmp.S index 73bbff9826..af788ede0f 100644 --- a/sysdeps/mach/hurd/i386/__longjmp.S +++ b/sysdeps/mach/hurd/i386/__longjmp.S @@ -45,7 +45,7 @@ ENTRY (__longjmp) movl %gs:SIGSTATE_OFFSET, %edi testl %edi, %edi - jnz .Lok /* sigstate not initialized yet */ + jz .Lok /* sigstate not initialized yet */ testl $SS_ONSTACK, (HURD_SIGSTATE__SIGALTSTACK__OFFSET + SIGALTSTACK__SS_FLAGS__OFFSET)(%edi) jz .Lok