netlabel: Always remove the correct address selector
Subsystems (3)
PATCH 1/1 netlabel: Always remove the correct address selector
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.
---
net/netlabel/netlabel_addrlist.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-)
net/netlabel/netlabel_addrlist.c +10 -16
@@ -256,13 +256,11 @@ 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) { -netlbl_af4list_remove_entry (entry); -return entry; - } - -return NULL ; + entry =netlbl_af4list_search_exact (addr, mask, head); +if (entry ==NULL ) +return NULL ; +netlbl_af4list_remove_entry (entry); +return entry; }#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )
@@ -299,15 +297,11 @@ 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)) { -netlbl_af6list_remove_entry (entry); -return entry; - } - -return NULL ; + entry =netlbl_af6list_search_exact (addr, mask, head); +if (entry ==NULL ) +return NULL ; +netlbl_af6list_remove_entry (entry); +return entry; }#endif /* IPv6 */
Quoted 8 lines · Paul Moore
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 <[email protected]>Signed-off-by Paul Moore <[email protected]>
Signature · 2 lines
James Morris <[email protected]>
Hi,
Quoted 5 lines · Paul Moore
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.
thanks Paul!
Quoted 54 lines
Reported-by Etienne Basset <[email protected]>Signed-off-by Paul Moore <[email protected]>---
net/netlabel/netlabel_addrlist.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-)net/netlabel/netlabel_addrlist.c +10
-16@@ -256,13 +256,11 @@ 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) { -netlbl_af4list_remove_entry (entry); -return entry; - } - -return NULL ; + entry =netlbl_af4list_search_exact (addr, mask, head); +if (entry ==NULL ) +return NULL ; +netlbl_af4list_remove_entry (entry); +return entry; }#if defined(CONFIG_IPV6 ) || defined(CONFIG_IPV6_MODULE )@@ -299,15 +297,11 @@ 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)) { -netlbl_af6list_remove_entry (entry); -return entry; - } - -return NULL ; + entry =netlbl_af6list_search_exact (addr, mask, head); +if (entry ==NULL ) +return NULL ; +netlbl_af6list_remove_entry (entry); +return entry; }#endif /* IPv6 */
From: Etienne Basset <[email protected]>
Date: Wed, 22 Apr 2009 07:55:05 +0200
Quoted 9 lines
Hi,
Quoted 5 lines · Paul Moore
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.
Quoted 3 lines
thanks Paul!
Tested-by Etienne Basset <[email protected]>
Applied, thanks everyone.