From 9f12204a7fe9cd2f0bcbf60ece7c44c9be84de39 Mon Sep 17 00:00:00 2001
From: Paul Moore <paul.moore@hp.com>
Date: Wed, 11 Oct 2006 19:10:49 -0400
Subject: [PATCH] --- yaml --- r: 39688 b: refs/heads/master c:
 ea614d7f4fb2d436b7a5ee490d1011615f6b38d5 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/cipso_ipv4.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 148c62832448..519b2340ca1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf0edf39296097f20c5fcc4919ed7d339194bd75
+refs/heads/master: ea614d7f4fb2d436b7a5ee490d1011615f6b38d5
diff --git a/trunk/net/ipv4/cipso_ipv4.c b/trunk/net/ipv4/cipso_ipv4.c
index d19c9ac7727e..e2077a3aa8c0 100644
--- a/trunk/net/ipv4/cipso_ipv4.c
+++ b/trunk/net/ipv4/cipso_ipv4.c
@@ -832,8 +832,8 @@ static int cipso_v4_map_cat_rbm_hton(const struct cipso_v4_doi *doi_def,
 
 	switch (doi_def->type) {
 	case CIPSO_V4_MAP_PASS:
-		net_spot_max = host_cat_len - 1;
-		while (net_spot_max > 0 && host_cat[net_spot_max] == 0)
+		net_spot_max = host_cat_len;
+		while (net_spot_max > 0 && host_cat[net_spot_max - 1] == 0)
 			net_spot_max--;
 		if (net_spot_max > net_cat_len)
 			return -EINVAL;