Patchwork net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add()

login
register
mail settings
Submitter Dan Carpenter
Date Nov. 24, 2011, 7:18 a.m.
Message ID <20111124071820.GB14122@elgon.mountain>
Download mbox | patch
Permalink /patch/127444/
State Accepted
Delegated to: David Miller
Headers show

Comments

Dan Carpenter - Nov. 24, 2011, 7:18 a.m.
This was copy and pasted from the IPv4 code.  We're calling the
ip4 version of that function and map4 is NULL.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Nov. 25, 2011, 6:42 a.m.
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 24 Nov 2011 10:18:20 +0300

> This was copy and pasted from the IPv4 code.  We're calling the
> ip4 version of that function and map4 is NULL.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied, thanks Dan.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Paul Moore - Nov. 29, 2011, 5:47 p.m.
On Thursday, November 24, 2011 10:18:20 AM Dan Carpenter wrote:
> This was copy and pasted from the IPv4 code.  We're calling the
> ip4 version of that function and map4 is NULL.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
> index 8ed67dcc..3735297 100644
> --- a/net/netlabel/netlabel_kapi.c
> +++ b/net/netlabel/netlabel_kapi.c
> @@ -162,8 +162,8 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
>  			map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3];
>  			map6->list.mask = *mask6;
>  			map6->list.valid = 1;
> -			ret_val = netlbl_af4list_add(&map4->list,
> -						     &addrmap->list4);
> +			ret_val = netlbl_af6list_add(&map6->list,
> +						     &addrmap->list6);
>  			if (ret_val != 0)
>  				goto cfg_unlbl_map_add_failure;
>  			break;

Thanks for fixing this.  I actually stumbled across this just last week while 
working on the CALIPSO stuff and queued up a patch but didn't get a chance to 
verify it before Thanksgiving - you just saved me the effort :)

Patch

diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 8ed67dcc..3735297 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -162,8 +162,8 @@  int netlbl_cfg_unlbl_map_add(const char *domain,
 			map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3];
 			map6->list.mask = *mask6;
 			map6->list.valid = 1;
-			ret_val = netlbl_af4list_add(&map4->list,
-						     &addrmap->list4);
+			ret_val = netlbl_af6list_add(&map6->list,
+						     &addrmap->list6);
 			if (ret_val != 0)
 				goto cfg_unlbl_map_add_failure;
 			break;