From patchwork Fri Dec 2 01:33:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 28649 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp588130wrr; Thu, 1 Dec 2022 17:36:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf5NEzHIMFT94qONdaxoQ4Vfz6jXU1qlbpyIVRUD546XkbNaBl8Uygd1xSpWgrwHf8IjZwLP X-Received: by 2002:aa7:820e:0:b0:573:ab15:1d6f with SMTP id k14-20020aa7820e000000b00573ab151d6fmr56247202pfi.9.1669945012954; Thu, 01 Dec 2022 17:36:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669945012; cv=none; d=google.com; s=arc-20160816; b=GwGumr43reU4O4CzEpVOs7isEIYQ0wVYsvnqOB6AgdSsRjx66LJAXIHAixPCclyOHn qoonJfM0F/yd52kqHle2PJafkPdTiF9GGiClpuZGCOtxeu2AwIGYLqFr/AKUG5Pdmy/z 4pBmYwnu2rdue7twyBM+Lc+l114HRrpgFwZFbJm5pVuy4vUE6MeELGo6SWdCdljP2P+U hT8sn93qilcTSXustbYbgY/7DRUwc7dozqOQx99zvF7u7Xa1SD0nw7V+UsvG4plZgstN bXCIsXmqZsHHIIfUHxh9q9fV7x50zE96BvjRNhEdpmc+Qj1Jv3Wue+vTiSdL3TAUMSIu T0ew== 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=EKvOSTS2b6VDSFBkCr00yngSZIwFKUNQNHkXo09hZmA=; b=FJt6ZEkA6iZvsTHEMLkBreXH3ULHPcU2shRUf1aNVVNd+/R2wVlLBcwEtmdVuhzeqd tageuygbzxR5OcIdfI7rpgT6diMbZcrYNyIxw1oX5EjpRSvGrVL01g1c7BOJzjuK8KCD EPMU43NYCTqUpslOy/eW4QD7nK1YsAjoiOP0tk8LQGTO/Na33p1jOIekOn83KOaA/MpJ DFt/Fv17vAZYfODWp5clI8H4YxstWjmUYAT03muBuCiOhUf9SNNoUhdyKgCcVRTyQiT0 diGnZ+JtKhqbXHjbI6edOTDUuZPRAqXoIdIReyBVj8TV8d86MYDJN6jY8iX3WdhkIt/S dJbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UItq22eT; 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=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u2-20020a6540c2000000b004703be83ebesi5229343pgp.79.2022.12.01.17.36.39; Thu, 01 Dec 2022 17:36:52 -0800 (PST) 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=@chromium.org header.s=google header.b=UItq22eT; 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=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231583AbiLBBfq (ORCPT + 99 others); Thu, 1 Dec 2022 20:35:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231387AbiLBBfn (ORCPT ); Thu, 1 Dec 2022 20:35:43 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE95AD2DAA for ; Thu, 1 Dec 2022 17:35:42 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id b11so3551560pjp.2 for ; Thu, 01 Dec 2022 17:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EKvOSTS2b6VDSFBkCr00yngSZIwFKUNQNHkXo09hZmA=; b=UItq22eTvou88l9SCVXNaNsYoaOY9tw3+2M7EbNGiX2xZq2K//Xz1mtQHjpjfA/i1u Fy5TVWpp7cRYhpc6qBj0wqXiQH0GmOtyo0/xiEzUgNrylUsAkDT59VZVha/4ZqUcQAZc 42UGiUeVciD+24zLL+Vawl2Fhzu21OK6hqpvY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EKvOSTS2b6VDSFBkCr00yngSZIwFKUNQNHkXo09hZmA=; b=Sn0zqJoZPaj+TsAcp39YqBCjbVmPkDUm3LdhvFvgXRFnZe+oyiTCsS8JH8GnEFUXIc UR5hM10euq8+b2aUflNpp5+Qrx8+pCmWiuZxcHvsWS5p4LcKBq9DgZ7LfwXb5LGNGtHW yfiD919DzGA6noVaTDvDojxCbZMoE8ESORqmKA7GS4KrtHxGdWOlyrfIusunX0pZ+c3J oO0PUDAgt26l05KOnVy/TqPz07bWycbaNrRPPa7oWO2JvSIH3NEw5ATs17CmyPfJ8ff8 hdYsNrVWoChZXziBO6ilwQlV9Ld8h971xFC2/XvWDq4AOAcj6VzL8B5VYGtvBnZBH7MV oHxg== X-Gm-Message-State: ANoB5pnRHgXmaBJa3HvYpPKulwLGabwGQzOmYjEbKrY2thhzMqu8R5gz meyNPQqpEWzdwYmbdWrtrazFUQ== X-Received: by 2002:a17:902:bf01:b0:186:8bca:1d50 with SMTP id bi1-20020a170902bf0100b001868bca1d50mr51764880plb.158.1669944942307; Thu, 01 Dec 2022 17:35:42 -0800 (PST) Received: from jeffxud.c.googlers.com.com (30.202.168.34.bc.googleusercontent.com. [34.168.202.30]) by smtp.gmail.com with ESMTPSA id s13-20020a65690d000000b00477fb27eaddsm3074241pgq.63.2022.12.01.17.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 17:35:41 -0800 (PST) From: jeffxu@chromium.org To: skhan@linuxfoundation.org, keescook@chromium.org Cc: akpm@linux-foundation.org, dmitry.torokhov@gmail.com, dverkamp@chromium.org, hughd@google.com, jeffxu@google.com, jorgelo@chromium.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, mnissler@chromium.org, jannh@google.com, linux-hardening@vger.kernel.org, Jeff Xu Subject: [PATCH v3] mm/memfd: add F_SEAL_EXEC Date: Fri, 2 Dec 2022 01:33:59 +0000 Message-Id: <20221202013404.163143-2-jeffxu@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog In-Reply-To: <20221202013404.163143-1-jeffxu@google.com> References: <20221202013404.163143-1-jeffxu@google.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable 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?1751064262143874134?= X-GMAIL-MSGID: =?utf-8?q?1751064262143874134?= From: Daniel Verkamp The new F_SEAL_EXEC flag will prevent modification of the exec bits: written as traditional octal mask, 0111, or as named flags, S_IXUSR | S_IXGRP | S_IXOTH. Any chmod(2) or similar call that attempts to modify any of these bits after the seal is applied will fail with errno EPERM. This will preserve the execute bits as they are at the time of sealing, so the memfd will become either permanently executable or permanently un-executable. Co-developed-by: Jeff Xu Signed-off-by: Jeff Xu Signed-off-by: Daniel Verkamp Reviewed-by: Kees Cook --- include/uapi/linux/fcntl.h | 1 + mm/memfd.c | 2 ++ mm/shmem.c | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/include/uapi/linux/fcntl.h b/include/uapi/linux/fcntl.h index 2f86b2ad6d7e..e8c07da58c9f 100644 --- a/include/uapi/linux/fcntl.h +++ b/include/uapi/linux/fcntl.h @@ -43,6 +43,7 @@ #define F_SEAL_GROW 0x0004 /* prevent file from growing */ #define F_SEAL_WRITE 0x0008 /* prevent writes */ #define F_SEAL_FUTURE_WRITE 0x0010 /* prevent future writes while mapped */ +#define F_SEAL_EXEC 0x0020 /* prevent chmod modifying exec bits */ /* (1U << 31) is reserved for signed error codes */ /* diff --git a/mm/memfd.c b/mm/memfd.c index 08f5f8304746..4ebeab94aa74 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -147,6 +147,7 @@ static unsigned int *memfd_file_seals_ptr(struct file *file) } #define F_ALL_SEALS (F_SEAL_SEAL | \ + F_SEAL_EXEC | \ F_SEAL_SHRINK | \ F_SEAL_GROW | \ F_SEAL_WRITE | \ @@ -175,6 +176,7 @@ static int memfd_add_seals(struct file *file, unsigned int seals) * SEAL_SHRINK: Prevent the file from shrinking * SEAL_GROW: Prevent the file from growing * SEAL_WRITE: Prevent write access to the file + * SEAL_EXEC: Prevent modification of the exec bits in the file mode * * As we don't require any trust relationship between two parties, we * must prevent seals from being removed. Therefore, sealing a file diff --git a/mm/shmem.c b/mm/shmem.c index c1d8b8a1aa3b..e18a9cf9d937 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1085,6 +1085,12 @@ static int shmem_setattr(struct user_namespace *mnt_userns, if (error) return error; + if ((info->seals & F_SEAL_EXEC) && (attr->ia_valid & ATTR_MODE)) { + if ((inode->i_mode ^ attr->ia_mode) & 0111) { + return -EPERM; + } + } + if (S_ISREG(inode->i_mode) && (attr->ia_valid & ATTR_SIZE)) { loff_t oldsize = inode->i_size; loff_t newsize = attr->ia_size;