Attachment 148924 Details for Bug 230255 – Patch to kernel-2.6.18-8.el5.lspp.67

[patch] Patch to kernel-2.6.18-8.el5.lspp.67

netlabel-cipso_std_bug (text/plain), 1.56 KB, created by Paul Moore on 2007-02-28 15:09:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Moore

Created: 2007-02-28 15:09:37 UTC

Size: 1.56 KB

patch

obsolete

>Subject: NetLabel: Verify sensitivity level has a valid CIPSO mapping
>
>The current CIPSO engine has a problem where it does not verify that the given
>sensitivity level has a valid CIPSO mapping when the "std" CIPSO DOI type is
>used.  The end result is that bad packets are sent on the wire which should
>have never been sent in the first place.  This patch corrects this problem by
>verifying the sensitivity level mapping similar to what is done with the
>category mapping.  This patch also changes the returned error code in this case
>to -EPERM to better match what the category mapping verification code returns.
>
>Signed-off-by: Paul Moore <paul.moore@hp.com>
>---
> net/ipv4/cipso_ipv4.c |    7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>Index: linux-2.6.18-8.el5.lspp.67/net/ipv4/cipso_ipv4.c
>===================================================================
>--- linux-2.6.18-8.el5.lspp.67.orig/net/ipv4/cipso_ipv4.c
>+++ linux-2.6.18-8.el5.lspp.67/net/ipv4/cipso_ipv4.c
>@@ -725,11 +725,12 @@ static int cipso_v4_map_lvl_hton(const s
> 		*net_lvl = host_lvl;
> 		return 0;
> 	case CIPSO_V4_MAP_STD:
>-		if (host_lvl < doi_def->map.std->lvl.local_size) {
>+		if (host_lvl < doi_def->map.std->lvl.local_size &&
>+		    doi_def->map.std->lvl.local[host_lvl] < CIPSO_V4_INV_LVL) {
> 			*net_lvl = doi_def->map.std->lvl.local[host_lvl];
> 			return 0;
> 		}
>-		break;
>+		return -EPERM;
> 	}
> 
> 	return -EINVAL;
>@@ -764,7 +765,7 @@ static int cipso_v4_map_lvl_ntoh(const s
> 			*host_lvl = doi_def->map.std->lvl.cipso[net_lvl];
> 			return 0;
> 		}
>-		break;
>+		return -EPERM;
> 	}
> 
> 	return -EINVAL;

Actions: View | Diff

Attachments on bug 230255: 148924