summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-05-21 00:00:02 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-21 21:59:17 +0200
commitd4e9dc63dca91cd89086b5a686d7f7635c8319e5 (patch)
treec6ec1b8801d8e526e0d7373b7cd91e46f20a4299 /security
parent[PATCH] binfmt_flat: don't check for EMFILE (diff)
downloadlinux-d4e9dc63dca91cd89086b5a686d7f7635c8319e5.tar.xz
linux-d4e9dc63dca91cd89086b5a686d7f7635c8319e5.zip
[PATCH] selinux: endian fix
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d987048d3f33..21dad415b896 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3231,7 +3231,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;
read_lock_bh(&sk->sk_callback_lock);