From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stanislav Fomichev Subject: [PATCH bpf] selftests/bpf: fix incorrect users of create_and_get_cgroup Date: Thu, 3 Jan 2019 10:57:17 -0800 Message-ID: <20190103185717.58134-1-sdf@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev To: netdev@vger.kernel.org Return-path: Received: from mail-pf1-f201.google.com ([209.85.210.201]:36921 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726564AbfACS5W (ORCPT ); Thu, 3 Jan 2019 13:57:22 -0500 Received: by mail-pf1-f201.google.com with SMTP id i3so35446313pfj.4 for ; Thu, 03 Jan 2019 10:57:21 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: create_and_get_cgroup returns 0 on error, fix the users that assume negative value in case of an error. Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/get_cgroup_id_user.c | 2 +- tools/testing/selftests/bpf/test_sockmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/get_cgroup_id_user.c b/tools/testing/selftests/bpf/get_cgroup_id_user.c index e8da7b39158d..dfaa9b353ac3 100644 --- a/tools/testing/selftests/bpf/get_cgroup_id_user.c +++ b/tools/testing/selftests/bpf/get_cgroup_id_user.c @@ -64,7 +64,7 @@ int main(int argc, char **argv) return 1; cgroup_fd = create_and_get_cgroup(TEST_CGROUP); - if (CHECK(cgroup_fd < 0, "create_and_get_cgroup", "err %d errno %d\n", + if (CHECK(!cgroup_fd, "create_and_get_cgroup", "err %d errno %d\n", cgroup_fd, errno)) goto cleanup_cgroup_env; diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c index e85a771f607b..2384896e8112 100644 --- a/tools/testing/selftests/bpf/test_sockmap.c +++ b/tools/testing/selftests/bpf/test_sockmap.c @@ -1676,7 +1676,7 @@ static int __test_suite(int cg_fd, char *bpf_file) } cg_fd = create_and_get_cgroup(CG_PATH); - if (cg_fd < 0) { + if (!cg_fd) { fprintf(stderr, "ERROR: (%i) open cg path failed: %s\n", cg_fd, optarg); -- 2.20.1.415.g653613c723-goog