[PATCH] NetLabel: parse the CIPSO ranged tag on incoming packets

[PATCH] NetLabel: parse the CIPSO ranged tag on incoming packets

[Paul Moore]

[-- Attachment #1: netlabel-cipso_missing_range --]
[-- Type: text/plain, Size: 1108 bytes --]

Commit 484b366932be0b73a22c74a82748ca10a721643e added support for the CIPSO
ranged categories tag.  However, it appears that I made a mistake when rebasing
then patch to the latest upstream sources for submission and dropped the part
of the patch that actually parses the tag on incoming packets.  This patch
fixes this mistake by adding the required function call to the
cipso_v4_skbuff_getattr() function.

I've run this patch over the weekend and have not noticed any problems.

Signed-off-by: Paul Moore <paul.moore@hp.com>
---
 net/ipv4/cipso_ipv4.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: net-2.6_bugfix_2/net/ipv4/cipso_ipv4.c
===================================================================
--- net-2.6_bugfix_2.orig/net/ipv4/cipso_ipv4.c
+++ net-2.6_bugfix_2/net/ipv4/cipso_ipv4.c
@@ -1933,6 +1933,11 @@ int cipso_v4_skbuff_getattr(const struct
 						 &cipso_ptr[6],
 						 secattr);
 		break;
+	case CIPSO_V4_TAG_RANGE:
+		ret_val = cipso_v4_parsetag_rng(doi_def,
+						&cipso_ptr[6],
+						secattr);
+		break;
 	}
 
 skbuff_getattr_return:

--
paul moore
linux security @ hp

Re: [PATCH] NetLabel: parse the CIPSO ranged tag on incoming packets

[James Morris]

On Mon, 12 Mar 2007, Paul Moore wrote:

> Commit 484b366932be0b73a22c74a82748ca10a721643e added support for the CIPSO
> ranged categories tag.  However, it appears that I made a mistake when rebasing
> then patch to the latest upstream sources for submission and dropped the part
> of the patch that actually parses the tag on incoming packets.  This patch
> fixes this mistake by adding the required function call to the
> cipso_v4_skbuff_getattr() function.
> 
> I've run this patch over the weekend and have not noticed any problems.
> 
> Signed-off-by: Paul Moore <paul.moore@hp.com>

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

> ---
>  net/ipv4/cipso_ipv4.c |    5 +++++
>  1 file changed, 5 insertions(+)
> 
> Index: net-2.6_bugfix_2/net/ipv4/cipso_ipv4.c
> ===================================================================
> --- net-2.6_bugfix_2.orig/net/ipv4/cipso_ipv4.c
> +++ net-2.6_bugfix_2/net/ipv4/cipso_ipv4.c
> @@ -1933,6 +1933,11 @@ int cipso_v4_skbuff_getattr(const struct
>  						 &cipso_ptr[6],
>  						 secattr);
>  		break;
> +	case CIPSO_V4_TAG_RANGE:
> +		ret_val = cipso_v4_parsetag_rng(doi_def,
> +						&cipso_ptr[6],
> +						secattr);
> +		break;
>  	}
>  
>  skbuff_getattr_return:
> 
> --
> paul moore
> linux security @ hp
> 
> -
> 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
> 

-- 
James Morris
<jmorris@namei.org>

Re: [PATCH] NetLabel: parse the CIPSO ranged tag on incoming packets

[David Miller]

From: James Morris <jmorris@namei.org>
Date: Mon, 12 Mar 2007 10:50:41 -0400 (EDT)

> On Mon, 12 Mar 2007, Paul Moore wrote:
> 
> > Commit 484b366932be0b73a22c74a82748ca10a721643e added support for the CIPSO
> > ranged categories tag.  However, it appears that I made a mistake when rebasing
> > then patch to the latest upstream sources for submission and dropped the part
> > of the patch that actually parses the tag on incoming packets.  This patch
> > fixes this mistake by adding the required function call to the
> > cipso_v4_skbuff_getattr() function.
> > 
> > I've run this patch over the weekend and have not noticed any problems.
> > 
> > Signed-off-by: Paul Moore <paul.moore@hp.com>
> 
> Acked-by: James Morris <jmorris@namei.org>

Applied, thanks guys.