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 master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
security
/
selinux
/
xfrm.c
diff --git
a/security/selinux/xfrm.c
b/security/selinux/xfrm.c
index
5b77765
..
b2af7ca
100644
(file)
--- a/
security/selinux/xfrm.c
+++ b/
security/selinux/xfrm.c
@@
-146,7
+146,7
@@
static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_us
return rc;
out:
return rc;
out:
- *ctxp =
0
;
+ *ctxp =
NULL
;
kfree(ctx);
return rc;
}
kfree(ctx);
return rc;
}