diff options
| author | David S. Miller | 2009-03-25 00:38:53 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-03-25 00:38:53 +0100 |
| commit | c80dd2da736ba235c2ca5dcaa00aac6907786c5b (patch) | |
| tree | d47d94305e17ca6e2b2e7462593241dc7984b317 /net | |
| parent | dnet: drivers/net/dnet.c needs <linux/io.h> (diff) | |
| parent | netfilter: nf_conntrack_tcp: fix unaligned memory access in tcp_sack (diff) | |
| download | kernel-qcow2-linux-c80dd2da736ba235c2ca5dcaa00aac6907786c5b.tar.gz kernel-qcow2-linux-c80dd2da736ba235c2ca5dcaa00aac6907786c5b.tar.xz kernel-qcow2-linux-c80dd2da736ba235c2ca5dcaa00aac6907786c5b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index f3fd154d1ddd..56ac4ee77a1d 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -15,6 +15,7 @@ #include <linux/skbuff.h> #include <linux/ipv6.h> #include <net/ip6_checksum.h> +#include <asm/unaligned.h> #include <net/tcp.h> @@ -466,7 +467,7 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff, for (i = 0; i < (opsize - TCPOLEN_SACK_BASE); i += TCPOLEN_SACK_PERBLOCK) { - tmp = ntohl(*((__be32 *)(ptr+i)+1)); + tmp = get_unaligned_be32((__be32 *)(ptr+i)+1); if (after(tmp, *sack)) *sack = tmp; |