summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Windsor <dave@nullcore.net>2017-06-10 22:50:34 -0400
committerKees Cook <keescook@chromium.org>2018-01-15 15:07:55 -0500
commit2b06a9e336170d7e3c807c21d5cd85cbc92fff4e (patch)
tree52192f755a97680a92956e00b6651013d69e99be
parent0fc256d3ad76f2552de0db781854506bb623715a (diff)
exofs: Define usercopy region in exofs_inode_cache slab cache
The exofs short symlink names, stored in struct exofs_i_info.i_data and therefore contained in the exofs_inode_cache slab cache, need to be copied to/from userspace. cache object allocation: fs/exofs/super.c: exofs_alloc_inode(...): ... oi = kmem_cache_alloc(exofs_inode_cachep, GFP_KERNEL); ... return &oi->vfs_inode; fs/exofs/namei.c: exofs_symlink(...): ... inode->i_link = (char *)oi->i_data; example usage trace: readlink_copy+0x43/0x70 vfs_readlink+0x62/0x110 SyS_readlinkat+0x100/0x130 fs/namei.c: readlink_copy(..., link): ... copy_to_user(..., link, len); (inlined in vfs_readlink) generic_readlink(dentry, ...): struct inode *inode = d_inode(dentry); const char *link = inode->i_link; ... readlink_copy(..., link); In support of usercopy hardening, this patch defines a region in the exofs_inode_cache slab cache in which userspace copy operations are allowed. This region is known as the slab cache's usercopy region. Slab caches can now check that each dynamically sized copy operation involving cache-managed memory falls entirely within the slab's usercopy region. This patch is modified from Brad Spengler/PaX Team's PAX_USERCOPY whitelisting code in the last public patch of grsecurity/PaX based on my understanding of the code. Changes or omissions from the original code are mine and don't reflect the original grsecurity/PaX code. Signed-off-by: David Windsor <dave@nullcore.net> [kees: adjust commit log, provide usage trace] Cc: Boaz Harrosh <ooo@electrozaur.com> Signed-off-by: Kees Cook <keescook@chromium.org>
-rw-r--r--fs/exofs/super.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 819624cfc8da..e5c532875bb7 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -192,10 +192,13 @@ static void exofs_init_once(void *foo)
192 */ 192 */
193static int init_inodecache(void) 193static int init_inodecache(void)
194{ 194{
195 exofs_inode_cachep = kmem_cache_create("exofs_inode_cache", 195 exofs_inode_cachep = kmem_cache_create_usercopy("exofs_inode_cache",
196 sizeof(struct exofs_i_info), 0, 196 sizeof(struct exofs_i_info), 0,
197 SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD | 197 SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD |
198 SLAB_ACCOUNT, exofs_init_once); 198 SLAB_ACCOUNT,
199 offsetof(struct exofs_i_info, i_data),
200 sizeof_field(struct exofs_i_info, i_data),
201 exofs_init_once);
199 if (exofs_inode_cachep == NULL) 202 if (exofs_inode_cachep == NULL)
200 return -ENOMEM; 203 return -ENOMEM;
201 return 0; 204 return 0;