Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

befs: Define usercopy region in befs_inode_cache slab cache

befs symlink pathnames, stored in struct befs_inode_info.i_data.symlink
and therefore contained in the befs_inode_cache slab cache, need to be
copied to/from userspace.

cache object allocation:
fs/befs/linuxvfs.c:
befs_alloc_inode(...):
...
bi = kmem_cache_alloc(befs_inode_cachep, GFP_KERNEL);
...
return &bi->vfs_inode;

befs_iget(...):
...
strlcpy(befs_ino->i_data.symlink, raw_inode->data.symlink,
BEFS_SYMLINK_LEN);
...
inode->i_link = befs_ino->i_data.symlink;

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
befs_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: Luis de Bethencourt <luisbg@kernel.org>
Cc: Salah Triki <salah.triki@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Luis de Bethencourt <luisbg@kernel.org>

authored by

David Windsor and committed by
Kees Cook
0fc256d3 8d2704d3

+9 -5
+9 -5
fs/befs/linuxvfs.c
··· 444 444 static int __init 445 445 befs_init_inodecache(void) 446 446 { 447 - befs_inode_cachep = kmem_cache_create("befs_inode_cache", 448 - sizeof (struct befs_inode_info), 449 - 0, (SLAB_RECLAIM_ACCOUNT| 450 - SLAB_MEM_SPREAD|SLAB_ACCOUNT), 451 - init_once); 447 + befs_inode_cachep = kmem_cache_create_usercopy("befs_inode_cache", 448 + sizeof(struct befs_inode_info), 0, 449 + (SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD| 450 + SLAB_ACCOUNT), 451 + offsetof(struct befs_inode_info, 452 + i_data.symlink), 453 + sizeof_field(struct befs_inode_info, 454 + i_data.symlink), 455 + init_once); 452 456 if (befs_inode_cachep == NULL) 453 457 return -ENOMEM; 454 458