diff options
| author | Richard Guy Briggs <rgb@redhat.com> | 2015-08-01 21:41:12 +0200 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2015-08-05 00:21:39 +0200 |
| commit | f8259b262bedd5ec71e55de5953464ea86ff69d9 (patch) | |
| tree | ce32d08492f85e80764cdabd7f194d5e632a095a /kernel/audit_watch.c | |
| parent | audit: Fix check of return value of strnlen_user() (diff) | |
| download | linux-f8259b262bedd5ec71e55de5953464ea86ff69d9.tar.xz linux-f8259b262bedd5ec71e55de5953464ea86ff69d9.zip | |
audit: eliminate unnecessary extra layer of watch references
The audit watch count was imbalanced, adding an unnecessary layer of watch
references. Only add the second reference when it is added to a parent.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'kernel/audit_watch.c')
| -rw-r--r-- | kernel/audit_watch.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index ad9c1682f616..54ee4bd66aef 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -203,7 +203,6 @@ int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op) if (IS_ERR(watch)) return PTR_ERR(watch); - audit_get_watch(watch); krule->watch = watch; return 0; @@ -387,8 +386,7 @@ static void audit_add_to_parent(struct audit_krule *krule, watch_found = 1; - /* put krule's and initial refs to temporary watch */ - audit_put_watch(watch); + /* put krule's ref to temporary watch */ audit_put_watch(watch); audit_get_watch(w); @@ -400,6 +398,7 @@ static void audit_add_to_parent(struct audit_krule *krule, audit_get_parent(parent); watch->parent = parent; + audit_get_watch(watch); list_add(&watch->wlist, &parent->watches); } list_add(&krule->rlist, &watch->rules); |