From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Moore Subject: Re: [PATCH V6 2/2] audit: eliminate unnecessary extra layer of watch parent references Date: Thu, 16 Jul 2015 16:32:23 -0400 Message-ID: <1782280.KrZWA343Ju@sifl> References: <606b8964c3147668af4d6b1a2d770ccf694d26f9.1435723005.git.rgb@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <606b8964c3147668af4d6b1a2d770ccf694d26f9.1435723005.git.rgb@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: Richard Guy Briggs Cc: linux-audit@redhat.com, linux-kernel@vger.kernel.org, sgrubb@redhat.com List-Id: linux-audit@redhat.com On Tuesday, July 14, 2015 11:40:42 AM Richard Guy Briggs wrote: > 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 > --- > 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; I understand removing the get() here and the put() in audit_add_watch, but I don't understand adding the put() above, can you help me understand? > 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: -- paul moore security @ redhat