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: 1356782 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=Cq3p3J6M; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bj7t21lwCz9sTR for ; Fri, 4 Sep 2020 04:01:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728827AbgICSBo (ORCPT ); Thu, 3 Sep 2020 14:01:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbgICSBm (ORCPT ); Thu, 3 Sep 2020 14:01:42 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9949C061247 for ; Thu, 3 Sep 2020 11:01:41 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 129so3607924ybn.15 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=th+u41/FMYmsm5xSrxX+A6paHyCfkyytbiVaJYL9jAs7UJVekkZvz46h6d1W0guxBy 1b3TsRXw+mqsnhvNuMcHtcPvuicrvEHXNwGz3Cb0f21cFn3IhMSJtGa/V1IiMIa7+fQ1 5YSDurP1PaN1PCNABqezzAuhKSBbpazdalPGIvmRgXXL5IsE2FY056xiQKL/7rNZNuBh WfPTmtpI9VIcCKOJdyzl/wzPlAhPfsa8l2gkiW9xExPQSyCsHLpXLMrvYJV13sgf3m6K uVzuDzC0bWYaYGCtfTAywlzSPZg+p9on4rJ8w0oLEoXysD0e3yOhbkalc2b58ysegbFZ Q01w== X-Gm-Message-State: AOAM532aSZ4NMBQ5C3hwuR1X9dXdPJ7XDtQsl3p6fYDoS7E5v40faprT RY8N4E7y5z+ygyhDVbrA1f8OMHrR5NPYYvPp9uG7LUlKGOTj4fwtpuOhTmEQz8NIElE5XUZYqSI n3yGUP2Zt4STdAL7cdtbGaHPS+N3JrN+gRzTf7u8bHx21wGsJmSO++jAG1h/LIA== 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_H=C3=B8iland-J=C3=B8rgensen?= " , KP Singh , Hao Luo Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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");