Message ID | 20230630031721.623955-2-jeffxu@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10070995vqr; Thu, 29 Jun 2023 20:20:53 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5R4pV5gfmMabsr0bRo14YkEG6dJS7+vXlzpMCFek1XVpdEYnIl1oiad9/iJtfLIL3m5f40 X-Received: by 2002:a05:6a20:8e08:b0:121:84ce:c629 with SMTP id y8-20020a056a208e0800b0012184cec629mr2290358pzj.0.1688095253648; Thu, 29 Jun 2023 20:20:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688095253; cv=none; d=google.com; s=arc-20160816; b=Ypv70MF39rVg2LI/5KSeFU88hwSq55o3m7ldUCYxCJd77Zu3eWU5OKkPnuRwwFrXb8 xYMGdaQsvWAahzI1UPpzS09YyMzPb9UIfJMoH3QSDBRrq0azZWQyMZkmsUsA8eJDfdNV 9fxRZoN7yKCiPfrfhKm5qjgqo0SbSzJu8YbT8cZpRHIQxIXEUK7X1vCJQ/C1nT6zcUYe sOtqtPohzXWB05xs1RyyDtmG74nuMgPpxalfKsNsAIpH6rkTlm3acdamEiLDLQf1vTYU Wy3KcUJx28ihpVKEFGpmvk9cGw9qFUgetoZOdshvew40NWDgcT3j9V8Bbq15LRONLnrR lfUA== 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=53ZMdGhNmZ+BOpMUbgSFLyEDTkK0ZHteXsorexZvGcc=; fh=+wFwOUChBMDyUEg63FIGralHY9qRggLvyZTCULGydUc=; b=T7oiHa6oOLH5Fs1kyTlrQxEAyekY0zGI5TRz/ZPR34xp3q/Vjr4kGP8qGhFdftN+uD Nn6SNLQ2mbNHpSRshl19vQiVlXHvB6av3q1HI/1FeIeVAvxws2RjH04szPcA33YoaNj7 zJ3/iCeO3cVjFpigVJyRNInrPZBls8pRAt6N+zO45yImACGpVwnX9uJ2Xxooi/ikQSOa akGigN8mlhpd548+eHbfXH785/V1iKYbh+uwZx4a9Sm7v3Lnvq11ARry1lMANbfWmc+k d9UVKPNDteR0zYnZ7jb33LS1fT6MHZ1ivhQ2QHLGVzLSCKPNShoSEkYINiLNCeDmQzG5 iHNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Hhds97GU; 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 ca17-20020a056a00419100b0068219eb27aesi2595932pfb.182.2023.06.29.20.20.40; Thu, 29 Jun 2023 20:20:53 -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=@chromium.org header.s=google header.b=Hhds97GU; 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 S231953AbjF3DRk (ORCPT <rfc822;ivan.orlov0322@gmail.com> + 99 others); Thu, 29 Jun 2023 23:17:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231655AbjF3DRb (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 29 Jun 2023 23:17:31 -0400 Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CAF53595 for <linux-kernel@vger.kernel.org>; Thu, 29 Jun 2023 20:17:30 -0700 (PDT) Received: by mail-oi1-x235.google.com with SMTP id 5614622812f47-39ecf031271so1025431b6e.1 for <linux-kernel@vger.kernel.org>; Thu, 29 Jun 2023 20:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1688095049; x=1690687049; 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=53ZMdGhNmZ+BOpMUbgSFLyEDTkK0ZHteXsorexZvGcc=; b=Hhds97GUYBeppbOwT50AZutzB1nVVfNLRInAfnNP58IkESH6yufdJYjjXoko1dy9G+ 7Ur8NWUwfJrbcpQSpTt286069+coFcb6LHT+Hpu/39T4cIbHcx3ohwZzEN7MljiB4mGX nGNyBGTlMBhsV2p04QbZotAIplV3r6a4qLE4w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688095049; x=1690687049; 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=53ZMdGhNmZ+BOpMUbgSFLyEDTkK0ZHteXsorexZvGcc=; b=gozz+SuJqklqtaoUskuypot5GOrxarSiyXG4A6QsJVYZcMwnNYhXmTaRq6wA+q+zp1 0n0vvXkrYW88oBf0aE9LLkOCQsOshUQ1FVWNOWUkiSqqT0eopf9UNjxjUihuHJiEoPCE 3GI2tJ4qssErx1AebM6iQfBw8ECmcvBj6oNCQydHJWe0AEacHKdfKP/trx40KuOiIKo9 ZSZlhNF/Q/5zKQ2qUUoy9wzaG9yDku05ZtJHr091sPdZVRdBJMwTXa0qPZRjE8thDU4j RjdloJrDX652IQgQx07jIkMIEVi0IQfrKN2+02M8/sbxSiy6n528Xmvp5etfeOYgD0o4 i0dQ== X-Gm-Message-State: AC+VfDwjZtVJoSSvKP0nIlByGvFL+HBmGV3sHH8pfo+jMzgtQPzb0JVd vpfxvBoar6vS0SmMvXebLRoNwQ== X-Received: by 2002:a05:6808:1921:b0:3a3:7e8f:2f2a with SMTP id bf33-20020a056808192100b003a37e8f2f2amr1773186oib.11.1688095049673; Thu, 29 Jun 2023 20:17:29 -0700 (PDT) Received: from localhost (183.43.230.35.bc.googleusercontent.com. [35.230.43.183]) by smtp.gmail.com with UTF8SMTPSA id x24-20020aa784d8000000b0065438394fa4sm1622577pfn.90.2023.06.29.20.17.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Jun 2023 20:17:29 -0700 (PDT) From: jeffxu@chromium.org To: skhan@linuxfoundation.org, keescook@chromium.org Cc: akpm@linux-foundation.org, dmitry.torokhov@gmail.com, dverkamp@chromium.org, asmadeus@codewreck.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, linux-security-module@vger.kernel.org Subject: [PATCH v1 1/2] mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED Date: Fri, 30 Jun 2023 03:17:19 +0000 Message-ID: <20230630031721.623955-2-jeffxu@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <20230630031721.623955-1-jeffxu@google.com> References: <20230630031721.623955-1-jeffxu@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770096168802892596?= X-GMAIL-MSGID: =?utf-8?q?1770096168802892596?= |
Series |
mm/memfd: fix sysctl MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED
|
|
Commit Message
Jeff Xu
June 30, 2023, 3:17 a.m. UTC
From: Jeff Xu <jeffxu@google.com> When vm.memfd_noexec is 2 (MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED), memfd_create(.., MFD_EXEC) should fail. This complies with how MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED is defined - "memfd_create() without MFD_NOEXEC_SEAL will be rejected" Link:https://lore.kernel.org/linux-mm/CABi2SkXUX_QqTQ10Yx9bBUGpN1wByOi_=gZU6WEy5a8MaQY3Jw@mail.gmail.com/T/ Fixes: 105ff5339f49 ("mm/memfd: add MFD_NOEXEC_SEAL and MFD_EXEC") Reported-by: Dominique Martinet <asmadeus@codewreck.org> Signed-off-by: Jeff Xu <jeffxu@google.com> --- mm/memfd.c | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-)
Comments
Hi, kernel test robot noticed the following build errors: [auto build test ERROR on akpm-mm/mm-everything] url: https://github.com/intel-lab-lkp/linux/commits/jeffxu-chromium-org/mm-memfd-sysctl-fix-MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED/20230630-111827 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/20230630031721.623955-2-jeffxu%40google.com patch subject: [PATCH v1 1/2] mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED config: microblaze-randconfig-r003-20230630 (https://download.01.org/0day-ci/archive/20230630/202306301351.kkbSegQW-lkp@intel.com/config) compiler: microblaze-linux-gcc (GCC) 12.3.0 reproduce: (https://download.01.org/0day-ci/archive/20230630/202306301351.kkbSegQW-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306301351.kkbSegQW-lkp@intel.com/ All errors (new ones prefixed by >>): mm/memfd.c: In function 'sysctl_memfd_noexec': >> mm/memfd.c:273:22: error: 'MEMFD_NOEXEC_SCOPE_EXEC' undeclared (first use in this function) 273 | int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; | ^~~~~~~~~~~~~~~~~~~~~~~ mm/memfd.c:273:22: note: each undeclared identifier is reported only once for each function it appears in mm/memfd.c: In function '__do_sys_memfd_create': >> mm/memfd.c:311:31: error: 'MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL' undeclared (first use in this function) 311 | if (sysctl == MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >> mm/memfd.c:321:43: error: 'MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED' undeclared (first use in this function) 321 | if (flags & MFD_EXEC && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ vim +/MEMFD_NOEXEC_SCOPE_EXEC +273 mm/memfd.c 270 271 static int sysctl_memfd_noexec(void) 272 { > 273 int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; 274 #ifdef CONFIG_SYSCTL 275 struct pid_namespace *ns; 276 277 ns = task_active_pid_ns(current); 278 if (ns) 279 sysctl = ns->memfd_noexec_scope; 280 #endif 281 return sysctl; 282 } 283 284 SYSCALL_DEFINE2(memfd_create, 285 const char __user *, uname, 286 unsigned int, flags) 287 { 288 char comm[TASK_COMM_LEN]; 289 unsigned int *file_seals; 290 struct file *file; 291 int fd, error; 292 char *name; 293 long len; 294 int sysctl = sysctl_memfd_noexec(); 295 296 if (!(flags & MFD_HUGETLB)) { 297 if (flags & ~(unsigned int)MFD_ALL_FLAGS) 298 return -EINVAL; 299 } else { 300 /* Allow huge page size encoding in flags. */ 301 if (flags & ~(unsigned int)(MFD_ALL_FLAGS | 302 (MFD_HUGE_MASK << MFD_HUGE_SHIFT))) 303 return -EINVAL; 304 } 305 306 /* Invalid if both EXEC and NOEXEC_SEAL are set.*/ 307 if ((flags & MFD_EXEC) && (flags & MFD_NOEXEC_SEAL)) 308 return -EINVAL; 309 310 if (!(flags & (MFD_EXEC | MFD_NOEXEC_SEAL))) { > 311 if (sysctl == MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL) 312 flags |= MFD_NOEXEC_SEAL; 313 else 314 flags |= MFD_EXEC; 315 316 pr_warn_once( 317 "memfd_create() without MFD_EXEC nor MFD_NOEXEC_SEAL, pid=%d '%s'\n", 318 task_pid_nr(current), get_task_comm(comm, current)); 319 } 320 > 321 if (flags & MFD_EXEC && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) {
Hi, kernel test robot noticed the following build errors: [auto build test ERROR on akpm-mm/mm-everything] url: https://github.com/intel-lab-lkp/linux/commits/jeffxu-chromium-org/mm-memfd-sysctl-fix-MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED/20230630-111827 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/20230630031721.623955-2-jeffxu%40google.com patch subject: [PATCH v1 1/2] mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED config: hexagon-randconfig-r005-20230630 (https://download.01.org/0day-ci/archive/20230630/202306301435.dpXv0GwQ-lkp@intel.com/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) reproduce: (https://download.01.org/0day-ci/archive/20230630/202306301435.dpXv0GwQ-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306301435.dpXv0GwQ-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from mm/memfd.c:12: In file included from include/linux/pagemap.h:11: In file included from include/linux/highmem.h:12: In file included from include/linux/hardirq.h:11: In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: In file included from include/asm-generic/hardirq.h:17: In file included from include/linux/irq.h:20: In file included from include/linux/io.h:13: In file included from arch/hexagon/include/asm/io.h:334: include/asm-generic/io.h:547:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 547 | val = __raw_readb(PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:560:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 560 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu' 37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) | ^ In file included from mm/memfd.c:12: In file included from include/linux/pagemap.h:11: In file included from include/linux/highmem.h:12: In file included from include/linux/hardirq.h:11: In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: In file included from include/asm-generic/hardirq.h:17: In file included from include/linux/irq.h:20: In file included from include/linux/io.h:13: In file included from arch/hexagon/include/asm/io.h:334: include/asm-generic/io.h:573:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 573 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu' 35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) | ^ In file included from mm/memfd.c:12: In file included from include/linux/pagemap.h:11: In file included from include/linux/highmem.h:12: In file included from include/linux/hardirq.h:11: In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1: In file included from include/asm-generic/hardirq.h:17: In file included from include/linux/irq.h:20: In file included from include/linux/io.h:13: In file included from arch/hexagon/include/asm/io.h:334: include/asm-generic/io.h:584:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 584 | __raw_writeb(value, PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:594:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 594 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:604:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 604 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ >> mm/memfd.c:273:15: error: use of undeclared identifier 'MEMFD_NOEXEC_SCOPE_EXEC' 273 | int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; | ^ >> mm/memfd.c:311:17: error: use of undeclared identifier 'MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL' 311 | if (sysctl == MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL) | ^ >> mm/memfd.c:321:36: error: use of undeclared identifier 'MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED' 321 | if (flags & MFD_EXEC && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) { | ^ 6 warnings and 3 errors generated. vim +/MEMFD_NOEXEC_SCOPE_EXEC +273 mm/memfd.c 270 271 static int sysctl_memfd_noexec(void) 272 { > 273 int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; 274 #ifdef CONFIG_SYSCTL 275 struct pid_namespace *ns; 276 277 ns = task_active_pid_ns(current); 278 if (ns) 279 sysctl = ns->memfd_noexec_scope; 280 #endif 281 return sysctl; 282 } 283 284 SYSCALL_DEFINE2(memfd_create, 285 const char __user *, uname, 286 unsigned int, flags) 287 { 288 char comm[TASK_COMM_LEN]; 289 unsigned int *file_seals; 290 struct file *file; 291 int fd, error; 292 char *name; 293 long len; 294 int sysctl = sysctl_memfd_noexec(); 295 296 if (!(flags & MFD_HUGETLB)) { 297 if (flags & ~(unsigned int)MFD_ALL_FLAGS) 298 return -EINVAL; 299 } else { 300 /* Allow huge page size encoding in flags. */ 301 if (flags & ~(unsigned int)(MFD_ALL_FLAGS | 302 (MFD_HUGE_MASK << MFD_HUGE_SHIFT))) 303 return -EINVAL; 304 } 305 306 /* Invalid if both EXEC and NOEXEC_SEAL are set.*/ 307 if ((flags & MFD_EXEC) && (flags & MFD_NOEXEC_SEAL)) 308 return -EINVAL; 309 310 if (!(flags & (MFD_EXEC | MFD_NOEXEC_SEAL))) { > 311 if (sysctl == MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL) 312 flags |= MFD_NOEXEC_SEAL; 313 else 314 flags |= MFD_EXEC; 315 316 pr_warn_once( 317 "memfd_create() without MFD_EXEC nor MFD_NOEXEC_SEAL, pid=%d '%s'\n", 318 task_pid_nr(current), get_task_comm(comm, current)); 319 } 320 > 321 if (flags & MFD_EXEC && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) {
Hi, kernel test robot noticed the following build errors: [auto build test ERROR on akpm-mm/mm-everything] url: https://github.com/intel-lab-lkp/linux/commits/jeffxu-chromium-org/mm-memfd-sysctl-fix-MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED/20230630-111827 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything patch link: https://lore.kernel.org/r/20230630031721.623955-2-jeffxu%40google.com patch subject: [PATCH v1 1/2] mm/memfd: sysctl: fix MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED config: riscv-randconfig-r042-20230630 (https://download.01.org/0day-ci/archive/20230630/202306301413.VtwSCI1F-lkp@intel.com/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project.git 4a5ac14ee968ff0ad5d2cc1ffa0299048db4c88a) reproduce: (https://download.01.org/0day-ci/archive/20230630/202306301413.VtwSCI1F-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202306301413.VtwSCI1F-lkp@intel.com/ All errors (new ones prefixed by >>): >> mm/memfd.c:273:15: error: use of undeclared identifier 'MEMFD_NOEXEC_SCOPE_EXEC' 273 | int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; | ^ >> mm/memfd.c:311:17: error: use of undeclared identifier 'MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL' 311 | if (sysctl == MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL) | ^ >> mm/memfd.c:321:36: error: use of undeclared identifier 'MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED' 321 | if (flags & MFD_EXEC && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) { | ^ 3 errors generated. vim +/MEMFD_NOEXEC_SCOPE_EXEC +273 mm/memfd.c 270 271 static int sysctl_memfd_noexec(void) 272 { > 273 int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; 274 #ifdef CONFIG_SYSCTL 275 struct pid_namespace *ns; 276 277 ns = task_active_pid_ns(current); 278 if (ns) 279 sysctl = ns->memfd_noexec_scope; 280 #endif 281 return sysctl; 282 } 283 284 SYSCALL_DEFINE2(memfd_create, 285 const char __user *, uname, 286 unsigned int, flags) 287 { 288 char comm[TASK_COMM_LEN]; 289 unsigned int *file_seals; 290 struct file *file; 291 int fd, error; 292 char *name; 293 long len; 294 int sysctl = sysctl_memfd_noexec(); 295 296 if (!(flags & MFD_HUGETLB)) { 297 if (flags & ~(unsigned int)MFD_ALL_FLAGS) 298 return -EINVAL; 299 } else { 300 /* Allow huge page size encoding in flags. */ 301 if (flags & ~(unsigned int)(MFD_ALL_FLAGS | 302 (MFD_HUGE_MASK << MFD_HUGE_SHIFT))) 303 return -EINVAL; 304 } 305 306 /* Invalid if both EXEC and NOEXEC_SEAL are set.*/ 307 if ((flags & MFD_EXEC) && (flags & MFD_NOEXEC_SEAL)) 308 return -EINVAL; 309 310 if (!(flags & (MFD_EXEC | MFD_NOEXEC_SEAL))) { > 311 if (sysctl == MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL) 312 flags |= MFD_NOEXEC_SEAL; 313 else 314 flags |= MFD_EXEC; 315 316 pr_warn_once( 317 "memfd_create() without MFD_EXEC nor MFD_NOEXEC_SEAL, pid=%d '%s'\n", 318 task_pid_nr(current), get_task_comm(comm, current)); 319 } 320 > 321 if (flags & MFD_EXEC && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) {
diff --git a/mm/memfd.c b/mm/memfd.c index e763e76f1106..812750298e8a 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -268,6 +268,19 @@ long memfd_fcntl(struct file *file, unsigned int cmd, unsigned int arg) #define MFD_ALL_FLAGS (MFD_CLOEXEC | MFD_ALLOW_SEALING | MFD_HUGETLB | MFD_NOEXEC_SEAL | MFD_EXEC) +static int sysctl_memfd_noexec(void) +{ + int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; +#ifdef CONFIG_SYSCTL + struct pid_namespace *ns; + + ns = task_active_pid_ns(current); + if (ns) + sysctl = ns->memfd_noexec_scope; +#endif + return sysctl; +} + SYSCALL_DEFINE2(memfd_create, const char __user *, uname, unsigned int, flags) @@ -278,6 +291,7 @@ SYSCALL_DEFINE2(memfd_create, int fd, error; char *name; long len; + int sysctl = sysctl_memfd_noexec(); if (!(flags & MFD_HUGETLB)) { if (flags & ~(unsigned int)MFD_ALL_FLAGS) @@ -294,35 +308,23 @@ SYSCALL_DEFINE2(memfd_create, return -EINVAL; if (!(flags & (MFD_EXEC | MFD_NOEXEC_SEAL))) { -#ifdef CONFIG_SYSCTL - int sysctl = MEMFD_NOEXEC_SCOPE_EXEC; - struct pid_namespace *ns; - - ns = task_active_pid_ns(current); - if (ns) - sysctl = ns->memfd_noexec_scope; - - switch (sysctl) { - case MEMFD_NOEXEC_SCOPE_EXEC: - flags |= MFD_EXEC; - break; - case MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL: + if (sysctl == MEMFD_NOEXEC_SCOPE_NOEXEC_SEAL) flags |= MFD_NOEXEC_SEAL; - break; - default: - pr_warn_once( - "memfd_create(): MFD_NOEXEC_SEAL is enforced, pid=%d '%s'\n", - task_pid_nr(current), get_task_comm(comm, current)); - return -EINVAL; - } -#else - flags |= MFD_EXEC; -#endif + else + flags |= MFD_EXEC; + pr_warn_once( "memfd_create() without MFD_EXEC nor MFD_NOEXEC_SEAL, pid=%d '%s'\n", task_pid_nr(current), get_task_comm(comm, current)); } + if (flags & MFD_EXEC && sysctl >= MEMFD_NOEXEC_SCOPE_NOEXEC_ENFORCED) { + pr_warn_once( + "memfd_create(): MFD_NOEXEC_SEAL is enforced, pid=%d '%s'\n", + task_pid_nr(current), get_task_comm(comm, current)); + return -EACCES; + } + /* length includes terminating zero */ len = strnlen_user(uname, MFD_NAME_MAX_LEN + 1); if (len <= 0)