From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id E18813852C4A; Wed, 23 Nov 2022 14:49:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E18813852C4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214976; bh=nzhA9HXz4GoIbi/RlAsfj68q90cfbTWpGZpEiKXRWr8=; h=From:To:Subject:Date:From; b=s3KvwKeYTTPAIzuLSrTh5vNgNA9Hgf9IXqfBSh9wv2c7FnWBdaMu3P/ngaRUmQNI9 /QDOQnGrNjdo0dp2I4aUY0k1gLQ3GgbqRUMMQ6ynRwEcWlrOHqao9OLNTWlbJlp/vi YGVG0NqbLVMJOSpx8z+ye4wEBL/Mn75V8hq5okv4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: nptl: Check user provided stack for PCS constraints X-Act-Checkin: glibc X-Git-Author: Carlos Eduardo Seo X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 040bc860fe46e7f7c1e99de92565398656b6b5e9 X-Git-Newrev: 5e606fb79cbf9b701f50d0dde041d19ce0b423eb Message-Id: <20221123144936.E18813852C4A@sourceware.org> Date: Wed, 23 Nov 2022 14:49:36 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5e606fb79cbf9b701f50d0dde041d19ce0b423eb commit 5e606fb79cbf9b701f50d0dde041d19ce0b423eb Author: Carlos Eduardo Seo Date: Thu Mar 17 20:51:32 2022 -0300 cheri: nptl: Check user provided stack for PCS constraints In pthread_attr_setstack fail with EINVAL if the input stack does not meet the PCS constraints. Diff: --- nptl/pthread_attr_setstack.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nptl/pthread_attr_setstack.c b/nptl/pthread_attr_setstack.c index e08b167df6..a0338c2752 100644 --- a/nptl/pthread_attr_setstack.c +++ b/nptl/pthread_attr_setstack.c @@ -19,7 +19,9 @@ #include #include "pthreadP.h" #include - +#ifdef __CHERI_PURE_CAPABILITY__ +# include +#endif #ifndef NEW_VERNUM # define NEW_VERNUM GLIBC_2_3_3 @@ -43,6 +45,11 @@ __pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr, EXTRA_PARAM_CHECKS; #endif +#ifdef __CHERI_PURE_CAPABILITY__ + if (!STACK_CAP_CHECK (stackaddr, stacksize)) + return EINVAL; +#endif + iattr->stacksize = stacksize; #if _STACK_GROWS_DOWN iattr->stackaddr = (char *) stackaddr + stacksize;