From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=vy7l=5K=vger.kernel.org=linux-kernel-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,
	MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,
	USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 96A14C18E5B
	for <linux-kernel@archiver.kernel.org>; Wed, 25 Mar 2020 00:36:58 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id 67C6620663
	for <linux-kernel@archiver.kernel.org>; Wed, 25 Mar 2020 00:36:58 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZHOdr89n"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1727249AbgCYAg5 (ORCPT
        <rfc822;linux-kernel@archiver.kernel.org>);
        Tue, 24 Mar 2020 20:36:57 -0400
Received: from mail-wm1-f67.google.com ([209.85.128.67]:52889 "EHLO
        mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727154AbgCYAg5 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 24 Mar 2020 20:36:57 -0400
Received: by mail-wm1-f67.google.com with SMTP id z18so629863wmk.2
        for <linux-kernel@vger.kernel.org>; Tue, 24 Mar 2020 17:36:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=chromium.org; s=google;
        h=from:date:to:cc:subject:message-id:references:mime-version
         :content-disposition:content-transfer-encoding:in-reply-to
         :user-agent;
        bh=4KBcpJjcZDkLZHBGKFNXJ02wL7qMrYpP4gvH6GCFvwI=;
        b=ZHOdr89naMMiNiv62yI8gtD1SGL/7HgG4AmSG8r8yJuaqLrU7C1Ju50p637E2TFdzS
         /E54jVu1cZp1SyrDR8/B9gAUzmmKsuqDPaxjCEW+acTOqIMEbRiMF6is+wUYe/UE/g2D
         swtqF77IV0Bg1GNMzwE3Cqf0cYdmoRuyn3m/Y=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:from:date:to:cc:subject:message-id:references
         :mime-version:content-disposition:content-transfer-encoding
         :in-reply-to:user-agent;
        bh=4KBcpJjcZDkLZHBGKFNXJ02wL7qMrYpP4gvH6GCFvwI=;
        b=iluYbjiWMrP9nal+bTjSil1LigXteV3AwHovXRm++cbPISxU1ZGc2YAE/3umag0SYT
         rfh3XGlQjqVDa41+Vj5fBDOMVuxmemX24UIoSKEQKcx0hxqqCileKl9XLyUlU2kAfmo4
         hm+M39ycM1Sdua6zk9kmjzfQjqQfoFHi/gbUbXS8XYi/grJ77HkNqNOGBsr+XVd45KoR
         AsdHfFRK5LQ+8Ur7mS8Wrz3cH8/rEGZPr9CgnoN7SdJOMObrvaueJNg927xTjF3To6Kz
         8WlWzWE5ZBZG0ZT2UPc1E4DTXi6AB25C0/Q5Rkz4cOfwyYD1QOoqcdNgFAsK3WDXBfmQ
         +f9Q==
X-Gm-Message-State: ANhLgQ1gNqk14Zvn3TWxdskSMOOoN8LPgqaJAkuZs37MPOSaTusLlN49
        iehHMg6UwqYLsrH0Ytzr0VihhQ==
X-Google-Smtp-Source: ADFU+vvRaL1HLy+9JKB6CEKxXaZ6oInA+i8KtxzdOYNaED497LNEndXmRmfEomXzVM7+PDv+4yf6Vg==
X-Received: by 2002:a1c:4c1a:: with SMTP id z26mr659917wmf.11.1585096613756;
        Tue, 24 Mar 2020 17:36:53 -0700 (PDT)
Received: from chromium.org (77-56-209-237.dclient.hispeed.ch. [77.56.209.237])
        by smtp.gmail.com with ESMTPSA id k133sm6389758wma.11.2020.03.24.17.36.52
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Tue, 24 Mar 2020 17:36:53 -0700 (PDT)
From:   KP Singh <kpsingh@chromium.org>
X-Google-Original-From: KP Singh <kpsingh>
Date:   Wed, 25 Mar 2020 01:36:51 +0100
To:     Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc:     open list <linux-kernel@vger.kernel.org>,
        bpf <bpf@vger.kernel.org>, linux-security-module@vger.kernel.org,
        Brendan Jackman <jackmanb@google.com>,
        Florent Revest <revest@google.com>,
        Thomas Garnier <thgarnie@google.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        James Morris <jmorris@namei.org>,
        Kees Cook <keescook@chromium.org>,
        Paul Turner <pjt@google.com>, Jann Horn <jannh@google.com>,
        Florent Revest <revest@chromium.org>,
        Brendan Jackman <jackmanb@chromium.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH bpf-next v5 7/7] bpf: lsm: Add selftests for
 BPF_PROG_TYPE_LSM
