diff options
| author | Jeff Garzik | 2007-07-16 21:25:01 -0400 |
|---|---|---|
| committer | Jeff Garzik | 2007-07-17 16:17:59 -0400 |
| commit | 6f686d3d14621b90f3793b705bdf9fa624fd29ca (patch) | |
| tree | 6addd4e43f433543b33ef0c5e8fdb9f0855f5dce /kernel | |
| parent | 49c13b51a15f1ba9f6d47e26e4a3886c4f3931e2 (diff) | |
kernel/auditfilter: kill bogus uninit'd-var compiler warning
Kill this warning...
kernel/auditfilter.c: In function ‘audit_receive_filter’:
kernel/auditfilter.c:1213: warning: ‘ndw’ may be used uninitialized in this function
kernel/auditfilter.c:1213: warning: ‘ndp’ may be used uninitialized in this function
...with a simplification of the code. audit_put_nd() can accept NULL
arguments, just like kfree(). It is cleaner to init two existing vars
to NULL, remove the redundant test variable 'putnd_needed' branches, and call
audit_put_nd() directly.
As a desired side effect, the warning goes away.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditfilter.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index ce61f423542c..1bf093dcffe0 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -1210,8 +1210,8 @@ static inline int audit_add_rule(struct audit_entry *entry, struct audit_entry *e; struct audit_field *inode_f = entry->rule.inode_f; struct audit_watch *watch = entry->rule.watch; - struct nameidata *ndp, *ndw; - int h, err, putnd_needed = 0; + struct nameidata *ndp = NULL, *ndw = NULL; + int h, err; #ifdef CONFIG_AUDITSYSCALL int dont_count = 0; @@ -1239,7 +1239,6 @@ static inline int audit_add_rule(struct audit_entry *entry, err = audit_get_nd(watch->path, &ndp, &ndw); if (err) goto error; - putnd_needed = 1; } mutex_lock(&audit_filter_mutex); @@ -1269,14 +1268,11 @@ static inline int audit_add_rule(struct audit_entry *entry, #endif mutex_unlock(&audit_filter_mutex); - if (putnd_needed) - audit_put_nd(ndp, ndw); - + audit_put_nd(ndp, ndw); /* NULL args OK */ return 0; error: - if (putnd_needed) - audit_put_nd(ndp, ndw); + audit_put_nd(ndp, ndw); /* NULL args OK */ if (watch) audit_put_watch(watch); /* tmp watch, matches initial get */ return err; |