From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 40CEBC04E53 for ; Wed, 15 May 2019 13:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17B0F20881 for ; Wed, 15 May 2019 13:48:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kinvolk.io header.i=@kinvolk.io header.b="bb0wfX8/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728084AbfEONse (ORCPT ); Wed, 15 May 2019 09:48:34 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34740 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728063AbfEONse (ORCPT ); Wed, 15 May 2019 09:48:34 -0400 Received: by mail-wr1-f66.google.com with SMTP id f8so2798216wrt.1 for ; Wed, 15 May 2019 06:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kinvolk.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C8C9qQrgN+nbsH+pjHzl6tlp7Nc6h5TeMF/8muSLzN0=; b=bb0wfX8/WrYuGLUAmDRcNpnd3bhxH6w7/sgCZ8Drhn8KHryZFCL75wztrn3JWWAnVM R0QfBsa9kVPuPPY8Fl3RqZexz2P73kISAhhEJg2Zjo9RldS3sYnWT3YAgPUYR6zk1OcB 73vtRKTT1JAauCFk9RwePECbqyDWlwQzdCSck= 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=C8C9qQrgN+nbsH+pjHzl6tlp7Nc6h5TeMF/8muSLzN0=; b=j/gg5+bW+FLpnikkljPzCVE8vFdSwIf22vVe7u4PS6JoK3Rd8XXwUrzssWDsZzjpqy aH1vjVqHT6h5QbwWrvVde7mJqHMRfNpPxVnuY7hoPCZQndWs8I8wWYFHXx/VUKGDOX9q uXHLqBVFIbQLcZOJnE0IvU3QxYfokqLpTEWQdRZR141w6MuoAa5ku/7ARuaoP5oDArJH vYrpqJ/pl+dxYzzEt1nte9OVb3woPHok3QTXlAAuXr3+UpSXtndOd8uC/qSnbYAkRRXH A1Zj8b47glNZn8/0HjzZXgL7qkqHUrOivuLQ54QTMp21rQkuaQl+EgUNuvxxu8BqWqDL SKNA== X-Gm-Message-State: APjAAAW/HqfXX0c4Kl2POLNQ01c6nk0z/KTaPbxxd/REObxpITJfGOgc g3wwa/YPUcEVzd1FqWEVSZ0IgB7dn3vNOw== X-Google-Smtp-Source: APXvYqw5wECdzlZCofc+dCbXApCTq0fMDCETyET6YAJzK0hcDDptniDy4A+BRGyfphuaB3WidJzFwQ== X-Received: by 2002:adf:cc8d:: with SMTP id p13mr13698244wrj.114.1557928112220; Wed, 15 May 2019 06:48:32 -0700 (PDT) Received: from localhost.localdomain (ip5f5aea35.dynamic.kabel-deutschland.de. [95.90.234.53]) by smtp.gmail.com with ESMTPSA id v5sm4498506wra.83.2019.05.15.06.48.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 May 2019 06:48:31 -0700 (PDT) From: Krzesimir Nowak To: bpf@vger.kernel.org Cc: iago@kinvolk.io, alban@kinvolk.io, Krzesimir Nowak , Jakub Kicinski , Shuah Khan , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrey Ignatov , Jiong Wang , linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf v1 3/3] selftests/bpf: Avoid a clobbering of errno Date: Wed, 15 May 2019 15:47:28 +0200 Message-Id: <20190515134731.12611-4-krzesimir@kinvolk.io> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515134731.12611-1-krzesimir@kinvolk.io> References: <20190515134731.12611-1-krzesimir@kinvolk.io> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Save errno right after bpf_prog_test_run returns, so we later check the error code actually set by bpf_prog_test_run, not by some libcap function. Cc: Jakub Kicinski Fixes: 5a8d5209ac022 ("selftests: bpf: add trivial JSET tests") Signed-off-by: Krzesimir Nowak --- tools/testing/selftests/bpf/test_verifier.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index bf0da03f593b..514e17246396 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -818,15 +818,17 @@ static int do_prog_test_run(int fd_prog, bool unpriv, uint32_t expected_val, __u32 size_tmp = sizeof(tmp); uint32_t retval; int err; + int saved_errno; if (unpriv) set_admin(true); err = bpf_prog_test_run(fd_prog, 1, data, size_data, tmp, &size_tmp, &retval, NULL); + saved_errno = errno; if (unpriv) set_admin(false); if (err) { - switch (errno) { + switch (saved_errno) { case 524/*ENOTSUPP*/: printf("Did not run the program (not supported) "); return 0; -- 2.20.1