aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorAl Viro <viro@hera.kernel.org>2006-12-04 17:00:55 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-04 22:32:44 -0500
commit87fcd70d983d30eca4b933fff2e97d9a31743d0a (patch)
tree2c79943f7691f80123af0145a8909f14011b0761 /security
parent91f433cacc9d1ae95ae46ce26d7bcf3a724c72d0 (diff)
[PATCH] selinux endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/avc.c2
-rw-r--r--security/selinux/hooks.c2
-rw-r--r--security/selinux/include/avc.h8
3 files changed, 6 insertions, 6 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 74c0319c417e..e73ac1ab7cfd 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -496,7 +496,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab,
496 audit_log_format(ab, " %s=%d", name2, ntohs(port)); 496 audit_log_format(ab, " %s=%d", name2, ntohs(port));
497} 497}
498 498
499static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, 499static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr,
500 __be16 port, char *name1, char *name2) 500 __be16 port, char *name1, char *name2)
501{ 501{
502 if (addr) 502 if (addr)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index a29d78d3f44c..78f98fe084eb 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3537,7 +3537,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
3537 goto out; 3537 goto out;
3538 3538
3539 /* Handle mapped IPv4 packets arriving via IPv6 sockets */ 3539 /* Handle mapped IPv4 packets arriving via IPv6 sockets */
3540 if (family == PF_INET6 && skb->protocol == ntohs(ETH_P_IP)) 3540 if (family == PF_INET6 && skb->protocol == htons(ETH_P_IP))
3541 family = PF_INET; 3541 family = PF_INET;
3542 3542
3543 AVC_AUDIT_DATA_INIT(&ad, NET); 3543 AVC_AUDIT_DATA_INIT(&ad, NET);
diff --git a/security/selinux/include/avc.h b/security/selinux/include/avc.h
index 960ef18ddc41..6ed10c3d3339 100644
--- a/security/selinux/include/avc.h
+++ b/security/selinux/include/avc.h
@@ -54,12 +54,12 @@ struct avc_audit_data {
54 char *netif; 54 char *netif;
55 struct sock *sk; 55 struct sock *sk;
56 u16 family; 56 u16 family;
57 u16 dport; 57 __be16 dport;
58 u16 sport; 58 __be16 sport;
59 union { 59 union {
60 struct { 60 struct {
61 u32 daddr; 61 __be32 daddr;
62 u32 saddr; 62 __be32 saddr;
63 } v4; 63 } v4;
64 struct { 64 struct {
65 struct in6_addr daddr; 65 struct in6_addr daddr;