soreuseport: change consume_skb to kfree_skb in error case

kraigatgoog · davem330 · commit 00ce3a15d811 · 2016-01-06T01:30:27.000-05:00
Fixes: 538950a ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF") Suggested-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Craig Gallek <kraig@google.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/sock_reuseport.c b/net/core/sock_reuseport.c
@@ -173,7 +173,7 @@ static struct sock *run_bpf(struct sock_reuseport *reuse, u16 socks,
 
 	/* temporarily advance data past protocol header */
 	if (!pskb_pull(skb, hdr_len)) {
-		consume_skb(nskb);
+		kfree_skb(nskb);
 		return NULL;
 	}
 	index = bpf_prog_run_save_cb(prog, skb);

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ static struct sock run_bpf(struct sock_reuseport reuse, u16 socks,`
`173`	`173`
`174`	`174`	`/* temporarily advance data past protocol header */`
`175`	`175`	`if (!pskb_pull(skb, hdr_len)) {`
`176`		`- consume_skb(nskb);`
	`176`	`+ kfree_skb(nskb);`
`177`	`177`	`return NULL;`
`178`	`178`	`}`
`179`	`179`	`index = bpf_prog_run_save_cb(prog, skb);`