From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id EE6131F45E for ; Mon, 17 Feb 2020 12:10:03 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; q=dns; s= default; b=ItQHzll6m/WoRlhO6pajaySTeD8RjK+Jo8ddrUXRFm2Yi6SRhmLpu ApVfUfAOGvLGI6RvOc88mv8uxmF7TpKqYfaD7P8gHNMWNgyBPtrlVI3CK5cF8iWW rC0OSvWdfGkL/y4PSeJOznv9hlIzTEFT4s4RDB1L7+3BUn34c78QbI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; s=default; bh=bxD3IH5L3VfiqrfFC8H0G2UO7mU=; b=p4GJmPd2nU92co590A9nc5gj/NZZ yGbH2xKGpcd5sBSie1SWTwe651mI8iWkfx3pTOEs9Ut0YsraI1eeUtcxoxbe69y2 tcCxdMFZ6/RUgRhBN+yMaFJu7G/7B1Y518BzSz/oNeYCsYnco9YJon4Q5H7cacma AWm383eayUSjBa4= Received: (qmail 107702 invoked by alias); 17 Feb 2020 12:10:01 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 107679 invoked by uid 89); 17 Feb 2020 12:10:00 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mx0a-001b2d01.pphosted.com From: "Lucas A. M. Magalhaes" To: libc-alpha@sourceware.org Cc: fweimer@redhat.com Subject: [PATCH v4] Fix tst-pkey expectations on pkey_get [BZ #23202] Date: Mon, 17 Feb 2020 09:09:52 -0300 Message-Id: <20200217120952.5219-1-lamm@linux.ibm.com> In-Reply-To: <871rqwyoxl.fsf@oldenburg2.str.redhat.com> References: <871rqwyoxl.fsf@oldenburg2.str.redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit >From the GNU C Library manual the pkey_set can receive a combination of PKEY_DISABLE_WRITE and PKEY_DISABLE_ACCESS. However PKEY_DISABLE_ACCESS is more restrictive than PKEY_DISABLE_WRITE and includes its behavior. The test expects that after setting (PKEY_DISABLE_WRITE|PKEY_DISABLE_ACCESS) pkey_get should return the same. This may not be true as PKEY_DISABLE_ACCESS will succeed in describe the state of the key in this case. The pkey behavior during signal handling is different between x86 and POWER. This change make the test compatible with both architectures. --- Hi, in V4: - Fix comments. in V3: - Commit message changes. - Add comments. in V2: - Fix signal handling expectations to accept x86 and POWER behavior. sysdeps/unix/sysv/linux/tst-pkey.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tst-pkey.c b/sysdeps/unix/sysv/linux/tst-pkey.c index 4ea1bc4f9a..cba40c73de 100644 --- a/sysdeps/unix/sysv/linux/tst-pkey.c +++ b/sysdeps/unix/sysv/linux/tst-pkey.c @@ -37,7 +37,7 @@ static pthread_barrier_t barrier; /* The keys used for testing. These have been allocated with access rights set based on their array index. */ -enum { key_count = 4 }; +enum { key_count = 3 }; static int keys[key_count]; static volatile int *pages[key_count]; @@ -111,14 +111,16 @@ check_page_access (int page, bool write) } static volatile sig_atomic_t sigusr1_handler_ran; - -/* Used to check that access is revoked in signal handlers. */ +/* Used to check the behavior in signal handlers. In x86 all access are + revoked during signal handling. In PowerPC the key permissions are + inherited by the interrupted thread. This test accept both approaches. */ static void sigusr1_handler (int signum) { TEST_COMPARE (signum, SIGUSR1); for (int i = 0; i < key_count; ++i) - TEST_COMPARE (pkey_get (keys[i]), PKEY_DISABLE_ACCESS); + TEST_VERIFY (pkey_get (keys[i]) == PKEY_DISABLE_ACCESS + || pkey_get (keys[i]) == i); sigusr1_handler_ran = 1; } -- 2.20.1