Linux Integrity Measurement development
 help / color / mirror / Atom feed
From: Petko Manolov <petkan@nucleusys.com>
To: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Linux Integrity <linux-integrity@vger.kernel.org>
Subject: [PATCH] IMA: use list_splice_tail_init_rcu() instead of its open coded variant
Date: Tue, 22 May 2018 17:06:55 +0300	[thread overview]
Message-ID: <20180522140655.GA5794@carbon> (raw)

	Hi Mimi,

Please review and consider this patch for mainlining if it looks OK to you.  
I've tested it on v4.17.0-rc6 and seems to be working fine.


		Petko


---
>From e5cb36d4470cf64af2087fba4615ee8539385c98 Mon Sep 17 00:00:00 2001
From: Petko Manolov <petko.manolov@konsulko.com>
Date: Fri, 18 May 2018 14:10:57 +0300
Subject: [PATCH] Replace the open coded version with
 list_splice_tail_init_rcu()

Signed-off-by: Petko Manolov <petko.manolov@konsulko.com>
---
 security/integrity/ima/ima_policy.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index d89bebf85421..722466f843ef 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -509,22 +509,9 @@ int ima_check_policy(void)
  */
 void ima_update_policy(void)
 {
-	struct list_head *first, *last, *policy;
+	struct list_head *policy = &ima_policy_rules;
 
-	/* append current policy with the new rules */
-	first = (&ima_temp_rules)->next;
-	last = (&ima_temp_rules)->prev;
-	policy = &ima_policy_rules;
-
-	synchronize_rcu();
-
-	last->next = policy;
-	rcu_assign_pointer(list_next_rcu(policy->prev), first);
-	first->prev = policy->prev;
-	policy->prev = last;
-
-	/* prepare for the next policy rules addition */
-	INIT_LIST_HEAD(&ima_temp_rules);
+	list_splice_tail_init_rcu(&ima_temp_rules, policy, synchronize_rcu);
 
 	if (ima_rules != policy) {
 		ima_policy_flag = 0;
-- 
2.11.0

             reply	other threads:[~2018-05-22 14:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-22 14:06 Petko Manolov [this message]
2018-05-23 15:37 ` [PATCH] IMA: use list_splice_tail_init_rcu() instead of its open coded variant Mimi Zohar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180522140655.GA5794@carbon \
    --to=petkan@nucleusys.com \
    --cc=linux-integrity@vger.kernel.org \
    --cc=zohar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox