diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 12:06:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 12:06:43 -0800 |
| commit | dafdcfba62f7ef23045f024a305168cac1c07590 (patch) | |
| tree | 346fb0400de442aa5d87e58fbc02e5c899d74a03 /security/selinux/ss/services.c | |
| parent | c90c69a508c2fd8d2f892c4b166baffc91111117 (diff) | |
| parent | 4f4acf3a478d5cada688f336f2229ab580f56113 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
Always initialize scontext and scontext_len
Reassign printk levels in selinux kernel code
Diffstat (limited to 'security/selinux/ss/services.c')
| -rw-r--r-- | security/selinux/ss/services.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index ca9154dc5d8..1e52356664d 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -609,6 +609,9 @@ int security_sid_to_context(u32 sid, char **scontext, u32 *scontext_len) struct context *context; int rc = 0; + *scontext = NULL; + *scontext_len = 0; + if (!ss_initialized) { if (sid <= SECINITSID_NUM) { char *scontextp; |