From patchwork Thu Sep 3 18:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Luo X-Patchwork-Id: 255245 Return-Path: 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=-12.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 7FA39C433E2 for ; Thu, 3 Sep 2020 18:01:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 583282078E for ; Thu, 3 Sep 2020 18:01:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Cq3p3J6M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726990AbgICSBn (ORCPT ); Thu, 3 Sep 2020 14:01:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726025AbgICSBl (ORCPT ); Thu, 3 Sep 2020 14:01:41 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E573C061245 for ; Thu, 3 Sep 2020 11:01:41 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id c78so3622381ybf.6 for ; Thu, 03 Sep 2020 11:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=Kysrwv2vyroocCwa+tcRYatIjOGKit3xRO3evVtQFbc=; b=Cq3p3J6MuBLmXs4+BsJhTAo9WFB6do5dQd5DtPvLivFpB+4Ju12w4vUq6lbWXAzjlm TbcW3W73CMNquCeiwEyKd9wULH55FwWxBcJpvqcNQcSVJIerstXZYAml83qKstkbK1SU okUjrP6TZJ46ow8QUFxy4cJEvShbzmqd/tMJGhc/ubslAQw5E5fKNSN+mDR7fcIMvWkl T5OyxJjCB5mabyFXVA/Kv+8UqCZMU/3HwpGbWxy6Qw6coOJcnVywx1qpwbmB4Rg2DxxW vRrg6aEM7P7/YB4eK0LrHrEquLEDOltwMIB5NacuCaNG7muP/MqjrNPvcOSChtXfdvOR opNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=Kysrwv2vyroocCwa+tcRYatIjOGKit3xRO3evVtQFbc=; b=AazzBpJfK+tkZXhQoBVWUQjLgfQew+9NZQ6SIXQhx/r3xcyF6/QHjQB0ejq+xvCD4O OtwKH6Wd3XWxWuQ+lEYj0i5C4Hvq9ivZ+A90WtuWoiNaLTD/0DlmsA1xDWZjdR1czzfv 2lJZhyS9XZSf4/ps9ZpYX5pRM10IFAhcq9fpZ7UCMIq+s50mQT6OB2hGLChn4/CYFuUU /aWznGEQk5s/TFQKyo1SiR8cGW9ZlIeHScRI53MRtzxIQaAebvBg+WPs4D4Ux/5OKrWW vURKQtRiXvSlpiRPfgEQP/Gfl2TF5UUnLvLc+GCXdMiSGX4abFhVfUPXN5V6zRSrIH8V nyxw== X-Gm-Message-State: AOAM533gMvT8qTSHCZyZaq4BQSdnTPSxzPGbU1kBJjsR+uWJrheG2Q36 /aRDKqJ2+JGf4/6KsSZJ8XSy7VOvaac= X-Google-Smtp-Source: ABdhPJznIT58g0Z8TdpOroAqfZSJEPyQbKcKvYMhot5h+i6tLXl0hXMlUC/qJtrEQeftD65KiOHntPOzGCQ= X-Received: from haoluo.svl.corp.google.com ([2620:15c:2cd:202:f693:9fff:fef4:e444]) (user=haoluo job=sendgmr) by 2002:a25:70c6:: with SMTP id l189mr4414948ybc.263.1599156100416; Thu, 03 Sep 2020 11:01:40 -0700 (PDT) Date: Thu, 3 Sep 2020 11:01:21 -0700 Message-Id: <20200903180121.662887-1-haoluo@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.28.0.402.g5ffc5be6b7-goog Subject: [PATCH] selftests/bpf: Fix check in global_data_init. From: Hao Luo To: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Shuah Khan , Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , "=?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?=" , KP Singh , Hao Luo Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The returned value of bpf_object__open_file() should be checked with IS_ERR() rather than NULL. This fix makes test_progs not crash when test_global_data.o is not present. Signed-off-by: Hao Luo --- tools/testing/selftests/bpf/prog_tests/global_data_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/global_data_init.c b/tools/testing/selftests/bpf/prog_tests/global_data_init.c index 3bdaa5a40744..1ece86d5c519 100644 --- a/tools/testing/selftests/bpf/prog_tests/global_data_init.c +++ b/tools/testing/selftests/bpf/prog_tests/global_data_init.c @@ -12,7 +12,7 @@ void test_global_data_init(void) size_t sz; obj = bpf_object__open_file(file, NULL); - if (CHECK_FAIL(!obj)) + if (CHECK_FAIL(IS_ERR(obj))) return; map = bpf_object__find_map_by_name(obj, "test_glo.rodata");