Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b36e44c authored by Wanlong Gao's avatar Wanlong Gao Committed by Eric Paris
Browse files

SELinux: replace weak GFP_ATOMIC to GFP_KERNEL in avc_add_callback 



avc_add_callback now only called from initcalls, so replace the
weak GFP_ATOMIC to GFP_KERNEL, and mark this function __init
to make a warning when not been called from initcalls.

Signed-off-by: default avatarWanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 899838b2

security/selinux/avc.c

+2 −2
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ noinline int slow_avc_audit(u32 ssid, u32 tsid, u16 tclass, 
 * @perms based on @tclass.  Returns %0 on success or

 * -%ENOMEM if insufficient memory exists to add the callback.

 */

int avc_add_callback(int (*callback)(u32 event, u32 ssid, u32 tsid,

int __init avc_add_callback(int (*callback)(u32 event, u32 ssid, u32 tsid,

				     u16 tclass, u32 perms,

				     u32 *out_retained),

		     u32 events, u32 ssid, u32 tsid,
@@ -519,7 +519,7 @@ int avc_add_callback(int (*callback)(u32 event, u32 ssid, u32 tsid, 
	struct avc_callback_node *c;

	int rc = 0;



	c = kmalloc(sizeof(*c), GFP_ATOMIC);

	c = kmalloc(sizeof(*c), GFP_KERNEL);

	if (!c) {

		rc = -ENOMEM;

		goto out;