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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL 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 8F9D0ECE587 for ; Tue, 1 Oct 2019 17:37:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68D682086A for ; Tue, 1 Oct 2019 17:37:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pkUaCWUs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731185AbfJARhw (ORCPT ); Tue, 1 Oct 2019 13:37:52 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:49323 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731054AbfJARhv (ORCPT ); Tue, 1 Oct 2019 13:37:51 -0400 Received: by mail-pf1-f202.google.com with SMTP id i28so10757550pfq.16 for ; Tue, 01 Oct 2019 10:37:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=N9RFaaUyKsxWingVv0Hbs7K3osgkOr8SsFI9Tp5Z20k=; b=pkUaCWUsUNn5GOGIGsw9ewd3WuO5fY7ACvpKIOrqGyJIGOpRMoiSevDRoraYlU3g1E MRQok2xDgzcgI/rR/T5km2Yh4E9uF2eul+yE6YGP9ayIfhNL40yFgBmiJU0Vre7wkx/m J8bSPFKjN3JqL5FJ2V7Iqq7fL1qCfDYM6rXNgdNXU5/uekhj5e/DizKb7wzQtZhqvjgP +iRdatoeZwIjcN5DI5ClBFP7tc6oCcFI1Pws3TfQ3tBJEvM6iWD3qeWJCoMRUvSj2aqC Y1WKkR8aHva576d8/Yuys12+opTnZ4IJSPGffybI3W7ot7aQoZFS0AYOq1b73DtAPkVQ f+ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=N9RFaaUyKsxWingVv0Hbs7K3osgkOr8SsFI9Tp5Z20k=; b=EXJvOCqDcJ7nlUBO7LOFAYp3C0ez82EfATfMaMLUq+C/zirN+fUdK19bgrNeqvrDZc El64yD2yemi9ygQ2i34XG9q4j/IOqjMH7CoDxjkKHrYCIkwFlQLwyUbRCDTpWv0fl7/q trbFqHMyDawdTrWvhHBag4w6iIyJJTaV9DepB1fpa0ZhiA8zocamF9YUlvV0Bt9/4iOQ FFgGszBgwbujcYESjRFWjcaA1mgybIGD4JN5F+7KZgENwEwcxFH4ToDTeMNgnKBAFN36 Le1Vlo7Wu5N6i7BDYmgrr31CrB/UFnWNrxPNPr6I/Vi9Jx+EHBoYquVH0NY/+nKst4Gp 5ZdQ== X-Gm-Message-State: APjAAAWbCB1kOjC1H2Nuw8LyQBolcmtMSkeEjOzGBViNWBlVfoPHR+D4 lyiwK8aTrjD3vR8SNGf+nN2qwseSTxwf X-Google-Smtp-Source: APXvYqzVpPUbmcD+5G95ld1l74Kl0q1JKw4guiKi0Cn9su/VfVfZUXHpnnxGewNd71ggaNYtdoEFjanI20ey X-Received: by 2002:a63:d30f:: with SMTP id b15mr30940913pgg.341.1569951470992; Tue, 01 Oct 2019 10:37:50 -0700 (PDT) Date: Tue, 1 Oct 2019 10:37:27 -0700 In-Reply-To: <20191001173728.149786-1-brianvv@google.com> Message-Id: <20191001173728.149786-2-brianvv@google.com> Mime-Version: 1.0 References: <20191001173728.149786-1-brianvv@google.com> X-Mailer: git-send-email 2.23.0.444.g18eeb5a265-goog Subject: [PATCH bpf 1/2] selftests/bpf: test_progs: don't leak server_fd in tcp_rtt From: Brian Vazquez To: Brian Vazquez , Alexei Starovoitov , Daniel Borkmann , "David S . Miller" Cc: Stanislav Fomichev , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, Brian Vazquez Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org server_fd needs to be closed if pthread can't be created. Fixes: 8a03222f508b ("selftests/bpf: test_progs: fix client/server race in tcp_rtt") Cc: Stanislav Fomichev Signed-off-by: Brian Vazquez --- tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c index a82da555b1b02..f4cd60d6fba2e 100644 --- a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c +++ b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c @@ -260,13 +260,14 @@ void test_tcp_rtt(void) if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread, (void *)&server_fd))) - goto close_cgroup_fd; + goto close_server_fd; pthread_mutex_lock(&server_started_mtx); pthread_cond_wait(&server_started, &server_started_mtx); pthread_mutex_unlock(&server_started_mtx); CHECK_FAIL(run_test(cgroup_fd, server_fd)); +close_server_fd: close(server_fd); close_cgroup_fd: close(cgroup_fd); -- 2.23.0.444.g18eeb5a265-goog