summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-16 03:05:18 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-16 03:05:17 -0800
commitbd552c4107722e3c88b572982e9f7a269f52ab47 (patch)
treedf5f267a6a892aa96755268ce71c76e5233ff848 /fs
parent007f16c6873d66466059c4487461d473ecb8fdf6 (diff)
parent92ef02fbb0f1fc2a120b7a5327964bf7ba16fc05 (diff)
Merge "BACKPORT: aio: mark AIO pseudo-fs noexec"
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 81761a4290d5..24493f07fb40 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -256,6 +256,7 @@ static int __init aio_setup(void)
aio_mnt = kern_mount(&aio_fs);
if (IS_ERR(aio_mnt))
panic("Failed to create aio fs mount.");
+ aio_mnt->mnt_flags |= MNT_NOEXEC;
kiocb_cachep = KMEM_CACHE(aio_kiocb, SLAB_HWCACHE_ALIGN|SLAB_PANIC);
kioctx_cachep = KMEM_CACHE(kioctx,SLAB_HWCACHE_ALIGN|SLAB_PANIC);