Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp736361pxf; Wed, 24 Mar 2021 14:52:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF6xD/jpK5V2ADfBIKToneANGc5bIDt7ogHE4Kd8fjrzRWMO2GHhea+IPfv7yK7JTlFif6 X-Received: by 2002:aa7:c88e:: with SMTP id p14mr5585214eds.119.1616622746227; Wed, 24 Mar 2021 14:52:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616622746; cv=none; d=google.com; s=arc-20160816; b=lfLeR0Ygvj0Mi4LSgWvn1Hn4gMf5BrfLuZvjHlHXPnrZ+UFsNBcUNhfY32jOcOYpHy yg6NnRcaVQUMexoOfgSSnorVZzSPtAXG6Ixb2rw06UN8B2Yy97XuuylA4dqVKhme2r2d dtwt4iCUPgXFZ/GqkUL27mXvb5j8qKcgE5N6q5RjJ+gQzdlnJcuZQGRLCDhHFq/00FJq 2vligkCP1aZPZXVDApXXn0yCbWzIMYUIkkK8QCt8ImqeiEJ6m1tiMN4S5gbFaD7ZmCvs lPgPR1/Vbe/skL7VTKDfoGK34FJ07zmNTR+YTZ7bo/sV7/3dMsghGJcu3LFqtNJjJ9tV HkCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=GlAt918dYBhXNqQsdpfiZm5SFHF6YcLaM76BqophvBo=; b=ZsIA27HnAIOIvscu/GhS6uDNeMF+uWZ/cBtqE9cjX9olpgFFCab8ZBSfhULULYQwDh JoAWr8eSfqozr7dvmxnJEg2N7ll86icYLnD+n3kF0KyrV0Bb9cICy2TRJugZsUvmew/j 07+x6Uf36EVi0z/raR2iy1iSuHUGn3B1aQyB6da2G3mdUdVSyUZYZJmwojID6r6NS2Km 6+F8g+8EB9wjimptYRP7ys8HDANrOfFgWVlzbmR3eH0lbhhbrunDGrxvhWS7KdzMOayy Z0Sivad0ks6O014hPtDOm+yPCQmMx83RY5QkG6rc7qUohx9dtRJfvWllCYBC7+tyXLfy gq+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=iBlOPlmF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m13si2561438edc.258.2021.03.24.14.52.01; Wed, 24 Mar 2021 14:52:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=iBlOPlmF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234841AbhCXCXY (ORCPT + 99 others); Tue, 23 Mar 2021 22:23:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234839AbhCXCXH (ORCPT ); Tue, 23 Mar 2021 22:23:07 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E6A4C061763 for ; Tue, 23 Mar 2021 19:23:06 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id j18so22832756wra.2 for ; Tue, 23 Mar 2021 19:23:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GlAt918dYBhXNqQsdpfiZm5SFHF6YcLaM76BqophvBo=; b=iBlOPlmFjwUJ45qvXmVJI46UJhVeQhGq7uuGobBbOYdIuJAbTTi9271QoMSLRxrLD2 NFqiFjo8Sr3N1JSTHv8erxgWrmHYnXR7CRrRVCjj2yX5KTlNiRK3JINlP5xKvevbUKt4 Jq/aAma1rsYUvclWJKkunDsqbhs51zSdyLPCM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GlAt918dYBhXNqQsdpfiZm5SFHF6YcLaM76BqophvBo=; b=L0oGA3uZmiQlVJxTr4t8AigTiwLryrA0tTAZJLtdVnjumw/Pu0ZPVWAQ5J7v+GKgBF sM+Bc3/PTUgk9878NP0G5t9f5iBwSHUkr+xTVUllmWgDJoAt8cDkD0zyUtmNFBe+wj8V Z4B6H58hnXza9UFersUYR041+izPQ0Am9J+bmyqO/OuW8I0IEpszuOzL8H9xFYdpcHqQ 52aFO/F0ex9D9zU649FPSV5axCJEuM9/s1ahYOU68moexpHW7u0L6ybJjvgr4iDUsAkH 2jASE8IiSUXjD226jJz3Gs1q4Hm9SQ3I9ZgKVV8+oHz2xJiJfqmx126BeMUHTE/aiwy4 ZnPw== X-Gm-Message-State: AOAM532/XwgGA+p5OfCB1yuxRJT0E8nL0hG8NxQQxETX/SaMThzo02sz UVctC/ephQ0WB5hc3sm2pZaOdhj37gTCMg== X-Received: by 2002:adf:b30f:: with SMTP id j15mr871617wrd.132.1616552585041; Tue, 23 Mar 2021 19:23:05 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:42:204:ccba:9601:929c:dbcb]) by smtp.gmail.com with ESMTPSA id n9sm74219wrx.46.2021.03.23.19.23.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 19:23:04 -0700 (PDT) From: Florent Revest To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, yhs@fb.com, kpsingh@kernel.org, jackmanb@chromium.org, linux-kernel@vger.kernel.org, Florent Revest Subject: [PATCH bpf-next v2 0/6] Add a snprintf eBPF helper Date: Wed, 24 Mar 2021 03:22:05 +0100 Message-Id: <20210324022211.1718762-1-revest@chromium.org> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have a usecase where we want to audit symbol names (if available) in callback registration hooks. (ex: fentry/nf_register_net_hook) A few months back, I proposed a bpf_kallsyms_lookup series but it was decided in the reviews that a more generic helper, bpf_snprintf, would be more useful. This series implements the helper according to the feedback received in https://lore.kernel.org/bpf/20201126165748.1748417-1-revest@google.com/T/#u - A new arg type guarantees the NULL-termination of string arguments and lets us pass format strings in only one arg - A new helper is implemented using that guarantee. Because the format string is known at verification time, the format string validation is done by the verifier - To implement a series of tests for bpf_snprintf, the logic for marshalling variadic args in a fixed-size array is reworked as per: https://lore.kernel.org/bpf/20210310015455.1095207-1-revest@chromium.org/T/#u --- Changes in v2: - Extracted the format validation/argument sanitization in a generic way for all printf-like helpers. - bpf_snprintf's str_size can now be 0 - bpf_snprintf is now exposed to all BPF program types - We now preempt_disable when using a per-cpu temporary buffer - Addressed a few cosmetic changes Florent Revest (6): bpf: Factorize bpf_trace_printk and bpf_seq_printf bpf: Add a ARG_PTR_TO_CONST_STR argument type bpf: Add a bpf_snprintf helper libbpf: Initialize the bpf_seq_printf parameters array field by field libbpf: Introduce a BPF_SNPRINTF helper macro selftests/bpf: Add a series of tests for bpf_snprintf include/linux/bpf.h | 7 + include/uapi/linux/bpf.h | 28 + kernel/bpf/helpers.c | 2 + kernel/bpf/verifier.c | 79 +++ kernel/trace/bpf_trace.c | 581 +++++++++--------- tools/include/uapi/linux/bpf.h | 28 + tools/lib/bpf/bpf_tracing.h | 44 +- .../selftests/bpf/prog_tests/snprintf.c | 65 ++ .../selftests/bpf/progs/test_snprintf.c | 59 ++ 9 files changed, 604 insertions(+), 289 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/snprintf.c create mode 100644 tools/testing/selftests/bpf/progs/test_snprintf.c -- 2.31.0.291.g576ba9dcdaf-goog