From patchwork Tue Oct 1 17:37:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Vazquez X-Patchwork-Id: 1170111 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="pkUaCWUs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46jRLX2Kl8z9sDB for ; Wed, 2 Oct 2019 03:37:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731202AbfJARhw (ORCPT ); Tue, 1 Oct 2019 13:37:52 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:57293 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731156AbfJARhw (ORCPT ); Tue, 1 Oct 2019 13:37:52 -0400 Received: by mail-pf1-f201.google.com with SMTP id b17so10537801pfo.23 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=GjpWHNa2J5tyJBvB8czEGeUTYYJak6r9wznuPBUBcb7UmEE3fWISyljL+6UIWDdwn/ xTLtYMMfd6eEAgVCuMIwQiV5+XehcrHvAFIgP+LhitlggjGeAmNqNWB/5wpkDREWFlNp G1G9sYmZ8n/BUbcm6ovXWv2U0ht7J57agvX2sakQjwz3kYG2G4jVzH5dpfj9awVpc9DS D0aKQaJxtqOnkPwwL8PijdmKyI0oUtpKY3Ar1Fy6J4OqsTptQ5rYR5l8v9DDXTqdNEab GXJ8QQnH4PvS2Lxdur7WXORP22lCUzbH32Z+SNNIQMaYCZhjsadnWhCoZNSxKyUWTlGr RabA== X-Gm-Message-State: APjAAAX0F21HHWtPSauNm2vQj7rHvyfJ4I8KTjGYFo35WP48gAUxW/nq YlTLm2HwZWGwu9o7s3drcvWBPbPgunlM 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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 Acked-by: Andrii Nakryiko --- 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); From patchwork Tue Oct 1 17:37:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Vazquez X-Patchwork-Id: 1170113 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="R43ESF1q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46jRLc6ryqz9sCJ for ; Wed, 2 Oct 2019 03:38:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731332AbfJARh7 (ORCPT ); Tue, 1 Oct 2019 13:37:59 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:47135 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731299AbfJARh6 (ORCPT ); Tue, 1 Oct 2019 13:37:58 -0400 Received: by mail-pg1-f201.google.com with SMTP id x8so11656419pgq.14 for ; Tue, 01 Oct 2019 10:37:56 -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=wk/kSRiVr2+hsdRYwtEFf1vJ/Djbn8eKotL+Cap8me8=; b=R43ESF1qMXL4EzulkwPKBST9Dj9BWXUYzOA79YIBN3gl1tGYXc1vwhGctIq6E00cZs 0/UjG2x1/oKDfi/3K/19NhvRkp+8lpVt4QD0EcW517r04E6T7md9G8OFfYeCb54cqRWW hFzCDuhmXbM62ySyLJzRaOr8xImhDdNMYqte9P8E99uDPTcvk6k5/o8SMaET/DQYIhiC XBqvzzqPoNyK4Qj5QBDw8DtSrRxTw1H6QgF/Iotstr3P/bwVSwEGLYWQC1svmAanmuSl Q08tr61T61IwMcGoYYyaD9N3u7i2s7GkmserM6YQ7yqFmj1awCGslVtUNUWbgxD3gDC2 hRhw== 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=wk/kSRiVr2+hsdRYwtEFf1vJ/Djbn8eKotL+Cap8me8=; b=r7X+TfGAUh7j6s6V2OZCa8cwGiuSBSWWp/cy2IFANErj+zmefNXGsPax56Og0uYpyU pf5qfonFpJ0N/T+fT8i4+n1JhPQnD7F9QqIktRwRTNAPM8R155L9yZdIVEQdaZD4oYsg V7EoDQVUaEwkz5376aer5AiVzGnpwtnvnKsVUKjh3qMjqY667sDllwClErLtW+A3wu0W o1JbrNn/F6VkyUFuo96y2e+EviCmk8Xc0z9ezHuFsA1/VabFaDZH+hM4n3sXDwweXBxM ZmG4hS5Ac3rVUvgKIpI5O6NziKNNN8H5KKqSUkOVgWwiH1A/LZImN9j4b6WfXo7l1iiO 1s2Q== X-Gm-Message-State: APjAAAV+6UlM3Sxpfci+ht73TALAQRLjWKt6EwS7v/KpAq49SFpO9Vox KPLBCFxy0scKQZU2huk+V7dNtUdAbjNb X-Google-Smtp-Source: APXvYqypaHVZ+jWEwbZaptMaWnugEpNBCtzVp1uSABDkv7TEphW8RK4IYnhKiUDvh2qs9s1LSN74jWoUUaM1 X-Received: by 2002:a65:6252:: with SMTP id q18mr32002268pgv.111.1569951475681; Tue, 01 Oct 2019 10:37:55 -0700 (PDT) Date: Tue, 1 Oct 2019 10:37:28 -0700 In-Reply-To: <20191001173728.149786-1-brianvv@google.com> Message-Id: <20191001173728.149786-3-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 2/2] selftests/bpf: test_progs: don't leak server_fd in test_sockopt_inherit 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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org server_fd needs to be close if pthread can't be created. Fixes: e3e02e1d9c24 ("selftests/bpf: test_progs: convert test_sockopt_inherit") Cc: Stanislav Fomichev Signed-off-by: Brian Vazquez Acked-by: Andrii Nakryiko --- tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c index 6cbeea7b4bf16..8547ecbdc61ff 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c @@ -195,7 +195,7 @@ static void run_test(int cgroup_fd) if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread, (void *)&server_fd))) - goto close_bpf_object; + goto close_server_fd; pthread_mutex_lock(&server_started_mtx); pthread_cond_wait(&server_started, &server_started_mtx);