From patchwork Thu Apr 20 08:57:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Brauner X-Patchwork-Id: 85797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp187678vqo; Thu, 20 Apr 2023 02:09:14 -0700 (PDT) X-Google-Smtp-Source: AKy350Y5pSypdyWRxt8zRlV6WrE4q4hRHDTb11hYo/YI9J5UDb1tu45LmBVZa98B5RIAlHQYTMBa X-Received: by 2002:a17:90b:2248:b0:24b:3295:3e23 with SMTP id hk8-20020a17090b224800b0024b32953e23mr1105371pjb.19.1681981754601; Thu, 20 Apr 2023 02:09:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681981754; cv=none; d=google.com; s=arc-20160816; b=dMF+Q/PrIoFpRYaYyrF2+JbLaFcaxUI2+kfgyFAeCJX+h/hTufDnzyXhl1CyEiomMM gJ+geLaEK7dGwl5Gy/C5uLu7efjJmEAtHqDcbu+LvXDzL2O0GYh+wkyR58ck2lkrpxbq 47aII1l1Fmu35scPS986ty7x95CRw+Qhv6y0XsjKvofMnHy54Rpx0mQ/AvAf/zsYuhYc mMW8EuXGmRoWiNMxgdHsAq48hoP9DB83rbCcIob+bPHhnuET4+KSAikyuc9D5nhE5opr Q6K1HCuAEBkXJ5eJmDqk0w58tsSY0Im+j8fKvruFQJXyg1wGXdhUJWEgT8RUapvAt2Uf DJmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=58wuWoHREGLSkS27xEX4CJklEJs4T1RLOFqkan956qI=; b=TbwYgmm3GpICZAXU3iQOiSW5x15dwravSpCdS4pl0QyCxpi2y7+hlw8An0bK1BbUin jf4pGLWSh1X2L8GjEwWdGGPc/1JJ9Pj3Og1BUw6JFVCvi+Ndf/679K+NpaL0PoJdTSS4 po4dVe91YLWQ6LcmV6U0TVT6nysll7mEHpsLnmeqoPW41F+efjJFmGrC6hPyy3+tfxmJ IRAjBpvQ1MjvDAGDZjj53z27N8xTH3/WJeCKvZlV5ctE/gl33UVaS/qlOSwD11RLOLcX TKp4YHWkVbC2Gi86vKa1Q46YdPEp0si7UPZ0MQfQ0WgfQNeSboXv1lnu3Qm1A5QGyN7d fv8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b2myTk6B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n9-20020a170902d2c900b001a6eba7583csi1318754plc.633.2023.04.20.02.09.02; Thu, 20 Apr 2023 02:09:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=b2myTk6B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234386AbjDTJD4 (ORCPT + 99 others); Thu, 20 Apr 2023 05:03:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232546AbjDTJDB (ORCPT ); Thu, 20 Apr 2023 05:03:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 071629ED8 for ; Thu, 20 Apr 2023 01:58:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6570960DC4 for ; Thu, 20 Apr 2023 08:58:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83BA0C433EF; Thu, 20 Apr 2023 08:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681981080; bh=KW/cOzzz0VeUWtRrIVVV/Jvq1YUVpWtNqR0e3LlJHpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b2myTk6B5eriGxsU6/qGzfQumjVeH2e3afVEFIWlU8rfbkviTzxfnFOTr+a1fbLh8 zWtjEyNyqdlnbur6mK5cefIAqwk90StKTjTec61TpMor9Xap1uHWxS5W/22bMVHn0E My3fk/2N/ilyUoS/47lxI5LJL1h7Eta0vkO6AfnQ4lkq2Q9eTOrCYGHKLzLSFZNVyu 1xuwf6mcGZ9ndyzuAsgC19Sx5DCwNqszhddBEK3f1ncrVhlmhT46kWXt+KaEpWmrXJ bP7Ht/9+Q95uQ9N8JkGbnU8WreQSsdGYAEM2bxB6u7NFj6zniS8LX9vFSh/FnHBWD8 lgMm12YTBcYCw== From: Christian Brauner To: Luis Chamberlain , Hugh Dickins Cc: Christian Brauner , akpm@linux-foundation.org, willy@infradead.org, linux-mm@kvack.org, p.raghav@samsung.com, da.gomez@samsung.com, a.manzanares@samsung.com, dave@stgolabs.net, yosryahmed@google.com, keescook@chromium.org, patches@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] shmem: restrict noswap option to initial user namespace Date: Thu, 20 Apr 2023 10:57:43 +0200 Message-Id: <20230420-faxen-advokat-40abb4c1a152@brauner> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=973; i=brauner@kernel.org; h=from:subject:message-id; bh=KW/cOzzz0VeUWtRrIVVV/Jvq1YUVpWtNqR0e3LlJHpU=; b=owGbwMvMwCU28Zj0gdSKO4sYT6slMaQ4/CtY+P1BygbWTxsmz2v3mbW68tTFF9vkznTv/rC0+Fq8 kMSC6R2lLAxiXAyyYoosDu0m4XLLeSo2G2VqwMxhZQIZwsDFKQATOdTB8D8nUVBgesz9L2museLMgc rL8zcymz6qnLdhWmCKaJrYpHcMv5h3cMz02syXubEt6dTWisvnC8/H9OUImU3acTB4f4qbJB8A X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763685700119354374?= X-GMAIL-MSGID: =?utf-8?q?1763685700119354374?= Prevent tmpfs instances mounted in an unprivileged namespaces from evading accounting of locked memory by using the "noswap" mount option. Cc: Luis Chamberlain Reported-by: Hugh Dickins Link: https://lore.kernel.org/lkml/79eae9fe-7818-a65c-89c6-138b55d609a@google.com Signed-off-by: Christian Brauner Reviewed-by: Luis Chamberlain --- mm/shmem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/shmem.c b/mm/shmem.c index 787e83791eb5..21ce9b26bb4d 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3571,6 +3571,10 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) ctx->seen |= SHMEM_SEEN_INUMS; break; case Opt_noswap: + if ((fc->user_ns != &init_user_ns) || !capable(CAP_SYS_ADMIN)) { + return invalfc(fc, + "Turning off swap in unprivileged tmpfs mounts unsupported"); + } ctx->noswap = true; ctx->seen |= SHMEM_SEEN_NOSWAP; break;