Skip to content
This repository has been archived by the owner on Feb 26, 2020. It is now read-only.

Commit

Permalink
Implement KM_USER for CONFIG_PAX_USERCOPY_SLABS support
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Yao <ryao@gentoo.org>
  • Loading branch information
ryao committed Oct 13, 2014
1 parent f61fcf5 commit d7db449
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions include/sys/kmem.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,23 @@
#define KM_NOSLEEP 0x0001 /* cannot block for memory; may fail */
#define KM_PUSHPAGE 0x0004 /* can block for memory; may use reserve */
#define KM_ZERO 0x1000 /* zero the allocation */
#define KM_USER 0x2000 /* Allow copies to/from userland */

/*
* GrSecurity introduced a security feature in their patchset for the Linux
* 3.14 kernel where copies to/from user must occur to regions of memory that
* have been properly marked with SLAB_USERCOPY. We extend the kernel memory
* allocation flag syntax to add KM_USER so that the zio data buffers can be
* properly marked.
*/
#ifdef CONFIG_PAX_USERCOPY_SLABS
# ifndef SLAB_USERCOPY
# error "CONFIG_PAX_USERCOPY_SLABS defined, but SLAB_USERCOPY missing"
# endif
#else
# undef KM_USER
# define KM_USER 0x0000
#endif

/* XXX: Modify the code to stop using these */
#define KM_NODEBUG 0x0
Expand Down Expand Up @@ -73,6 +90,9 @@ kmem_flags_convert(int flags)
if (flags & KM_ZERO)
lflags |= __GFP_ZERO;

if (flags & KM_USER)
lflags |= KM_USER;

return lflags;
}

Expand Down

0 comments on commit d7db449

Please sign in to comment.