From patchwork Tue Dec 6 15:23:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Xu X-Patchwork-Id: 30380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2889779wrr; Tue, 6 Dec 2022 07:33:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf6YomQkr6N/Di0Zc3eRPr8srSsAraDeD/ePHJ+z507hhpTvDdS/4ABbJZhATmLW85jjShAj X-Received: by 2002:a17:902:a50a:b0:189:dedd:a4f9 with SMTP id s10-20020a170902a50a00b00189dedda4f9mr7880329plq.99.1670340834874; Tue, 06 Dec 2022 07:33:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670340834; cv=none; d=google.com; s=arc-20160816; b=iLsPdizZKcEubabsBSvrGcD//9LtC3CwsSeHjWKkDQXLLcxdai6IysY/9DHxNthSU4 IFqsZCUVPGjwNd16ZYmpvtDCvNLOC0bGsvdQjzopAra2vr45cicnnMcVrLwleft2tJCn b4YxokpNndkCPJPLSNuylvyMQ0yEbevS1dIz3EqVnn2ceUKXkNAVSClp+ueXzZLcHlms DelNFaneNj7Wr0LBQgjFUo1hBuMr3Xg5+IidNbb7w6l9KJQ9CWi3xPOfn4MgPvO+CxXB SiCJAfXTxMEbI6zN8Zjp+T24GJmJ+05N8CS9IieF5Tnj9NHed7trcmbf8XSDgPIe6iVT FJPw== 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=FWkrRAknVBR+DtqNNWTgcHsNLwaDUPfHC+NIWe1Ak98=; b=MpqhzJnVpOITkj10INKx78OSt+2Oh2+0AKWjJHvBEqI6rAbdMY16rGdqcyJ/i/dnEb d2qgGesu618wDxmjNhWdyzDuVgXqgAWILwpeR+TyY4kFOAion90GS5WaITx1Y/xcQFfE i/1S6IJHs1xavKoOk/WMiQi2GOviwzfptjH+3N0wrFoEH5vNiQZifKVdiDKrLF04Il06 rLXatPOh24dnCJ1ZMyyRtcS3/92dTr5d0k+dFhN2pWbirnRg0evQeyZSYf96Eb32dF4g 5M/6LA9ox57UQe+ruIZGfwihxT797rSU3+EJC6x5PhbUaslzxUhkbP4sIzPpBHyfAWbJ QPJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Fth6Ljyi; 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 q14-20020a631f4e000000b0042b4defce13si16905567pgm.344.2022.12.06.07.33.37; Tue, 06 Dec 2022 07:33:54 -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=Fth6Ljyi; 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 S234873AbiLFPYN (ORCPT + 99 others); Tue, 6 Dec 2022 10:24:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234156AbiLFPYE (ORCPT ); Tue, 6 Dec 2022 10:24:04 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55CF5ED for ; Tue, 6 Dec 2022 07:24:04 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id 4so14272836pli.0 for ; Tue, 06 Dec 2022 07:24:04 -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=FWkrRAknVBR+DtqNNWTgcHsNLwaDUPfHC+NIWe1Ak98=; b=Fth6Ljyi3O8BqZBrAER8NKJhbiS+1IWC8mWNeQeNKwWGRBfLBRBzE1IapAmq3O7HcY vnuXFwZthnjSaauPCurPg+gSgg1rpuOvtLGCFKszkVtulVawZm49XGMeiVaH4mB0e4lk 3qTh0tcbpMEm0Y6GAcorBW/EW1GlUGjutAtcY= 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=FWkrRAknVBR+DtqNNWTgcHsNLwaDUPfHC+NIWe1Ak98=; b=v6jPvxYLJQrPAZBqF1XK7Fwhm+onsKX3jH59kpAbSTFXIJDYJfVBqTKjLdeVNTrL0Q hb+WkX9GmwxXEhu29CqI7xUprhUchZr/d9hLbOh4pYzQaG7A50boJdxV1q1B0/Dm5Ovz lN7uuNGhU0e9XZ0WO3f/sULVQBXCpbhutqEewOicyi0UfSLWIo0CM9t25h7YXabkpe3J r8BpEudlBL/EWwjt/mtSNt3/1zqIzGu6W8IOC1TuDnWbD3nF80rsg8mVccKAipZRliJC kCreXKyAdJ0EnERNhax0Jy7qiPQF+PqFIf5rW6/ZfCMehvUq3Eb2EpNAFywSBCBXs2VG D1YA== X-Gm-Message-State: ANoB5pmvSNmYyFF9A+DLTmcfpCGvzMNdR8JtAWMpCTn9qL4FRQ0twrEI u8bSNbenOgGm9Y2WGd48DEeOpg== X-Received: by 2002:a17:90a:6983:b0:21a:a0f:6acc with SMTP id s3-20020a17090a698300b0021a0a0f6accmr1008574pjj.77.1670340243766; Tue, 06 Dec 2022 07:24:03 -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 r25-20020a635d19000000b0046b1dabf9a8sm10004686pgb.70.2022.12.06.07.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 07:24:03 -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, jannh@google.com, linux-hardening@vger.kernel.org, Jeff Xu Subject: [PATCH v5 1/6] mm/memfd: add F_SEAL_EXEC Date: Tue, 6 Dec 2022 15:23:53 +0000 Message-Id: <20221206152358.1966099-2-jeffxu@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog In-Reply-To: <20221206152358.1966099-1-jeffxu@google.com> References: <20221206152358.1966099-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?1751479311221144460?= X-GMAIL-MSGID: =?utf-8?q?1751479311221144460?= 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. Signed-off-by: Daniel Verkamp Co-developed-by: Jeff Xu Signed-off-by: Jeff Xu --- 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;