aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDmitry Mishin <dim@openvz.org>2006-04-18 14:50:10 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-04-18 15:57:54 -0700
commit40daafc80b0f6a950c9252f9f1a242ab5cb6a648 (patch)
tree93e74daf6429d544af14bff31e9ffe3f772186d3 /net/core
parentb809739a1b455396c21de13bcbf6669faf82f747 (diff)
downloadkernel_samsung_smdk4412-40daafc80b0f6a950c9252f9f1a242ab5cb6a648.zip
kernel_samsung_smdk4412-40daafc80b0f6a950c9252f9f1a242ab5cb6a648.tar.gz
kernel_samsung_smdk4412-40daafc80b0f6a950c9252f9f1a242ab5cb6a648.tar.bz2
unaligned access in sk_run_filter()
This patch fixes unaligned access warnings noticed on IA64 in sk_run_filter(). 'ptr' can be unaligned. Signed-off-By: Dmitry Mishin <dim@openvz.org> Signed-off-By: Kirill Korotaev <dev@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/filter.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 93fbd01..5b4486a 100644
--- a/net/core/filter.c
+++ b/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 @@ load_w:
load_h:
ptr = load_pointer(skb, k, 2, &tmp);
if (ptr != NULL) {
- A = ntohs(*(u16 *)ptr);
+ A = ntohs(get_unaligned((u16 *)ptr));
continue;
}
break;