Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1183809

[PATCH V6 2/2] audit: eliminate unnecessary extra layer of watch parent references

Show all headers | View raw

The audit watch parent count was imbalanced, adding an unnecessary layer of
watch parent references.  Decrement the additional parent reference when a
watch is reused, already having a reference to the parent.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
---
 kernel/audit_watch.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index f33f54c..8f123d7 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -391,11 +391,12 @@ static void audit_add_to_parent(struct audit_krule *krule,
 
 		audit_get_watch(w);
 		krule->watch = watch = w;
+
+		audit_put_parent(parent);
 		break;
 	}
 
 	if (!watch_found) {
-		audit_get_parent(parent);
 		watch->parent = parent;
 
 		audit_get_watch(watch);
@@ -436,9 +437,6 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list)
 
 	audit_add_to_parent(krule, parent);
 
-	/* match get in audit_find_parent or audit_init_parent */
-	audit_put_parent(parent);
-
 	h = audit_hash_ino((u32)watch->ino);
 	*list = &audit_inode_hash[h];
 error:
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V6 0/2] audit: rebalance and remove extra layers of watch references Richard Guy Briggs <rgb@redhat.com> - 2015-07-14 17:50 +0200
  [PATCH V6 2/2] audit: eliminate unnecessary extra layer of watch parent references Richard Guy Briggs <rgb@redhat.com> - 2015-07-14 17:50 +0200
    Re: [PATCH V6 2/2] audit: eliminate unnecessary extra layer of watch parent references Paul Moore <pmoore@redhat.com> - 2015-07-16 22:40 +0200
      Re: [PATCH V6 2/2] audit: eliminate unnecessary extra layer of watch  parent references Richard Guy Briggs <rgb@redhat.com> - 2015-07-17 03:50 +0200

csiph-web