Message-ID: <20200325003651.GA5973@chromium.org>
References: <20200323164415.12943-1-kpsingh@chromium.org>
 <20200323164415.12943-8-kpsingh@chromium.org>
 <CAEf4BzZCVqpUDqGetxa=Nx1ZC7Q+2yX2D9FMwywWkFDoN8JHDA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAEf4BzZCVqpUDqGetxa=Nx1ZC7Q+2yX2D9FMwywWkFDoN8JHDA@mail.gmail.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 24-Mär 16:54, Andrii Nakryiko wrote:
> On Mon, Mar 23, 2020 at 9:45 AM KP Singh <kpsingh@chromium.org> wrote:
> >
> > From: KP Singh <kpsingh@google.com>
> >
> > * Load/attach a BPF program to the file_mprotect (int) and
> >   bprm_committed_creds (void) LSM hooks.
> > * Perform an action that triggers the hook.
> > * Verify if the audit event was received using a shared global
> >   result variable.
> >
> > Signed-off-by: KP Singh <kpsingh@google.com>
> > Reviewed-by: Brendan Jackman <jackmanb@google.com>
> > Reviewed-by: Florent Revest <revest@google.com>
> > Reviewed-by: Thomas Garnier <thgarnie@google.com>
> > ---
> >  tools/testing/selftests/bpf/lsm_helpers.h     |  19 +++
> >  .../selftests/bpf/prog_tests/lsm_test.c       | 112 ++++++++++++++++++
> >  .../selftests/bpf/progs/lsm_int_hook.c        |  54 +++++++++
> >  .../selftests/bpf/progs/lsm_void_hook.c       |  41 +++++++
> >  4 files changed, 226 insertions(+)
> >  create mode 100644 tools/testing/selftests/bpf/lsm_helpers.h
> >  create mode 100644 tools/testing/selftests/bpf/prog_tests/lsm_test.c
> >  create mode 100644 tools/testing/selftests/bpf/progs/lsm_int_hook.c
> >  create mode 100644 tools/testing/selftests/bpf/progs/lsm_void_hook.c
> >
> > diff --git a/tools/testing/selftests/bpf/lsm_helpers.h b/tools/testing/selftests/bpf/lsm_helpers.h
> > new file mode 100644
> > index 000000000000..3de230df93db
> > --- /dev/null
> > +++ b/tools/testing/selftests/bpf/lsm_helpers.h
> > @@ -0,0 +1,19 @@
> > +/* SPDX-License-Identifier: GPL-2.0 */
> > +
> > +/*
> > + * Copyright (C) 2020 Google LLC.
> > + */
> > +#ifndef _LSM_HELPERS_H
> > +#define _LSM_HELPERS_H
> > +
> > +struct lsm_prog_result {
> > +       /* This ensures that the LSM Hook only monitors the PID requested
> > +        * by the loader
> > +        */
> > +       __u32 monitored_pid;
> > +       /* The number of calls to the prog for the monitored PID.
> > +        */
> > +       __u32 count;
> > +};
> > +
> 
> Having this extra header just for this simple struct... On BPF side
> it's easier and nicer to just use global variables. Can you please
> drop helper and just pass two variables in prog_test part?

Removed the header and moved to global variables. One less file to
worry about :)

