Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next

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)
          * 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;
 }
 
 /**