From: Martin KaFai Lau <martin.lau@linux.dev>
To: Stanislav Fomichev <sdf@google.com>
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
song@kernel.org, yhs@fb.com, john.fastabend@gmail.com,
kpsingh@kernel.org, haoluo@google.com, jolsa@kernel.org,
bpf@vger.kernel.org
Subject: Re: [PATCH bpf-next v4 2/4] selftests/bpf: Update EFAULT {g,s}etsockopt selftests
Date: Fri, 5 May 2023 14:47:00 -0700 [thread overview]
Message-ID: <9dcd94cd-d0b8-b86a-f566-42ddea6dfdf2@linux.dev> (raw)
In-Reply-To: <20230504184349.3632259-3-sdf@google.com>
On 5/4/23 11:43 AM, Stanislav Fomichev wrote:
> @@ -648,6 +676,49 @@ static struct sockopt_test {
>
> .error = EFAULT_SETSOCKOPT,
> },
> + {
> + .descr = "setsockopt: ignore >PAGE_SIZE optlen",
> + .insns = {
> + /* write 0xFF to the first optval byte */
> +
> + /* r6 = ctx->optval */
> + BPF_LDX_MEM(BPF_DW, BPF_REG_6, BPF_REG_1,
> + offsetof(struct bpf_sockopt, optval)),
> + /* r2 = ctx->optval */
> + BPF_MOV64_REG(BPF_REG_2, BPF_REG_6),
> + /* r6 = ctx->optval + 1 */
> + BPF_ALU64_IMM(BPF_ADD, BPF_REG_6, 1),
> +
> + /* r7 = ctx->optval_end */
> + BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_1,
> + offsetof(struct bpf_sockopt, optval_end)),
> +
> + /* if (ctx->optval + 1 <= ctx->optval_end) { */
> + BPF_JMP_REG(BPF_JGT, BPF_REG_6, BPF_REG_7, 1),
> + /* ctx->optval[0] = 0xF0 */
> + BPF_ST_MEM(BPF_B, BPF_REG_2, 0, 0xFF),
> + /* } */
> +
> + BPF_MOV64_IMM(BPF_REG_0, 1),
> + BPF_EXIT_INSN(),
> + },
> + .attach_type = BPF_CGROUP_SETSOCKOPT,
> + .expected_attach_type = BPF_CGROUP_SETSOCKOPT,
> +
> + .set_level = SOL_IP,
> + .set_optname = IP_TOS,
> + .set_optval = { 1 << 3 },
> + .set_optlen = PAGE_SIZE + 1,
> +
> + .get_level = SOL_IP,
> + .get_optname = IP_TOS,
> +#if __BYTE_ORDER == __LITTLE_ENDIAN
> + .get_optval = { 1 << 3, 0, 0, 0 }, /* the changes are ignored */
> +#else
> + .get_optval = { 0, 0, 0, 1 << 3 }, /* the changes are ignored */
This fails in s390 (big endian?):
https://github.com/kernel-patches/bpf/actions/runs/4895136324/jobs/8740562449
I don't think it needs special treatment here on different __BYTE_ORDER. Other
tests in this file also don't do that.
> +#endif
> + .get_optlen = 4,
> + },
next prev parent reply other threads:[~2023-05-05 21:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 18:43 [PATCH bpf-next v4 0/4] bpf: Don't EFAULT for {g,s}setsockopt with wrong optlen Stanislav Fomichev
2023-05-04 18:43 ` [PATCH bpf-next v4 1/4] " Stanislav Fomichev
2023-05-04 18:43 ` [PATCH bpf-next v4 2/4] selftests/bpf: Update EFAULT {g,s}etsockopt selftests Stanislav Fomichev
2023-05-05 21:47 ` Martin KaFai Lau [this message]
2023-05-04 18:43 ` [PATCH bpf-next v4 3/4] selftests/bpf: Correctly handle optlen > 4096 Stanislav Fomichev
2023-05-05 21:49 ` Martin KaFai Lau
2023-05-04 18:43 ` [PATCH bpf-next v4 4/4] bpf: Document EFAULT changes for sockopt Stanislav Fomichev
2023-05-05 22:00 ` [PATCH bpf-next v4 0/4] bpf: Don't EFAULT for {g,s}setsockopt with wrong optlen Martin KaFai Lau
2023-05-05 22:04 ` Stanislav Fomichev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9dcd94cd-d0b8-b86a-f566-42ddea6dfdf2@linux.dev \
--to=martin.lau@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox