---

yaml --- r: 25919 b: refs/heads/master c: 40daafc h: refs/heads/master i: 25917: 6b1943a 25915: 1faa586 25911: 34a4bd3 25903: 9e688bf 25887: cf2403c 25855: f6e42e6 v: v3
git-mirror · Apr 18, 2006 · 317d4aa · 317d4aa
1 parent fcb4371
commit 317d4aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;