Attachment 49578 Details for Bug 115846

[patch] Patch from 2.6.13.1

socket-filter-fix (text/plain), 1.70 KB, created by Olaf Kirch on 2005-09-12 09:34:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olaf Kirch

Created: 2005-09-12 09:34:50 UTC

Size: 1.70 KB

patch

obsolete

>From: Herbert Xu <herbert@gondor.apana.org.au>
>Date: Tue, 6 Sep 2005 01:47:10 +0000 (-0700)
>Subject: [PATCH] 2.6.13 breaks libpcap (and tcpdump)
>X-Git-Tag: v2.6.13.1
>X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/chrisw/linux-2.6.13.y.git;a=commitdiff;h=a49567a4dbfd414f19e5bf828a4b2c540f164ea8
>References: 115846
>Patch-mainline: 2.6.13.1
>
>  [PATCH] 2.6.13 breaks libpcap (and tcpdump)
>  
>  [NET]: 2.6.13 breaks libpcap (and tcpdump)
>  
>  Patrick McHardy says:
>  
>    Never mind, I got it, we never fall through to the second switch
>    statement anymore. I think we could simply break when load_pointer
>    returns NULL. The switch statement will fall through to the default
>    case and return 0 for all cases but 0 > k >= SKF_AD_OFF.
>  
>  Here's a patch to do just that.
>  
>  I left BPF_MSH alone because it's really a hack to calculate the IP
>  header length, which makes no sense when applied to the special data.
>  
>  Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>  Signed-off-by: David S. Miller <davem@davemloft.net>
>  Signed-off-by: Chris Wright <chrisw@osdl.org>
>  Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
>---
>
>--- a/net/core/filter.c
>+++ b/net/core/filter.c
>@@ -182,7 +182,7 @@ int sk_run_filter(struct sk_buff *skb, s
> 				A = ntohl(*(u32 *)ptr);
> 				continue;
> 			}
>-			return 0;
>+			break;
> 		case BPF_LD|BPF_H|BPF_ABS:
> 			k = fentry->k;
>  load_h:
>@@ -191,7 +191,7 @@ int sk_run_filter(struct sk_buff *skb, s
> 				A = ntohs(*(u16 *)ptr);
> 				continue;
> 			}
>-			return 0;
>+			break;
> 		case BPF_LD|BPF_B|BPF_ABS:
> 			k = fentry->k;
> load_b:
>@@ -200,7 +200,7 @@ load_b:
> 				A = *(u8 *)ptr;
> 				continue;
> 			}
>-			return 0;
>+			break;
> 		case BPF_LD|BPF_W|BPF_LEN:
> 			A = skb->len;
> 			continue;

Actions: View | Diff

Attachments on bug 115846: 49578