Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f686d3d authored by Jeff Garzik's avatar Jeff Garzik
Browse files

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: default avatarJeff Garzik <jeff@garzik.org>
parent 49c13b51

kernel/auditfilter.c

+4 −8
Original line number Diff line number Diff line
@@ -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;