projects / openwrt / staging / dedeckeh.git / blob
? search:


ad7b12d650cc31d94cdf5da032c67023ee904e05
[openwrt/staging/dedeckeh.git] / target / linux / ath79 / patches-4.19 / 910-unaligned_access_hacks.patch
1 --- a/arch/mips/include/asm/checksum.h
2 +++ b/arch/mips/include/asm/checksum.h
3 @@ -134,26 +134,30 @@ static inline __sum16 ip_fast_csum(const
4 const unsigned int *stop = word + ihl;
5 unsigned int csum;
6 int carry;
7 + unsigned int w;
8
9 - csum = word[0];
10 - csum += word[1];
11 - carry = (csum < word[1]);
12 + csum = net_hdr_word(word++);
13 +
14 + w = net_hdr_word(word++);
15 + csum += w;
16 + carry = (csum < w);
17 csum += carry;
18
19 - csum += word[2];
20 - carry = (csum < word[2]);
21 + w = net_hdr_word(word++);
22 + csum += w;
23 + carry = (csum < w);
24 csum += carry;
25
26 - csum += word[3];
27 - carry = (csum < word[3]);
28 + w = net_hdr_word(word++);
29 + csum += w;
30 + carry = (csum < w);
31 csum += carry;
32
33 - word += 4;
34 do {
35 - csum += *word;
36 - carry = (csum < *word);
37 + w = net_hdr_word(word++);
38 + csum += w;
39 + carry = (csum < w);
40 csum += carry;
41 - word++;
42 } while (word != stop);
43
44 return csum_fold(csum);
45 @@ -214,73 +218,6 @@ static inline __sum16 ip_compute_csum(co
46 return csum_fold(csum_partial(buff, len, 0));
47 }
48
49 -#define _HAVE_ARCH_IPV6_CSUM
50 -static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
51 - const struct in6_addr *daddr,
52 - __u32 len, __u8 proto,
53 - __wsum sum)
54 -{
55 - __wsum tmp;
56 -
57 - __asm__(
58 - " .set push # csum_ipv6_magic\n"
59 - " .set noreorder \n"
60 - " .set noat \n"
61 - " addu %0, %5 # proto (long in network byte order)\n"
62 - " sltu $1, %0, %5 \n"
63 - " addu %0, $1 \n"
64 -
65 - " addu %0, %6 # csum\n"
66 - " sltu $1, %0, %6 \n"
67 - " lw %1, 0(%2) # four words source address\n"
68 - " addu %0, $1 \n"
69 - " addu %0, %1 \n"
70 - " sltu $1, %0, %1 \n"
71 -
72 - " lw %1, 4(%2) \n"
73 - " addu %0, $1 \n"
74 - " addu %0, %1 \n"
75 - " sltu $1, %0, %1 \n"
76 -
77 - " lw %1, 8(%2) \n"
78 - " addu %0, $1 \n"
79 - " addu %0, %1 \n"
80 - " sltu $1, %0, %1 \n"
81 -
82 - " lw %1, 12(%2) \n"
83 - " addu %0, $1 \n"
84 - " addu %0, %1 \n"
85 - " sltu $1, %0, %1 \n"
86 -
87 - " lw %1, 0(%3) \n"
88 - " addu %0, $1 \n"
89 - " addu %0, %1 \n"
90 - " sltu $1, %0, %1 \n"
91 -
92 - " lw %1, 4(%3) \n"
93 - " addu %0, $1 \n"
94 - " addu %0, %1 \n"
95 - " sltu $1, %0, %1 \n"
96 -
97 - " lw %1, 8(%3) \n"
98 - " addu %0, $1 \n"
99 - " addu %0, %1 \n"
100 - " sltu $1, %0, %1 \n"
101 -
102 - " lw %1, 12(%3) \n"
103 - " addu %0, $1 \n"
104 - " addu %0, %1 \n"
105 - " sltu $1, %0, %1 \n"
106 -
107 - " addu %0, $1 # Add final carry\n"
108 - " .set pop"
109 - : "=&r" (sum), "=&r" (tmp)
110 - : "r" (saddr), "r" (daddr),
111 - "0" (htonl(len)), "r" (htonl(proto)), "r" (sum));
112 -
113 - return csum_fold(sum);
114 -}
115 -
116 #include <asm-generic/checksum.h>
117 #endif /* CONFIG_GENERIC_CSUM */
118
119 --- a/include/uapi/linux/ip.h
120 +++ b/include/uapi/linux/ip.h
121 @@ -103,7 +103,7 @@ struct iphdr {
122 __be32 saddr;
123 __be32 daddr;
124 /*The options start here. */
125 -};
126 +} __attribute__((packed, aligned(2)));
127
128
129 struct ip_auth_hdr {
130 --- a/include/uapi/linux/ipv6.h
131 +++ b/include/uapi/linux/ipv6.h
132 @@ -131,7 +131,7 @@ struct ipv6hdr {
133
134 struct in6_addr saddr;
135 struct in6_addr daddr;
136 -};
137 +} __attribute__((packed, aligned(2)));
138
139
140 /* index values for the variables in ipv6_devconf */
141 --- a/include/uapi/linux/tcp.h
142 +++ b/include/uapi/linux/tcp.h
143 @@ -55,7 +55,7 @@ struct tcphdr {
144 __be16 window;
145 __sum16 check;
146 __be16 urg_ptr;
147 -};
148 +} __attribute__((packed, aligned(2)));
149
150 /*
151 * The union cast uses a gcc extension to avoid aliasing problems
152 @@ -65,7 +65,7 @@ struct tcphdr {
153 union tcp_word_hdr {
154 struct tcphdr hdr;
155 __be32 words[5];
156 -};
157 +} __attribute__((packed, aligned(2)));
158
159 #define tcp_flag_word(tp) ( ((union tcp_word_hdr *)(tp))->words [3])
160
161 --- a/include/uapi/linux/udp.h
162 +++ b/include/uapi/linux/udp.h
163 @@ -25,7 +25,7 @@ struct udphdr {
164 __be16 dest;
165 __be16 len;
166 __sum16 check;
167 -};
168 +} __attribute__((packed, aligned(2)));
169
170 /* UDP socket options */
171 #define UDP_CORK 1 /* Never send partially complete segments */
172 --- a/net/netfilter/nf_conntrack_core.c
173 +++ b/net/netfilter/nf_conntrack_core.c
174 @@ -263,8 +263,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
175
176 switch (l3num) {
177 case NFPROTO_IPV4:
178 - tuple->src.u3.ip = ap[0];
179 - tuple->dst.u3.ip = ap[1];
180 + tuple->src.u3.ip = net_hdr_word(ap++);
181 + tuple->dst.u3.ip = net_hdr_word(ap);
182 break;
183 case NFPROTO_IPV6:
184 memcpy(tuple->src.u3.ip6, ap, sizeof(tuple->src.u3.ip6));
185 --- a/include/uapi/linux/icmp.h
186 +++ b/include/uapi/linux/icmp.h
187 @@ -82,7 +82,7 @@ struct icmphdr {
188 } frag;
189 __u8 reserved[4];
190 } un;
191 -};
192 +} __attribute__((packed, aligned(2)));
193
194
195 /*
196 --- a/include/uapi/linux/in6.h
197 +++ b/include/uapi/linux/in6.h
198 @@ -43,7 +43,7 @@ struct in6_addr {
199 #define s6_addr16 in6_u.u6_addr16
200 #define s6_addr32 in6_u.u6_addr32
201 #endif
202 -};
203 +} __attribute__((packed, aligned(2)));
204 #endif /* __UAPI_DEF_IN6_ADDR */
205
206 #if __UAPI_DEF_SOCKADDR_IN6
207 --- a/net/ipv6/tcp_ipv6.c
208 +++ b/net/ipv6/tcp_ipv6.c
209 @@ -39,6 +39,7 @@
210 #include <linux/ipsec.h>
211 #include <linux/times.h>
212 #include <linux/slab.h>
213 +#include <asm/unaligned.h>
214 #include <linux/uaccess.h>
215 #include <linux/ipv6.h>
216 #include <linux/icmpv6.h>
217 @@ -836,10 +837,10 @@ static void tcp_v6_send_response(const s
218 topt = (__be32 *)(t1 + 1);
219
220 if (tsecr) {
221 - *topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
222 - (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP);
223 - *topt++ = htonl(tsval);
224 - *topt++ = htonl(tsecr);
225 + put_unaligned_be32((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
226 + (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP, topt++);
227 + put_unaligned_be32(tsval, topt++);
228 + put_unaligned_be32(tsecr, topt++);
229 }
230
231 #ifdef CONFIG_TCP_MD5SIG
232 --- a/include/linux/ipv6.h
233 +++ b/include/linux/ipv6.h
234 @@ -6,6 +6,7 @@
235
236 #define ipv6_optlen(p) (((p)->hdrlen+1) << 3)
237 #define ipv6_authlen(p) (((p)->hdrlen+2) << 2)
238 +
239 /*
240 * This structure contains configuration options per IPv6 link.
241 */
242 --- a/net/ipv6/datagram.c
243 +++ b/net/ipv6/datagram.c
244 @@ -480,7 +480,7 @@ int ipv6_recv_error(struct sock *sk, str
245 ipv6_iface_scope_id(&sin->sin6_addr,
246 IP6CB(skb)->iif);
247 } else {
248 - ipv6_addr_set_v4mapped(*(__be32 *)(nh + serr->addr_offset),
249 + ipv6_addr_set_v4mapped(net_hdr_word(nh + serr->addr_offset),
250 &sin->sin6_addr);
251 sin->sin6_scope_id = 0;
252 }
253 @@ -830,12 +830,12 @@ int ip6_datagram_send_ctl(struct net *ne
254 }
255
256 if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
257 - if ((fl6->flowlabel^*(__be32 *)CMSG_DATA(cmsg))&~IPV6_FLOWINFO_MASK) {
258 + if ((fl6->flowlabel^net_hdr_word(CMSG_DATA(cmsg)))&~IPV6_FLOWINFO_MASK) {
259 err = -EINVAL;
260 goto exit_f;
261 }
262 }
263 - fl6->flowlabel = IPV6_FLOWINFO_MASK & *(__be32 *)CMSG_DATA(cmsg);
264 + fl6->flowlabel = IPV6_FLOWINFO_MASK & net_hdr_word(CMSG_DATA(cmsg));
265 break;
266
267 case IPV6_2292HOPOPTS:
268 --- a/net/ipv6/ip6_gre.c
269 +++ b/net/ipv6/ip6_gre.c
270 @@ -452,7 +452,7 @@ static void ip6gre_err(struct sk_buff *s
271 return;
272 ipv6h = (const struct ipv6hdr *)skb->data;
273 greh = (const struct gre_base_hdr *)(skb->data + offset);
274 - key = key_off ? *(__be32 *)(skb->data + key_off) : 0;
275 + key = key_off ? net_hdr_word((__be32 *)(skb->data + key_off)) : 0;
276
277 t = ip6gre_tunnel_lookup(skb->dev, &ipv6h->daddr, &ipv6h->saddr,
278 key, greh->protocol);
279 --- a/net/ipv6/exthdrs.c
280 +++ b/net/ipv6/exthdrs.c
281 @@ -756,7 +756,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
282 goto drop;
283 }
284
285 - pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));
286 + pkt_len = ntohl(net_hdr_word(nh + optoff + 2));
287 if (pkt_len <= IPV6_MAXPLEN) {
288 __IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);
289 icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);
290 --- a/include/linux/types.h
291 +++ b/include/linux/types.h
292 @@ -230,5 +230,11 @@ struct callback_head {
293 typedef void (*rcu_callback_t)(struct rcu_head *head);
294 typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
295
296 +struct net_hdr_word {
297 + u32 words[1];
298 +} __attribute__((packed, aligned(2)));
299 +
300 +#define net_hdr_word(_p) (((struct net_hdr_word *) (_p))->words[0])
301 +
302 #endif /* __ASSEMBLY__ */
303 #endif /* _LINUX_TYPES_H */
304 --- a/net/ipv4/af_inet.c
305 +++ b/net/ipv4/af_inet.c
306 @@ -1422,8 +1422,8 @@ struct sk_buff *inet_gro_receive(struct
307 if (unlikely(ip_fast_csum((u8 *)iph, 5)))
308 goto out_unlock;
309
310 - id = ntohl(*(__be32 *)&iph->id);
311 - flush = (u16)((ntohl(*(__be32 *)iph) ^ skb_gro_len(skb)) | (id & ~IP_DF));
312 + id = ntohl(net_hdr_word(&iph->id));
313 + flush = (u16)((ntohl(net_hdr_word(iph)) ^ skb_gro_len(skb)) | (id & ~IP_DF));
314 id >>= 16;
315
316 list_for_each_entry(p, head, list) {
317 --- a/net/ipv4/route.c
318 +++ b/net/ipv4/route.c
319 @@ -448,7 +448,7 @@ static struct neighbour *ipv4_neigh_look
320 else if (skb)
321 pkey = &ip_hdr(skb)->daddr;
322
323 - n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey);
324 + n = __ipv4_neigh_lookup(dev, net_hdr_word(pkey));
325 if (n)
326 return n;
327 return neigh_create(&arp_tbl, pkey, dev);
328 --- a/net/ipv4/tcp_output.c
329 +++ b/net/ipv4/tcp_output.c
330 @@ -444,48 +444,53 @@ static void tcp_options_write(__be32 *pt
331 u16 options = opts->options; /* mungable copy */
332
333 if (unlikely(OPTION_MD5 & options)) {
334 - *ptr++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
335 - (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
336 + net_hdr_word(ptr++) =
337 + htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
338 + (TCPOPT_MD5SIG << 8) | TCPOLEN_MD5SIG);
339 /* overload cookie hash location */
340 opts->hash_location = (__u8 *)ptr;
341 ptr += 4;
342 }
343
344 if (unlikely(opts->mss)) {
345 - *ptr++ = htonl((TCPOPT_MSS << 24) |
346 - (TCPOLEN_MSS << 16) |
347 - opts->mss);
348 + net_hdr_word(ptr++) =
349 + htonl((TCPOPT_MSS << 24) | (TCPOLEN_MSS << 16) |
350 + opts->mss);
351 }
352
353 if (likely(OPTION_TS & options)) {
354 if (unlikely(OPTION_SACK_ADVERTISE & options)) {
355 - *ptr++ = htonl((TCPOPT_SACK_PERM << 24) |
356 - (TCPOLEN_SACK_PERM << 16) |
357 - (TCPOPT_TIMESTAMP << 8) |
358 - TCPOLEN_TIMESTAMP);
359 + net_hdr_word(ptr++) =
360 + htonl((TCPOPT_SACK_PERM << 24) |
361 + (TCPOLEN_SACK_PERM << 16) |
362 + (TCPOPT_TIMESTAMP << 8) |
363 + TCPOLEN_TIMESTAMP);
364 options &= ~OPTION_SACK_ADVERTISE;
365 } else {
366 - *ptr++ = htonl((TCPOPT_NOP << 24) |
367 - (TCPOPT_NOP << 16) |
368 - (TCPOPT_TIMESTAMP << 8) |
369 - TCPOLEN_TIMESTAMP);
370 + net_hdr_word(ptr++) =
371 + htonl((TCPOPT_NOP << 24) |
372 + (TCPOPT_NOP << 16) |
373 + (TCPOPT_TIMESTAMP << 8) |
374 + TCPOLEN_TIMESTAMP);
375 }
376 - *ptr++ = htonl(opts->tsval);
377 - *ptr++ = htonl(opts->tsecr);
378 + net_hdr_word(ptr++) = htonl(opts->tsval);
379 + net_hdr_word(ptr++) = htonl(opts->tsecr);
380 }
381
382 if (unlikely(OPTION_SACK_ADVERTISE & options)) {
383 - *ptr++ = htonl((TCPOPT_NOP << 24) |
384 - (TCPOPT_NOP << 16) |
385 - (TCPOPT_SACK_PERM << 8) |
386 - TCPOLEN_SACK_PERM);
387 + net_hdr_word(ptr++) =
388 + htonl((TCPOPT_NOP << 24) |
389 + (TCPOPT_NOP << 16) |
390 + (TCPOPT_SACK_PERM << 8) |
391 + TCPOLEN_SACK_PERM);
392 }
393
394 if (unlikely(OPTION_WSCALE & options)) {
395 - *ptr++ = htonl((TCPOPT_NOP << 24) |
396 - (TCPOPT_WINDOW << 16) |
397 - (TCPOLEN_WINDOW << 8) |
398 - opts->ws);
399 + net_hdr_word(ptr++) =
400 + htonl((TCPOPT_NOP << 24) |
401 + (TCPOPT_WINDOW << 16) |
402 + (TCPOLEN_WINDOW << 8) |
403 + opts->ws);
404 }
405
406 if (unlikely(opts->num_sack_blocks)) {
407 @@ -493,16 +498,17 @@ static void tcp_options_write(__be32 *pt
408 tp->duplicate_sack : tp->selective_acks;
409 int this_sack;
410
411 - *ptr++ = htonl((TCPOPT_NOP << 24) |
412 - (TCPOPT_NOP << 16) |
413 - (TCPOPT_SACK << 8) |
414 - (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
415 + net_hdr_word(ptr++) =
416 + htonl((TCPOPT_NOP << 24) |
417 + (TCPOPT_NOP << 16) |
418 + (TCPOPT_SACK << 8) |
419 + (TCPOLEN_SACK_BASE + (opts->num_sack_blocks *
420 TCPOLEN_SACK_PERBLOCK)));
421
422 for (this_sack = 0; this_sack < opts->num_sack_blocks;
423 ++this_sack) {
424 - *ptr++ = htonl(sp[this_sack].start_seq);
425 - *ptr++ = htonl(sp[this_sack].end_seq);
426 + net_hdr_word(ptr++) = htonl(sp[this_sack].start_seq);
427 + net_hdr_word(ptr++) = htonl(sp[this_sack].end_seq);
428 }
429
430 tp->rx_opt.dsack = 0;
431 @@ -515,13 +521,14 @@ static void tcp_options_write(__be32 *pt
432
433 if (foc->exp) {
434 len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
435 - *ptr = htonl((TCPOPT_EXP << 24) | (len << 16) |
436 + net_hdr_word(ptr) =
437 + htonl((TCPOPT_EXP << 24) | (len << 16) |
438 TCPOPT_FASTOPEN_MAGIC);
439 p += TCPOLEN_EXP_FASTOPEN_BASE;
440 } else {
441 len = TCPOLEN_FASTOPEN_BASE + foc->len;
442 - *p++ = TCPOPT_FASTOPEN;
443 - *p++ = len;
444 + net_hdr_word(p++) = TCPOPT_FASTOPEN;
445 + net_hdr_word(p++) = len;
446 }
447
448 memcpy(p, foc->val, foc->len);
449 --- a/include/uapi/linux/igmp.h
450 +++ b/include/uapi/linux/igmp.h
451 @@ -33,7 +33,7 @@ struct igmphdr {
452 __u8 code; /* For newer IGMP */
453 __sum16 csum;
454 __be32 group;
455 -};
456 +} __attribute__((packed, aligned(2)));
457
458 /* V3 group record types [grec_type] */
459 #define IGMPV3_MODE_IS_INCLUDE 1
460 @@ -49,7 +49,7 @@ struct igmpv3_grec {
461 __be16 grec_nsrcs;
462 __be32 grec_mca;
463 __be32 grec_src[0];
464 -};
465 +} __attribute__((packed, aligned(2)));
466
467 struct igmpv3_report {
468 __u8 type;
469 @@ -58,7 +58,7 @@ struct igmpv3_report {
470 __be16 resv2;
471 __be16 ngrec;
472 struct igmpv3_grec grec[0];
473 -};
474 +} __attribute__((packed, aligned(2)));
475
476 struct igmpv3_query {
477 __u8 type;
478 @@ -79,7 +79,7 @@ struct igmpv3_query {
479 __u8 qqic;
480 __be16 nsrcs;
481 __be32 srcs[0];
482 -};
483 +} __attribute__((packed, aligned(2)));
484
485 #define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */
486 #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
487 --- a/net/core/flow_dissector.c
488 +++ b/net/core/flow_dissector.c
489 @@ -111,7 +111,7 @@ __be32 __skb_flow_get_ports(const struct
490 ports = __skb_header_pointer(skb, thoff + poff,
491 sizeof(_ports), data, hlen, &_ports);
492 if (ports)
493 - return *ports;
494 + return (__be32)net_hdr_word(ports);
495 }
496
497 return 0;
498 --- a/include/uapi/linux/icmpv6.h
499 +++ b/include/uapi/linux/icmpv6.h
500 @@ -77,7 +77,7 @@ struct icmp6hdr {
501 #define icmp6_addrconf_other icmp6_dataun.u_nd_ra.other
502 #define icmp6_rt_lifetime icmp6_dataun.u_nd_ra.rt_lifetime
503 #define icmp6_router_pref icmp6_dataun.u_nd_ra.router_pref
504 -};
505 +} __attribute__((packed, aligned(2)));
506
507
508 #define ICMPV6_ROUTER_PREF_LOW 0x3
509 --- a/include/net/ndisc.h
510 +++ b/include/net/ndisc.h
511 @@ -89,7 +89,7 @@ struct ra_msg {
512 struct icmp6hdr icmph;
513 __be32 reachable_time;
514 __be32 retrans_timer;
515 -};
516 +} __attribute__((packed, aligned(2)));
517
518 struct rd_msg {
519 struct icmp6hdr icmph;
520 @@ -368,10 +368,10 @@ static inline u32 ndisc_hashfn(const voi
521 {
522 const u32 *p32 = pkey;
523
524 - return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) +
525 - (p32[1] * hash_rnd[1]) +
526 - (p32[2] * hash_rnd[2]) +
527 - (p32[3] * hash_rnd[3]));
528 + return (((net_hdr_word(&p32[0]) ^ hash32_ptr(dev)) * hash_rnd[0]) +
529 + (net_hdr_word(&p32[1]) * hash_rnd[1]) +
530 + (net_hdr_word(&p32[2]) * hash_rnd[2]) +
531 + (net_hdr_word(&p32[3]) * hash_rnd[3]));
532 }
533
534 static inline struct neighbour *__ipv6_neigh_lookup_noref(struct net_device *dev, const void *pkey)
535 --- a/net/sched/cls_u32.c
536 +++ b/net/sched/cls_u32.c
537 @@ -165,7 +165,7 @@ next_knode:
538 data = skb_header_pointer(skb, toff, 4, &hdata);
539 if (!data)
540 goto out;
541 - if ((*data ^ key->val) & key->mask) {
542 + if ((net_hdr_word(data) ^ key->val) & key->mask) {
543 n = rcu_dereference_bh(n->next);
544 goto next_knode;
545 }
546 @@ -218,8 +218,8 @@ check_terminal:
547 &hdata);
548 if (!data)
549 goto out;
550 - sel = ht->divisor & u32_hash_fold(*data, &n->sel,
551 - n->fshift);
552 + sel = ht->divisor & u32_hash_fold(net_hdr_word(data),
553 + &n->sel, n->fshift);
554 }
555 if (!(n->sel.flags & (TC_U32_VAROFFSET | TC_U32_OFFSET | TC_U32_EAT)))
556 goto next_ht;
557 --- a/net/ipv6/ip6_offload.c
558 +++ b/net/ipv6/ip6_offload.c
559 @@ -223,7 +223,7 @@ static struct sk_buff *ipv6_gro_receive(
560 continue;
561
562 iph2 = (struct ipv6hdr *)(p->data + off);
563 - first_word = *(__be32 *)iph ^ *(__be32 *)iph2;
564 + first_word = net_hdr_word(iph) ^ net_hdr_word(iph2);
565
566 /* All fields must match except length and Traffic Class.
567 * XXX skbs on the gro_list have all been parsed and pulled
568 --- a/include/net/addrconf.h
569 +++ b/include/net/addrconf.h
570 @@ -47,7 +47,7 @@ struct prefix_info {
571 __be32 reserved2;
572
573 struct in6_addr prefix;
574 -};
575 +} __attribute__((packed, aligned(2)));
576
577 #include <linux/netdevice.h>
578 #include <net/if_inet6.h>
579 --- a/include/net/inet_ecn.h
580 +++ b/include/net/inet_ecn.h
581 @@ -125,9 +125,9 @@ static inline int IP6_ECN_set_ce(struct
582 if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
583 return 0;
584
585 - from = *(__be32 *)iph;
586 + from = net_hdr_word(iph);
587 to = from | htonl(INET_ECN_CE << 20);
588 - *(__be32 *)iph = to;
589 + net_hdr_word(iph) = to;
590 if (skb->ip_summed == CHECKSUM_COMPLETE)
591 skb->csum = csum_add(csum_sub(skb->csum, (__force __wsum)from),
592 (__force __wsum)to);
593 --- a/include/net/ipv6.h
594 +++ b/include/net/ipv6.h
595 @@ -149,7 +149,7 @@ struct frag_hdr {
596 __u8 reserved;
597 __be16 frag_off;
598 __be32 identification;
599 -};
600 +} __attribute__((packed, aligned(2)));
601
602 #define IP6_MF 0x0001
603 #define IP6_OFFSET 0xFFF8
604 @@ -499,8 +499,8 @@ static inline void __ipv6_addr_set_half(
605 }
606 #endif
607 #endif
608 - addr[0] = wh;
609 - addr[1] = wl;
610 + net_hdr_word(&addr[0]) = wh;
611 + net_hdr_word(&addr[1]) = wl;
612 }
613
614 static inline void ipv6_addr_set(struct in6_addr *addr,
615 @@ -559,6 +559,8 @@ static inline bool ipv6_prefix_equal(con
616 const __be32 *a1 = addr1->s6_addr32;
617 const __be32 *a2 = addr2->s6_addr32;
618 unsigned int pdw, pbi;
619 + /* Used for last <32-bit fraction of prefix */
620 + u32 pbia1, pbia2;
621
622 /* check complete u32 in prefix */
623 pdw = prefixlen >> 5;
624 @@ -567,7 +569,9 @@ static inline bool ipv6_prefix_equal(con
625
626 /* check incomplete u32 in prefix */
627 pbi = prefixlen & 0x1f;
628 - if (pbi && ((a1[pdw] ^ a2[pdw]) & htonl((0xffffffff) << (32 - pbi))))
629 + pbia1 = net_hdr_word(&a1[pdw]);
630 + pbia2 = net_hdr_word(&a2[pdw]);
631 + if (pbi && ((pbia1 ^ pbia2) & htonl((0xffffffff) << (32 - pbi))))
632 return false;
633
634 return true;
635 @@ -683,13 +687,13 @@ static inline void ipv6_addr_set_v4mappe
636 */
637 static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
638 {
639 - const __be32 *a1 = token1, *a2 = token2;
640 + const struct in6_addr *a1 = token1, *a2 = token2;
641 int i;
642
643 addrlen >>= 2;
644
645 for (i = 0; i < addrlen; i++) {
646 - __be32 xb = a1[i] ^ a2[i];
647 + __be32 xb = a1->s6_addr32[i] ^ a2->s6_addr32[i];
648 if (xb)
649 return i * 32 + 31 - __fls(ntohl(xb));
650 }
651 @@ -876,17 +880,18 @@ static inline int ip6_multipath_hash_pol
652 static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
653 __be32 flowlabel)
654 {
655 - *(__be32 *)hdr = htonl(0x60000000 | (tclass << 20)) | flowlabel;
656 + net_hdr_word((__be32 *)hdr) =
657 + htonl(0x60000000 | (tclass << 20)) | flowlabel;
658 }
659
660 static inline __be32 ip6_flowinfo(const struct ipv6hdr *hdr)
661 {
662 - return *(__be32 *)hdr & IPV6_FLOWINFO_MASK;
663 + return net_hdr_word((__be32 *)hdr) & IPV6_FLOWINFO_MASK;
664 }
665
666 static inline __be32 ip6_flowlabel(const struct ipv6hdr *hdr)
667 {
668 - return *(__be32 *)hdr & IPV6_FLOWLABEL_MASK;
669 + return net_hdr_word((__be32 *)hdr) & IPV6_FLOWLABEL_MASK;
670 }
671
672 static inline u8 ip6_tclass(__be32 flowinfo)
673 --- a/include/net/secure_seq.h
674 +++ b/include/net/secure_seq.h
675 @@ -3,6 +3,7 @@
676 #define _NET_SECURE_SEQ
677
678 #include <linux/types.h>
679 +#include <linux/in6.h>
680
681 u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
682 u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
683 --- a/include/uapi/linux/in.h
684 +++ b/include/uapi/linux/in.h
685 @@ -84,7 +84,7 @@ enum {
686 /* Internet address. */
687 struct in_addr {
688 __be32 s_addr;
689 -};
690 +} __attribute__((packed, aligned(2)));
691 #endif
692
693 #define IP_TOS 1
694 --- a/net/ipv6/ip6_fib.c
695 +++ b/net/ipv6/ip6_fib.c
696 @@ -142,7 +142,7 @@ static __be32 addr_bit_set(const void *t
697 * See include/asm-generic/bitops/le.h.
698 */
699 return (__force __be32)(1 << ((~fn_bit ^ BITOP_BE32_SWIZZLE) & 0x1f)) &
700 - addr[fn_bit >> 5];
701 + net_hdr_word(&addr[fn_bit >> 5]);
702 }
703
704 struct fib6_info *fib6_info_alloc(gfp_t gfp_flags)
705 --- a/net/netfilter/nf_conntrack_proto_tcp.c
706 +++ b/net/netfilter/nf_conntrack_proto_tcp.c
707 @@ -423,7 +423,7 @@ static void tcp_sack(const struct sk_buf
708
709 /* Fast path for timestamp-only option */
710 if (length == TCPOLEN_TSTAMP_ALIGNED
711 - && *(__be32 *)ptr == htonl((TCPOPT_NOP << 24)
712 + && net_hdr_word(ptr) == htonl((TCPOPT_NOP << 24)
713 | (TCPOPT_NOP << 16)
714 | (TCPOPT_TIMESTAMP << 8)
715 | TCPOLEN_TIMESTAMP))
716 --- a/net/xfrm/xfrm_input.c
717 +++ b/net/xfrm/xfrm_input.c
718 @@ -194,8 +194,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
719 if (!pskb_may_pull(skb, hlen))
720 return -EINVAL;
721
722 - *spi = *(__be32 *)(skb_transport_header(skb) + offset);
723 - *seq = *(__be32 *)(skb_transport_header(skb) + offset_seq);
724 + *spi = net_hdr_word(skb_transport_header(skb) + offset);
725 + *seq = net_hdr_word(skb_transport_header(skb) + offset_seq);
726 return 0;
727 }
728 EXPORT_SYMBOL(xfrm_parse_spi);
729 --- a/net/ipv4/tcp_input.c
730 +++ b/net/ipv4/tcp_input.c
731 @@ -3891,14 +3891,16 @@ static bool tcp_parse_aligned_timestamp(
732 {
733 const __be32 *ptr = (const __be32 *)(th + 1);
734
735 - if (*ptr == htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16)
736 - | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
737 + if (net_hdr_word(ptr) ==
738 + htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
739 + (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
740 tp->rx_opt.saw_tstamp = 1;
741 ++ptr;
742 - tp->rx_opt.rcv_tsval = ntohl(*ptr);
743 + tp->rx_opt.rcv_tsval = get_unaligned_be32(ptr);
744 ++ptr;
745 - if (*ptr)
746 - tp->rx_opt.rcv_tsecr = ntohl(*ptr) - tp->tsoffset;
747 + if (net_hdr_word(ptr))
748 + tp->rx_opt.rcv_tsecr = get_unaligned_be32(ptr) -
749 + tp->tsoffset;
750 else
751 tp->rx_opt.rcv_tsecr = 0;
752 return true;
753 --- a/include/uapi/linux/if_pppox.h
754 +++ b/include/uapi/linux/if_pppox.h
755 @@ -51,6 +51,7 @@ struct pppoe_addr {
756 */
757 struct pptp_addr {
758 __u16 call_id;
759 + __u16 pad;
760 struct in_addr sin_addr;
761 };
762
763 --- a/net/ipv6/netfilter/nf_log_ipv6.c
764 +++ b/net/ipv6/netfilter/nf_log_ipv6.c
765 @@ -66,9 +66,9 @@ static void dump_ipv6_packet(struct net
766 /* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
767 nf_log_buf_add(m, "LEN=%zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
768 ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
769 - (ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
770 + (ntohl(net_hdr_word(ih)) & 0x0ff00000) >> 20,
771 ih->hop_limit,
772 - (ntohl(*(__be32 *)ih) & 0x000fffff));
773 + (ntohl(net_hdr_word(ih)) & 0x000fffff));
774
775 fragment = 0;
776 ptr = ip6hoff + sizeof(struct ipv6hdr);
777 --- a/include/net/neighbour.h
778 +++ b/include/net/neighbour.h
779 @@ -266,8 +266,10 @@ static inline bool neigh_key_eq128(const
780 const u32 *n32 = (const u32 *)n->primary_key;
781 const u32 *p32 = pkey;
782
783 - return ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
784 - (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0;
785 + return ((n32[0] ^ net_hdr_word(&p32[0])) |
786 + (n32[1] ^ net_hdr_word(&p32[1])) |
787 + (n32[2] ^ net_hdr_word(&p32[2])) |
788 + (n32[3] ^ net_hdr_word(&p32[3]))) == 0;
789 }
790
791 static inline struct neighbour *___neigh_lookup_noref(
792 --- a/include/uapi/linux/netfilter_arp/arp_tables.h
793 +++ b/include/uapi/linux/netfilter_arp/arp_tables.h
794 @@ -70,7 +70,7 @@ struct arpt_arp {
795 __u8 flags;
796 /* Inverse flags */
797 __u16 invflags;
798 -};
799 +} __attribute__((aligned(4)));
800
801 /* Values for "flag" field in struct arpt_ip (general arp structure).
802 * No flags defined yet.
803 --- a/net/core/utils.c
804 +++ b/net/core/utils.c
805 @@ -447,8 +447,14 @@ void inet_proto_csum_replace16(__sum16 *
806 bool pseudohdr)
807 {
808 __be32 diff[] = {
809 - ~from[0], ~from[1], ~from[2], ~from[3],
810 - to[0], to[1], to[2], to[3],
811 + ~net_hdr_word(&from[0]),
812 + ~net_hdr_word(&from[1]),
813 + ~net_hdr_word(&from[2]),
814 + ~net_hdr_word(&from[3]),
815 + net_hdr_word(&to[0]),
816 + net_hdr_word(&to[1]),
817 + net_hdr_word(&to[2]),
818 + net_hdr_word(&to[3]),
819 };
820 if (skb->ip_summed != CHECKSUM_PARTIAL) {
821 *sum = csum_fold(csum_partial(diff, sizeof(diff),
822 --- a/include/linux/etherdevice.h
823 +++ b/include/linux/etherdevice.h
824 @@ -480,7 +480,7 @@ static inline bool is_etherdev_addr(cons
825 * @b: Pointer to Ethernet header
826 *
827 * Compare two Ethernet headers, returns 0 if equal.
828 - * This assumes that the network header (i.e., IP header) is 4-byte
829 + * This assumes that the network header (i.e., IP header) is 2-byte
830 * aligned OR the platform can handle unaligned access. This is the
831 * case for all packets coming into netif_receive_skb or similar
832 * entry points.
833 @@ -503,11 +503,12 @@ static inline unsigned long compare_ethe
834 fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
835 return fold;
836 #else
837 - u32 *a32 = (u32 *)((u8 *)a + 2);
838 - u32 *b32 = (u32 *)((u8 *)b + 2);
839 + const u16 *a16 = a;
840 + const u16 *b16 = b;
841
842 - return (*(u16 *)a ^ *(u16 *)b) | (a32[0] ^ b32[0]) |
843 - (a32[1] ^ b32[1]) | (a32[2] ^ b32[2]);
844 + return (a16[0] ^ b16[0]) | (a16[1] ^ b16[1]) | (a16[2] ^ b16[2]) |
845 + (a16[3] ^ b16[3]) | (a16[4] ^ b16[4]) | (a16[5] ^ b16[5]) |
846 + (a16[6] ^ b16[6]);
847 #endif
848 }
849
850 --- a/net/ipv4/tcp_offload.c
851 +++ b/net/ipv4/tcp_offload.c
852 @@ -226,7 +226,7 @@ struct sk_buff *tcp_gro_receive(struct l
853
854 th2 = tcp_hdr(p);
855
856 - if (*(u32 *)&th->source ^ *(u32 *)&th2->source) {
857 + if (net_hdr_word(&th->source) ^ net_hdr_word(&th2->source)) {
858 NAPI_GRO_CB(p)->same_flow = 0;
859 continue;
860 }
861 @@ -244,8 +244,8 @@ found:
862 ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH));
863 flush |= (__force int)(th->ack_seq ^ th2->ack_seq);
864 for (i = sizeof(*th); i < thlen; i += 4)
865 - flush |= *(u32 *)((u8 *)th + i) ^
866 - *(u32 *)((u8 *)th2 + i);
867 + flush |= net_hdr_word((u8 *)th + i) ^
868 + net_hdr_word((u8 *)th2 + i);
869
870 /* When we receive our second frame we can made a decision on if we
871 * continue this flow as an atomic flow with a fixed ID or if we use
872 --- a/net/ipv6/netfilter/ip6table_mangle.c
873 +++ b/net/ipv6/netfilter/ip6table_mangle.c
874 @@ -50,7 +50,7 @@ ip6t_mangle_out(struct sk_buff *skb, con
875 hop_limit = ipv6_hdr(skb)->hop_limit;
876
877 /* flowlabel and prio (includes version, which shouldn't change either */
878 - flowlabel = *((u_int32_t *)ipv6_hdr(skb));
879 + flowlabel = net_hdr_word(ipv6_hdr(skb));
880
881 ret = ip6t_do_table(skb, state, state->net->ipv6.ip6table_mangle);
882
883 @@ -59,7 +59,7 @@ ip6t_mangle_out(struct sk_buff *skb, con
884 !ipv6_addr_equal(&ipv6_hdr(skb)->daddr, &daddr) ||
885 skb->mark != mark ||
886 ipv6_hdr(skb)->hop_limit != hop_limit ||
887 - flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) {
888 + flowlabel != net_hdr_word(ipv6_hdr(skb)))) {
889 err = ip6_route_me_harder(state->net, skb);
890 if (err < 0)
891 ret = NF_DROP_ERR(err);
Staging tree of dedeckeh