Merge "selinux: stop flooding the log buffer" (7c907221) · Commits · e / devices / android_kernel_fairphone_FP3

security/selinux/avc.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -348,26 +348,27 @@ static struct avc_xperms_decision_node
		struct avc_xperms_decision_node *xpd_node;
		struct extended_perms_decision *xpd;

		xpd_node = kmem_cache_zalloc(avc_xperms_decision_cachep, GFP_NOWAIT);
		xpd_node = kmem_cache_zalloc(avc_xperms_decision_cachep,
		GFP_NOWAIT \| __GFP_NOWARN);
		if (!xpd_node)
		return NULL;

		xpd = &xpd_node->xpd;
		if (which & XPERMS_ALLOWED) {
		xpd->allowed = kmem_cache_zalloc(avc_xperms_data_cachep,
		GFP_NOWAIT);
		GFP_NOWAIT \| __GFP_NOWARN);
		if (!xpd->allowed)
		goto error;
		}
		if (which & XPERMS_AUDITALLOW) {
		xpd->auditallow = kmem_cache_zalloc(avc_xperms_data_cachep,
		GFP_NOWAIT);
		GFP_NOWAIT \| __GFP_NOWARN);
		if (!xpd->auditallow)
		goto error;
		}
		if (which & XPERMS_DONTAUDIT) {
		xpd->dontaudit = kmem_cache_zalloc(avc_xperms_data_cachep,
		GFP_NOWAIT);
		GFP_NOWAIT \| __GFP_NOWARN);
		if (!xpd->dontaudit)
		goto error;
		}
		@@ -395,7 +396,8 @@ static struct avc_xperms_node *avc_xperms_alloc(void)
		{
		struct avc_xperms_node *xp_node;

		xp_node = kmem_cache_zalloc(avc_xperms_cachep, GFP_NOWAIT);
		xp_node = kmem_cache_zalloc(avc_xperms_cachep,
		GFP_NOWAIT \| __GFP_NOWARN);
		if (!xp_node)
		return xp_node;
		INIT_LIST_HEAD(&xp_node->xpd_head);
		@@ -548,7 +550,7 @@ static struct avc_node *avc_alloc_node(void)
		{
		struct avc_node *node;

		node = kmem_cache_zalloc(avc_node_cachep, GFP_NOWAIT);
		node = kmem_cache_zalloc(avc_node_cachep, GFP_NOWAIT \| __GFP_NOWARN);
		if (!node)
		goto out;