Skip to contentSkip to conversation

Patch "bpf: add bpf_clone_redirect to bpf_helper_changes_pkt_data" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 31, 2017

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

bpf: add bpf_clone_redirect to bpf_helper_changes_pkt_data

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
bpf-add-bpf_clone_redirect-to-bpf_helper_changes_pkt_data.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed May 31 09:13:34 JST 2017

From: Daniel Borkmann <[email protected]>
Date: Thu, 25 May 2017 01:05:07 +0200
Subject: bpf: add bpf_clone_redirect to bpf_helper_changes_pkt_data

From: Daniel Borkmann <[email protected]>

[ Upstream commit 41703a731066fde79c3e5ccf3391cf77a98aeda5 ]

The bpf_clone_redirect() still needs to be listed in bpf_helper_changes_pkt_data() since we call into bpf_try_make_head_writable() from there, thus we need to invalidate prior pkt regs as well.

Fixes 36bbef52c7eb ("bpf: direct packet write and access for helpers for clsact progs")
---
 net/core/filter.c |    1 +
 1 file changed, 1 insertion(+)
net/core/filter.c +1 -0
@@ -2198,6 +2198,7 @@ bool bpf_helper_changes_skb_data(void *f
 	    func == bpf_skb_change_proto ||
 	    func == bpf_skb_change_tail ||
 	    func == bpf_skb_pull_data ||
+	    func == bpf_clone_redirect ||
 	    func == bpf_l3_csum_replace ||
 	    func == bpf_l4_csum_replace)
 		return true;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/bpf-arm64-fix-faulty-emission-of-map-access-in-tail-calls.patch queue-4.9/bpf-add-bpf_clone_redirect-to-bpf_helper_changes_pkt_data.patch