Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into for-linus

This commit is contained in:
James Morris
2014-02-10 11:48:21 +11:00
2 changed files with 6 additions and 0 deletions

View File

@@ -1232,6 +1232,10 @@ static int security_context_to_sid_core(const char *scontext, u32 scontext_len,
struct context context;
int rc = 0;
/* An empty security context is never valid. */
if (!scontext_len)
return -EINVAL;
if (!ss_initialized) {
int i;