Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753012Ab2KTUmp (ORCPT ); Tue, 20 Nov 2012 15:42:45 -0500 Received: from smtp.outflux.net ([198.145.64.163]:58689 "EHLO smtp.outflux.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752866Ab2KTUmn (ORCPT ); Tue, 20 Nov 2012 15:42:43 -0500 Date: Tue, 20 Nov 2012 12:42:38 -0800 From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , ellyjones@chromium.org, Kay Sievers , Roland Eggner Subject: [PATCH v2] devtmpfs: mount with noexec and nosuid Message-ID: <20121120204238.GA19554@www.outflux.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-HELO: www.outflux.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2997 Lines: 93 Since devtmpfs is writable, make the default noexec,nosuid as well. This protects from the case of a privileged process having an arbitrary file write flaw and an argumentless arbitrary execution (i.e. it would lack the ability to run "mount -o remount,exec,suid /dev"). Cc: ellyjones@chromium.org Cc: Kay Sievers Cc: Roland Eggner Signed-off-by: Kees Cook --- v2: - use CONFIG_DEVTMPFS_SAFE to wrap the logic. --- drivers/base/Kconfig | 12 ++++++++++++ drivers/base/devtmpfs.c | 12 ++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index b34b5cd..a37fcf2 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -56,6 +56,18 @@ config DEVTMPFS_MOUNT rescue mode with init=/bin/sh, even when the /dev directory on the rootfs is completely empty. +config DEVTMPFS_SAFE + bool "Use nosuid,noexec mount options on devtmpfs" + depends on DEVTMPFS + help + This instructs the kernel to include the MS_NOEXEC and + MS_NOSUID mount flags when mounting devtmpfs. This prevents + certain kinds of code-execution attacks on embedded platforms. + + Notice: If enabled, things like /dev/mem cannot be mmapped + with the PROT_EXEC flag. This can break, for example, non-KMS + video drivers. + config STANDALONE bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL default y diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index 147d1a4..bf85fbf 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -340,6 +340,10 @@ static int handle_remove(const char *nodename, struct device *dev) int devtmpfs_mount(const char *mntdir) { int err; + int mflags = MS_SILENT; +#ifdef CONFIG_DEVTMPFS_SAFE + mflags |= MS_NOEXEC | MS_NOSUID; +#endif if (!mount_dev) return 0; @@ -347,7 +351,7 @@ int devtmpfs_mount(const char *mntdir) if (!thread) return 0; - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL); + err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", mflags, NULL); if (err) printk(KERN_INFO "devtmpfs: error mounting %i\n", err); else @@ -369,10 +373,14 @@ static int devtmpfsd(void *p) { char options[] = "mode=0755"; int *err = p; + int mflags = MS_SILENT; +#ifdef CONFIG_DEVTMPFS_SAFE + mflags |= MS_NOEXEC | MS_NOSUID; +#endif *err = sys_unshare(CLONE_NEWNS); if (*err) goto out; - *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options); + *err = sys_mount("devtmpfs", "/", "devtmpfs", mflags, options); if (*err) goto out; sys_chdir("/.."); /* will traverse into overmounted root */ -- 1.7.9.5 -- Kees Cook Chrome OS Security -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/