From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91312EB64DC for ; Mon, 17 Jul 2023 16:13:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E7A878D0001; Mon, 17 Jul 2023 12:13:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2A716B0074; Mon, 17 Jul 2023 12:13:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF2B98D0001; Mon, 17 Jul 2023 12:13:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C238C6B0072 for ; Mon, 17 Jul 2023 12:13:11 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 89251B0CCC for ; Mon, 17 Jul 2023 16:13:11 +0000 (UTC) X-FDA: 81021598182.10.CE4E8F2 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by imf03.hostedemail.com (Postfix) with ESMTP id B06802000C for ; Mon, 17 Jul 2023 16:13:09 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=paul-moore.com header.s=google header.b=cQpEj7wQ; spf=pass (imf03.hostedemail.com: domain of paul@paul-moore.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=paul@paul-moore.com; dmarc=pass (policy=none) header.from=paul-moore.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689610389; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8CqPKH8zLjxPG0T2aNpKAIqJzacVH6EbJBb3LjExpjw=; b=xZ7GS0bRJ+uP1vvVAIpZjOnb/Kysxhop94eUbBL4CVFrVG62v2KToiLEu81SBUQ8/rgiQG N2NApFLi6XGy/sD5UL8CmtlEbug2xQkZKe4IRIplNbF2z4pXnEH79LXv0hEaRGCORhmNWf YrTg8ZslEXS1bn+7R/e3PuXmYAAx3VE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689610389; a=rsa-sha256; cv=none; b=cBH7q1pKHc76DqdLDxNNkoLaXSCK503UOrVDmdCn/FE9mp8lYMM08PWFxhlGh4iaPKi72Q cttlxjmKIOLWXfLBb6R3zP61K6GIDaAYBgBxRvszZS4Asx+Ot/30IHQn5PdSieD6v/JpNg WgftsRv8bt5a16YkYE8cTvyFaSO7FnI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=paul-moore.com header.s=google header.b=cQpEj7wQ; spf=pass (imf03.hostedemail.com: domain of paul@paul-moore.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=paul@paul-moore.com; dmarc=pass (policy=none) header.from=paul-moore.com Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-579d5d89b41so47072907b3.2 for ; Mon, 17 Jul 2023 09:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore.com; s=google; t=1689610389; x=1692202389; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=8CqPKH8zLjxPG0T2aNpKAIqJzacVH6EbJBb3LjExpjw=; b=cQpEj7wQVECv/U9cTpn+RN55ujAIWvks3MU4IX4Wr/hwnFIe0F/qx5YUKjSMpnx703 CHzs0WWQ7uBihIAx5z5eiCKmCaltnArXhlaNRgavYeytVm5vSw/gQiRT1py2AerifbO6 AiJnYOTJCz0R2HkNoD7T9Yf9t3z2uTFa83xyLrtRemXVRe2lrXcVvM5qyrJMMViUNE7U 6aLZBv3MPfrrvSHz+w10LReOyQijeOLBQAf/Jl5WjQxapxktKezBDH2erUpWfo+TfrZS RnuZ/YnESkQ6HSr7gO5+BgLJh/oDlySt0yQzLcBh/BGfPb0h9TdwTyAHNWQPywULEg7z BUVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689610389; x=1692202389; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8CqPKH8zLjxPG0T2aNpKAIqJzacVH6EbJBb3LjExpjw=; b=jKJBP2bPcGnQjx8lrM+hvzWnLcxhvz18WCPcaEh28KI2cQjz0MwWmNfJcbQWzY9lb4 E2Fe7WpnyLDjzleF9PnXFbYlr2DFfUPYCXVdMWyJxT1N99aE8BSR0PbaqxZgxYsDGCoZ Ch5EJuxQL5eooGALxEpq9ZL29pStB1vrNjKRXsOgU1DXoMa16WA8t2ZcX0fS91j6bXel biiDzs38Ec/oqjSilOYFgOAEU+AoLn85ztfU8YCisAcQDJ2JsCkdIc+iU86NEkNgWpd9 xKl9P/i1OEoiiFhqxReCqlBcgvvC1cYOZ6J6+OlmsenbpA7aWhe2jptyvYcwv4FGsZcg J/ng== X-Gm-Message-State: ABy/qLbsbgO0oX1BT54Vp6L5qquCKWhCQbrCIaRkEXHJv/uNJjc17yZw iaqay2LlpSk1SR5je3Tb3M1teHjky83yh1+kqJSn X-Google-Smtp-Source: APBJJlGog4dyfGlwFIS3iBtcrvJFLeH/ogm5YcXS+semC1utnZAcGzlBZgUKou2DvMgGuYXX4nNPAERtXRDz/TQJF88= X-Received: by 2002:a81:67c1:0:b0:577:2fda:f181 with SMTP id b184-20020a8167c1000000b005772fdaf181mr12551811ywc.44.1689610388723; Mon, 17 Jul 2023 09:13:08 -0700 (PDT) MIME-Version: 1.0 References: <20230712143831.120701-1-wangkefeng.wang@huawei.com> <20230712143831.120701-5-wangkefeng.wang@huawei.com> In-Reply-To: <20230712143831.120701-5-wangkefeng.wang@huawei.com> From: Paul Moore Date: Mon, 17 Jul 2023 12:12:58 -0400 Message-ID: Subject: Re: [PATCH 4/5] selinux: use vma_is_stack() and vma_is_heap() To: Kefeng Wang , Andrew Morton Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-perf-users@vger.kernel.org, selinux@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: B06802000C X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: edmzo4ug9oah6inq4738dgn57daznorh X-HE-Tag: 1689610389-26142 X-HE-Meta: U2FsdGVkX1/ZSGs8eRbLsFcsTMoUZYzyZ1e+p/GoNiSgJwmGlbBt2u+8IZiwDSor+geevnhXEvgFilgFCYlRoZB833mjpMCxfmkSDmhMNI6wJ74jtm4y1nmgGiAlScFnXH3hSDBqhVgzl926yrrQO2HfwfSO8QeagZUdpQy6RRLq8tR3fH5lsK71thVjtFNd69aFJaQiLupa4ZlftlTvBNSZa29v5Bz7OlpMlXsOqYnaQiITgrqtY2waGoymJuZ6jC8CG9XVoH0kYLJ/Oefk4hWirwduQHVa1vP1WqpHf1+HP4I65UyjgDJLCVnWHYE1R0yqsZigCl5hIja4Qmr7yu1U+Y9/qfq2TR/PahweRxFuFWx0Qu7y14nPcRV8HK0tsvx/79TxghaMglDiHtVyf23rbw24UZEUK3JGSwUjYxad20Hw6+hy97NLdB8CS1cuTqjbscLwrQB16iLvdv5issQf3T2mHsiNDosLrI46Id/4KXjiQI1+yCeB71QcbtQRPDT/vmVVQt0uun15phl19YZeNt9bnuiuhD1BqhyTAVMqUWOREjaMVQeW22rle9SuqGJfBah8AKfwBHwSc/ONivIqBrj7VM6PTgIMYFBj9agv9CfRSp64IEskk1RxlO6TnhhiVXWebvvqy0p+UXfHB+pyAhjJkn3SVFPmhopTgGEW/U89nASEP6cNMV/ZF1o1Qr/wSlpl/0Zv4smF/kPurK41vv1y+qJ6mzIXSpcUu/eHVyU/vLOH8mSkaSPyBMJIxNaMQ5yhhjqW4tRQ83M6sAIssgcFf0kNEGob8fW1Uf0srq3akI8ITdx/TqGxfpus5p4JaFEkqGXYsTsl33ikMYRZMmkTwutPWN56Z2CKtM9svikDZAtWAuO1opVIo+n57u7XmVWV91aEli3GEL1clqfneN/8FPi8mCE9vPxDuhSdjutiVad25Dy55D/TcyEFJJifXo+n8tQAKBWMoxQ hJOEbD6c 4+ERqtnaUJgJtubVBfQbWlvfgUntaSPcXPTc+sP4JK5EBuW45yGvHK8YYmiQQQq1ax2957soPqmrUsoLVALTaFZvxfn5U5JzdZQxbRM8VuxZB08WIvOhsqPTh4RDdDHq9a+cjo26MvQWxu8ss3jBrXUco+XbwBMPw6ObfqRCQr4MZQNeCxafTuIwzXXujPmWcw0QrZ9cWHDz8BkQGSkzEmjyRUwfd4GSKmA0m52+/PK+8dq7LVDnlipohC4MFvXnchytSuJVLEFfUiobHDYkWXV3XOdi0LO4BCbUgcUubVgMC6w8Y4CbfID9cHYSxuuJQStKyB+dPk0BTMzlz1omtJ33N3+29xKm3KIek/iKdomAgiP8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000035, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Jul 12, 2023 at 10:25=E2=80=AFAM Kefeng Wang wrote: > > Use the helpers to simplify code. > > Signed-off-by: Kefeng Wang > --- > security/selinux/hooks.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index 4e46cf3d67b6..289ef2d6a427 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -3775,13 +3775,10 @@ static int selinux_file_mprotect(struct vm_area_s= truct *vma, > if (default_noexec && > (prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) { > int rc =3D 0; > - if (vma->vm_start >=3D vma->vm_mm->start_brk && > - vma->vm_end <=3D vma->vm_mm->brk) { > + if (vma_is_heap(vma)) { > rc =3D avc_has_perm(sid, sid, SECCLASS_PROCESS, > PROCESS__EXECHEAP, NULL); > - } else if (!vma->vm_file && > - ((vma->vm_start <=3D vma->vm_mm->start_stack &= & > - vma->vm_end >=3D vma->vm_mm->start_stack) || > + } else if (!vma->vm_file && vma_is_stack(vma) || > vma_is_stack_for_current(vma))) { With the parens fix that Andrew already provided. Acked-by: Paul Moore > rc =3D avc_has_perm(sid, sid, SECCLASS_PROCESS, > PROCESS__EXECSTACK, NULL); > -- > 2.41.0 --=20 paul-moore.com