Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1280685ybt; Thu, 9 Jul 2020 03:13:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3ASnVQB8FS4Nq1WU+Y8Iq6vGChuPEcJ6h7a56ynzrfixB/7YDbONdVOaZpCEBU9/Xy4FG X-Received: by 2002:a17:906:1356:: with SMTP id x22mr58311433ejb.429.1594289630016; Thu, 09 Jul 2020 03:13:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594289630; cv=none; d=google.com; s=arc-20160816; b=bg9TVlba/Z2NFDEglOPczZ7raySxUQAScdfA0t1vmOaoPLWNSTlvEKjpuU9qyHhQKj 0OQn7zs4ggJjjajPvIltf1oMapaZIJiTKclRUH/h2f6qHktJkFOOv0rjfljMqqZkwMgR YH94mTL+iFNnoRoVr8mM4l2CKSSqyxSQ71N2uCVnJpbzRCoeo0XxefhKeXpQpzNYS4oN 7AzKNkmoYnISqBJIOIqEAzWDm4+qS7o4x/QrzGmXBRsCFN2dg8IIwTk7o3BfO2p4dYyQ 5I9EKgHOm7l8GSaACYnInfmwAxK87icOTUeSK8dfZPZNvoU8e7CGb0kqITkoKPuBIGGI qzJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6LUxAcH1p2jd4UOhn99gfFC8uQP4AVfDHydIOJan7II=; b=qMxODUSfTvGW2nD4o+uw6xWi2WwiW7jMJUfCgj48J3XM8j1y9aLQnkorc/RLSUDYRu uVaXI914QeA4qUnPNBXCxtLmM0fIVUL6i33RggpOCkhR7WaOc/AtaAy0TBh/Tq83Vn06 3APjlJkrI8lyZ1JCxgkbwBH8uqDzk+ZbhkHcpOvB8cgB5+WxIMwc6M+j3aaCKDsSoHp6 2gt40WCnVPYpwL5896hCz4exlTGfhWtSGPi6owyaMoj7DtH4MXPf2z6lNJgx9mpd7htO l8/eS/l4VmK5perXBI8BBNMthnDZl9W1fy6Gt7JVy0D5YZ1N6r8tcnRraC1irNArDBeB JujQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=HjHRha9W; 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 a24si1540528ejk.208.2020.07.09.03.13.26; Thu, 09 Jul 2020 03:13:49 -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=HjHRha9W; 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 S1726845AbgGIKMy (ORCPT + 99 others); Thu, 9 Jul 2020 06:12:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726790AbgGIKMt (ORCPT ); Thu, 9 Jul 2020 06:12:49 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4A77C035425 for ; Thu, 9 Jul 2020 03:12:47 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id z2so1738148wrp.2 for ; Thu, 09 Jul 2020 03:12:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=6LUxAcH1p2jd4UOhn99gfFC8uQP4AVfDHydIOJan7II=; b=HjHRha9W1SioA/VVdxgx7QQEEemizC5hZBgXGf0Yo4fjeX3HlT5HwuHt0IFeuAHsFP +mNzogNr7LinVWHee+lNxUrCahz5PsPnQr2GDAua72fE7CkxIG4iJg7KvXHrFlhJWI5N jH23uTHry750zmB+Fc2jxud02uWtn2rVXYmQk= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=6LUxAcH1p2jd4UOhn99gfFC8uQP4AVfDHydIOJan7II=; b=RE+9CEFzj4SH+bAuzYe3Nx6N+iAnjE0uz2/3ntOhWAyvcsgFFBu68z1EonLq//9vp9 XjSNI59xyl9R0jgDlg2gLdAw6Jrt3I+q4PmZDLnakkMvQ9g6MIp6idgk6kamXvdnmcSL UCxNzr9yeP0MogGGEKZvIx5ibktALOGr7T3LOMChfdy2WEi26O2X2PIWgbFhlu6z90vL 5C8l7coBORqkewP9mtvuHgKygD3cL5Qz4zEWHVKVnIS4bfQu5kyT4dwCwdnO7thjIfHb fBDYOvy9owNyf2oNBkexjebj+A8ihSIZSxuU3mwa4Jd2CxXjoGHEXk8Rlio9WP70mnYj 2eYw== X-Gm-Message-State: AOAM53137wQC5lhcAdD1o/e2djNFj323/kH7ffsK/8B2pOPTa4mHZHuB ArK5LPn0tlkcNOxSYuH7vZwJIt5D3gw= X-Received: by 2002:adf:c3c7:: with SMTP id d7mr60583966wrg.51.1594289566246; Thu, 09 Jul 2020 03:12:46 -0700 (PDT) Received: from kpsingh.zrh.corp.google.com ([81.6.44.51]) by smtp.gmail.com with ESMTPSA id g3sm5538287wrb.59.2020.07.09.03.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 03:12:45 -0700 (PDT) From: KP Singh To: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-security-module@vger.kernel.org Cc: Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Paul Turner , Jann Horn , Florent Revest Subject: [PATCH bpf-next v4 4/4] bpf: Add selftests for local_storage Date: Thu, 9 Jul 2020 12:12:39 +0200 Message-Id: <20200709101239.3829793-5-kpsingh@chromium.org> X-Mailer: git-send-email 2.27.0.389.gc38d7665816-goog In-Reply-To: <20200709101239.3829793-1-kpsingh@chromium.org> References: <20200709101239.3829793-1-kpsingh@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: KP Singh inode_local_storage: * Hook to the file_open and inode_unlink LSM hooks. * Create and unlink a temporary file. * Store some information in the inode's bpf_local_storage during file_open. * Verify that this information exists when the file is unlinked. sk_local_storage: * Hook to the socket_post_create and socket_bind LSM hooks. * Open and bind a socket and set the sk_storage in the socket_post_create hook using the start_server helper. * Verify if the information is set in the socket_bind hook. Acked-by: Andrii Nakryiko Signed-off-by: KP Singh --- .../bpf/prog_tests/test_local_storage.c | 60 ++++++++ .../selftests/bpf/progs/local_storage.c | 136 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/test_local_storage.c create mode 100644 tools/testing/selftests/bpf/progs/local_storage.c diff --git a/tools/testing/selftests/bpf/prog_tests/test_local_storage.c b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c new file mode 100644 index 000000000000..d4ba89195c43 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/test_local_storage.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Copyright (C) 2020 Google LLC. + */ + +#include +#include + +#include "local_storage.skel.h" +#include "network_helpers.h" + +int create_and_unlink_file(void) +{ + char fname[PATH_MAX] = "/tmp/fileXXXXXX"; + int fd; + + fd = mkstemp(fname); + if (fd < 0) + return fd; + + close(fd); + unlink(fname); + return 0; +} + +void test_test_local_storage(void) +{ + struct local_storage *skel = NULL; + int err, duration = 0, serv_sk = -1; + + skel = local_storage__open_and_load(); + if (CHECK(!skel, "skel_load", "lsm skeleton failed\n")) + goto close_prog; + + err = local_storage__attach(skel); + if (CHECK(err, "attach", "lsm attach failed: %d\n", err)) + goto close_prog; + + skel->bss->monitored_pid = getpid(); + + err = create_and_unlink_file(); + if (CHECK(err < 0, "exec_cmd", "err %d errno %d\n", err, errno)) + goto close_prog; + + CHECK(!skel->bss->inode_storage_result, "inode_storage_result", + "inode_local_storage not set"); + + serv_sk = start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0); + if (CHECK(serv_sk < 0, "start_server", "failed to start server\n")) + goto close_prog; + + CHECK(!skel->bss->sk_storage_result, "sk_storage_result", + "sk_local_storage not set"); + + close(serv_sk); + +close_prog: + local_storage__destroy(skel); +} diff --git a/tools/testing/selftests/bpf/progs/local_storage.c b/tools/testing/selftests/bpf/progs/local_storage.c new file mode 100644 index 000000000000..cb608b7b90f0 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/local_storage.c @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Copyright 2020 Google LLC. + */ + +#include +#include +#include +#include +#include + +char _license[] SEC("license") = "GPL"; + +#define DUMMY_STORAGE_VALUE 0xdeadbeef + +int monitored_pid = 0; +bool inode_storage_result = false; +bool sk_storage_result = false; + +struct dummy_storage { + __u32 value; +}; + +struct { + __uint(type, BPF_MAP_TYPE_INODE_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, struct dummy_storage); +} inode_storage_map SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_SK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC | BPF_F_CLONE); + __type(key, int); + __type(value, struct dummy_storage); +} sk_storage_map SEC(".maps"); + +/* TODO Use vmlinux.h once BTF pruning for embedded types is fixed. + */ +struct sock {} __attribute__((preserve_access_index)); +struct sockaddr {} __attribute__((preserve_access_index)); +struct socket { + struct sock *sk; +} __attribute__((preserve_access_index)); + +struct inode {} __attribute__((preserve_access_index)); +struct dentry { + struct inode *d_inode; +} __attribute__((preserve_access_index)); +struct file { + struct inode *f_inode; +} __attribute__((preserve_access_index)); + + +SEC("lsm/inode_unlink") +int BPF_PROG(unlink_hook, struct inode *dir, struct dentry *victim) +{ + __u32 pid = bpf_get_current_pid_tgid() >> 32; + struct dummy_storage *storage; + + if (pid != monitored_pid) + return 0; + + storage = bpf_inode_storage_get(&inode_storage_map, victim->d_inode, 0, + BPF_SK_STORAGE_GET_F_CREATE); + if (!storage) + return 0; + + if (storage->value == DUMMY_STORAGE_VALUE) + inode_storage_result = true; + + return 0; +} + +SEC("lsm/socket_bind") +int BPF_PROG(socket_bind, struct socket *sock, struct sockaddr *address, + int addrlen) +{ + __u32 pid = bpf_get_current_pid_tgid() >> 32; + struct dummy_storage *storage; + + if (pid != monitored_pid) + return 0; + + storage = bpf_sk_storage_get(&sk_storage_map, sock->sk, 0, + BPF_SK_STORAGE_GET_F_CREATE); + if (!storage) + return 0; + + if (storage->value == DUMMY_STORAGE_VALUE) + sk_storage_result = true; + + return 0; +} + +SEC("lsm/socket_post_create") +int BPF_PROG(socket_post_create, struct socket *sock, int family, int type, + int protocol, int kern) +{ + __u32 pid = bpf_get_current_pid_tgid() >> 32; + struct dummy_storage *storage; + + if (pid != monitored_pid) + return 0; + + storage = bpf_sk_storage_get(&sk_storage_map, sock->sk, 0, + BPF_SK_STORAGE_GET_F_CREATE); + if (!storage) + return 0; + + storage->value = DUMMY_STORAGE_VALUE; + + return 0; +} + +SEC("lsm/file_open") +int BPF_PROG(test_int_hook, struct file *file) +{ + __u32 pid = bpf_get_current_pid_tgid() >> 32; + struct dummy_storage *storage; + + if (pid != monitored_pid) + return 0; + + if (!file->f_inode) + return 0; + + storage = bpf_inode_storage_get(&inode_storage_map, file->f_inode, 0, + BPF_LOCAL_STORAGE_GET_F_CREATE); + if (!storage) + return 0; + + storage->value = DUMMY_STORAGE_VALUE; + return 0; +} -- 2.27.0.389.gc38d7665816-goog