From patchwork Mon Jan 15 15:46:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Gladkov X-Patchwork-Id: 188232 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp1787058dyc; Mon, 15 Jan 2024 07:55:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpwRT+lGDzLvTaqYZY1pKC8QfkVkZCOd12ER102UG8+HoJKPk0o52Y6tRDDeSjWt3T7z4n X-Received: by 2002:a17:90a:2bc2:b0:28e:2444:597e with SMTP id n2-20020a17090a2bc200b0028e2444597emr1366074pje.37.1705334146847; Mon, 15 Jan 2024 07:55:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705334146; cv=none; d=google.com; s=arc-20160816; b=r6BadOn+ThHAKRftaKcxZdNYQeVPQas9umytE0/ahA4JGNtcT+gppTruYGEF+cUC0z LVptz3/j3Z0oKgjpj9+zmRRlM3ynZuQ0Lo+mEiuq6DzwyAMdifbCHP6A95rvU6e+LiKl gSG88Agvli3jTZe2FF7MfFuFOxgYAlH6P6KcinmQ18+LjBVJwdMVOGbIYmxRVRkE4p+i A86RgSsExsq5Xo3XutIYalUi/0CvHUf4vpP7q0t4qSP7GQ3wrIGbpAGQIHuPaOJK5FjQ bABImNZ85jO62ekFnJNpat8RDk3nOBzyyfEz8POEXhjMZHgGOaErqek+FUZ96Wjhd9q+ 4GeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Atg2TFpCiKAfpvoEitluBziGAvlHwW9+Bw/DYrVfHlw=; fh=zd5tx2mrKpeDSq8i29C8fPinxTee353gUXgQsj9s1wU=; b=bf7KsDzV1TvPzSI57xSCIkxlkq9k758FEVQr8u2mqgTuwDWJ6CCnVlp8kNbxx0OBOB hL6JS3GB6U5pN7DhG9+skMzgRo/NWcaoAZ0cIsZV4zXR6EL0/niPEv1d54Nxif4egfaN ijvtU5qcTxOBq7JJtwVaqTjNTmj8DlSCfZreVGVUn51YlaJVOaBTAFE9BkbjwFUNjCmV qUGXe/fZIkKD6TL327fSDcoqrvtemjy7UbLD6TS6LUL3GWbirN9qzJHH4y7Z5uzXpSq1 ps169fbn8JMnr5k5sy/24ZaoGEUbm7L8wdx5jCoDdPGPr1A6OQ83C/phRqIlgNPBlNhx /ApQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-26193-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26193-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id p8-20020a17090ab90800b0028e69509986si457058pjr.68.2024.01.15.07.55.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 07:55:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-26193-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-26193-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-26193-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 54B3C283423 for ; Mon, 15 Jan 2024 15:49:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 701F917BC0; Mon, 15 Jan 2024 15:48:31 +0000 (UTC) Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95BA317757 for ; Mon, 15 Jan 2024 15:48:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=kernel.org Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-107-_RghfqN5O6OKasyAw_gn3g-1; Mon, 15 Jan 2024 10:47:16 -0500 X-MC-Unique: _RghfqN5O6OKasyAw_gn3g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E73FE2825BBF; Mon, 15 Jan 2024 15:47:15 +0000 (UTC) Received: from localhost.redhat.com (unknown [10.45.226.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B36F3C25; Mon, 15 Jan 2024 15:47:14 +0000 (UTC) From: Alexey Gladkov To: LKML , Linux Containers Cc: Andrew Morton , Christian Brauner , "Eric W . Biederman" , Joel Granados , Kees Cook , Luis Chamberlain , Manfred Spraul Subject: [RESEND PATCH v3 3/3] sysctl: Allow to change limits for posix messages queues Date: Mon, 15 Jan 2024 15:46:43 +0000 Message-ID: <6ad67f23d1459a4f4339f74aa73bac0ecf3995e1.1705333426.git.legion@kernel.org> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788172458212863291 X-GMAIL-MSGID: 1788172458212863291 All parameters of posix messages queues (queues_max/msg_max/msgsize_max) end up being limited by RLIMIT_MSGQUEUE. The code in mqueue_get_inode is where that limiting happens. The RLIMIT_MSGQUEUE is bound to the user namespace and is counted hierarchically. We can allow root in the user namespace to modify the posix messages queues parameters. Signed-off-by: Alexey Gladkov Link: https://lkml.kernel.org/r/7eb21211c8622e91d226e63416b1b93c079f60ee.1663756794.git.legion@kernel.org Signed-off-by: Eric W. Biederman --- ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c index ebb5ed81c151..21fba3a6edaf 100644 --- a/ipc/mq_sysctl.c +++ b/ipc/mq_sysctl.c @@ -12,6 +12,7 @@ #include #include #include +#include static int msg_max_limit_min = MIN_MSGMAX; static int msg_max_limit_max = HARD_MSGMAX; @@ -76,8 +77,43 @@ static int set_is_seen(struct ctl_table_set *set) return ¤t->nsproxy->ipc_ns->mq_set == set; } +static void mq_set_ownership(struct ctl_table_header *head, + struct ctl_table *table, + kuid_t *uid, kgid_t *gid) +{ + struct ipc_namespace *ns = + container_of(head->set, struct ipc_namespace, mq_set); + + kuid_t ns_root_uid = make_kuid(ns->user_ns, 0); + kgid_t ns_root_gid = make_kgid(ns->user_ns, 0); + + *uid = uid_valid(ns_root_uid) ? ns_root_uid : GLOBAL_ROOT_UID; + *gid = gid_valid(ns_root_gid) ? ns_root_gid : GLOBAL_ROOT_GID; +} + +static int mq_permissions(struct ctl_table_header *head, struct ctl_table *table) +{ + int mode = table->mode; + kuid_t ns_root_uid; + kgid_t ns_root_gid; + + mq_set_ownership(head, table, &ns_root_uid, &ns_root_gid); + + if (uid_eq(current_euid(), ns_root_uid)) + mode >>= 6; + + else if (in_egroup_p(ns_root_gid)) + mode >>= 3; + + mode &= 7; + + return (mode << 6) | (mode << 3) | mode; +} + static struct ctl_table_root set_root = { .lookup = set_lookup, + .permissions = mq_permissions, + .set_ownership = mq_set_ownership, }; bool setup_mq_sysctls(struct ipc_namespace *ns)