Commit 18ebe16d authored by John Fastabend's avatar John Fastabend Committed by Alexei Starovoitov
Browse files

bpf, sockmap: Add skb_adjust_room to pop bytes off ingress payload 



This implements a new helper skb_adjust_room() so users can push/pop
extra bytes from a BPF_SK_SKB_STREAM_VERDICT program.

Some protocols may include headers and other information that we may
not want to include when doing a redirect from a BPF_SK_SKB_STREAM_VERDICT
program. One use case is to redirect TLS packets into a receive socket
that doesn't expect TLS data. In TLS case the first 13B or so contain the
protocol header. With KTLS the payload is decrypted so we should be able
to redirect this to a receiving socket, but the receiving socket may not
be expecting to receive a TLS header and discard the data. Using the
above helper we can pop the header off and put an appropriate header on
the payload. This allows for creating a proxy between protocols without
extra hops through the stack or userspace.

So in order to fix this case add skb_adjust_room() so users can strip the
header. After this the user can strip the header and an unmodified receiver
thread will work correctly when data is redirected into the ingress path
of a sock.

Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/160160099197.7052.8443193973242831692.stgit@john-Precision-5820-Tower
parent 60a128b5

net/core/filter.c

+46 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include <net/bpf_sk_storage.h>

#include <net/transp_v6.h>

#include <linux/btf_ids.h>

#include <net/tls.h>



static const struct bpf_func_proto *

bpf_sk_base_func_proto(enum bpf_func_id func_id);
@@ -3479,6 +3480,48 @@ static u32 __bpf_skb_max_len(const struct sk_buff *skb) 
			  SKB_MAX_ALLOC;

}



BPF_CALL_4(sk_skb_adjust_room, struct sk_buff *, skb, s32, len_diff,

	   u32, mode, u64, flags)

{

	u32 len_diff_abs = abs(len_diff);

	bool shrink = len_diff < 0;

	int ret = 0;



	if (unlikely(flags || mode))

		return -EINVAL;

	if (unlikely(len_diff_abs > 0xfffU))

		return -EFAULT;



	if (!shrink) {

		ret = skb_cow(skb, len_diff);

		if (unlikely(ret < 0))

			return ret;

		__skb_push(skb, len_diff_abs);

		memset(skb->data, 0, len_diff_abs);

	} else {

		if (unlikely(!pskb_may_pull(skb, len_diff_abs)))

			return -ENOMEM;

		__skb_pull(skb, len_diff_abs);

	}

	bpf_compute_data_end_sk_skb(skb);

	if (tls_sw_has_ctx_rx(skb->sk)) {

		struct strp_msg *rxm = strp_msg(skb);



		rxm->full_len += len_diff;

	}

	return ret;

}



static const struct bpf_func_proto sk_skb_adjust_room_proto = {

	.func		= sk_skb_adjust_room,

	.gpl_only	= false,

	.ret_type	= RET_INTEGER,

	.arg1_type	= ARG_PTR_TO_CTX,

	.arg2_type	= ARG_ANYTHING,

	.arg3_type	= ARG_ANYTHING,

	.arg4_type	= ARG_ANYTHING,

};



BPF_CALL_4(bpf_skb_adjust_room, struct sk_buff *, skb, s32, len_diff,

	   u32, mode, u64, flags)

{
@@ -6745,6 +6788,7 @@ bool bpf_helper_changes_pkt_data(void *func) 
	    func == bpf_skb_change_tail ||

	    func == sk_skb_change_tail ||

	    func == bpf_skb_adjust_room ||

	    func == sk_skb_adjust_room ||

	    func == bpf_skb_pull_data ||

	    func == sk_skb_pull_data ||

	    func == bpf_clone_redirect ||
@@ -7218,6 +7262,8 @@ sk_skb_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) 
		return &sk_skb_change_tail_proto;

	case BPF_FUNC_skb_change_head:

		return &sk_skb_change_head_proto;

	case BPF_FUNC_skb_adjust_room:

		return &sk_skb_adjust_room_proto;

	case BPF_FUNC_get_socket_cookie:

		return &bpf_get_socket_cookie_proto;

	case BPF_FUNC_get_socket_uid:

CRA Git | Maintained and supported by SUSTech CRA and CCSE