Commit 6e8a43c8 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: fix memory leak in security_netlbl_cache_add()
parents b2e961eb 0ec8abd7
...@@ -2417,8 +2417,10 @@ static void security_netlbl_cache_add(struct netlbl_lsm_secattr *secattr, ...@@ -2417,8 +2417,10 @@ static void security_netlbl_cache_add(struct netlbl_lsm_secattr *secattr,
cache->type = NETLBL_CACHE_T_MLS; cache->type = NETLBL_CACHE_T_MLS;
if (ebitmap_cpy(&cache->data.mls_label.level[0].cat, if (ebitmap_cpy(&cache->data.mls_label.level[0].cat,
&ctx->range.level[0].cat) != 0) &ctx->range.level[0].cat) != 0) {
kfree(cache);
return; return;
}
cache->data.mls_label.level[1].cat.highbit = cache->data.mls_label.level[1].cat.highbit =
cache->data.mls_label.level[0].cat.highbit; cache->data.mls_label.level[0].cat.highbit;
cache->data.mls_label.level[1].cat.node = cache->data.mls_label.level[1].cat.node =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment