diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:32:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 12:32:12 -0700 |
| commit | 6e8a43c8432649686921b57255db8172edcebf6f (patch) | |
| tree | 57867bdcb71b5bd0339f822ddb8032974a37a822 | |
| parent | Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | SELinux: fix memory leak in security_netlbl_cache_add() (diff) | |
| download | linux-dev-6e8a43c8432649686921b57255db8172edcebf6f.tar.xz linux-dev-6e8a43c8432649686921b57255db8172edcebf6f.zip | |
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()
| -rw-r--r-- | security/selinux/ss/services.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index b5f017f07a75..0ae032f3876b 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -2417,8 +2417,10 @@ static void security_netlbl_cache_add(struct netlbl_lsm_secattr *secattr, cache->type = NETLBL_CACHE_T_MLS; 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; + } cache->data.mls_label.level[1].cat.highbit = cache->data.mls_label.level[0].cat.highbit; cache->data.mls_label.level[1].cat.node = |