KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
openwrtv4/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch

957 lines
31 KiB
Diff
Raw Normal View History

ar71xx: add v3.18 support Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44456
2015-02-15 19:45:29 +00:00
Index: linux-3.18.7/arch/mips/include/asm/checksum.h
===================================================================
--- linux-3.18.7.orig/arch/mips/include/asm/checksum.h 2015-02-11 08:01:12.000000000 +0100
+++ linux-3.18.7/arch/mips/include/asm/checksum.h 2015-02-15 01:50:55.118444466 +0100
@@ -134,26 +134,30 @@
const unsigned int *stop = word + ihl;
unsigned int csum;
int carry;
+ unsigned int w;
- csum = word[0];
- csum += word[1];
- carry = (csum < word[1]);
+ csum = net_hdr_word(word++);
+
+ w = net_hdr_word(word++);
+ csum += w;
+ carry = (csum < w);
csum += carry;
- csum += word[2];
- carry = (csum < word[2]);
+ w = net_hdr_word(word++);
+ csum += w;
+ carry = (csum < w);
csum += carry;
- csum += word[3];
- carry = (csum < word[3]);
+ w = net_hdr_word(word++);
+ csum += w;
+ carry = (csum < w);
csum += carry;
- word += 4;
do {
- csum += *word;
- carry = (csum < *word);
+ w = net_hdr_word(word++);
+ csum += w;
+ carry = (csum < w);
csum += carry;
- word++;
} while (word != stop);
return csum_fold(csum);
@@ -222,69 +226,4 @@
return csum_fold(csum_partial(buff, len, 0));
}
-#define _HAVE_ARCH_IPV6_CSUM
-static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
- const struct in6_addr *daddr,
- __u32 len, unsigned short proto,
- __wsum sum)
-{
- __asm__(
- " .set push # csum_ipv6_magic\n"
- " .set noreorder \n"
- " .set noat \n"
- " addu %0, %5 # proto (long in network byte order)\n"
- " sltu $1, %0, %5 \n"
- " addu %0, $1 \n"
-
- " addu %0, %6 # csum\n"
- " sltu $1, %0, %6 \n"
- " lw %1, 0(%2) # four words source address\n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " lw %1, 4(%2) \n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " lw %1, 8(%2) \n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " lw %1, 12(%2) \n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " lw %1, 0(%3) \n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " lw %1, 4(%3) \n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " lw %1, 8(%3) \n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " lw %1, 12(%3) \n"
- " addu %0, $1 \n"
- " addu %0, %1 \n"
- " sltu $1, %0, %1 \n"
-
- " addu %0, $1 # Add final carry\n"
- " .set pop"
- : "=r" (sum), "=r" (proto)
- : "r" (saddr), "r" (daddr),
- "0" (htonl(len)), "1" (htonl(proto)), "r" (sum));
-
- return csum_fold(sum);
-}
-
#endif /* _ASM_CHECKSUM_H */
Index: linux-3.18.7/include/uapi/linux/ip.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/ip.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/ip.h 2015-02-15 01:50:55.118444466 +0100
@@ -102,7 +102,7 @@
__be32 saddr;
__be32 daddr;
/*The options start here. */
-};
+} __attribute__((packed, aligned(2)));
struct ip_auth_hdr {
Index: linux-3.18.7/include/uapi/linux/ipv6.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/ipv6.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/ipv6.h 2015-02-15 01:50:55.118444466 +0100
@@ -125,7 +125,7 @@
struct in6_addr saddr;
struct in6_addr daddr;
-};
+} __attribute__((packed, aligned(2)));
/* index values for the variables in ipv6_devconf */
Index: linux-3.18.7/include/uapi/linux/tcp.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/tcp.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/tcp.h 2015-02-15 01:50:55.118444466 +0100
@@ -54,7 +54,7 @@
__be16 window;
__sum16 check;
__be16 urg_ptr;
-};
+} __attribute__((packed, aligned(2)));
/*
* The union cast uses a gcc extension to avoid aliasing problems
@@ -64,7 +64,7 @@
union tcp_word_hdr {
struct tcphdr hdr;
__be32 words[5];
-};
+} __attribute__((packed, aligned(2)));
#define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3])
Index: linux-3.18.7/include/uapi/linux/udp.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/udp.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/udp.h 2015-02-15 01:50:55.118444466 +0100
@@ -24,7 +24,7 @@
__be16 dest;
__be16 len;
__sum16 check;
-};
+} __attribute__((packed, aligned(2)));
/* UDP socket options */
#define UDP_CORK 1 /* Never send partially complete segments */
Index: linux-3.18.7/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
===================================================================
--- linux-3.18.7.orig/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2015-02-15 01:50:55.118444466 +0100
@@ -41,8 +41,8 @@
if (ap == NULL)
return false;
- tuple->src.u3.ip = ap[0];
- tuple->dst.u3.ip = ap[1];
+ tuple->src.u3.ip = net_hdr_word(ap++);
+ tuple->dst.u3.ip = net_hdr_word(ap);
return true;
}
Index: linux-3.18.7/include/uapi/linux/icmp.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/icmp.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/icmp.h 2015-02-15 01:50:55.118444466 +0100
@@ -80,7 +80,7 @@
__be16 mtu;
} frag;
} un;
-};
+} __attribute__((packed, aligned(2)));
/*
Index: linux-3.18.7/include/uapi/linux/in6.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/in6.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/in6.h 2015-02-15 01:50:55.118444466 +0100
@@ -42,7 +42,7 @@
#define s6_addr16 in6_u.u6_addr16
#define s6_addr32 in6_u.u6_addr32
#endif
-};
+} __attribute__((packed, aligned(2)));
#endif /* __UAPI_DEF_IN6_ADDR */
#if __UAPI_DEF_SOCKADDR_IN6
Index: linux-3.18.7/net/ipv6/tcp_ipv6.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/tcp_ipv6.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv6/tcp_ipv6.c 2015-02-15 02:12:55.605235801 +0100
@@ -39,6 +39,7 @@
#include <linux/ipsec.h>
#include <linux/times.h>
#include <linux/slab.h>
+#include <asm/unaligned.h>
#include <linux/uaccess.h>
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
@@ -833,10 +834,10 @@
topt = (__be32 *)(t1 + 1);
if (tsecr) {
- *topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
- (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP);
- *topt++ = htonl(tsval);
- *topt++ = htonl(tsecr);
+ put_unaligned_be32((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
+ (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP, topt++);
+ put_unaligned_be32(tsval, topt++);
+ put_unaligned_be32(tsecr, topt++);
}
#ifdef CONFIG_TCP_MD5SIG
Index: linux-3.18.7/include/linux/ipv6.h
===================================================================
--- linux-3.18.7.orig/include/linux/ipv6.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/linux/ipv6.h 2015-02-15 01:50:55.118444466 +0100
@@ -5,6 +5,7 @@
#define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
#define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
+
/*
* This structure contains configuration options per IPv6 link.
*/
Index: linux-3.18.7/net/ipv6/datagram.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/datagram.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv6/datagram.c 2015-02-15 01:50:55.118444466 +0100
@@ -374,7 +374,7 @@
ipv6_iface_scope_id(&sin->sin6_addr,
IP6CB(skb)->iif);
} else {
- ipv6_addr_set_v4mapped(*(__be32 *)(nh + serr->addr_offset),
+ ipv6_addr_set_v4mapped(net_hdr_word(nh + serr->addr_offset),
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
@@ -712,12 +712,12 @@
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
- if ((fl6->flowlabel^*(__be32 *)CMSG_DATA(cmsg))&~IPV6_FLOWINFO_MASK) {
+ if ((fl6->flowlabel^net_hdr_word(CMSG_DATA(cmsg)))&~IPV6_FLOWINFO_MASK) {
err = -EINVAL;
goto exit_f;
}
}
- fl6->flowlabel = IPV6_FLOWINFO_MASK & *(__be32 *)CMSG_DATA(cmsg);
+ fl6->flowlabel = IPV6_FLOWINFO_MASK & net_hdr_word(CMSG_DATA(cmsg));
break;
case IPV6_2292HOPOPTS:
Index: linux-3.18.7/net/ipv6/ip6_gre.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/ip6_gre.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv6/ip6_gre.c 2015-02-15 01:50:55.118444466 +0100
@@ -393,7 +393,7 @@
t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
flags & GRE_KEY ?
- *(((__be32 *)p) + (grehlen / 4) - 1) : 0,
+ net_hdr_word(((__be32 *)p) + (grehlen / 4) - 1) : 0,
p[1]);
if (t == NULL)
return;
@@ -475,11 +475,11 @@
offset += 4;
}
if (flags&GRE_KEY) {
- key = *(__be32 *)(h + offset);
+ key = net_hdr_word(h + offset);
offset += 4;
}
if (flags&GRE_SEQ) {
- seqno = ntohl(*(__be32 *)(h + offset));
+ seqno = ntohl(net_hdr_word(h + offset));
offset += 4;
}
}
@@ -744,7 +744,7 @@
if (tunnel->parms.o_flags&GRE_SEQ) {
++tunnel->o_seqno;
- *ptr = htonl(tunnel->o_seqno);
+ net_hdr_word(ptr) = htonl(tunnel->o_seqno);
ptr--;
}
if (tunnel->parms.o_flags&GRE_KEY) {
@@ -840,7 +840,7 @@
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
- fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
+ fl6.flowlabel |= net_hdr_word(ipv6h) & IPV6_TCLASS_MASK;
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)
fl6.flowlabel |= ip6_flowlabel(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
Index: linux-3.18.7/net/ipv6/ip6_tunnel.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/ip6_tunnel.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv6/ip6_tunnel.c 2015-02-15 01:50:55.118444466 +0100
@@ -1291,7 +1291,7 @@
dsfield = ipv6_get_dsfield(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)
- fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);
+ fl6.flowlabel |= net_hdr_word(ipv6h) & IPV6_TCLASS_MASK;
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)
fl6.flowlabel |= ip6_flowlabel(ipv6h);
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
Index: linux-3.18.7/net/ipv6/exthdrs.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/exthdrs.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv6/exthdrs.c 2015-02-15 01:50:55.118444466 +0100
@@ -573,7 +573,7 @@
goto drop;
}
- pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));
+ pkt_len = ntohl(net_hdr_word(nh + optoff + 2));
if (pkt_len <= IPV6_MAXPLEN) {
IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),
IPSTATS_MIB_INHDRERRORS);
Index: linux-3.18.7/include/linux/types.h
===================================================================
--- linux-3.18.7.orig/include/linux/types.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/linux/types.h 2015-02-15 01:50:55.118444466 +0100
@@ -213,5 +213,11 @@
};
#define rcu_head callback_head
+struct net_hdr_word {
+ u32 words[1];
+} __attribute__((packed, aligned(2)));
+
+#define net_hdr_word(_p) (((struct net_hdr_word *) (_p))->words[0])
+
#endif /* __ASSEMBLY__ */
#endif /* _LINUX_TYPES_H */
Index: linux-3.18.7/net/ipv4/af_inet.c
===================================================================
--- linux-3.18.7.orig/net/ipv4/af_inet.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv4/af_inet.c 2015-02-15 01:50:55.118444466 +0100
@@ -1324,8 +1324,8 @@
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;
- id = ntohl(*(__be32 *)&iph->id);
- flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF));
+ id = ntohl(net_hdr_word(&iph->id));
+ flush = (u16)((ntohl(net_hdr_word(iph)) ^ skb_gro_len(skb)) | (id & ~IP_DF));
id >>= 16;
for (p = *head; p; p = p->next) {
Index: linux-3.18.7/net/ipv4/route.c
===================================================================
--- linux-3.18.7.orig/net/ipv4/route.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv4/route.c 2015-02-15 01:50:55.118444466 +0100
@@ -454,7 +454,7 @@
else if (skb)
pkey = &ip_hdr(skb)->daddr;
- n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey);
+ n = __ipv4_neigh_lookup(dev, net_hdr_word(pkey));
if (n)
return n;
return neigh_create(&arp_tbl, pkey, dev);
Index: linux-3.18.7/net/ipv4/tcp_output.c
===================================================================
--- linux-3.18.7.orig/net/ipv4/tcp_output.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv4/tcp_output.c 2015-02-15 01:50:55.122444370 +0100
@@ -446,48 +446,53 @@
u16 options = opts->options; /* mungable copy */
if (unlikely(OPTION_MD5 & options)) {
- *ptr++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
- (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
+ (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
/* overload cookie hash location */
opts->hash_location = (__u8 *)ptr;
ptr += 4;
}
if (unlikely(opts->mss)) {
- *ptr++ = htonl((TCPOPT_MSS << 24) |
- (TCPOLEN_MSS << 16) |
- opts->mss);
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_MSS << 24) | (TCPOLEN_MSS << 16) |
+ opts->mss);
}
if (likely(OPTION_TS & options)) {
if (unlikely(OPTION_SACK_ADVERTISE & options)) {
- *ptr++ = htonl((TCPOPT_SACK_PERM << 24) |
- (TCPOLEN_SACK_PERM << 16) |
- (TCPOPT_TIMESTAMP << 8) |
- TCPOLEN_TIMESTAMP);
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_SACK_PERM << 24) |
+ (TCPOLEN_SACK_PERM << 16) |
+ (TCPOPT_TIMESTAMP << 8) |
+ TCPOLEN_TIMESTAMP);
options &= ~OPTION_SACK_ADVERTISE;
} else {
- *ptr++ = htonl((TCPOPT_NOP << 24) |
- (TCPOPT_NOP << 16) |
- (TCPOPT_TIMESTAMP << 8) |
- TCPOLEN_TIMESTAMP);
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_NOP << 24) |
+ (TCPOPT_NOP << 16) |
+ (TCPOPT_TIMESTAMP << 8) |
+ TCPOLEN_TIMESTAMP);
}
- *ptr++ = htonl(opts->tsval);
- *ptr++ = htonl(opts->tsecr);
+ net_hdr_word(ptr++) = htonl(opts->tsval);
+ net_hdr_word(ptr++) = htonl(opts->tsecr);
}
if (unlikely(OPTION_SACK_ADVERTISE & options)) {
- *ptr++ = htonl((TCPOPT_NOP << 24) |
- (TCPOPT_NOP << 16) |
- (TCPOPT_SACK_PERM << 8) |
- TCPOLEN_SACK_PERM);
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_NOP << 24) |
+ (TCPOPT_NOP << 16) |
+ (TCPOPT_SACK_PERM << 8) |
+ TCPOLEN_SACK_PERM);
}
if (unlikely(OPTION_WSCALE & options)) {
- *ptr++ = htonl((TCPOPT_NOP << 24) |
- (TCPOPT_WINDOW << 16) |
- (TCPOLEN_WINDOW << 8) |
- opts->ws);
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_NOP << 24) |
+ (TCPOPT_WINDOW << 16) |
+ (TCPOLEN_WINDOW << 8) |
+ opts->ws);
}
if (unlikely(opts->num_sack_blocks)) {
@@ -495,16 +500,17 @@
tp->duplicate_sack : tp->selective_acks;
int this_sack;
- *ptr++ = htonl((TCPOPT_NOP << 24) |
- (TCPOPT_NOP << 16) |
- (TCPOPT_SACK << 8) |
- (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_NOP << 24) |
+ (TCPOPT_NOP << 16) |
+ (TCPOPT_SACK << 8) |
+ (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
TCPOLEN_SACK_PERBLOCK)));
for (this_sack = 0; this_sack < opts->num_sack_blocks;
++this_sack) {
- *ptr++ = htonl(sp[this_sack].start_seq);
- *ptr++ = htonl(sp[this_sack].end_seq);
+ net_hdr_word(ptr++) = htonl(sp[this_sack].start_seq);
+ net_hdr_word(ptr++) = htonl(sp[this_sack].end_seq);
}
tp->rx_opt.dsack = 0;
@@ -513,9 +519,10 @@
if (unlikely(OPTION_FAST_OPEN_COOKIE & options)) {
struct tcp_fastopen_cookie *foc = opts->fastopen_cookie;
- *ptr++ = htonl((TCPOPT_EXP << 24) |
- ((TCPOLEN_EXP_FASTOPEN_BASE + foc->len) << 16) |
- TCPOPT_FASTOPEN_MAGIC);
+ net_hdr_word(ptr++) =
+ htonl((TCPOPT_EXP << 24) |
+ ((TCPOLEN_EXP_FASTOPEN_BASE + foc->len) << 16) |
+ TCPOPT_FASTOPEN_MAGIC);
memcpy(ptr, foc->val, foc->len);
if ((foc->len & 3) == 2) {
Index: linux-3.18.7/net/ipv4/igmp.c
===================================================================
--- linux-3.18.7.orig/net/ipv4/igmp.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv4/igmp.c 2015-02-15 01:50:55.122444370 +0100
@@ -495,7 +495,7 @@
if (!skb)
return NULL;
psrc = (__be32 *)skb_put(skb, sizeof(__be32));
- *psrc = psf->sf_inaddr;
+ net_hdr_word(psrc) = psf->sf_inaddr;
scount++; stotal++;
if ((type == IGMPV3_ALLOW_NEW_SOURCES ||
type == IGMPV3_BLOCK_OLD_SOURCES) && psf->sf_crcount) {
Index: linux-3.18.7/include/uapi/linux/igmp.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/igmp.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/igmp.h 2015-02-15 01:50:55.122444370 +0100
@@ -32,7 +32,7 @@
__u8 code; /* For newer IGMP */
__sum16 csum;
__be32 group;
-};
+} __attribute__((packed, aligned(2)));
/* V3 group record types [grec_type] */
#define IGMPV3_MODE_IS_INCLUDE 1
@@ -48,7 +48,7 @@
__be16 grec_nsrcs;
__be32 grec_mca;
__be32 grec_src[0];
-};
+} __attribute__((packed, aligned(2)));
struct igmpv3_report {
__u8 type;
@@ -57,7 +57,7 @@
__be16 resv2;
__be16 ngrec;
struct igmpv3_grec grec[0];
-};
+} __attribute__((packed, aligned(2)));
struct igmpv3_query {
__u8 type;
@@ -78,7 +78,7 @@
__u8 qqic;
__be16 nsrcs;
__be32 srcs[0];
-};
+} __attribute__((packed, aligned(2)));
#define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */
#define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
Index: linux-3.18.7/net/core/flow_dissector.c
===================================================================
--- linux-3.18.7.orig/net/core/flow_dissector.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/core/flow_dissector.c 2015-02-15 01:50:55.122444370 +0100
@@ -53,7 +53,7 @@
ports = __skb_header_pointer(skb, thoff + poff,
sizeof(_ports), data, hlen, &_ports);
if (ports)
- return *ports;
+ return (__be32)net_hdr_word(ports);
}
return 0;
Index: linux-3.18.7/include/uapi/linux/icmpv6.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/icmpv6.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/icmpv6.h 2015-02-15 01:50:55.122444370 +0100
@@ -76,7 +76,7 @@
#define icmp6_addrconf_other icmp6_dataun.u_nd_ra.other
#define icmp6_rt_lifetime icmp6_dataun.u_nd_ra.rt_lifetime
#define icmp6_router_pref icmp6_dataun.u_nd_ra.router_pref
-};
+} __attribute__((packed, aligned(2)));
#define ICMPV6_ROUTER_PREF_LOW 0x3
Index: linux-3.18.7/include/net/ndisc.h
===================================================================
--- linux-3.18.7.orig/include/net/ndisc.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/net/ndisc.h 2015-02-15 01:50:55.122444370 +0100
@@ -76,7 +76,7 @@
struct icmp6hdr icmph;
__be32 reachable_time;
__be32 retrans_timer;
-};
+} __attribute__((packed, aligned(2)));
struct rd_msg {
struct icmp6hdr icmph;
@@ -148,10 +148,10 @@
{
const u32 *p32 = pkey;
- return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) +
- (p32[1] * hash_rnd[1]) +
- (p32[2] * hash_rnd[2]) +
- (p32[3] * hash_rnd[3]));
+ return (((net_hdr_word(&p32[0]) ^ hash32_ptr(dev)) * hash_rnd[0]) +
+ (net_hdr_word(&p32[1]) * hash_rnd[1]) +
+ (net_hdr_word(&p32[2]) * hash_rnd[2]) +
+ (net_hdr_word(&p32[3]) * hash_rnd[3]));
}
static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
@@ -168,8 +168,10 @@
n = rcu_dereference_bh(n->next)) {
u32 *n32 = (u32 *) n->primary_key;
if (n->dev == dev &&
- ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
- (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0)
+ ((n32[0] ^ net_hdr_word(&p32[0])) |
+ (n32[1] ^ net_hdr_word(&p32[1])) |
+ (n32[2] ^ net_hdr_word(&p32[2])) |
+ (n32[3] ^ net_hdr_word(&p32[3]))) == 0)
return n;
}
Index: linux-3.18.7/net/sched/cls_u32.c
===================================================================
--- linux-3.18.7.orig/net/sched/cls_u32.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/sched/cls_u32.c 2015-02-15 02:14:43.685467248 +0100
@@ -148,6 +148,7 @@
data = skb_header_pointer(skb, toff, 4, &hdata);
if (!data)
goto out;
+ if ((net_hdr_word(data) ^ key->val) & key->mask) {
if ((*data ^ key->val) & key->mask) {
n = rcu_dereference_bh(n->next);
goto next_knode;
@@ -201,8 +202,8 @@
&hdata);
if (!data)
goto out;
- sel = ht->divisor & u32_hash_fold(*data, &n->sel,
- n->fshift);
+ sel = ht->divisor & u32_hash_fold(net_hdr_word(data),
+ &n->sel, n->fshift);
}
if (!(n->sel.flags & (TC_U32_VAROFFSET | TC_U32_OFFSET | TC_U32_EAT)))
goto next_ht;
Index: linux-3.18.7/net/ipv6/ip6_offload.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/ip6_offload.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv6/ip6_offload.c 2015-02-15 02:14:06.541386363 +0100
@@ -221,7 +221,7 @@
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
- first_word = *(__be32 *)iph ^ *(__be32 *)iph2;
+ first_word = net_hdr_word(iph) ^ net_hdr_word(iph2);
/* All fields must match except length and Traffic Class.
* XXX skbs on the gro_list have all been parsed and pulled
Index: linux-3.18.7/include/net/addrconf.h
===================================================================
--- linux-3.18.7.orig/include/net/addrconf.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/net/addrconf.h 2015-02-15 01:50:55.122444370 +0100
@@ -43,7 +43,7 @@
__be32 reserved2;
struct in6_addr prefix;
-};
+} __attribute__((packed, aligned(2)));
#include <linux/netdevice.h>
Index: linux-3.18.7/include/net/inet_ecn.h
===================================================================
--- linux-3.18.7.orig/include/net/inet_ecn.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/net/inet_ecn.h 2015-02-15 01:50:55.126444189 +0100
@@ -115,13 +115,13 @@
{
if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
return 0;
- *(__be32*)iph |= htonl(INET_ECN_CE << 20);
+ net_hdr_word(iph) |= htonl(INET_ECN_CE << 20);
return 1;
}
static inline void IP6_ECN_clear(struct ipv6hdr *iph)
{
- *(__be32*)iph &= ~htonl(INET_ECN_MASK << 20);
+ net_hdr_word(iph) &= ~htonl(INET_ECN_MASK << 20);
}
static inline void ipv6_copy_dscp(unsigned int dscp, struct ipv6hdr *inner)
Index: linux-3.18.7/include/net/ipv6.h
===================================================================
--- linux-3.18.7.orig/include/net/ipv6.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/net/ipv6.h 2015-02-15 01:50:55.126444189 +0100
@@ -109,7 +109,7 @@
__u8 reserved;
__be16 frag_off;
__be32 identification;
-};
+} __attribute__((packed, aligned(2)));
#define IP6_MF 0x0001
#define IP6_OFFSET 0xFFF8
@@ -398,8 +398,8 @@
}
#endif
#endif
- addr[0] = wh;
- addr[1] = wl;
+ net_hdr_word(&addr[0]) = wh;
+ net_hdr_word(&addr[1]) = wl;
}
static inline void ipv6_addr_set(struct in6_addr *addr,
@@ -458,6 +458,8 @@
const __be32 *a1 = addr1->s6_addr32;
const __be32 *a2 = addr2->s6_addr32;
unsigned int pdw, pbi;
+ /* Used for last <32-bit fraction of prefix */
+ u32 pbia1, pbia2;
/* check complete u32 in prefix */
pdw = prefixlen >> 5;
@@ -466,7 +468,9 @@
/* check incomplete u32 in prefix */
pbi = prefixlen & 0x1f;
- if (pbi && ((a1[pdw] ^ a2[pdw]) & htonl((0xffffffff) << (32 - pbi))))
+ pbia1 = net_hdr_word(&a1[pdw]);
+ pbia2 = net_hdr_word(&a2[pdw]);
+ if (pbi && ((pbia1 ^ pbia2) & htonl((0xffffffff) << (32 - pbi))))
return false;
return true;
@@ -609,13 +613,13 @@
*/
static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
{
- const __be32 *a1 = token1, *a2 = token2;
+ const struct in6_addr *a1 = token1, *a2 = token2;
int i;
addrlen >>= 2;
for (i = 0; i < addrlen; i++) {
- __be32 xb = a1[i] ^ a2[i];
+ __be32 xb = a1->s6_addr32[i] ^ a2->s6_addr32[i];
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
@@ -739,17 +743,18 @@
static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
__be32 flowlabel)
{
- *(__be32 *)hdr = htonl(0x60000000 | (tclass << 20)) | flowlabel;
+ net_hdr_word((__be32 *)hdr) =
+ htonl(0x60000000 | (tclass << 20)) | flowlabel;
}
static inline __be32 ip6_flowinfo(const struct ipv6hdr *hdr)
{
- return *(__be32 *)hdr & IPV6_FLOWINFO_MASK;
+ return net_hdr_word((__be32 *)hdr) & IPV6_FLOWINFO_MASK;
}
static inline __be32 ip6_flowlabel(const struct ipv6hdr *hdr)
{
- return *(__be32 *)hdr & IPV6_FLOWLABEL_MASK;
+ return net_hdr_word((__be32 *)hdr) & IPV6_FLOWLABEL_MASK;
}
static inline u8 ip6_tclass(__be32 flowinfo)
Index: linux-3.18.7/include/net/secure_seq.h
===================================================================
--- linux-3.18.7.orig/include/net/secure_seq.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/net/secure_seq.h 2015-02-15 01:50:55.126444189 +0100
@@ -2,6 +2,7 @@
#define _NET_SECURE_SEQ
#include <linux/types.h>
+#include <linux/in6.h>
u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
Index: linux-3.18.7/include/uapi/linux/in.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/in.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/in.h 2015-02-15 01:50:55.126444189 +0100
@@ -78,7 +78,7 @@
/* Internet address. */
struct in_addr {
__be32 s_addr;
-};
+} __attribute__((packed, aligned(2)));
#define IP_TOS 1
#define IP_TTL 2
Index: linux-3.18.7/net/core/secure_seq.c
===================================================================
--- linux-3.18.7.orig/net/core/secure_seq.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/core/secure_seq.c 2015-02-15 01:50:55.126444189 +0100
@@ -46,11 +46,12 @@
u32 secret[MD5_MESSAGE_BYTES / 4];
u32 hash[MD5_DIGEST_WORDS];
u32 i;
+ const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
net_secret_init();
memcpy(hash, saddr, 16);
for (i = 0; i < 4; i++)
- secret[i] = net_secret[i] + (__force u32)daddr[i];
+ secret[i] = net_secret[i] + (__force u32)daddr6->s6_addr32[i];
secret[4] = net_secret[4] +
(((__force u16)sport << 16) + (__force u16)dport);
for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
@@ -68,11 +69,12 @@
u32 secret[MD5_MESSAGE_BYTES / 4];
u32 hash[MD5_DIGEST_WORDS];
u32 i;
+ const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
net_secret_init();
memcpy(hash, saddr, 16);
for (i = 0; i < 4; i++)
- secret[i] = net_secret[i] + (__force u32) daddr[i];
+ secret[i] = net_secret[i] + (__force u32) daddr6->s6_addr32[i];
secret[4] = net_secret[4] + (__force u32)dport;
for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
secret[i] = net_secret[i];
@@ -150,11 +152,12 @@
u32 hash[MD5_DIGEST_WORDS];
u64 seq;
u32 i;
+ const struct in6_addr *daddr6 = (struct in6_addr *) daddr;
net_secret_init();
memcpy(hash, saddr, 16);
for (i = 0; i < 4; i++)
- secret[i] = net_secret[i] + daddr[i];
+ secret[i] = net_secret[i] + daddr6->s6_addr32[i];
secret[4] = net_secret[4] +
(((__force u16)sport << 16) + (__force u16)dport);
for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
Index: linux-3.18.7/net/ipv6/ip6_fib.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/ip6_fib.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv6/ip6_fib.c 2015-02-15 01:50:55.126444189 +0100
@@ -137,7 +137,7 @@
* See include/asm-generic/bitops/le.h.
*/
return (__force __be32)(1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)) &
- addr[fn_bit >> 5];
+ net_hdr_word(&addr[fn_bit >> 5]);
}
static struct fib6_node *node_alloc(void)
Index: linux-3.18.7/net/netfilter/nf_conntrack_proto_tcp.c
===================================================================
--- linux-3.18.7.orig/net/netfilter/nf_conntrack_proto_tcp.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/netfilter/nf_conntrack_proto_tcp.c 2015-02-15 01:50:55.126444189 +0100
@@ -456,7 +456,7 @@
/* Fast path for timestamp-only option */
if (length == TCPOLEN_TSTAMP_ALIGNED
- && *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
+ && net_hdr_word(ptr) == htonl((TCPOPT_NOP << 24)
| (TCPOPT_NOP << 16)
| (TCPOPT_TIMESTAMP << 8)
| TCPOLEN_TIMESTAMP))
Index: linux-3.18.7/net/xfrm/xfrm_input.c
===================================================================
--- linux-3.18.7.orig/net/xfrm/xfrm_input.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/xfrm/xfrm_input.c 2015-02-15 01:50:55.126444189 +0100
@@ -152,8 +152,8 @@
if (!pskb_may_pull(skb, hlen))
return -EINVAL;
- *spi = *(__be32 *)(skb_transport_header(skb) + offset);
- *seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
+ *spi = net_hdr_word(skb_transport_header(skb) + offset);
+ *seq = net_hdr_word(skb_transport_header(skb) + offset_seq);
return 0;
}
Index: linux-3.18.7/net/ipv4/tcp_input.c
===================================================================
--- linux-3.18.7.orig/net/ipv4/tcp_input.c 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/net/ipv4/tcp_input.c 2015-02-15 01:50:55.126444189 +0100
@@ -3677,14 +3677,16 @@
{
const __be32 *ptr = (const __be32 *)(th + 1);
- if (*ptr == htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16)
- | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
+ if (net_hdr_word(ptr) ==
+ htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
+ (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
tp->rx_opt.saw_tstamp = 1;
++ptr;
- tp->rx_opt.rcv_tsval = ntohl(*ptr);
+ tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr);
++ptr;
- if (*ptr)
- tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset;
+ if (net_hdr_word(ptr))
+ tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) -
+ tp->tsoffset;
else
tp->rx_opt.rcv_tsecr = 0;
return true;
Index: linux-3.18.7/include/uapi/linux/if_pppox.h
===================================================================
--- linux-3.18.7.orig/include/uapi/linux/if_pppox.h 2015-02-15 01:50:18.000000000 +0100
+++ linux-3.18.7/include/uapi/linux/if_pppox.h 2015-02-15 01:50:55.126444189 +0100
@@ -47,6 +47,7 @@
*/
struct pptp_addr {
__u16 call_id;
+ __u16 pad;
struct in_addr sin_addr;
};
Index: linux-3.18.7/net/ipv6/netfilter/nf_log_ipv6.c
===================================================================
--- linux-3.18.7.orig/net/ipv6/netfilter/nf_log_ipv6.c 2015-02-11 08:01:12.000000000 +0100
+++ linux-3.18.7/net/ipv6/netfilter/nf_log_ipv6.c 2015-02-15 02:17:44.193854463 +0100
@@ -63,9 +63,10 @@
/* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
nf_log_buf_add(m, "LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
+ (ntohl(net_hdr_word(ih)) & 0x0ff00000) >> 20,
(ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
ih->hop_limit,
- (ntohl(*(__be32 *)ih) & 0x000fffff));
+ (ntohl(net_hdr_word(ih)) & 0x000fffff));
fragment = 0;
ptr = ip6hoff + sizeof(struct ipv6hdr);
Reference in a new issue Copy permalink