> 
> > +#endif /* _LSM_HELPERS_H */
> > diff --git a/tools/testing/selftests/bpf/prog_tests/lsm_test.c b/tools/testing/selftests/bpf/prog_tests/lsm_test.c
> > new file mode 100644
> > index 000000000000..5fd6b8f569f7
> > --- /dev/null
> > +++ b/tools/testing/selftests/bpf/prog_tests/lsm_test.c
> > @@ -0,0 +1,112 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +
> > +/*
> > + * Copyright (C) 2020 Google LLC.
> > + */
> > +
> > +#include <test_progs.h>
> > +#include <sys/mman.h>
> > +#include <sys/wait.h>
> > +#include <unistd.h>
> > +#include <malloc.h>
> > +#include <stdlib.h>
> > +
> > +#include "lsm_helpers.h"
> > +#include "lsm_void_hook.skel.h"
> > +#include "lsm_int_hook.skel.h"
> > +
> > +char *LS_ARGS[] = {"true", NULL};
> > +
> > +int heap_mprotect(void)
> > +{
> > +       void *buf;
> > +       long sz;
> > +
> > +       sz = sysconf(_SC_PAGESIZE);
> > +       if (sz < 0)
> > +               return sz;
> > +
> > +       buf = memalign(sz, 2 * sz);
> > +       if (buf == NULL)
> > +               return -ENOMEM;
> > +
> > +       return mprotect(buf, sz, PROT_READ | PROT_EXEC);
> > +}
> > +
> > +int exec_ls(struct lsm_prog_result *result)
> > +{
> > +       int child_pid;
> > +
> > +       child_pid = fork();
> > +       if (child_pid == 0) {
> > +               result->monitored_pid = getpid();
> 
> monitored_pid needed here only
> 
> > +               execvp(LS_ARGS[0], LS_ARGS);
> > +               return -EINVAL;
> > +       } else if (child_pid > 0)
> > +               return wait(NULL);
> > +
> > +       return -EINVAL;
> > +}
> > +
> > +void test_lsm_void_hook(void)
> > +{
> > +       struct lsm_prog_result *result;
> > +       struct lsm_void_hook *skel = NULL;
> > +       int err, duration = 0;
> > +
> > +       skel = lsm_void_hook__open_and_load();
> > +       if (CHECK(!skel, "skel_load", "lsm_void_hook skeleton failed\n"))
> > +               goto close_prog;
> > +
> > +       err = lsm_void_hook__attach(skel);
> > +       if (CHECK(err, "attach", "lsm_void_hook attach failed: %d\n", err))
> > +               goto close_prog;
> > +
> > +       result = &skel->bss->result;
> 
> if you define variables directly, you'll access them easily as
> skel->bss->monitored_pid and skel->bss->count, no problem, right?

Yes. Updated.

> 
> > +
> > +       err = exec_ls(result);
> > +       if (CHECK(err < 0, "exec_ls", "err %d errno %d\n", err, errno))
> > +               goto close_prog;
> > +
> > +       if (CHECK(result->count != 1, "count", "count = %d", result->count))
> > +               goto close_prog;
> > +
> > +       CHECK_FAIL(result->count != 1);
> > +
> > +close_prog:
> > +       lsm_void_hook__destroy(skel);
> > +}
> > +
> > +void test_lsm_int_hook(void)
> > +{
> > +       struct lsm_prog_result *result;
> > +       struct lsm_int_hook *skel = NULL;
> > +       int err, duration = 0;
> > +
> > +       skel = lsm_int_hook__open_and_load();
> > +       if (CHECK(!skel, "skel_load", "lsm_int_hook skeleton failed\n"))
> > +               goto close_prog;
> > +
> > +       err = lsm_int_hook__attach(skel);
> > +       if (CHECK(err, "attach", "lsm_int_hook attach failed: %d\n", err))
> > +               goto close_prog;
> > +
> > +       result = &skel->bss->result;
> > +       result->monitored_pid = getpid();
> > +
> > +       err = heap_mprotect();
> > +       if (CHECK(errno != EPERM, "heap_mprotect", "want errno=EPERM, got %d\n",
> > +                 errno))
> > +               goto close_prog;
> > +
> > +       CHECK_FAIL(result->count != 1);
> > +
> > +close_prog:
> > +       lsm_int_hook__destroy(skel);
> > +}
> > +
> > +void test_lsm_test(void)
> > +{
> > +       test_lsm_void_hook();
> > +       test_lsm_int_hook();
> 
> These should be subtests (see test__start_subtest() usage). Also, I'm
> not sure why you need two separate BPF programs, why not create one
> and use it for two subtests?

Thanks! I simplified it much more based on your feedback.

Now we just have two files:

* prog_tests/test_lsm.c which defines "test_lsm_test which
  does an exec and an mprotect and verifies the global variables and
  the return of the mprotect.
  These are fairly simple, so we can drop the need for subtests.
* progs/lsm.c which has both bprm_committed_creds and file_mprotect.

> 
> 
> > +}
> > diff --git a/tools/testing/selftests/bpf/progs/lsm_int_hook.c b/tools/testing/selftests/bpf/progs/lsm_int_hook.c
> > new file mode 100644
> > index 000000000000..1c5028ddca61
> > --- /dev/null
> > +++ b/tools/testing/selftests/bpf/progs/lsm_int_hook.c
> 
> consider it a nit because not every test follows this, but using
> progs/test_whatever.c for BPF side and prog_test/whatever.c makes my
> life a bit easier.

