netdev - Re: [PATCH] netlabel: Always remove the correct address selector

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 22 Apr 2009 07:55:05 +0200
From:	Etienne Basset <etienne.basset@...ericable.fr>
To:	Paul Moore <paul.moore@...com>
CC:	netdev@...r.kernel.org, linux-security-module@...r.kernel.org
Subject: Re: [PATCH] netlabel: Always remove the correct address selector

Hi,

Paul Moore wrote:
> 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!

Tested-by: Etienne Basset <etienne.basset@...ericable.fr>

> 
> Reported-by: Etienne Basset <etienne.basset@...ericable.fr>
> Signed-off-by: Paul Moore <paul.moore@...com>
> ---
> 
>  net/netlabel/netlabel_addrlist.c |   26 ++++++++++----------------
>  1 files changed, 10 insertions(+), 16 deletions(-)
> 
> diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c
> index 834c6eb..c051913 100644
> --- a/net/netlabel/netlabel_addrlist.c
> +++ b/net/netlabel/netlabel_addrlist.c
> @@ -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 */
>  
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html