From patchwork Thu Jul 11 07:28:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ma Ke X-Patchwork-Id: 13730089 Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F3BB13B597; Thu, 11 Jul 2024 07:29:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.84 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720682960; cv=none; b=S8W4ZN+msdnftYNMvmdXpWM6nrFpjtAmbx7RL+PyDOa4LN63lXuPz+6YwO5IL2FlxcCIzBhdAPaoeNnOJCeCFqxkhfoLHp/TJn2hjcLdm6/8fI6mstY0YEwmPpeQb38a/xyBdI4GR2+WMWo76kFjLSt/sk0lmmv9tkPKveEjfP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720682960; c=relaxed/simple; bh=g3VjYZgrv2jlGGRW7hqDYzUkSBeWW+tEsX5oVhdojtY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=APv4SLSkID0NkAiQ2JZe63nGOMGqOBOfkT30FAvZbZvrNkBIrMwD6de1j3UeGL4lLt0vleIfJsACmveC0jyNC+eOWkJK8ZopETWN0vN8nqenHtwqDfNhhfKviVdV/D8zOcfRQ6pU7lA6col9qWG5b5qe0GZfeESKIHNx49pxq0s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from icess-ProLiant-DL380-Gen10.. (unknown [183.174.60.14]) by APP-05 (Coremail) with SMTP id zQCowAC3v7eviY9m9sK0Ag--.57010S2; Thu, 11 Jul 2024 15:28:54 +0800 (CST) From: Ma Ke To: andrii@kernel.org, eddyz87@gmail.com, mykolal@fb.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, rdna@fb.com Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Ma Ke Subject: [PATCH] selftests/bpf:fix a resource leak in run_tests() Date: Thu, 11 Jul 2024 15:28:45 +0800 Message-Id: <20240711072845.2243176-1-make24@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: zQCowAC3v7eviY9m9sK0Ag--.57010S2 X-Coremail-Antispam: 1UD129KBjvdXoWrur1DtryUtr1xJr45Ww4xCrg_yoW3urXE9a 1jvr97GrZFy3Z8Aw1j93WFkFWkCws3urW7JrZxJay3AayUXrs8GFs7urs8J3WY9rZ8WFy2 vFs5CrWftw4akjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUba8FF20E14v26ryj6rWUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6r1S6rWUM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_ Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Cr 1j6rxdM2vYz4IE04k24VAvwVAKI4IrM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJV W8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI2 0VAGYxC7M4IIrI8v6xkF7I0E8cxan2IY04v7MxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r 1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcS sGvfC2KfnxnUUI43ZEXa7VU1YiiDUUUUU== X-CM-SenderInfo: ppdnvj2u6l2u1dvotugofq/ The requested resources should be closed before return in run_tests(), otherwise resource leak will occur. Add a check of cg_fd before close(). Fixes: 1d436885b23b ("selftests/bpf: Selftest for sys_bind post-hooks.") Signed-off-by: Ma Ke --- tools/testing/selftests/bpf/test_sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_sock.c b/tools/testing/selftests/bpf/test_sock.c index 810c3740b2cc..bb5038fc15ac 100644 --- a/tools/testing/selftests/bpf/test_sock.c +++ b/tools/testing/selftests/bpf/test_sock.c @@ -550,7 +550,8 @@ int main(int argc, char **argv) err: err = -1; out: - close(cgfd); + if (cgfd >= 0) + close(cgfd); cleanup_cgroup_environment(); return err; }