tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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()

Linus Torvalds 2165f631 76acae04

+4 -7
+4 -7
security/selinux/ss/services.c
··· 2737 2737 if (ctx == NULL) 2738 2738 goto netlbl_secattr_to_sid_return; 2739 2739 2740 + context_init(&ctx_new); 2740 2741 ctx_new.user = ctx->user; 2741 2742 ctx_new.role = ctx->role; 2742 2743 ctx_new.type = ctx->type; ··· 2746 2745 if (ebitmap_netlbl_import(&ctx_new.range.level[0].cat, 2747 2746 secattr->attr.mls.cat) != 0) 2748 2747 goto netlbl_secattr_to_sid_return; 2749 - ctx_new.range.level[1].cat.highbit = 2750 - ctx_new.range.level[0].cat.highbit; 2751 - ctx_new.range.level[1].cat.node = 2752 - ctx_new.range.level[0].cat.node; 2753 - } else { 2754 - ebitmap_init(&ctx_new.range.level[0].cat); 2755 - ebitmap_init(&ctx_new.range.level[1].cat); 2748 + memcpy(&ctx_new.range.level[1].cat, 2749 + &ctx_new.range.level[0].cat, 2750 + sizeof(ctx_new.range.level[0].cat)); 2756 2751 } 2757 2752 if (mls_context_isvalid(&policydb, &ctx_new) != 1) 2758 2753 goto netlbl_secattr_to_sid_return_cleanup;