I am all for uniformity :) Updated.

> 
> 
> > @@ -0,0 +1,54 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +
> > +/*
> > + * Copyright 2020 Google LLC.
> > + */
> > +
> > +#include <linux/bpf.h>
> > +#include <stdbool.h>
> > +#include <bpf/bpf_helpers.h>
> > +#include <bpf/bpf_tracing.h>
> > +#include  <errno.h>
> > +#include "lsm_helpers.h"
> > +
> > +char _license[] SEC("license") = "GPL";
> > +
> > +struct lsm_prog_result result = {
> > +       .monitored_pid = 0,
> > +       .count = 0,
> > +};
> > +
> > +/*
> > + * Define some of the structs used in the BPF program.
> > + * Only the field names and their sizes need to be the
> > + * same as the kernel type, the order is irrelevant.
> > + */
> > +struct mm_struct {
> > +       unsigned long start_brk, brk;
> > +} __attribute__((preserve_access_index));
> > +
> > +struct vm_area_struct {
> > +       unsigned long vm_start, vm_end;
> > +       struct mm_struct *vm_mm;
> > +} __attribute__((preserve_access_index));
> 
> Why not just using vmlinux.h instead?

Thanks, updated.

> 
> > +
> > +SEC("lsm/file_mprotect")
> > +int BPF_PROG(test_int_hook, struct vm_area_struct *vma,
> > +            unsigned long reqprot, unsigned long prot, int ret)
> > +{
> > +       if (ret != 0)
> > +               return ret;
> > +
> > +       __u32 pid = bpf_get_current_pid_tgid();
> > +       int is_heap = 0;
> > +
> > +       is_heap = (vma->vm_start >= vma->vm_mm->start_brk &&
> > +                  vma->vm_end <= vma->vm_mm->brk);
> > +
> > +       if (is_heap && result.monitored_pid == pid) {
> > +               result.count++;
> > +               ret = -EPERM;
> > +       }
> > +
> > +       return ret;
> > +}
> > diff --git a/tools/testing/selftests/bpf/progs/lsm_void_hook.c b/tools/testing/selftests/bpf/progs/lsm_void_hook.c
> > new file mode 100644
> > index 000000000000..4d01a8536413
> > --- /dev/null
> > +++ b/tools/testing/selftests/bpf/progs/lsm_void_hook.c
> > @@ -0,0 +1,41 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +
> > +/*
> > + * Copyright (C) 2020 Google LLC.
> > + */
> > +
> > +#include <linux/bpf.h>
> > +#include <stdbool.h>
> > +#include <bpf/bpf_helpers.h>
> > +#include <bpf/bpf_tracing.h>
> > +#include  <errno.h>
> > +#include "lsm_helpers.h"
> > +
> > +char _license[] SEC("license") = "GPL";
> > +
> > +struct lsm_prog_result result = {
> > +       .monitored_pid = 0,
> > +       .count = 0,
> > +};
> > +
> > +/*
> > + * Define some of the structs used in the BPF program.
> > + * Only the field names and their sizes need to be the
> > + * same as the kernel type, the order is irrelevant.
> > + */
> > +struct linux_binprm {
> > +       const char *filename;
> > +} __attribute__((preserve_access_index));
> > +
> > +SEC("lsm/bprm_committed_creds")
> > +int BPF_PROG(test_void_hook, struct linux_binprm *bprm)
> > +{
> > +       __u32 pid = bpf_get_current_pid_tgid();
> > +       char fmt[] = "lsm(bprm_committed_creds): process executed %s\n";
> 
> Try static char fmt[] = "..." instead and then compare BPF assembly
> before and after, you'll be amazed ;)
> 
> > +
> > +       bpf_trace_printk(fmt, sizeof(fmt), bprm->filename);
> 
> is this part of test?

Not really, removed.

- KP

> 
> > +       if (result.monitored_pid == pid)
> > +               result.count++;
> > +
> > +       return 0;
> > +}
> > --
> > 2.20.1
> >