Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40daafc8 authored by Dmitry Mishin's avatar Dmitry Mishin Committed by David S. Miller
Browse files

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: default avatarDmitry Mishin <dim@openvz.org>
Signed-off-By: default avatarKirill Korotaev <dev@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b809739a

net/core/filter.c

+3 −2
Original line number Diff line number Diff line
@@ -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;