diff options
| author | James Morris <jmorris@namei.org> | 2008-10-11 00:26:14 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-11 00:26:14 +0200 |
| commit | 0da939b0058742ad2d8580b7db6b966d0fc72252 (patch) | |
| tree | 47cb109fdf97135191bff5db4e3bfc905136bf8b /security/smack | |
| parent | As pointed out by Jonathan Corbet, the timer must be deleted before (diff) | |
| parent | netlabel: Add configuration support for local labeling (diff) | |
| download | linux-0da939b0058742ad2d8580b7db6b966d0fc72252.tar.xz linux-0da939b0058742ad2d8580b7db6b966d0fc72252.zip | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_lsm.c | 5 | ||||
| -rw-r--r-- | security/smack/smackfs.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 87d75417ea93..6e2dc0bab70d 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -2179,7 +2179,10 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) * This is the simplist possible security model * for networking. */ - return smk_access(smack, ssp->smk_in, MAY_WRITE); + rc = smk_access(smack, ssp->smk_in, MAY_WRITE); + if (rc != 0) + netlbl_skbuff_err(skb, rc, 0); + return rc; } /** 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) doip->tags[rc] = CIPSO_V4_TAG_INVALID; rc = netlbl_cfg_cipsov4_add_map(doip, NULL, &audit_info); - if (rc != 0) + if (rc != 0) { printk(KERN_WARNING "%s:%d add rc = %d\n", __func__, __LINE__, rc); + kfree(doip); + } } /** |