Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87fcd70d authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] selinux endianness annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 91f433ca

security/selinux/avc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -496,7 +496,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab, 
		audit_log_format(ab, " %s=%d", name2, ntohs(port));

		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)

				       __be16 port, char *name1, char *name2)

{

{

	if (addr)

	if (addr)

security/selinux/hooks.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3537,7 +3537,7 @@ static int selinux_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb) 
		goto out;

		goto out;





	/* Handle mapped IPv4 packets arriving via IPv6 sockets */

	/* 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;

		family = PF_INET;





	AVC_AUDIT_DATA_INIT(&ad, NET);

	AVC_AUDIT_DATA_INIT(&ad, NET);

security/selinux/include/avc.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -54,12 +54,12 @@ struct avc_audit_data { 
			char *netif;

			char *netif;

			struct sock *sk;

			struct sock *sk;

			u16 family;

			u16 family;

			u16 dport;

			__be16 dport;

			u16 sport;

			__be16 sport;

			union {

			union {

				struct {

				struct {

					u32 daddr;

					__be32 daddr;

					u32 saddr;

					__be32 saddr;

				} v4;

				} v4;

				struct {

				struct {

					struct in6_addr daddr;

					struct in6_addr daddr;