Skip to content

Commit

Permalink
net: filter: fix warning on 32-bit arch
Browse files Browse the repository at this point in the history
fix compiler warning on 32-bit architectures:

net/core/filter.c: In function '__sk_run_filter':
net/core/filter.c:540:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
net/core/filter.c:550:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
net/core/filter.c:560:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alexei Starovoitov authored and David S. Miller committed Jun 11, 2014
1 parent 02c00c2 commit 61f83d0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/core/filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ static unsigned int __sk_run_filter(void *ctx, const struct sock_filter_int *ins
* BPF_R0 - 8/16/32-bit skb data converted to cpu endianness
*/

ptr = load_pointer((struct sk_buff *) CTX, off, 4, &tmp);
ptr = load_pointer((struct sk_buff *) (unsigned long) CTX, off, 4, &tmp);
if (likely(ptr != NULL)) {
BPF_R0 = get_unaligned_be32(ptr);
CONT;
Expand All @@ -547,7 +547,7 @@ static unsigned int __sk_run_filter(void *ctx, const struct sock_filter_int *ins
LD_ABS_H: /* BPF_R0 = ntohs(*(u16 *) (skb->data + imm32)) */
off = IMM;
load_half:
ptr = load_pointer((struct sk_buff *) CTX, off, 2, &tmp);
ptr = load_pointer((struct sk_buff *) (unsigned long) CTX, off, 2, &tmp);
if (likely(ptr != NULL)) {
BPF_R0 = get_unaligned_be16(ptr);
CONT;
Expand All @@ -557,7 +557,7 @@ static unsigned int __sk_run_filter(void *ctx, const struct sock_filter_int *ins
LD_ABS_B: /* BPF_R0 = *(u8 *) (skb->data + imm32) */
off = IMM;
load_byte:
ptr = load_pointer((struct sk_buff *) CTX, off, 1, &tmp);
ptr = load_pointer((struct sk_buff *) (unsigned long) CTX, off, 1, &tmp);
if (likely(ptr != NULL)) {
BPF_R0 = *(u8 *)ptr;
CONT;
Expand Down

0 comments on commit 61f83d0

Please sign in to comment.