diff options
| author | Linus Torvalds | 2008-10-04 03:22:36 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-04 03:22:36 +0200 |
| commit | 2165f631f0e1d4e9a1ee425ef05cb727352285e0 (patch) | |
| tree | 43be885c57a085eab44ac148ed0d08bb88076075 | |
| parent | ACPI: Make /proc/acpi/wakeup interface handle PCI devices (again) (diff) | |
| parent | selinux: Fix an uninitialized variable BUG/panic in selinux_secattr_to_sid() (diff) | |
| download | kernel-qcow2-linux-2165f631f0e1d4e9a1ee425ef05cb727352285e0.tar.gz kernel-qcow2-linux-2165f631f0e1d4e9a1ee425ef05cb727352285e0.tar.xz kernel-qcow2-linux-2165f631f0e1d4e9a1ee425ef05cb727352285e0.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
selinux: Fix an uninitialized variable BUG/panic in selinux_secattr_to_sid()
| -rw-r--r-- | security/selinux/ss/services.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index d11a8154500f..8551952ef329 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -2737,6 +2737,7 @@ int security_netlbl_secattr_to_sid(struct netlbl_lsm_secattr *secattr, if (ctx == NULL) goto netlbl_secattr_to_sid_return; + context_init(&ctx_new); ctx_new.user = ctx->user; ctx_new.role = ctx->role; ctx_new.type = ctx->type; @@ -2745,13 +2746,9 @@ int security_netlbl_secattr_to_sid(struct netlbl_lsm_secattr *secattr, if (ebitmap_netlbl_import(&ctx_new.range.level[0].cat, secattr->attr.mls.cat) != 0) goto netlbl_secattr_to_sid_return; - ctx_new.range.level[1].cat.highbit = - ctx_new.range.level[0].cat.highbit; - ctx_new.range.level[1].cat.node = - ctx_new.range.level[0].cat.node; - } else { - ebitmap_init(&ctx_new.range.level[0].cat); - ebitmap_init(&ctx_new.range.level[1].cat); + memcpy(&ctx_new.range.level[1].cat, + &ctx_new.range.level[0].cat, + sizeof(ctx_new.range.level[0].cat)); } if (mls_context_isvalid(&policydb, &ctx_new) != 1) goto netlbl_secattr_to_sid_return_cleanup; |