diff options
| author | James Morris <jmorris@namei.org> | 2008-10-12 18:35:14 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-12 18:35:14 -0400 |
| commit | 93db628658197aa46bd7f83d429908b6f187ec9c (patch) | |
| tree | b09496f42570a5864212eb8cfde4ba2ea9fa7a40 /security/smack/smackfs.c | |
| parent | f1b2a5ace996de339292d4035f9f5b294aecd11e (diff) | |
| parent | 0da939b0058742ad2d8580b7db6b966d0fc72252 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/smack/smackfs.c')
| -rw-r--r-- | security/smack/smackfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index e7c642458ec9..c21d8c8bf0c7 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c | |||
| @@ -354,9 +354,11 @@ static void smk_cipso_doi(void) | |||
| 354 | doip->tags[rc] = CIPSO_V4_TAG_INVALID; | 354 | doip->tags[rc] = CIPSO_V4_TAG_INVALID; |
| 355 | 355 | ||
| 356 | rc = netlbl_cfg_cipsov4_add_map(doip, NULL, &audit_info); | 356 | rc = netlbl_cfg_cipsov4_add_map(doip, NULL, &audit_info); |
| 357 | if (rc != 0) | 357 | if (rc != 0) { |
| 358 | printk(KERN_WARNING "%s:%d add rc = %d\n", | 358 | printk(KERN_WARNING "%s:%d add rc = %d\n", |
| 359 | __func__, __LINE__, rc); | 359 | __func__, __LINE__, rc); |
| 360 | kfree(doip); | ||
| 361 | } | ||
| 360 | } | 362 | } |
| 361 | 363 | ||
| 362 | /** | 364 | /** |
