From patchwork Mon Jul 15 16:39:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1132109 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="Gfw+Q+z+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45nTlk7453z9sMQ for ; Tue, 16 Jul 2019 02:40:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730915AbfGOQkC (ORCPT ); Mon, 15 Jul 2019 12:40:02 -0400 Received: from mail-vs1-f74.google.com ([209.85.217.74]:55751 "EHLO mail-vs1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729941AbfGOQkC (ORCPT ); Mon, 15 Jul 2019 12:40:02 -0400 Received: by mail-vs1-f74.google.com with SMTP id w23so3426614vsj.22 for ; Mon, 15 Jul 2019 09:40:01 -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=/4GOuezfoSXQsme0oY5IMJILtncU/YuwK20WFYPvy1k=; b=Gfw+Q+z+kXoFqI16PLUwNK/6E70/lm4vOqq+bKJ13ZpCyrp70pRmT1fYi5jbkMbwAw SOFKaZf3EjFEH7OhTsl3U9DmJRcBrzirZVLEHUPhCceZ4j+HFWUiNEyiIaCDjnTyJXIG xN3pVaeZue566N5J12JOSiNygwTsdiiP1teRecRFWbgxzhiVw2KirE+/KyKI/v9k9+zI AxMth2N/N/0HyPEL/vVq9JesXrSpXvrZrRGAXuLUrzxKyJRDfRsQGDBO8q9KA4VnwbEm Rwno00SHHD9T54tGB4/vSp1xlw81ACqequZBb8tcx2SFqKTMp/p2ivc4XXKWsM82xdvK 6pmA== 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=/4GOuezfoSXQsme0oY5IMJILtncU/YuwK20WFYPvy1k=; b=UlWZXUZCiWp/28tiHPlMcM6PRzOS0tP22XOyA/mE+N443KaGEuqT8Cs8dILPYgjWcC IDxudmGLSvI4zbmQT9AeaMYntwvfmzl5E4wShHyEraG5EkTysai0mEBzbRiakss1/E/v 07HyRgjmOq9gcWdAoXhCq0QtyJcAARtTBeV9IUQQy2OraVNC8uR2RIGChPGvA06z/Z0m 6VFB5/qkxmUWFpZDKSwq9CN2P2z3mXyMxu51Kl/ag2KRmCuCFMKi+eN/7EdeXumSdbLu OTry/wtXGLJkl6cBODo/UDpgG5ABjAYc6gqmlXrDsgNGLpr0pGdM99G4TBImMojQ/6g/ biPw== X-Gm-Message-State: APjAAAUC+wosfVxlfX2cqJPMe/F+s8fg7roo/DXe5QywpYYGxKAGeTLx fx+IiynX+H1eaaDL8ZwkuJBu9lI= X-Google-Smtp-Source: APXvYqw7IFloMg0HVhi260b0gZX2quy3sDJU/zr7RMuDgUDJqNowz1SrVOyRSqWfIgM+cOTXrW4r47Q= X-Received: by 2002:ab0:69c8:: with SMTP id u8mr16512558uaq.132.1563208801299; Mon, 15 Jul 2019 09:40:01 -0700 (PDT) Date: Mon, 15 Jul 2019 09:39:52 -0700 In-Reply-To: <20190715163956.204061-1-sdf@google.com> Message-Id: <20190715163956.204061-2-sdf@google.com> Mime-Version: 1.0 References: <20190715163956.204061-1-sdf@google.com> X-Mailer: git-send-email 2.22.0.510.g264f2c817a-goog Subject: [PATCH bpf 1/5] bpf: rename bpf_ctx_wide_store_ok to bpf_ctx_wide_access_ok From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Yonghong Song Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Rename bpf_ctx_wide_store_ok to bpf_ctx_wide_access_ok to indicate that it can be used for both loads and stores. Cc: Yonghong Song Signed-off-by: Stanislav Fomichev --- include/linux/filter.h | 2 +- net/core/filter.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index 6d944369ca87..ff65d22cf336 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -747,7 +747,7 @@ 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) \ +#define bpf_ctx_wide_access_ok(off, size, type, field) \ (size == sizeof(__u64) && \ off >= offsetof(type, field) && \ off + sizeof(__u64) <= offsetofend(type, field) && \ diff --git a/net/core/filter.c b/net/core/filter.c index 47f6386fb17a..c5983ddb1a9f 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6890,14 +6890,14 @@ 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)) + if (bpf_ctx_wide_access_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)) + if (bpf_ctx_wide_access_ok(off, size, + struct bpf_sock_addr, + msg_src_ip6)) return true; if (size != size_default)