netlabel: Always remove the correct address selector (50b2ff1b) · Commits · 戴 / test

The NetLabel address selector mechanism has a problem where it can get mistakenly remove the wrong selector when similar addresses are used. The problem is caused when multiple addresses are configured that have different netmasks but the same address, e.g. 127.0.0.0/8 and 127.0.0.0/24. This patch fixes the problem. Reported-by:

Etienne Basset <etienne.basset@numericable.fr> Signed-off-by:

Paul Moore <paul.moore@hp.com> Acked-by:

James Morris <jmorris@namei.org> Tested-by:

Etienne Basset <etienne.basset@numericable.fr> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/netlabel/netlabel_addrlist.c

+10 −16

Original line number	Diff line number	Diff line
		@@ -256,15 +256,13 @@ struct netlbl_af4list *netlbl_af4list_remove(__be32 addr, __be32 mask,
		{
		struct netlbl_af4list *entry;

		entry = netlbl_af4list_search(addr, head);
		if (entry != NULL && entry->addr == addr && entry->mask == mask) {
		entry = netlbl_af4list_search_exact(addr, mask, head);
		if (entry == NULL)
		return NULL;
		netlbl_af4list_remove_entry(entry);
		return entry;
		}

		return NULL;
		}

		#if defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE)
		/**
		* netlbl_af6list_remove_entry - Remove an IPv6 address entry
		@@ -299,16 +297,12 @@ struct netlbl_af6list netlbl_af6list_remove(const struct in6_addr addr,
		{
		struct netlbl_af6list *entry;

		entry = netlbl_af6list_search(addr, head);
		if (entry != NULL &&
		ipv6_addr_equal(&entry->addr, addr) &&
		ipv6_addr_equal(&entry->mask, mask)) {
		entry = netlbl_af6list_search_exact(addr, mask, head);
		if (entry == NULL)
		return NULL;
		netlbl_af6list_remove_entry(entry);
		return entry;
		}

		return NULL;
		}
		#endif /* IPv6 */

		/*

Admin message