From patchwork Wed May 27 18:56:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Protopopov X-Patchwork-Id: 11573801 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F6B0912 for ; Wed, 27 May 2020 18:59:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47AFE2078C for ; Wed, 27 May 2020 18:59:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IcCGEHwh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728561AbgE0S5h (ORCPT ); Wed, 27 May 2020 14:57:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbgE0S5g (ORCPT ); Wed, 27 May 2020 14:57:36 -0400 Received: from mail-oo1-xc44.google.com (mail-oo1-xc44.google.com [IPv6:2607:f8b0:4864:20::c44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9F65C08C5C1; Wed, 27 May 2020 11:57:35 -0700 (PDT) Received: by mail-oo1-xc44.google.com with SMTP id v3so575236oot.1; Wed, 27 May 2020 11:57:35 -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=r46D0cfhvOhWWQ3wuo1JGTI5mTXEa2xSDV25qx6cAKk=; b=IcCGEHwh6VfbORhnPgDkpXIEqASSNM6+Dy5fNAYhoMaqUwYzRyY2PLTJbYrUDfoyAO reP2FE0YljDiGL3KMwEUMilq3ThaHIkNeOTdv2cCnM7zjE4NNXddO4UQnbwni8qb2fUX 6lZX8tVc43EGjFxWqEeCLEsX6ZO/lWbBXAPVzNMQJ6LZTIjmqKh8raLLYG06iutyoWbR xRT/XINpNtPB4gySXxiPq339x9iO/FtFJ+YL9Gk6VbwD6+a1YJKtzEjg0jiHmJgES6sW SPkb/ZxUeEgp1uMHuhlR+25VB2++Byfdnu5oFbEfQYfkQ6qnDYAmFvkXnbJsMUfwxnIx ayPg== 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=r46D0cfhvOhWWQ3wuo1JGTI5mTXEa2xSDV25qx6cAKk=; b=cde1GrR6zFyUnFdLP9tId+y66zcOBhv1MB3vGmboIy81LlF+w5GH2h7xDClnq/Klw2 nwgZRBUPTpId6gNMUVaiVxx0VbtM5A52mT2Kj4QeA+M5yTk8FkpRf0dvcDxeP2LQUUE3 YSPIqs9PePwhmtjKtR7+nNTnD8eApp5M7FwlBxw+IWRujTUztPkwLCwgLvAgcW0VX6F3 M+0SFui6+09+plBvG6uSt9YVa7gFGNnsiVyG6U510BzpPns/fnXYVP7Of4MIDh9Ie8bK G4V/KG78BI7oxpxb0HW+oy5KuAYvj7whC1qj+9cHBuBf+Jn6kh7ujIwgAS6njnyqXtB5 Iv8g== X-Gm-Message-State: AOAM532HKiejRtn2IuiV6Vp49I5p3nxN2nnRvOU64fndEWfTu1Va1b1t t6novdpXroMcxda739AQ7Uo= X-Google-Smtp-Source: ABdhPJwY0kLd6Qt/cOzyeaTF+lRjh66ysW6Shhec+3r7seZ08dLvdYfT34asas6wWsct9uKRnljAMw== X-Received: by 2002:a4a:244e:: with SMTP id v14mr4182967oov.57.1590605855296; Wed, 27 May 2020 11:57:35 -0700 (PDT) Received: from localhost.members.linode.com ([2600:3c00::f03c:92ff:fe3e:1759]) by smtp.gmail.com with ESMTPSA id i127sm1074596oih.38.2020.05.27.11.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 11:57:34 -0700 (PDT) From: Anton Protopopov To: Alexei Starovoitov , Daniel Borkmann , Shuah Khan Cc: Anton Protopopov , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 1/5] selftests/bpf: fix a typo in test_maps Date: Wed, 27 May 2020 18:56:56 +0000 Message-Id: <20200527185700.14658-2-a.s.protopopov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527185700.14658-1-a.s.protopopov@gmail.com> References: <20200527185700.14658-1-a.s.protopopov@gmail.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Trivial fix to a typo in the test_map_wronly test: "read" -> "write" Signed-off-by: Anton Protopopov --- tools/testing/selftests/bpf/test_maps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index c6766b2cff85..f717acc0c68d 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -1410,7 +1410,7 @@ static void test_map_wronly(void) fd = bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(key), sizeof(value), MAP_SIZE, map_flags | BPF_F_WRONLY); if (fd < 0) { - printf("Failed to create map for read only test '%s'!\n", + printf("Failed to create map for write only test '%s'!\n", strerror(errno)); exit(1); } From patchwork Wed May 27 18:56:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Protopopov X-Patchwork-Id: 11573803 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7AF7B912 for ; Wed, 27 May 2020 18:59:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63E1C2100A for ; Wed, 27 May 2020 18:59:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DFl0fF7d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729024AbgE0S7F (ORCPT ); Wed, 27 May 2020 14:59:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728564AbgE0S5h (ORCPT ); Wed, 27 May 2020 14:57:37 -0400 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3921DC08C5C1; Wed, 27 May 2020 11:57:37 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id x22so415352otq.4; Wed, 27 May 2020 11:57:37 -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=eW6ryn1rOfnt2FF7cISQz6U787vY1TgBbRYE31eh+Uw=; b=DFl0fF7dcBxB5zqV1ix3II/kS7GQWkr6h7MlBOIRyyX9w/lmsBDVqgZKwMtq0L4M9H JTBc6t/jarulee9eP3RPJKMS2NvII2IvXAT0SjYl2xUHexw2iLgQZVQwSUPKlmY5/tYu blnENDtu+hHIbyK+fWHgVFD2xWYKMl0dQlHidD4j3U3cRAYEdixqEZsEMbCUaOiO6Iem AaZO+xMLT7bai9YdpZ8wEx6wvizd+XffPHmevaIB/n/EpgKdqo1WI7hkfxe32wVQeBOf UFz9ZFZlvdfXGql8cPsqCC4q63jmWoSjd5QqXTYzEdiKuCUTHUkLidSnDhGYt0Y9Sh8U cFrQ== 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=eW6ryn1rOfnt2FF7cISQz6U787vY1TgBbRYE31eh+Uw=; b=LZ78mXkLqXZvW1PqKUgBHFUBx/MvKDMDC4Qm9+ZhiYzssPBbfTBtDjIcty0DZmQ4pE fwx3iv4/de8yBOM7vACUzK8dUpM4N18JXTja1kx6QoBxniGDbaVfPx2xxnn+nAGC5l0/ O7HGgHMs9+e8qxKifvWdb8ZIGqBCS/+c1LyN5tINW0NwHolCgOEZkT0DDhe8mBE290dE an/y7bna+GcgWiCD2W6oouxANX02/mWi+WyntD3LU3UFnPJAqbvH47BB/QP1RNIr8+sV nNONuh416mdRNz8am9nusoLfbskgpXKHdljr0VNzzapkRvYxzhhhB1ycXCwFOVTvQjse Hj3A== X-Gm-Message-State: AOAM533pk8tM+prv1mkdjWCfJdlIhLUUe9xkeZrSr/m9pl2u6Wp9+V3m A+zDVORpW/IAUrKgJZ9cN2s= X-Google-Smtp-Source: ABdhPJy0KJw3sf9zmT1G+HDG+6Q0TCF/0gOW2ku15pcSyJcP5yU5cr/zlnwmgb0j4Gon70V/ZXqnNw== X-Received: by 2002:a9d:4807:: with SMTP id c7mr5327778otf.279.1590605856664; Wed, 27 May 2020 11:57:36 -0700 (PDT) Received: from localhost.members.linode.com ([2600:3c00::f03c:92ff:fe3e:1759]) by smtp.gmail.com with ESMTPSA id i127sm1074596oih.38.2020.05.27.11.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 11:57:35 -0700 (PDT) From: Anton Protopopov To: Alexei Starovoitov , Daniel Borkmann , Shuah Khan Cc: Anton Protopopov , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 2/5] selftests/bpf: cleanup some file descriptors in test_maps Date: Wed, 27 May 2020 18:56:57 +0000 Message-Id: <20200527185700.14658-3-a.s.protopopov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527185700.14658-2-a.s.protopopov@gmail.com> References: <20200527185700.14658-1-a.s.protopopov@gmail.com> <20200527185700.14658-2-a.s.protopopov@gmail.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The test_map_rdonly and test_map_wronly tests should close file descriptors which they open. Signed-off-by: Anton Protopopov --- tools/testing/selftests/bpf/test_maps.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index f717acc0c68d..46cf2c232964 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -1401,6 +1401,8 @@ static void test_map_rdonly(void) /* Check that key=2 is not found. */ assert(bpf_map_lookup_elem(fd, &key, &value) == -1 && errno == ENOENT); assert(bpf_map_get_next_key(fd, &key, &value) == -1 && errno == ENOENT); + + close(fd); } static void test_map_wronly(void) @@ -1423,6 +1425,8 @@ static void test_map_wronly(void) /* Check that key=2 is not found. */ assert(bpf_map_lookup_elem(fd, &key, &value) == -1 && errno == EPERM); assert(bpf_map_get_next_key(fd, &key, &value) == -1 && errno == EPERM); + + close(fd); } static void prepare_reuseport_grp(int type, int map_fd, size_t map_elem_size, From patchwork Wed May 27 18:56:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Protopopov X-Patchwork-Id: 11573799 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B6AC1912 for ; Wed, 27 May 2020 18:59:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B8CD2075A for ; Wed, 27 May 2020 18:59:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KVvW98Bq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728635AbgE0S5k (ORCPT ); Wed, 27 May 2020 14:57:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728620AbgE0S5j (ORCPT ); Wed, 27 May 2020 14:57:39 -0400 Received: from mail-oo1-xc41.google.com (mail-oo1-xc41.google.com [IPv6:2607:f8b0:4864:20::c41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73605C08C5C2; Wed, 27 May 2020 11:57:38 -0700 (PDT) Received: by mail-oo1-xc41.google.com with SMTP id v3so575272oot.1; Wed, 27 May 2020 11:57:38 -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=g+Sx+LdvdlNSFwCeU+0IiQJrZn4C+WBNteUBifrI+jE=; b=KVvW98BqWNJ24t4WyN/kDF2iHvPjOBw9yXgMoj+8JhHhAlRDlE+LpzKyLqn3Xpvukv nqown0T98zAjGQYo/R+soVOVV9GmMOEPZemPOE6E9AskUI2lTowG+89h2Nae54qub440 nN4oIa7J5phAONxfckHzvZ3M0u8UDlYQE5GLjjgP9oIx0/fYQAjHbPFXdYtLjfyPmfRu HqKv+HM3L6omH2j6MAGfV9IatjOE/0OhnlBCcpfQ119Igf7IDlYpuOPjDsezkhjNiLBs ObWnVQCjDvdmjGWi4ARxA5ZfIhjymjU5aRf6ZmarnM2zUVaqStWptuYpvxI5gXym6FuP 31QA== 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=g+Sx+LdvdlNSFwCeU+0IiQJrZn4C+WBNteUBifrI+jE=; b=oNmLG6Zy4b2/fKHXa3gRIKsE5wGN6HvlOfEluG1ixr0nW0mhrT3q5xG0k2J7PAa75N 0csW9QMgsqAMn+348XmVL3E7MF3GNGEedZbRIWLncslLfXNBU9uYumpio3tdGH9v9/za FZGaVWtmyzgXe0UzeITaegRB1jWqpvFJUTHm/P+kigZYAjxPXf+vOofLfH+amalIZTyM O9UuwuxrK84XwYLdobSnBvmeJbyHaNZ9SfFJmaMFv/FvxQG+Mpr7kLZf1Cnf3ZK7YARM F52/ipL12wuDgObeimzp6QFNtoRE75E5V4Sa3XYoQ79Lp8pQWgugkQVGAx7ybgCM7aFk 2X6w== X-Gm-Message-State: AOAM530X0nVnTEBDKyOfMug/ovbf6nTzG7XguI1kYFkje99UDDbwqUtg UWOJA5yh0f2R8z3314idRgk= X-Google-Smtp-Source: ABdhPJxzxs3LBefZR3f9QCZMzmpVC0Xh6Fb7A6WGu2tA0bCiDIdtmf9eu5W4zxbg+ADgH2XQJc85eg== X-Received: by 2002:a4a:6b0b:: with SMTP id g11mr4196074ooc.6.1590605857821; Wed, 27 May 2020 11:57:37 -0700 (PDT) Received: from localhost.members.linode.com ([2600:3c00::f03c:92ff:fe3e:1759]) by smtp.gmail.com with ESMTPSA id i127sm1074596oih.38.2020.05.27.11.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 11:57:37 -0700 (PDT) From: Anton Protopopov To: Alexei Starovoitov , Daniel Borkmann , Shuah Khan Cc: Anton Protopopov , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 3/5] selftests/bpf: cleanup comments in test_maps Date: Wed, 27 May 2020 18:56:58 +0000 Message-Id: <20200527185700.14658-4-a.s.protopopov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527185700.14658-3-a.s.protopopov@gmail.com> References: <20200527185700.14658-1-a.s.protopopov@gmail.com> <20200527185700.14658-2-a.s.protopopov@gmail.com> <20200527185700.14658-3-a.s.protopopov@gmail.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Make comments inside the test_map_rdonly and test_map_wronly tests consistent with logic. Signed-off-by: Anton Protopopov --- tools/testing/selftests/bpf/test_maps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index 46cf2c232964..08d63948514a 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -1394,11 +1394,11 @@ static void test_map_rdonly(void) key = 1; value = 1234; - /* Insert key=1 element. */ + /* Try to insert key=1 element. */ assert(bpf_map_update_elem(fd, &key, &value, BPF_ANY) == -1 && errno == EPERM); - /* Check that key=2 is not found. */ + /* Check that key=1 is not found. */ assert(bpf_map_lookup_elem(fd, &key, &value) == -1 && errno == ENOENT); assert(bpf_map_get_next_key(fd, &key, &value) == -1 && errno == ENOENT); @@ -1422,7 +1422,7 @@ static void test_map_wronly(void) /* Insert key=1 element. */ assert(bpf_map_update_elem(fd, &key, &value, BPF_ANY) == 0); - /* Check that key=2 is not found. */ + /* Check that reading elements and keys from the map is not allowed. */ assert(bpf_map_lookup_elem(fd, &key, &value) == -1 && errno == EPERM); assert(bpf_map_get_next_key(fd, &key, &value) == -1 && errno == EPERM); From patchwork Wed May 27 18:56:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Protopopov X-Patchwork-Id: 11573797 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B875C912 for ; Wed, 27 May 2020 18:58:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A01292073B for ; Wed, 27 May 2020 18:58:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CQIL3L9Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729009AbgE0S6w (ORCPT ); Wed, 27 May 2020 14:58:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725747AbgE0S5k (ORCPT ); Wed, 27 May 2020 14:57:40 -0400 Received: from mail-oo1-xc43.google.com (mail-oo1-xc43.google.com [IPv6:2607:f8b0:4864:20::c43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3815EC08C5C1; Wed, 27 May 2020 11:57:40 -0700 (PDT) Received: by mail-oo1-xc43.google.com with SMTP id x17so1243749oog.6; Wed, 27 May 2020 11:57:40 -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=/bi2v/w881kTu6aWVQghMQWdHo/A6/i+CwZouKlxmms=; b=CQIL3L9QuGAGDOch3ZMsrDWOowK34i8Dzmn0YPcOlbVnRAkpWIkm5klrZ7exR8KX2V yvoM1/mwIx6c32q4jY+hff50T+XO+4+RwrlJH5VzZ1+9hud0QAGUzzTtnb3Zpyr2n2tV tp1gO7TsKr3QnvY49tvhWCjqbHBmI4cchjZq/CNphEyjEv5bceDjxftzbADAsOUXbZ2u RN4T2b7SqMfyAnp4JyjgbAilvaycZNST78JZEBc4Y9S57yNkJcIaC7Gcs4ppj47iB/Ky qXwwXupF+FcBY/udgJBgefsgsVBNHDPDve4jiF9V9DcOQLcmKyQZzCaNpT5l6cCWS/xL 7D1g== 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=/bi2v/w881kTu6aWVQghMQWdHo/A6/i+CwZouKlxmms=; b=nWgasd1qg/E/bb6gkrjIy8qFYjpnzlb/Bke2TQcaWooxHtqdY2ddNNH9/mj6an0Hzu YcpCDfD1PGqgEeW31hYrRqSsH+Rza+z1M2bpJuMtbWxEU5e0pRRiUF4+N88qhwXMzgTa s4m6SSJPtEFrybnK/tD9JoqzR08BS6F4lJsoO+CcmI88/Ej1ho5BMKz5eoTh8OBuSKPP 9tXcvP5RpCem4cVqtKE+N8AeA8mouOgwy3wvwtholqs1UpXm9N2YMpwt2GNK0rLDyJIX Xy6+34HpDggVLdA4+4xsTBUiOAkRI3u9gS1bFRu+BRyx0f1gc0tbkvXu0FcJYHLhc6Gu /1Kw== X-Gm-Message-State: AOAM533DRdpP+leTPuXHwR+NrjcOGFz+obovEl0lUB9kwaGXxMTMW3WE vZG288V/50k5V8xoghoFjO8= X-Google-Smtp-Source: ABdhPJyzzRIMTL2FQqJKEg9svGszotkEOxIapfGj9shfnfRkXZ8OYl6TxV8aHgl0uRVzP+PIFoUAhQ== X-Received: by 2002:a4a:5548:: with SMTP id e69mr4198269oob.23.1590605859440; Wed, 27 May 2020 11:57:39 -0700 (PDT) Received: from localhost.members.linode.com ([2600:3c00::f03c:92ff:fe3e:1759]) by smtp.gmail.com with ESMTPSA id i127sm1074596oih.38.2020.05.27.11.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 11:57:38 -0700 (PDT) From: Anton Protopopov To: Alexei Starovoitov , Daniel Borkmann , Shuah Khan Cc: Anton Protopopov , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 4/5] bpf: fix map permissions check Date: Wed, 27 May 2020 18:56:59 +0000 Message-Id: <20200527185700.14658-5-a.s.protopopov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527185700.14658-4-a.s.protopopov@gmail.com> References: <20200527185700.14658-1-a.s.protopopov@gmail.com> <20200527185700.14658-2-a.s.protopopov@gmail.com> <20200527185700.14658-3-a.s.protopopov@gmail.com> <20200527185700.14658-4-a.s.protopopov@gmail.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The map_lookup_and_delete_elem() function should check for both FMODE_CAN_WRITE and FMODE_CAN_READ permissions because it returns a map element to user space. Fixes: bd513cd08f10 ("bpf: add MAP_LOOKUP_AND_DELETE_ELEM syscall") Signed-off-by: Anton Protopopov --- kernel/bpf/syscall.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 4e6dee19a668..5e52765161f9 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1468,7 +1468,8 @@ static int map_lookup_and_delete_elem(union bpf_attr *attr) map = __bpf_map_get(f); if (IS_ERR(map)) return PTR_ERR(map); - if (!(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { + if (!(map_get_sys_perms(map, f) & FMODE_CAN_READ) || + !(map_get_sys_perms(map, f) & FMODE_CAN_WRITE)) { err = -EPERM; goto err_put; } From patchwork Wed May 27 18:57:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Protopopov X-Patchwork-Id: 11573769 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 22B48912 for ; Wed, 27 May 2020 18:57:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0767E208B8 for ; Wed, 27 May 2020 18:57:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Hl+IXHSF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728709AbgE0S5n (ORCPT ); Wed, 27 May 2020 14:57:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728688AbgE0S5m (ORCPT ); Wed, 27 May 2020 14:57:42 -0400 Received: from mail-oi1-x244.google.com (mail-oi1-x244.google.com [IPv6:2607:f8b0:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92AD9C08C5C2; Wed, 27 May 2020 11:57:41 -0700 (PDT) Received: by mail-oi1-x244.google.com with SMTP id m67so12307588oif.4; Wed, 27 May 2020 11:57:41 -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=I09zh1v7z5u8lEFHdYt72pjx0gywlmdpCKdvNPS3YjA=; b=Hl+IXHSFurDg/vHoOJem9FDAWswbJsRgzR+fGRdAysJ9zCQOtQuNxJWkcmpRqH7649 M/Y3j5yHoE5LMgaorq7cDkZC5Z2mNAWvFE13fZRXW/GEBIk9PJ3MOvmc6oGzZk+XS5L+ /F8TPP/8cPLNdBA4qIQ4e+DZWgqWR9Cr1T9g9zUph6jFs1GCN2xJ5AR/Es0KSBEiHwTU hQSg+Eb/8CJX62DK1aNQbc9vVlTHIUU6GyM8BV7c71G4ggYUPfJaT3+bQ+zl+AAWz+mE wDuK8owCbABniOeKBJmd+6+RDEWJgA/DBIaDXAvnni/okb0rQo5NfMRA7p0rPeGPGK+Q VaQA== 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=I09zh1v7z5u8lEFHdYt72pjx0gywlmdpCKdvNPS3YjA=; b=motbcn1OSmmwLGxuv7KDz68uDSSQqN4JwASLK8Ahj7UZFmQMR403Jm3w315t5Qmlyv 4axzkoTL4AmrC3XPmZDIaIYqP1TiwukfyTHMMaW8K6OGCocCUJueWuovzo9oxulp48vl RXxRsK8cUXaHQLDM+9GolAMl57YhCcRfEJ1tUlt2TTz0m7HR3kvMeTKh2GOSMqDLyEQs sjc7cF2/9lQabjfQQ5Y7csnzI90UhRUDPFjU26FjswOh5TDk3niCmDELVAzIoAOkWcq2 78VTUjfDBJh5mkpZwzLsfoXk8QqNWn4mLP6GIECsGw05Hm5PS77jgT89qRjthNmvvOcu Mt/Q== X-Gm-Message-State: AOAM530471s0Ej/VIoV6uuucspj3x57naCIs8NWwsWb2vnLzgEra9dTg St1tBMymiNv5LKKtomaE6QnRFInvThQ= X-Google-Smtp-Source: ABdhPJxvi0EZe24uD0uYZYuQSoDF1clZ5ClhD7yha8spsIME2wl9ZZLZy5AG25fwLfpFhSyAjB7Fkg== X-Received: by 2002:a05:6808:d8:: with SMTP id t24mr3598966oic.10.1590605860922; Wed, 27 May 2020 11:57:40 -0700 (PDT) Received: from localhost.members.linode.com ([2600:3c00::f03c:92ff:fe3e:1759]) by smtp.gmail.com with ESMTPSA id i127sm1074596oih.38.2020.05.27.11.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 11:57:39 -0700 (PDT) From: Anton Protopopov To: Alexei Starovoitov , Daniel Borkmann , Shuah Khan Cc: Anton Protopopov , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 5/5] selftests/bpf: add tests for write-only stacks/queues Date: Wed, 27 May 2020 18:57:00 +0000 Message-Id: <20200527185700.14658-6-a.s.protopopov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527185700.14658-5-a.s.protopopov@gmail.com> References: <20200527185700.14658-1-a.s.protopopov@gmail.com> <20200527185700.14658-2-a.s.protopopov@gmail.com> <20200527185700.14658-3-a.s.protopopov@gmail.com> <20200527185700.14658-4-a.s.protopopov@gmail.com> <20200527185700.14658-5-a.s.protopopov@gmail.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org For write-only stacks and queues bpf_map_update_elem should be allowed, but bpf_map_lookup_elem and bpf_map_lookup_and_delete_elem should fail with EPERM. Signed-off-by: Anton Protopopov --- tools/testing/selftests/bpf/test_maps.c | 40 ++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index 08d63948514a..6a12a0e01e07 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -1405,7 +1405,7 @@ static void test_map_rdonly(void) close(fd); } -static void test_map_wronly(void) +static void test_map_wronly_hash(void) { int fd, key = 0, value = 0; @@ -1429,6 +1429,44 @@ static void test_map_wronly(void) close(fd); } +static void test_map_wronly_stack_or_queue(enum bpf_map_type map_type) +{ + int fd, value = 0; + + assert(map_type == BPF_MAP_TYPE_QUEUE || + map_type == BPF_MAP_TYPE_STACK); + fd = bpf_create_map(map_type, 0, sizeof(value), MAP_SIZE, + map_flags | BPF_F_WRONLY); + /* Stack/Queue maps do not support BPF_F_NO_PREALLOC */ + if (map_flags & BPF_F_NO_PREALLOC) { + assert(fd < 0 && errno == EINVAL); + return; + } + if (fd < 0) { + printf("Failed to create map '%s'!\n", strerror(errno)); + exit(1); + } + + value = 1234; + assert(bpf_map_update_elem(fd, NULL, &value, BPF_ANY) == 0); + + /* Peek element should fail */ + assert(bpf_map_lookup_elem(fd, NULL, &value) == -1 && errno == EPERM); + + /* Pop element should fail */ + assert(bpf_map_lookup_and_delete_elem(fd, NULL, &value) == -1 && + errno == EPERM); + + close(fd); +} + +static void test_map_wronly(void) +{ + test_map_wronly_hash(); + test_map_wronly_stack_or_queue(BPF_MAP_TYPE_STACK); + test_map_wronly_stack_or_queue(BPF_MAP_TYPE_QUEUE); +} + static void prepare_reuseport_grp(int type, int map_fd, size_t map_elem_size, __s64 *fds64, __u64 *sk_cookies, unsigned int n)