From d6ee116353b5cbdccd9b73ab9f09a9ceeb760334 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Sat, 20 May 2006 15:00:02 -0700 Subject: [PATCH] --- yaml --- r: 26851 b: refs/heads/master c: d4e9dc63dca91cd89086b5a686d7f7635c8319e5 h: refs/heads/master i: 26849: 67b9132c8c5b981690f33adae7e5bd1df81c2c84 26847: 84aa4549a2dcec2d0ee462c673b874547092acb5 v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 44ed4e211173..9e6df3a6ba6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df88912a2165f56a7402db80126cf8ea075221fe +refs/heads/master: d4e9dc63dca91cd89086b5a686d7f7635c8319e5 diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index d987048d3f33..21dad415b896 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/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);