From d55fe3eff11d62f31c34e4b0d81b417887c2f95f Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 18 Apr 2008 17:38:27 -0400
Subject: [PATCH] --- yaml --- r: 91708 b: refs/heads/master c:
 3c1c88ab8ad8d1f7db74f719f2649a070190fd5e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/security/selinux/xfrm.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d029e6060c37..61a57c3d5ba2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfff3aa49765eb10053b58ee220949cfcc7a1a80
+refs/heads/master: 3c1c88ab8ad8d1f7db74f719f2649a070190fd5e
diff --git a/trunk/security/selinux/xfrm.c b/trunk/security/selinux/xfrm.c
index 874d17c83c61..7a5bf0978a90 100644
--- a/trunk/security/selinux/xfrm.c
+++ b/trunk/security/selinux/xfrm.c
@@ -181,8 +181,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall)
 
 					if (!ckall)
 						break;
-				}
-				else if (*sid != ctx->ctx_sid)
+				} else if (*sid != ctx->ctx_sid)
 					return -EINVAL;
 			}
 		}
@@ -327,8 +326,7 @@ int selinux_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx,
  */
 void selinux_xfrm_policy_free(struct xfrm_sec_ctx *ctx)
 {
-	if (ctx)
-		kfree(ctx);
+	kfree(ctx);
 }
 
 /*
@@ -373,8 +371,7 @@ int selinux_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *uct
 void selinux_xfrm_state_free(struct xfrm_state *x)
 {
 	struct xfrm_sec_ctx *ctx = x->security;
-	if (ctx)
-		kfree(ctx);
+	kfree(ctx);
 }
 
  /*