Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1854941pxb; Thu, 16 Sep 2021 18:02:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1ODckY8LroKj6YuLAB/2JkLpys3e9u0Xh5VJXxeR/cn12ouMG/Pag0nNDvEs1mTPGOSBM X-Received: by 2002:a05:6e02:1144:: with SMTP id o4mr5770115ill.264.1631840553357; Thu, 16 Sep 2021 18:02:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631840553; cv=none; d=google.com; s=arc-20160816; b=dic3nU44s1bSYcHQPp1KtTUGsniPPUUh5vwUvBrcHx7a3g3Nc3RTsI8A0Hr7pb0HgO umJFLgo1gjX1jnRy3fqcst02WC2YTlw+mFeq0j3sE6VhJoGOtUoGrfbTewzxWISrdZjG /Xvq3i8ApDjpeBXZ0qZqDPM5orwoEJTcLOrH+17Kd9GEUf7KNfdvQEfvXqkZzwUppicv Xd7T1vSSVYjNtg/ABIz0CiD/vQ6XUKmTyFlOHrWoWv4Beq2QBq8l32tSY6GChH+T2wMC nm83czKLiLMLQqnryIN0Asa9TzY/xjIW5HXFd3oDUfC/1tKnteFqITeryVuY0caE8wwD BLHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pLy7tAXgCm7t9rRjEa38zqJ3QTGQ3Ix0YoejidKpFT0=; b=yn64OIw6B+pl09A+TTPmGhnkN6OG5PVLRF0nHNSauYkiNhUYvwJignR1AOGp2INp9y Laz6HqQeahrfiXdeWduVFJOXdDj6bCZl+mF9zult113045pG2wqVYFKh9D9JwP1RAvVJ 9NZdGMj8XMAQBY8rEg6a6T38xkwpnUpvfqQg1kKKBX0/oMde1HZgfvpzSI3VoJsG5CT6 ZxmwMTonyGpeuCuIZupB3TWy5Khwsh9poyAJN52aCp1h2cAdU79up3EIiLPJav8jKzKL /0H/sUcmnTGmFYhXONQrhfjORe+50FrBV4zjyqF6X8s4gT40REQQKIEjps/09409yVgc f3cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vWs8nvw9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 187si4105527jaj.27.2021.09.16.18.02.19; Thu, 16 Sep 2021 18:02:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vWs8nvw9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350201AbhIPRJ1 (ORCPT + 99 others); Thu, 16 Sep 2021 13:09:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:51940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347354AbhIPQ6v (ORCPT ); Thu, 16 Sep 2021 12:58:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 429F76162E; Thu, 16 Sep 2021 16:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809934; bh=RgyEE/gxv2+PbwT+Twl7+jMwQK+Cn83YUGhdVMiZbVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vWs8nvw9gn3E8mKL4ieHMrZ52lwYhxzo8K7gFFPOvbHPCbIbDdO0OdigYd+OhFba1 Bqa9bbmsH4WfZsHHquKHXEyI9ATXwRSscIXtQkBUEaOrqus0SKLPaPW9fwtXWkpXw3 WRwppI6ntUJTNLg9CHtSkl6L7Qqllb8W3UNLSma0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chengfeng Ye , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.13 337/380] selftests/bpf: Fix potential unreleased lock Date: Thu, 16 Sep 2021 18:01:34 +0200 Message-Id: <20210916155815.503899529@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chengfeng Ye [ Upstream commit 47bb27a20d6ea22cd092c1fc2bb4fcecac374838 ] This lock is not released if the program return at the patched branch. Signed-off-by: Chengfeng Ye Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20210827074140.118671-1-cyeaa@connect.ust.hk Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c | 4 +++- 1 file changed, 3 insertions(+), 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 ec281b0363b8..86f97681ad89 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +++ b/tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c @@ -195,8 +195,10 @@ static void run_test(int cgroup_fd) pthread_mutex_lock(&server_started_mtx); if (CHECK_FAIL(pthread_create(&tid, NULL, server_thread, - (void *)&server_fd))) + (void *)&server_fd))) { + pthread_mutex_unlock(&server_started_mtx); goto close_server_fd; + } pthread_cond_wait(&server_started, &server_started_mtx); pthread_mutex_unlock(&server_started_mtx); -- 2.30.2