* [patch] net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add()
@ 2011-11-24 7:18 Dan Carpenter
2011-11-25 6:42 ` David Miller
2011-11-29 17:47 ` Paul Moore
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2011-11-24 7:18 UTC (permalink / raw)
To: Paul Moore; +Cc: David S. Miller, netdev, kernel-janitors
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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add()
2011-11-24 7:18 [patch] net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add() Dan Carpenter
@ 2011-11-25 6:42 ` David Miller
2011-11-29 17:47 ` Paul Moore
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2011-11-25 6:42 UTC (permalink / raw)
To: dan.carpenter; +Cc: paul, netdev, kernel-janitors
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add()
2011-11-24 7:18 [patch] net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add() Dan Carpenter
2011-11-25 6:42 ` David Miller
@ 2011-11-29 17:47 ` Paul Moore
1 sibling, 0 replies; 3+ messages in thread
From: Paul Moore @ 2011-11-29 17:47 UTC (permalink / raw)
To: Dan Carpenter; +Cc: David S. Miller, netdev, kernel-janitors
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 :)
--
paul moore
www.paul-moore.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-29 17:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-24 7:18 [patch] net/netlabel: copy and paste bug in netlbl_cfg_unlbl_map_add() Dan Carpenter
2011-11-25 6:42 ` David Miller
2011-11-29 17:47 ` Paul Moore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox