From 317d4aaaf0ee8bd5f3cc28d9dae42161ed3e812a Mon Sep 17 00:00:00 2001
From: Dmitry Mishin <dim@openvz.org>
Date: Tue, 18 Apr 2006 14:50:10 -0700
Subject: [PATCH] --- yaml --- r: 25919 b: refs/heads/master c:
 40daafc80b0f6a950c9252f9f1a242ab5cb6a648 h: refs/heads/master i:   25917:
 6b1943afaf2c60bb041c4f4120dbf993fa14c8c4   25915:
 1faa5862206a21c97fa1ece4fb3b180af29ebe30   25911:
 34a4bd3d4a31ffb330463264f58c0b7824db718b   25903:
 9e688bf408e69061050c5359314dc6d57de8b514   25887:
 cf2403c3c946abaf097c6a53fc944c332bd864be   25855:
 f6e42e6cb6a70d0d49e44260ece8e05b58e19a8b v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/filter.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8ffd3769823c..e31b189cbc50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b809739a1b455396c21de13bcbf6669faf82f747
+refs/heads/master: 40daafc80b0f6a950c9252f9f1a242ab5cb6a648
diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c
index 93fbd01d2259..5b4486a60cf6 100644
--- a/trunk/net/core/filter.c
+++ b/trunk/net/core/filter.c
@@ -34,6 +34,7 @@
 #include <linux/timer.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
+#include <asm/unaligned.h>
 #include <linux/filter.h>
 
 /* No hurry in this branch */
@@ -177,7 +178,7 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 load_w:
 			ptr = load_pointer(skb, k, 4, &tmp);
 			if (ptr != NULL) {
-				A = ntohl(*(u32 *)ptr);
+				A = ntohl(get_unaligned((u32 *)ptr));
 				continue;
 			}
 			break;
@@ -186,7 +187,7 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
 load_h:
 			ptr = load_pointer(skb, k, 2, &tmp);
 			if (ptr != NULL) {
-				A = ntohs(*(u16 *)ptr);
+				A = ntohs(get_unaligned((u16 *)ptr));
 				continue;
 			}
 			break;