mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 01:33:00 -04:00
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
This commit is contained in:
commit
0da939b005
22 changed files with 2732 additions and 972 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in a new issue