From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D5FD2FB1 for ; Mon, 10 May 2021 17:23:04 +0000 (UTC) Received: by mail-qt1-f176.google.com with SMTP id f8so8334841qth.6 for ; Mon, 10 May 2021 10:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jxuzpoKujYtr2aHiM/kDtdSl1lSD9oNhumKLKx3WNhI=; b=cim2XGAYUsRYtj3qYEecXybCMYw3siy/whG1UYmVo9bCb0DP9dGn0X6vqnCsTnw3Qb oKHVXOYbDs0C3ZUfdElVbiFfHpdg/oDCfRhaW96kzakVZ4PNS0PM+eTJP3muffFNgsZ6 FD6/yxgNixLspgbzKtWqT1lPhMzCXIv+Lzg6rhVRL3rlx1xReAsmQjviAjs5Gh0GG9ot 5VtNsFrMIrx9sc3OEHv4px0SOwKM/J7SzyfUOZxm/woWxUj0q1XV8M1ivNFDlKj+60Qq KucQcDJG+XE3H04y4W4AbHWeJJ3i9EkQkr8o47xME/HoLufj/YWKXVf8w6zw/ufl8hDJ 8mKA== 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=jxuzpoKujYtr2aHiM/kDtdSl1lSD9oNhumKLKx3WNhI=; b=bTsDO/9insSGOr3O8lqfudxwdMj/hOrxVKR5Pxg0XjFYcasEJatfQd2Y7a1kLf3iKH HuqLTGSDWJ0EkzYm/N8YeUbGy1V/DZGsbO7e1c3TFFq2qatpatNwfqsJXs/XRPuH6zJZ Y/CDZhkgM97txXZ6MC4+PrVR6rsLWYQk32hcDDw3fWXBFkfzjWNp/gYCQ8Sf8gc/gVf7 SIIjJvm8K2L6AtD4D7kqVWnbPOqyjNkMl3VAOOjvLBflft8zpuPpXKMyqzHxbM87Yn3s Nwprrih/LDKOGXhF46sbm+yle1M0yB9IE1UKbRwUsSELG1bcXMoFF6n1RWMlPRyQpC7J gboA== X-Gm-Message-State: AOAM531TD8o4qvLs3SCJPSqjqGMXTfF4X7nieJ945xfHhSQShFd5GTg9 P6Ycy+wEuj9M3U11S4rDdbFL/AzxBqB1d2/c X-Google-Smtp-Source: ABdhPJxFkSB5mUmfRJ/kv+m/vRYxB1+SBmVTgvWXRofx/Tgdpz9dCSNx6diUsdagHlUsBhavhfieDA== X-Received: by 2002:a05:622a:13c6:: with SMTP id p6mr23882773qtk.288.1620667383346; Mon, 10 May 2021 10:23:03 -0700 (PDT) Received: from localhost.localdomain (host-173-230-99-154.tnkngak.clients.pavlovmedia.com. [173.230.99.154]) by smtp.gmail.com with ESMTPSA id q7sm11924367qki.17.2021.05.10.10.23.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 10:23:03 -0700 (PDT) From: YiFei Zhu To: containers@lists.linux.dev, bpf@vger.kernel.org Cc: YiFei Zhu , linux-security-module@vger.kernel.org, Alexei Starovoitov , Andrea Arcangeli , Andy Lutomirski , Austin Kuo , Claudio Canella , Daniel Borkmann , Daniel Gruss , Dimitrios Skarlatos , Giuseppe Scrivano , Hubertus Franke , Jann Horn , Jinghao Jia , Josep Torrellas , Kees Cook , Sargun Dhillon , Tianyin Xu , Tobin Feldman-Fitzthum , Tom Hromatka , Will Drewry Subject: [RFC PATCH bpf-next seccomp 08/12] seccomp-ebpf: restrict filter to almost cBPF if LSM request such Date: Mon, 10 May 2021 12:22:45 -0500 Message-Id: <25cc2777f0c1e5603fc8751bff0f36249b018388.1620499942.git.yifeifz2@illinois.edu> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-Mailing-List: containers@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: YiFei Zhu If LSM hook security_seccomp_extended returns non-zero, seccomp-eBPF filters are not permitted to use eBPF maps or helpers. Signed-off-by: YiFei Zhu --- kernel/seccomp.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index 8550ae885245..b9ed9951a05b 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -2441,6 +2441,9 @@ static bool seccomp_is_valid_access(int off, int size, static const struct bpf_func_proto * seccomp_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) { + if (security_seccomp_extended()) + return NULL; + switch (func_id) { case BPF_FUNC_get_current_uid_gid: return &bpf_get_current_uid_gid_proto; @@ -2459,9 +2462,15 @@ seccomp_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) const struct bpf_prog_ops seccomp_prog_ops = { }; +static bool seccomp_map_access(enum bpf_access_type type) +{ + return !security_seccomp_extended(); +} + const struct bpf_verifier_ops seccomp_verifier_ops = { .get_func_proto = seccomp_func_proto, .is_valid_access = seccomp_is_valid_access, + .map_access = seccomp_map_access, }; #endif /* CONFIG_SECCOMP_FILTER_EXTENDED */ -- 2.31.1