| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <7c1faed8-9533-5916-5f61-4b078038c7e3@linux.dev>
Date: Mon, 30 Jan 2023 15:11:13 -0800
From: Martin KaFai Lau <martin.lau@...ux.dev>
To: Alexei Starovoitov <alexei.starovoitov@...il.com>
Cc: Joanne Koong <joannelkoong@...il.com>, daniel@...earbox.net,
andrii@...nel.org, martin.lau@...nel.org, ast@...nel.org,
netdev@...r.kernel.org, memxor@...il.com, kernel-team@...com,
bpf@...r.kernel.org
Subject: Re: [PATCH v9 bpf-next 3/5] bpf: Add skb dynptrs
On 1/30/23 2:31 PM, Alexei Starovoitov wrote:
> On Mon, Jan 30, 2023 at 02:04:08PM -0800, Martin KaFai Lau wrote:
>> On 1/27/23 11:17 AM, Joanne Koong wrote:
>>> @@ -8243,6 +8316,28 @@ static int check_helper_call(struct bpf_verifier_env *env, struct bpf_insn *insn
>>> mark_reg_known_zero(env, regs, BPF_REG_0);
>>> regs[BPF_REG_0].type = PTR_TO_MEM | ret_flag;
>>> regs[BPF_REG_0].mem_size = meta.mem_size;
>>> + if (func_id == BPF_FUNC_dynptr_data &&
>>> + dynptr_type == BPF_DYNPTR_TYPE_SKB) {
>>> + bool seen_direct_write = env->seen_direct_write;
>>> +
>>> + regs[BPF_REG_0].type |= DYNPTR_TYPE_SKB;
>>> + if (!may_access_direct_pkt_data(env, NULL, BPF_WRITE))
>>> + regs[BPF_REG_0].type |= MEM_RDONLY;
>>> + else
>>> + /*
>>> + * Calling may_access_direct_pkt_data() will set
>>> + * env->seen_direct_write to true if the skb is
>>> + * writable. As an optimization, we can ignore
>>> + * setting env->seen_direct_write.
>>> + *
>>> + * env->seen_direct_write is used by skb
>>> + * programs to determine whether the skb's page
>>> + * buffers should be cloned. Since data slice
>>> + * writes would only be to the head, we can skip
>>> + * this.
>>> + */
>>> + env->seen_direct_write = seen_direct_write;
>>> + }
>>
>> [ ... ]
>>
>>> @@ -9263,17 +9361,26 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_
>>> return ret;
>>> break;
>>> case KF_ARG_PTR_TO_DYNPTR:
>>> + {
>>> + enum bpf_arg_type dynptr_arg_type = ARG_PTR_TO_DYNPTR;
>>> +
>>> if (reg->type != PTR_TO_STACK &&
>>> reg->type != CONST_PTR_TO_DYNPTR) {
>>> verbose(env, "arg#%d expected pointer to stack or dynptr_ptr\n", i);
>>> return -EINVAL;
>>> }
>>> - ret = process_dynptr_func(env, regno, insn_idx,
>>> - ARG_PTR_TO_DYNPTR | MEM_RDONLY);
>>> + if (meta->func_id == special_kfunc_list[KF_bpf_dynptr_from_skb])
>>> + dynptr_arg_type |= MEM_UNINIT | DYNPTR_TYPE_SKB;
>>> + else
>>> + dynptr_arg_type |= MEM_RDONLY;
>>> +
>>> + ret = process_dynptr_func(env, regno, insn_idx, dynptr_arg_type,
>>> + meta->func_id);
>>> if (ret < 0)
>>> return ret;
>>> break;
>>> + }
>>> case KF_ARG_PTR_TO_LIST_HEAD:
>>> if (reg->type != PTR_TO_MAP_VALUE &&
>>> reg->type != (PTR_TO_BTF_ID | MEM_ALLOC)) {
>>> @@ -15857,6 +15964,14 @@ static int fixup_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn,
>>> desc->func_id == special_kfunc_list[KF_bpf_rdonly_cast]) {
>>> insn_buf[0] = BPF_MOV64_REG(BPF_REG_0, BPF_REG_1);
>>> *cnt = 1;
>>> + } else if (desc->func_id == special_kfunc_list[KF_bpf_dynptr_from_skb]) {
>>> + bool is_rdonly = !may_access_direct_pkt_data(env, NULL, BPF_WRITE);
>>
>> Does it need to restore the env->seen_direct_write here also?
>>
>> It seems this 'seen_direct_write' saving/restoring is needed now because
>> 'may_access_direct_pkt_data(BPF_WRITE)' is not only called when it is
>> actually writing the packet. Some refactoring can help to avoid issue like
>> this.
>>
>> While at 'seen_direct_write', Alexei has also pointed out that the verifier
>> needs to track whether the (packet) 'slice' returned by bpf_dynptr_data()
>> has been written. It should be tracked in 'seen_direct_write'. Take a look
>> at how reg_is_pkt_pointer() and may_access_direct_pkt_data() are done in
>> check_mem_access(). iirc, this reg_is_pkt_pointer() part got loss somewhere
>> in v5 (or v4?) when bpf_dynptr_data() was changed to return register typed
>> PTR_TO_MEM instead of PTR_TO_PACKET.
>
> btw tc progs are using gen_prologue() approach because data/data_end are not kfuncs
> (nothing is being called by the bpf prog).
> In this case we don't need to repeat this approach. If so we don't need to
> set seen_direct_write.
> Instead bpf_dynptr_data() can call bpf_skb_pull_data() directly.
> And technically we don't need to limit it to skb head. It can handle any off/len.
> It will work for skb, but there is no equivalent for xdp_pull_data().
> I don't think we can implement xdp_pull_data in all drivers.
> That's massive amount of work, but we need to be consistent if we want
> dynptr to wrap both skb and xdp.
> We can say dynptr_data is for head only, but we've seen bugs where people
> had to switch from data/data_end to load_bytes.
>
> Also bpf_skb_pull_data is quite heavy. For progs that only want to parse
> the packet calling that in bpf_dynptr_data is a heavy hammer.
>
> It feels that we need to go back to skb_header_pointer-like discussion.
> Something like:
> bpf_dynptr_slice(const struct bpf_dynptr *ptr, u32 offset, u32 len, void *buffer)
> Whether buffer is a part of dynptr or program provided is tbd.
It would be nice if it can get something similar to skb_header_pointer(). I
think Jakub has mentioned that also.
No pull in the common case. Copy to 'buffer' when it is not in head (for skb) or
across frags (for xdp). In the copy-to-'buffer' case and the bpf prog did change
the 'buffer', the bpf prog will be responsible to call bpf_dynptr_write() to
write back to the skb/xdp if needed?
Powered by blists - more mailing lists