From patchwork Mon Jul 1 17:38:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1125521 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="XPjWxcbj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45cvk02BP5z9sPH for ; Tue, 2 Jul 2019 03:38:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727578AbfGARis (ORCPT ); Mon, 1 Jul 2019 13:38:48 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:49839 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727094AbfGARir (ORCPT ); Mon, 1 Jul 2019 13:38:47 -0400 Received: by mail-pf1-f201.google.com with SMTP id 145so2803404pfw.16 for ; Mon, 01 Jul 2019 10:38:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=LuA5/ZzaFRvCrMv8h/GWULJQIiv6PMuzB4YrBHKvmDg=; b=XPjWxcbjt+1M7BigI9mdLIaLUNs5k73XfEpIFKv82/ZK6m6kXh0QS4NVugfJQ/MdmP Wh2xUzIGP4V++aeAAb+A6n6rnvF25/SC695jU1QBAcLvHcW1p0RP+BTXVPKHQwwJzZjS o622YxGTeAG4GCBcBR5I+zMkePztaY++dOqzTXC1vWdsNrhkB1Q0AZzxZToRui6VjZPX /H4XI9mTcOIqfLmM1W1D5Lj7SBrMgetXsYdYCquxcUnoNfSQ0TIc3/us4SDmUGQ86bnR Y/dy2QnemEFBZFm95tu4bze/OBsZVbf+9kCEUX70haugxsSWwZ2IJ7w4MuJqiuIK6Uq3 Pn3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LuA5/ZzaFRvCrMv8h/GWULJQIiv6PMuzB4YrBHKvmDg=; b=Q1A+XZea2rvFeyh7aVpE0rFnVp6WkjmVBsnIhE2DTBKUfdlVvwSfH1ylW4q/qoqkty 3rlYriFldsokU5cUwn1rRUuGhQRWueTZJ2JaJ5M897wrVCctRrrl5YAn4iZA15YjaUdw Q8J319JHRoQsXvKUuVRpCtT8qs6krkC0HX+gA2TVlrVYb8pbjWGjkrRduX/F7MZXEMHq R4p1eOPb547zHlVpvbqUfbOTQr8nwm1YmTnkQd6TxI2pMe88lnjXnealR+VvuLLmw/WU hAE1vkcIwWqQ0ir1FP2JrBB85SXzLWTfIOHFhtO5Tx7YgyN6KuDgmL8G9LCJ/kzCxG4v pdhQ== X-Gm-Message-State: APjAAAVv4yTk/hbC9DYWAKiGsS6DdI2QTK7q2m2uiCeKkDQKb1H07gCW anEFJGVKfLoDG3hIL28RJDiDZhI= X-Google-Smtp-Source: APXvYqxOo4BnqXg6L2bQyvUaAQXaVM215HW/11c/JpdlnecYaZda0I/b0jjRLCCs/4CHPxbDXcTW6Ig= X-Received: by 2002:a63:60c8:: with SMTP id u191mr24307007pgb.401.1562002726488; Mon, 01 Jul 2019 10:38:46 -0700 (PDT) Date: Mon, 1 Jul 2019 10:38:39 -0700 In-Reply-To: <20190701173841.32249-1-sdf@google.com> Message-Id: <20190701173841.32249-2-sdf@google.com> Mime-Version: 1.0 References: <20190701173841.32249-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next v3 1/3] bpf: allow wide (u64) aligned stores for some fields of bpf_sock_addr From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Andrii Nakryiko , Yonghong Song , kernel test robot Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Since commit cd17d7770578 ("bpf/tools: sync bpf.h") clang decided that it can do a single u64 store into user_ip6[2] instead of two separate u32 ones: # 17: (18) r2 = 0x100000000000000 # ; ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2); # 19: (7b) *(u64 *)(r1 +16) = r2 # invalid bpf_context access off=16 size=8 From the compiler point of view it does look like a correct thing to do, so let's support it on the kernel side. Credit to Andrii Nakryiko for a proper implementation of bpf_ctx_wide_store_ok. Cc: Andrii Nakryiko Cc: Yonghong Song Fixes: cd17d7770578 ("bpf/tools: sync bpf.h") Reported-by: kernel test robot Acked-by: Yonghong Song Acked-by: Andrii Nakryiko Signed-off-by: Stanislav Fomichev --- include/linux/filter.h | 6 ++++++ include/uapi/linux/bpf.h | 6 +++--- net/core/filter.c | 22 ++++++++++++++-------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index 1fe53e78c7e3..6d944369ca87 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -747,6 +747,12 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default) return size <= size_default && (size & (size - 1)) == 0; } +#define bpf_ctx_wide_store_ok(off, size, type, field) \ + (size == sizeof(__u64) && \ + off >= offsetof(type, field) && \ + off + sizeof(__u64) <= offsetofend(type, field) && \ + off % sizeof(__u64) == 0) + #define bpf_classic_proglen(fprog) (fprog->len * sizeof(fprog->filter[0])) static inline void bpf_prog_lock_ro(struct bpf_prog *fp) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index cffea1826a1f..dcdc606e57d6 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3240,7 +3240,7 @@ struct bpf_sock_addr { __u32 user_ip4; /* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ - __u32 user_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write. + __u32 user_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. * Stored in network byte order. */ __u32 user_port; /* Allows 4-byte read and write. @@ -3249,10 +3249,10 @@ struct bpf_sock_addr { __u32 family; /* Allows 4-byte read, but no write */ __u32 type; /* Allows 4-byte read, but no write */ __u32 protocol; /* Allows 4-byte read, but no write */ - __u32 msg_src_ip4; /* Allows 1,2,4-byte read an 4-byte write. + __u32 msg_src_ip4; /* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ - __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write. + __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. * Stored in network byte order. */ __bpf_md_ptr(struct bpf_sock *, sk); diff --git a/net/core/filter.c b/net/core/filter.c index 4836264f82ee..2520dbc539fc 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6851,6 +6851,16 @@ static bool sock_addr_is_valid_access(int off, int size, if (!bpf_ctx_narrow_access_ok(off, size, size_default)) return false; } else { + if (bpf_ctx_wide_store_ok(off, size, + struct bpf_sock_addr, + user_ip6)) + return true; + + if (bpf_ctx_wide_store_ok(off, size, + struct bpf_sock_addr, + msg_src_ip6)) + return true; + if (size != size_default) return false; } @@ -7691,9 +7701,6 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, /* SOCK_ADDR_STORE_NESTED_FIELD_OFF() has semantic similar to * SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF() but for store operation. * - * It doesn't support SIZE argument though since narrow stores are not - * supported for now. - * * In addition it uses Temporary Field TF (member of struct S) as the 3rd * "register" since two registers available in convert_ctx_access are not * enough: we can't override neither SRC, since it contains value to store, nor @@ -7701,7 +7708,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, * instructions. But we need a temporary place to save pointer to nested * structure whose field we want to store to. */ -#define SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, OFF, TF) \ +#define SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, SIZE, OFF, TF) \ do { \ int tmp_reg = BPF_REG_9; \ if (si->src_reg == tmp_reg || si->dst_reg == tmp_reg) \ @@ -7712,8 +7719,7 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, offsetof(S, TF)); \ *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(S, F), tmp_reg, \ si->dst_reg, offsetof(S, F)); \ - *insn++ = BPF_STX_MEM( \ - BPF_FIELD_SIZEOF(NS, NF), tmp_reg, si->src_reg, \ + *insn++ = BPF_STX_MEM(SIZE, tmp_reg, si->src_reg, \ bpf_target_off(NS, NF, FIELD_SIZEOF(NS, NF), \ target_size) \ + OFF); \ @@ -7725,8 +7731,8 @@ static u32 xdp_convert_ctx_access(enum bpf_access_type type, TF) \ do { \ if (type == BPF_WRITE) { \ - SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, OFF, \ - TF); \ + SOCK_ADDR_STORE_NESTED_FIELD_OFF(S, NS, F, NF, SIZE, \ + OFF, TF); \ } else { \ SOCK_ADDR_LOAD_NESTED_FIELD_SIZE_OFF( \ S, NS, F, NF, SIZE, OFF); \ From patchwork Mon Jul 1 17:38:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1125523 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="uEd08RMu"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45cvk25njMz9sPH for ; Tue, 2 Jul 2019 03:38:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728331AbfGARiu (ORCPT ); Mon, 1 Jul 2019 13:38:50 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:55920 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727130AbfGARiu (ORCPT ); Mon, 1 Jul 2019 13:38:50 -0400 Received: by mail-pf1-f202.google.com with SMTP id i26so9179025pfo.22 for ; Mon, 01 Jul 2019 10:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=rqxRKWNEo1osvaBkv3/KPbZBsws5mfNzEZoyqO4E7N0=; b=uEd08RMuRZkIcdgl/k7/xWDXggSB7BIAEHoCC54LmnZryPZbzhb0qGfkQYyeEF9HwZ AMqishzIroKm5Q6ZnbjDIabRPPx8VE+JMMTWLGMz07nrO8urswHBugHWM3Av2/Kc0d+D M9/bVmFXXreaEKJe93mL8fUF+OaQcrCt508Zabl3UqWmQZbOJ5tgSZJLvqZFhPzlButD 1Pp4NsOtM3SYwPEd3Qgx7ioQGJzBAEJ9iX9XZr6Dvr3xVf71k7+4WMk8yuylaVRTQDP8 ErsSFS8WXPnWAy4r0G3HWfrcbSG52CuRhyx5fxEa9AoC7Fak0lTthHifpZpvLDYQ7eIF T8Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=rqxRKWNEo1osvaBkv3/KPbZBsws5mfNzEZoyqO4E7N0=; b=O4aOSK0/Yd5pjNTHX5ivRYAZiN5e6WKZvTsLt5st2NZd5ThylrUhfYajEh0fF1IxMI 9fNZenEXn1yfWwAPdqZOSMSVRYw+Cy/hlSE7sxq2//jViQ0BXd7JNaYB7j9Ol7G/3laE tP5RQgHtVc4T7ncqhAjschHZd9tTD308CQlLzkA0DTv0GZiDILb7ByUKjYx/K4XJwBcE y0UZwU0Hj1X7h6U4b5vEE14HryPMKnr6H3tW660Cvx7oTlmJqETd6vS55M2momXvvDFE /96elW2OodbeSwBGyeYd5G1xOR64cp+94MWsEDWPukK5zMJFoCv0m4tZ0MdpeE23/+oC hv9Q== X-Gm-Message-State: APjAAAXjqMRCiaUmzDefAttGGgdEsgUxdSOvUW0wJxRu1zZrVxDz+RDw UGDaLAk9glqwrxf5pDq3tCETIrA= X-Google-Smtp-Source: APXvYqxqMd81L1DDmkwA3FYZGIcQqmw1s+00/5mYjsII7gtoJsELsfFIxiFV5KROBjQf3TfZe7iPhiw= X-Received: by 2002:a65:5c0a:: with SMTP id u10mr26577468pgr.412.1562002729019; Mon, 01 Jul 2019 10:38:49 -0700 (PDT) Date: Mon, 1 Jul 2019 10:38:40 -0700 In-Reply-To: <20190701173841.32249-1-sdf@google.com> Message-Id: <20190701173841.32249-3-sdf@google.com> Mime-Version: 1.0 References: <20190701173841.32249-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next v3 2/3] bpf: sync bpf.h to tools/ From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Sync user_ip6 & msg_src_ip6 comments. Signed-off-by: Stanislav Fomichev --- tools/include/uapi/linux/bpf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index a396b516a2b2..c59dc921ce83 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -3237,7 +3237,7 @@ struct bpf_sock_addr { __u32 user_ip4; /* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ - __u32 user_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write. + __u32 user_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. * Stored in network byte order. */ __u32 user_port; /* Allows 4-byte read and write. @@ -3246,10 +3246,10 @@ struct bpf_sock_addr { __u32 family; /* Allows 4-byte read, but no write */ __u32 type; /* Allows 4-byte read, but no write */ __u32 protocol; /* Allows 4-byte read, but no write */ - __u32 msg_src_ip4; /* Allows 1,2,4-byte read an 4-byte write. + __u32 msg_src_ip4; /* Allows 1,2,4-byte read and 4-byte write. * Stored in network byte order. */ - __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write. + __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. * Stored in network byte order. */ __bpf_md_ptr(struct bpf_sock *, sk); From patchwork Mon Jul 1 17:38:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1125525 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="SYsJg6hb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45cvk53B5rz9sPH for ; Tue, 2 Jul 2019 03:38:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728588AbfGARix (ORCPT ); Mon, 1 Jul 2019 13:38:53 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:40265 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728253AbfGARiw (ORCPT ); Mon, 1 Jul 2019 13:38:52 -0400 Received: by mail-qk1-f202.google.com with SMTP id c1so14222403qkl.7 for ; Mon, 01 Jul 2019 10:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=v1r29MqYaO/Cq43bRrhBm1H7TAMfY3ek9WtE+T1iazw=; b=SYsJg6hbTnC0ZvAKADsBB9K0xJo1/2ac7po8d8oWRcIJGcCmzbaC7SvQ9ENODpsmf+ SUkrUSbc8Se0AoEpYkfMA6qIUuViloWgFLmWCyKUKjgbitD8OwRMiq7ccry1GPqO1hkM wC1OBeIo4QuMBVYt2uZ5en+dApIVBni5oRvY2QcgiyL9zKVaj2eeBrYeghDIGPosdcu3 RNtZPLWhC6C8yIwZplHyWVHCQU1EZNS5XOR+MqATR3uUEc3WTrORQq/tHQlcN1+mDa3d ZHEAvA8Il2lX96QBmQ5knU+dhchzZy5ScM9Cke9PzJAzzQiIqSeAFEVX7F19pBqud1hn WAXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=v1r29MqYaO/Cq43bRrhBm1H7TAMfY3ek9WtE+T1iazw=; b=HnP7qJKS03wzFV7x2jYUEgNIcg9geBQieVz6a7h2uIN2qz/lLcFvpIZT426TzVYUD1 G+//6wCRtMiz11pacvMsRahPr/sx+QOXkW+jRXyv5oRGWma+PgEPjVFzMjfZVlYniDhP rhmCTXa7npMDqfIn8xvaX2i2kYNMf4egBeHI86NUnAnZ1fywOe6bcFn4YaUs7Y1aBWFk y8B45s8nceTckPA/+iJ4gGqF7y+hC3jNkieJhPN7pZaN521HrFoQ1i3kK/55Z3nnVsvK 4gaa/OYPBXrRsmbg5q3ge0i+QZqZc2zJeT/N5kb7VdRpirC99gFh7Of8+t7BQ7i8Zl7u X7qQ== X-Gm-Message-State: APjAAAXkpUcC5QowVZSVvXn0rwNRX/946tSYLGro4h2mwYu/xLKyvZEB u2qdRn67kgIn8AAzN1kxlL7v3EE= X-Google-Smtp-Source: APXvYqyzLaMfeB3/U3O6wlSdHFGy9xiW42koJ8DA3WsO/VRuxrj8fSH8sASzTW+J0V43RAjikKGa2dA= X-Received: by 2002:ac8:2e59:: with SMTP id s25mr21284003qta.94.1562002731645; Mon, 01 Jul 2019 10:38:51 -0700 (PDT) Date: Mon, 1 Jul 2019 10:38:41 -0700 In-Reply-To: <20190701173841.32249-1-sdf@google.com> Message-Id: <20190701173841.32249-4-sdf@google.com> Mime-Version: 1.0 References: <20190701173841.32249-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next v3 3/3] selftests/bpf: add verifier tests for wide stores From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Andrii Nakryiko , Yonghong Song Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Make sure that wide stores are allowed at proper (aligned) addresses. Note that user_ip6 is naturally aligned on 8-byte boundary, so correct addresses are user_ip6[0] and user_ip6[2]. msg_src_ip6 is, however, aligned on a 4-byte bondary, so only msg_src_ip6[1] can be wide-stored. Cc: Andrii Nakryiko Cc: Yonghong Song Acked-by: Andrii Nakryiko Signed-off-by: Stanislav Fomichev Acked-by: Yonghong Song --- tools/testing/selftests/bpf/test_verifier.c | 17 +++++++-- .../selftests/bpf/verifier/wide_store.c | 36 +++++++++++++++++++ 2 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/bpf/verifier/wide_store.c diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index c5514daf8865..b0773291012a 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -105,6 +105,7 @@ struct bpf_test { __u64 data64[TEST_DATA_LEN / 8]; }; } retvals[MAX_TEST_RUNS]; + enum bpf_attach_type expected_attach_type; }; /* Note we want this to be 64 bit aligned so that the end of our array is @@ -850,6 +851,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv, int fd_prog, expected_ret, alignment_prevented_execution; int prog_len, prog_type = test->prog_type; struct bpf_insn *prog = test->insns; + struct bpf_load_program_attr attr; int run_errs, run_successes; int map_fds[MAX_NR_MAPS]; const char *expected_err; @@ -881,8 +883,17 @@ static void do_test_single(struct bpf_test *test, bool unpriv, pflags |= BPF_F_STRICT_ALIGNMENT; if (test->flags & F_NEEDS_EFFICIENT_UNALIGNED_ACCESS) pflags |= BPF_F_ANY_ALIGNMENT; - fd_prog = bpf_verify_program(prog_type, prog, prog_len, pflags, - "GPL", 0, bpf_vlog, sizeof(bpf_vlog), 4); + + memset(&attr, 0, sizeof(attr)); + attr.prog_type = prog_type; + attr.expected_attach_type = test->expected_attach_type; + attr.insns = prog; + attr.insns_cnt = prog_len; + attr.license = "GPL"; + attr.log_level = 4; + attr.prog_flags = pflags; + + fd_prog = bpf_load_program_xattr(&attr, bpf_vlog, sizeof(bpf_vlog)); if (fd_prog < 0 && !bpf_probe_prog_type(prog_type, 0)) { printf("SKIP (unsupported program type %d)\n", prog_type); skips++; @@ -912,7 +923,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv, printf("FAIL\nUnexpected success to load!\n"); goto fail_log; } - if (!strstr(bpf_vlog, expected_err)) { + if (!expected_err || !strstr(bpf_vlog, expected_err)) { printf("FAIL\nUnexpected error message!\n\tEXP: %s\n\tRES: %s\n", expected_err, bpf_vlog); goto fail_log; diff --git a/tools/testing/selftests/bpf/verifier/wide_store.c b/tools/testing/selftests/bpf/verifier/wide_store.c new file mode 100644 index 000000000000..8fe99602ded4 --- /dev/null +++ b/tools/testing/selftests/bpf/verifier/wide_store.c @@ -0,0 +1,36 @@ +#define BPF_SOCK_ADDR(field, off, res, err) \ +{ \ + "wide store to bpf_sock_addr." #field "[" #off "]", \ + .insns = { \ + BPF_MOV64_IMM(BPF_REG_0, 1), \ + BPF_STX_MEM(BPF_DW, BPF_REG_1, BPF_REG_0, \ + offsetof(struct bpf_sock_addr, field[off])), \ + BPF_EXIT_INSN(), \ + }, \ + .result = res, \ + .prog_type = BPF_PROG_TYPE_CGROUP_SOCK_ADDR, \ + .expected_attach_type = BPF_CGROUP_UDP6_SENDMSG, \ + .errstr = err, \ +} + +/* user_ip6[0] is u64 aligned */ +BPF_SOCK_ADDR(user_ip6, 0, ACCEPT, + NULL), +BPF_SOCK_ADDR(user_ip6, 1, REJECT, + "invalid bpf_context access off=12 size=8"), +BPF_SOCK_ADDR(user_ip6, 2, ACCEPT, + NULL), +BPF_SOCK_ADDR(user_ip6, 3, REJECT, + "invalid bpf_context access off=20 size=8"), + +/* msg_src_ip6[0] is _not_ u64 aligned */ +BPF_SOCK_ADDR(msg_src_ip6, 0, REJECT, + "invalid bpf_context access off=44 size=8"), +BPF_SOCK_ADDR(msg_src_ip6, 1, ACCEPT, + NULL), +BPF_SOCK_ADDR(msg_src_ip6, 2, REJECT, + "invalid bpf_context access off=52 size=8"), +BPF_SOCK_ADDR(msg_src_ip6, 3, REJECT, + "invalid bpf_context access off=56 size=8"), + +#undef BPF_SOCK_ADDR