aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-11-20 18:35:04 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-20 18:35:04 -0500
commit8964be4a9a5ca8cab1219bb046db2f6d1936227c (patch)
tree8838c73a03cc69c010b55928fce3725d17bc26a9 /security
parentfa9a6fed87df1b50804405e700f8d30251d3aaf1 (diff)
net: rename skb->iif to skb->skb_iif
To help grep games, rename iif to skb_iif Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c6
-rw-r--r--security/smack/smack_lsm.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index bb230d5d7085..83a4aada0b4c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4085,7 +4085,7 @@ static int selinux_sock_rcv_skb_compat(struct sock *sk, struct sk_buff *skb,
4085 char *addrp; 4085 char *addrp;
4086 4086
4087 COMMON_AUDIT_DATA_INIT(&ad, NET); 4087 COMMON_AUDIT_DATA_INIT(&ad, NET);
4088 ad.u.net.netif = skb->iif; 4088 ad.u.net.netif = skb->skb_iif;
4089 ad.u.net.family = family; 4089 ad.u.net.family = family;
4090 err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL); 4090 err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
4091 if (err) 4091 if (err)
@@ -4147,7 +4147,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
4147 return 0; 4147 return 0;
4148 4148
4149 COMMON_AUDIT_DATA_INIT(&ad, NET); 4149 COMMON_AUDIT_DATA_INIT(&ad, NET);
4150 ad.u.net.netif = skb->iif; 4150 ad.u.net.netif = skb->skb_iif;
4151 ad.u.net.family = family; 4151 ad.u.net.family = family;
4152 err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL); 4152 err = selinux_parse_skb(skb, &ad, &addrp, 1, NULL);
4153 if (err) 4153 if (err)
@@ -4159,7 +4159,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
4159 err = selinux_skb_peerlbl_sid(skb, family, &peer_sid); 4159 err = selinux_skb_peerlbl_sid(skb, family, &peer_sid);
4160 if (err) 4160 if (err)
4161 return err; 4161 return err;
4162 err = selinux_inet_sys_rcv_skb(skb->iif, addrp, family, 4162 err = selinux_inet_sys_rcv_skb(skb->skb_iif, addrp, family,
4163 peer_sid, &ad); 4163 peer_sid, &ad);
4164 if (err) { 4164 if (err) {
4165 selinux_netlbl_err(skb, err, 0); 4165 selinux_netlbl_err(skb, err, 0);
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index c33b6bb9b6dd..529c9ca65878 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -2602,7 +2602,7 @@ static int smack_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
2602#ifdef CONFIG_AUDIT 2602#ifdef CONFIG_AUDIT
2603 smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET); 2603 smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
2604 ad.a.u.net.family = sk->sk_family; 2604 ad.a.u.net.family = sk->sk_family;
2605 ad.a.u.net.netif = skb->iif; 2605 ad.a.u.net.netif = skb->skb_iif;
2606 ipv4_skb_to_auditdata(skb, &ad.a, NULL); 2606 ipv4_skb_to_auditdata(skb, &ad.a, NULL);
2607#endif 2607#endif
2608 /* 2608 /*
@@ -2757,7 +2757,7 @@ static int smack_inet_conn_request(struct sock *sk, struct sk_buff *skb,
2757#ifdef CONFIG_AUDIT 2757#ifdef CONFIG_AUDIT
2758 smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET); 2758 smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_NET);
2759 ad.a.u.net.family = family; 2759 ad.a.u.net.family = family;
2760 ad.a.u.net.netif = skb->iif; 2760 ad.a.u.net.netif = skb->skb_iif;
2761 ipv4_skb_to_auditdata(skb, &ad.a, NULL); 2761 ipv4_skb_to_auditdata(skb, &ad.a, NULL);
2762#endif 2762#endif
2763 /* 2763 /*