git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
security
/
selinux
/
xfrm.c
diff --git
a/security/selinux/xfrm.c
b/security/selinux/xfrm.c
index
3b8b994
..
8f17f54
100644
(file)
--- a/
security/selinux/xfrm.c
+++ b/
security/selinux/xfrm.c
@@
-180,8
+180,7
@@
int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall)
if (!ckall)
break;
if (!ckall)
break;
- }
- else if (*sid != ctx->ctx_sid)
+ } else if (*sid != ctx->ctx_sid)
return -EINVAL;
}
}
return -EINVAL;
}
}
@@
-326,8
+325,7
@@
int selinux_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx,
*/
void selinux_xfrm_policy_free(struct xfrm_sec_ctx *ctx)
{
*/
void selinux_xfrm_policy_free(struct xfrm_sec_ctx *ctx)
{
- if (ctx)
- kfree(ctx);
+ kfree(ctx);
}
/*
}
/*
@@
-372,8
+370,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;
void selinux_xfrm_state_free(struct xfrm_state *x)
{
struct xfrm_sec_ctx *ctx = x->security;
- if (ctx)
- kfree(ctx);
+ kfree(ctx);
}
/*
}
/*