Message ID | 20241125104011.36552-3-cgoettsche@seltendoof.de (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 23B24D3B7FF for <linux-mm@archiver.kernel.org>; Mon, 25 Nov 2024 10:40:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CAB66B0082; Mon, 25 Nov 2024 05:40:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 27AFE6B0083; Mon, 25 Nov 2024 05:40:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1435A6B0085; Mon, 25 Nov 2024 05:40:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id EB6936B0082 for <linux-mm@kvack.org>; Mon, 25 Nov 2024 05:40:30 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5CBD880570 for <linux-mm@kvack.org>; Mon, 25 Nov 2024 10:40:30 +0000 (UTC) X-FDA: 82824273252.08.3932A15 Received: from server02.seltendoof.de (server02.seltendoof.de [168.119.48.163]) by imf22.hostedemail.com (Postfix) with ESMTP id 409E2C0010 for <linux-mm@kvack.org>; Mon, 25 Nov 2024 10:40:24 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=seltendoof.de header.s=2023072701 header.b=Mdb4xOeL; spf=pass (imf22.hostedemail.com: domain of cgoettsche@seltendoof.de designates 168.119.48.163 as permitted sender) smtp.mailfrom=cgoettsche@seltendoof.de; dmarc=pass (policy=reject) header.from=seltendoof.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732531224; h=from:from:sender:reply-to: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=uXJbjp9TEMr3wvQ+2vZpGMNVJ7tkSZTdw7fouyXGnz0=; b=tGPKbs/z3xAabOoXOt5b+9uYG7EZv2/LV7X0zHylloYQir5wsIjoMPT36nSdzywcOAAz4b hsH1ccIVErn5ksyzDYVLW3iRWKOuvcIadMoXSOZ4gD6GBclOcobX6AJcgCl0EFe/MQfFzU aP32iP6ZfBm5e27TM1bUNa+wPf4uf6Y= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=seltendoof.de header.s=2023072701 header.b=Mdb4xOeL; spf=pass (imf22.hostedemail.com: domain of cgoettsche@seltendoof.de designates 168.119.48.163 as permitted sender) smtp.mailfrom=cgoettsche@seltendoof.de; dmarc=pass (policy=reject) header.from=seltendoof.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732531224; a=rsa-sha256; cv=none; b=0+hm/7SxDgRTvVrPmTS1vOE4d2gl39HdzyTp6cQEfuSt6X+u/ySYI8UzUy6jg+1KeH8db/ ABpgPhed16cLIZs6zfA4Sz03VYy87Eg8bjkBoHpTH49brTXKmu2UvAAoF0zmjjTTQcj7ZB iZ3VkLKQCFxPiTbNtscVkxEltwZLuRQ= From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgoettsche@seltendoof.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seltendoof.de; s=2023072701; t=1732531225; h=from:from:reply-to: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; bh=uXJbjp9TEMr3wvQ+2vZpGMNVJ7tkSZTdw7fouyXGnz0=; b=Mdb4xOeLmRxHgooUx3JOijX3+LMSlj4GRxvTHEPWd1og60SnG27YZkYD2Ceyjx+7B333QM ZyLgYWtMHFmpAS4jQ0VS7zdfJq9cQ9qMI1VXAh2OJqLOjuiladwhEQxhs5QkMpM4d+88/j YY61kw6/zF9K2N5hNSbT40SYIj6CvC8CdzV+bU9xHoZrZXIDj3azO4Pssrl2ovpBnSmIzD Mv0etwsaWtD04zX2lsGfDFSxo61zYM7APvut1Mn8G6dTOzCPF4BW7lPtuQElc1iacTmQXf 8qW38Pn8ScwYATLiIG45X5y8yS2CZ7A99XQg1RtL/r9qa9EeW8r4/TzXlS2Ylw== To: linux-security-module@vger.kernel.org Cc: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>, Muchun Song <muchun.song@linux.dev>, Serge Hallyn <serge@hallyn.com>, Julia Lawall <Julia.Lawall@inria.fr>, Nicolas Palix <nicolas.palix@imag.fr>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, cocci@inria.fr Subject: [PATCH 04/11] hugetlbfs: reorder capability check last Date: Mon, 25 Nov 2024 11:39:56 +0100 Message-ID: <20241125104011.36552-3-cgoettsche@seltendoof.de> In-Reply-To: <20241125104011.36552-1-cgoettsche@seltendoof.de> References: <20241125104011.36552-1-cgoettsche@seltendoof.de> Reply-To: cgzones@googlemail.com MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 409E2C0010 X-Stat-Signature: hozeyubg8b7ifno9exegu4kbrtqcedx7 X-Rspam-User: X-HE-Tag: 1732531224-878721 X-HE-Meta: U2FsdGVkX18/8YLdVyV3vnFEey5zPK5FULk3DROEzF3L5BJX3LRFsR2Lqx4/bc6aoLkenRqbzS/zcv2/yhq9JAY9OHcITZ1pLl31w1SQeIqUqNsRpnBKBTt6mxvitIXLw8t70dNrSmTsccecF4/007pC15VP5Knlr1ymMK8LVHZ7nyCouLeDcDsRph1nnrF7VckBPo2lZI+hvn+JdclfnffzDvLgx9r9qx765nivgGfIkmuxmjUiibBTUBGoUMqJCDfrBbayQbcCokonFiJx/1CAe5ajX990Zj4m5l8qGdfgNkLT+ARULYgJshXkYwM0EyP4k1uOCRPBvRK3aJm9lw0UrcizkpXQmyZPZdrXIiS3C8GPJnwBHyLeV5CX/KLTgeaj5AHk3rgZIElpqpn9ICuKQa4D5ywdRv1XTY8IDZnZK0HR4iUA4Y4QbHTvF5aUtm4DmUIBIkZZq4+wM57cGixab/7qGqGEnMkLzL4umLtsvfwyqfkU/Z4kMLIr/kzom9bRg0kU4SnnmCtwIz3Yig221LXlMOI/jKOQ0vOzPbgtugSKWbWf64/GRACMuGGmr8NcBgWIsUvrFJC2VQ2caQ3E1YmVHxZzTF7RjFaJF98nwFcDAYp/OZX958hWPvoe1RKoPQVeeeWW4f7x/u2jhpLr0y6ZL5X3cYH5h8yUjwBY1VrLYe7U1whE77ACDmg3v88ZMyNonEGwikNUx4zUxQKxFbHRi8NZq5WOSWL4J16pADQOBor0RuMn6JICy8XtrTnEozTZ2Hu5ZyWjjYaOdoogujaR8ISztXRH1IgdECKSrSzgwDnQD/LvfWnaUDYLIu6v4e5tIXRZSpgoKq0shZ84aLGZ2tX1ZM9lav871b1EGCFoVdKRLi4GLeVsKVtnWVK3rAeLOfNBxW93IYygqEhGywP1vPPB1pXO6i3WXRBC3BBB68PRCGA+hjKq7lVJuaFquA3qbnbtw1oRKvF 1auuN5M/ SSUVh4N1M6peNrDf0BRe3ZbY1FKIIWmeNqLmpicJKdLh3+my440y4nkaXCIoxEC+mkNjqIGaOFQy+Lx465/2Yfx+9gx0VnaBT0eh44hmrvN1hQmk0rOQMNRETX4Fl4HzoW1on4JQwOOOLpEcGymagyruY8d0uB3Q2gAk7uOBBolzVHuktB1FvGA1oMnqMi82ztXYuQg9lOlaSiN1p6+fWOQDxmaUPmk0ozQY0G8qo1E/M1XGL4x5SJoLX3/DU50hXf0qfTn7IV72Iix6ot14YM3FGupdjANmkG15OY0NUzPFzV5ycLKKyrIiTerP2FMeouJnvgTsGjzXO7IGuvv7KkTtF6Et1e+0Jqqr/8zloYSJiARc18Y6MGKk9jwT6x9fkTdsbW+QHZBYFkvOnmRj4Np/bJSCTv1SS4+s6mqHZqZXYAO7sggLLQ8UcDQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
None
|
expand
|
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index a4441fb77f7c..e4f6790c1638 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1508,7 +1508,7 @@ static int can_do_hugetlb_shm(void) { kgid_t shm_group; shm_group = make_kgid(&init_user_ns, sysctl_hugetlb_shm_group); - return capable(CAP_IPC_LOCK) || in_group_p(shm_group); + return in_group_p(shm_group) || capable(CAP_IPC_LOCK); } static int get_hstate_idx(int page_size_log)