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/smack_lsm.c | |
| parent | f1b2a5ace996de339292d4035f9f5b294aecd11e (diff) | |
| parent | 0da939b0058742ad2d8580b7db6b966d0fc72252 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/smack/smack_lsm.c')
| -rw-r--r-- | security/smack/smack_lsm.c | 5 |
1 files changed, 4 insertions, 1 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) | |||
| 2179 | * This is the simplist possible security model | 2179 | * This is the simplist possible security model |
| 2180 | * for networking. | 2180 | * for networking. |
| 2181 | */ | 2181 | */ |
| 2182 | return smk_access(smack, ssp->smk_in, MAY_WRITE); | 2182 | rc = smk_access(smack, ssp->smk_in, MAY_WRITE); |
| 2183 | if (rc != 0) | ||
| 2184 | netlbl_skbuff_err(skb, rc, 0); | ||
| 2185 | return rc; | ||
| 2183 | } | 2186 | } |
| 2184 | 2187 | ||
| 2185 | /** | 2188 | /** |