git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: libsepol: remove dead code in check_avtab_hierarchy_callback()
[safe/jmp/linux-2.6]
/
security
/
smack
/
smack_lsm.c
diff --git
a/security/smack/smack_lsm.c
b/security/smack/smack_lsm.c
index
c33b6bb
..
a5721b3
100644
(file)
--- a/
security/smack/smack_lsm.c
+++ b/
security/smack/smack_lsm.c
@@
-157,12
+157,12
@@
static int smack_ptrace_traceme(struct task_struct *ptp)
*
* Returns 0 on success, error code otherwise.
*/
*
* Returns 0 on success, error code otherwise.
*/
-static int smack_syslog(int type)
+static int smack_syslog(int type
, bool from_file
)
{
int rc;
char *sp = current_security();
{
int rc;
char *sp = current_security();
- rc = cap_syslog(type);
+ rc = cap_syslog(type
, from_file
);
if (rc != 0)
return rc;
if (rc != 0)
return rc;
@@
-2602,7
+2602,7
@@
static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
#ifdef CONFIG_AUDIT
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
ad.a.u.net.family = sk->sk_family;
#ifdef CONFIG_AUDIT
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
ad.a.u.net.family = sk->sk_family;
- ad.a.u.net.netif = skb->iif;
+ ad.a.u.net.netif = skb->
skb_
iif;
ipv4_skb_to_auditdata(skb, &ad.a, NULL);
#endif
/*
ipv4_skb_to_auditdata(skb, &ad.a, NULL);
#endif
/*
@@
-2757,7
+2757,7
@@
static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
#ifdef CONFIG_AUDIT
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
ad.a.u.net.family = family;
#ifdef CONFIG_AUDIT
smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
ad.a.u.net.family = family;
- ad.a.u.net.netif = skb->iif;
+ ad.a.u.net.netif = skb->
skb_
iif;
ipv4_skb_to_auditdata(skb, &ad.a, NULL);
#endif
/*
ipv4_skb_to_auditdata(skb, &ad.a, NULL);
#endif
/*