audit_update_lsm_rules() misses the audit_inode_hash[] ones (1a9d0797) · Commits · e / devices / android_kernel_sony_msm8994

kernel/auditfilter.c

+47 −30

Original line number	Diff line number	Diff line
		@@ -1778,25 +1778,15 @@ unlock_and_return:
		return result;
		}

		/* This function will re-initialize the lsm_rule field of all applicable rules.
		* It will traverse the filter lists serarching for rules that contain LSM
		* specific filter fields. When such a rule is found, it is copied, the
		* LSM field is re-initialized, and the old rule is replaced with the
		* updated rule. */
		int audit_update_lsm_rules(void)
		static int update_lsm_rule(struct audit_entry *entry)
		{
		struct audit_entry entry, n, *nentry;
		struct audit_entry *nentry;
		struct audit_watch *watch;
		struct audit_tree *tree;
		int i, err = 0;

		/* audit_filter_mutex synchronizes the writers */
		mutex_lock(&audit_filter_mutex);
		int err = 0;

		for (i = 0; i < AUDIT_NR_FILTERS; i++) {
		list_for_each_entry_safe(entry, n, &audit_filter_list[i], list) {
		if (!security_audit_rule_known(&entry->rule))
		continue;
		return 0;

		watch = entry->rule.watch;
		tree = entry->rule.tree;
		@@ -1804,7 +1794,6 @@ int audit_update_lsm_rules(void)
		if (IS_ERR(nentry)) {
		/* save the first error encountered for the
		* return value */
		if (!err)
		err = PTR_ERR(nentry);
		audit_panic("error updating LSM filters");
		if (watch)
		@@ -1812,8 +1801,7 @@ int audit_update_lsm_rules(void)
		list_del_rcu(&entry->list);
		} else {
		if (watch) {
		list_add(&nentry->rule.rlist,
		&watch->rules);
		list_add(&nentry->rule.rlist, &watch->rules);
		list_del(&entry->rule.rlist);
		} else if (tree)
		list_replace_init(&entry->rule.rlist,
		@@ -1821,6 +1809,35 @@ int audit_update_lsm_rules(void)
		list_replace_rcu(&entry->list, &nentry->list);
		}
		call_rcu(&entry->rcu, audit_free_rule_rcu);

		return err;
		}

		/* This function will re-initialize the lsm_rule field of all applicable rules.
		* It will traverse the filter lists serarching for rules that contain LSM
		* specific filter fields. When such a rule is found, it is copied, the
		* LSM field is re-initialized, and the old rule is replaced with the
		* updated rule. */
		int audit_update_lsm_rules(void)
		{
		struct audit_entry e, n;
		int i, err = 0;

		/* audit_filter_mutex synchronizes the writers */
		mutex_lock(&audit_filter_mutex);

		for (i = 0; i < AUDIT_NR_FILTERS; i++) {
		list_for_each_entry_safe(e, n, &audit_filter_list[i], list) {
		int res = update_lsm_rule(e);
		if (!err)
		err = res;
		}
		}
		for (i=0; i< AUDIT_INODE_BUCKETS; i++) {
		list_for_each_entry_safe(e, n, &audit_inode_hash[i], list) {
		int res = update_lsm_rule(e);
		if (!err)
		err = res;
		}
		}