diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2014-02-18 16:20:42 +0530 |
|---|---|---|
| committer | Deepak Nibade <dnibade@nvidia.com> | 2014-03-10 20:03:21 +0530 |
| commit | 243d4c9490e60a84e3812cad8786f23da374adac (patch) | |
| tree | dabe9e60a091b766e6f8b59b1479453999e39098 /security/selinux/ss/services.c | |
| parent | 635837f825386fe490d57c471442c1dcf2d8bdc0 (diff) | |
| parent | 43356cafc2d7d49408c8587039660bbcbc521f01 (diff) | |
Merge branch 'android-3.10' into dev-kernel-3.10
Bug 1456092
Change-Id: I87b6b883c382000fc0dfee7c8d8f36269f504e46
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'security/selinux/ss/services.c')
| -rw-r--r-- | security/selinux/ss/services.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index b4feecc3fe01..18caa16de27b 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1231,6 +1231,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; |