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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A8AD4C606BD for ; Mon, 8 Jul 2019 16:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81E4C21537 for ; Mon, 8 Jul 2019 16:32:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kinvolk.io header.i=@kinvolk.io header.b="W11kKcw1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389521AbfGHQb4 (ORCPT ); Mon, 8 Jul 2019 12:31:56 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:34657 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388494AbfGHQbu (ORCPT ); Mon, 8 Jul 2019 12:31:50 -0400 Received: by mail-wr1-f68.google.com with SMTP id 31so1053488wrm.1 for ; Mon, 08 Jul 2019 09:31:49 -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=3geFFJ9tql4ZwrkQmT2Y6FVy9TSA0XcjotCe5RWiIWM=; b=W11kKcw12664L0TISI/sieWZFZRo6VanqFvi/sZiO58JX6zHqbOe5vVsLBGA/+5B+Y kKAtx9nfU9bBDJD3JcMKrs3s0vOlMoOeV4DK5ENYnVnXju2PxsleMeKcMdkefpydrt/X /qu3fMa+w+lGdlcWFfAf4e1+K73wTK7C4pWbc= 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=3geFFJ9tql4ZwrkQmT2Y6FVy9TSA0XcjotCe5RWiIWM=; b=hPFLO4gHFSe/yWm7SCLVPCeaJIjpY2pdkc1Y1JLCBzCvWCt+tri4r2nvIOGwP9Fhu8 VAJqMgAr28VnslrXSVxUQyUEu0UccUwplhrKPHbHivsDLlt4IFl2024FtDLyUcsT1Rnr wNv6ex/mUoPKALUHUjpFQsdHYTguZLgsmaDMbRt/jucEbRowt/8Rw5TqOMYSKZMQnGoQ 6bvNHvhGfEv0MttMB8DLTUZ8JKUnany0tkVyDnHfVgrZa8PcujTXPZvL/WKwPywuF38t xULhagXt+01hAJDaFtOmRV+kJYGW9xkVIdd3tsAUlFUoMD58PqRDS0VkbegQHQfMc0zK q22w== X-Gm-Message-State: APjAAAWOmP0xkB1GP0TH8UDlXOY6Kxid0Ejw1Yxj4C45zLQF5epu+8Xj 17SGOaSufyVeXwA8RStR0V7xVzXPYiDvHw== X-Google-Smtp-Source: APXvYqzjb6vUPKfQHIBsttODvNl7TdmxISCG+2hXPuXBG5uEruZ3Y9wg/g4GGXFNnZrOITpNYyyoWQ== X-Received: by 2002:adf:ec0f:: with SMTP id x15mr19952633wrn.165.1562603508638; Mon, 08 Jul 2019 09:31:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5aedbe.dynamic.kabel-deutschland.de. [95.90.237.190]) by smtp.gmail.com with ESMTPSA id e6sm18255086wrw.23.2019.07.08.09.31.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 09:31:48 -0700 (PDT) From: Krzesimir Nowak To: linux-kernel@vger.kernel.org Cc: Alban Crequy , =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , netdev@vger.kernel.org, bpf@vger.kernel.org, xdp-newbies@vger.kernel.org, Krzesimir Nowak Subject: [bpf-next v3 02/12] selftests/bpf: Avoid a clobbering of errno Date: Mon, 8 Jul 2019 18:31:11 +0200 Message-Id: <20190708163121.18477-3-krzesimir@kinvolk.io> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190708163121.18477-1-krzesimir@kinvolk.io> References: <20190708163121.18477-1-krzesimir@kinvolk.io> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. Changes since v1: - Fix the "Fixes:" tag to mention actual commit that introduced the bug Changes since v2: - Move the declaration so it fits the reverse christmas tree style. Cc: Daniel Borkmann Fixes: 832c6f2c29ec ("bpf: test make sure to run unpriv test cases in test_verifier") 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 b8d065623ead..3fe126e0083b 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -823,16 +823,18 @@ static int do_prog_test_run(int fd_prog, bool unpriv, uint32_t expected_val, __u8 tmp[TEST_DATA_LEN << 2]; __u32 size_tmp = sizeof(tmp); uint32_t retval; + int saved_errno; int err; 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