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

Commit 4c3a0a25 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[NETLABEL]: Fix lookup logic of netlbl_domhsh_search_def. 



Currently, if the call to netlbl_domhsh_search succeeds the
return result will still be NULL.

Fix that, by returning the found entry (if any).

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f8f27c3

net/netlabel/netlabel_domainhash.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -150,11 +150,11 @@ static struct netlbl_dom_map *netlbl_domhsh_search_def(const char *domain) 
	entry = netlbl_domhsh_search(domain);

	entry = netlbl_domhsh_search(domain);

	if (entry == NULL) {

	if (entry == NULL) {

		entry = rcu_dereference(netlbl_domhsh_def);

		entry = rcu_dereference(netlbl_domhsh_def);

		if (entry != NULL && entry->valid)

		if (entry != NULL && !entry->valid)

			return entry;

			entry = NULL;

	}

	}





	return NULL;

	return entry;

}

}





/*

/*