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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C8DE0C2BA19 for ; Sat, 11 Apr 2020 23:50:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DF7820787 for ; Sat, 11 Apr 2020 23:50:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586649003; bh=/SDnD2eq8+OiMeGXkOs2RH6/El94rXKUQzFr8/5uLIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mwEWyJa2vHEx3h3OBkzqClN8wQMPKbPO2LMpcdTNazz81Z4v5uEmDaHr6VQtMWQAX SGaRx36JZjg6vXRExebfhjapz68U9/pJYOgyyVW0cbEk8oWsw/I32h2Ej+ZQbj5lHL JjhjakUPmjuKoU2LZz8jPJNQkBPH9Q3Iyhf1YB8I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729493AbgDKXuC (ORCPT ); Sat, 11 Apr 2020 19:50:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:37534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727052AbgDKXEP (ORCPT ); Sat, 11 Apr 2020 19:04:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 85C9021924; Sat, 11 Apr 2020 23:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646255; bh=/SDnD2eq8+OiMeGXkOs2RH6/El94rXKUQzFr8/5uLIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=syQsqRuHXP9KaJQK2HjI0nGY82sFV7flSFENXdGlWzScNlhI40SY5/XOy1uiK8Yqb UlhyMHaBZMJ0+RMhH96QZXctmGxhf5QuVGmziKBNysHvRG6eVF1fd1ZATDDfWQSS2O hNl7t/gHxbrFZV4NgMkgNao1LJPAB3np5FL1xx1o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrii Nakryiko , Daniel Borkmann , Martin KaFai Lau , Sasha Levin , linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 022/149] selftests/bpf: Fix test_progs's parsing of test numbers Date: Sat, 11 Apr 2020 19:01:39 -0400 Message-Id: <20200411230347.22371-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411230347.22371-1-sashal@kernel.org> References: <20200411230347.22371-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andrii Nakryiko [ Upstream commit fc32490bff855a539d253c8a52c5a1ba51d1325a ] When specifying disjoint set of tests, test_progs doesn't set skipped test's array elements to false. This leads to spurious execution of tests that should have been skipped. Fix it by explicitly initializing them to false. Fixes: 3a516a0a3a7b ("selftests/bpf: add sub-tests support for test_progs") Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Acked-by: Martin KaFai Lau Link: https://lore.kernel.org/bpf/20200314013932.4035712-2-andriin@fb.com Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/test_progs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index bab1e6f1d8f13..709b6d43bbed9 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -408,7 +408,7 @@ static int parse_str_list(const char *s, struct str_set *set) int parse_num_list(const char *s, struct test_selector *sel) { - int i, set_len = 0, num, start = 0, end = -1; + int i, set_len = 0, new_len, num, start = 0, end = -1; bool *set = NULL, *tmp, parsing_end = false; char *next; @@ -443,18 +443,19 @@ int parse_num_list(const char *s, struct test_selector *sel) return -EINVAL; if (end + 1 > set_len) { - set_len = end + 1; - tmp = realloc(set, set_len); + new_len = end + 1; + tmp = realloc(set, new_len); if (!tmp) { free(set); return -ENOMEM; } + for (i = set_len; i < start; i++) + tmp[i] = false; set = tmp; + set_len = new_len; } - for (i = start; i <= end; i++) { + for (i = start; i <= end; i++) set[i] = true; - } - } if (!set) -- 2.20.1