forked from Minki/linux
[PATCH] selinux endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
91f433cacc
commit
87fcd70d98
@ -496,7 +496,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab,
|
||||
audit_log_format(ab, " %s=%d", name2, ntohs(port));
|
||||
}
|
||||
|
||||
static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr,
|
||||
static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr,
|
||||
__be16 port, char *name1, char *name2)
|
||||
{
|
||||
if (addr)
|
||||
|
@ -3537,7 +3537,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
|
||||
goto out;
|
||||
|
||||
/* Handle mapped IPv4 packets arriving via IPv6 sockets */
|
||||
if (family == PF_INET6 && skb->protocol == ntohs(ETH_P_IP))
|
||||
if (family == PF_INET6 && skb->protocol == htons(ETH_P_IP))
|
||||
family = PF_INET;
|
||||
|
||||
AVC_AUDIT_DATA_INIT(&ad, NET);
|
||||
|
@ -54,12 +54,12 @@ struct avc_audit_data {
|
||||
char *netif;
|
||||
struct sock *sk;
|
||||
u16 family;
|
||||
u16 dport;
|
||||
u16 sport;
|
||||
__be16 dport;
|
||||
__be16 sport;
|
||||
union {
|
||||
struct {
|
||||
u32 daddr;
|
||||
u32 saddr;
|
||||
__be32 daddr;
|
||||
__be32 saddr;
|
||||
} v4;
|
||||
struct {
|
||||
struct in6_addr daddr;
|
||||
|
Loading…
Reference in New Issue
Block a user