From 9f0bcbe5dddf7291fceb8fdb7c6517d936f5e0a1 Mon Sep 17 00:00:00 2001
From: Paul Moore <paul.moore@hp.com>
Date: Fri, 17 Nov 2006 17:38:47 -0500
Subject: [PATCH] --- yaml --- r: 41751 b: refs/heads/master c:
 05e00cbf5036929355020dab4837b637203a0742 h: refs/heads/master i:   41749:
 1f0997442e4dac97fa1091026db1f4854e060f2b   41747:
 fd439fb42a7e9064df7b0a95853a5a6e7cdc166f   41743:
 4e14bbb31b7cedb3a92b8e2b8f669b1233aa059b v: v3

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

diff --git a/[refs] b/[refs]
index 5deb8830d760..3a56360694cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 701a90bad99b8081a824cca52c178c8fc8f46bb2
+refs/heads/master: 05e00cbf5036929355020dab4837b637203a0742
diff --git a/trunk/net/ipv4/cipso_ipv4.c b/trunk/net/ipv4/cipso_ipv4.c
index f0a0785047fe..fb5d913f5815 100644
--- a/trunk/net/ipv4/cipso_ipv4.c
+++ b/trunk/net/ipv4/cipso_ipv4.c
@@ -1435,8 +1435,6 @@ int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
 	u32 doi;
 	struct cipso_v4_doi *doi_def;
 
-	if (!CIPSO_V4_OPTEXIST(skb))
-		return -ENOMSG;
 	cipso_ptr = CIPSO_V4_OPTPTR(skb);
 	if (cipso_v4_cache_check(cipso_ptr, cipso_ptr[1], secattr) == 0)
 		return 0;
diff --git a/trunk/net/netlabel/netlabel_kapi.c b/trunk/net/netlabel/netlabel_kapi.c
index da2f1975a042..b35ebf94918c 100644
--- a/trunk/net/netlabel/netlabel_kapi.c
+++ b/trunk/net/netlabel/netlabel_kapi.c
@@ -149,10 +149,8 @@ int netlbl_socket_getattr(const struct socket *sock,
 int netlbl_skbuff_getattr(const struct sk_buff *skb,
 			  struct netlbl_lsm_secattr *secattr)
 {
-	int ret_val;
-
-	ret_val = cipso_v4_skbuff_getattr(skb, secattr);
-	if (ret_val == 0)
+	if (CIPSO_V4_OPTEXIST(skb) &&
+	    cipso_v4_skbuff_getattr(skb, secattr) == 0)
 		return 0;
 
 	return netlbl_unlabel_getattr(secattr);