From patchwork Thu Nov 28 12:54:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhongqiu Han X-Patchwork-Id: 13888043 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D68A91974FE; Thu, 28 Nov 2024 12:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732798519; cv=none; b=LR+u4Wmli5jZB+5jQXXUghZ2aKKeEWJXbMc1oE3IjpiHAbfOEWUtFUu8CBBuGSUqetw1uPuUOnoutNwGJchxzAzIJVr9STDWPs2O916m2dvccPfQOfLuLXg/oQtlPl5pjJgBc10U8McbF6HK4iVxTXwEUQ8qU7ETCf261RU36cM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732798519; c=relaxed/simple; bh=JsAoCWQzDKT9XJikk7iuUO7M81cmO0TUGFcx6oxdF2Q=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VvnH8JtNnQ3O+dbg3R6KxBPIc+nLECc5GYLKbuSywEIUdOBkHKZFCJ8UXiXPKrEip6YKMvZZqJdNwV8+TPuwLJNwR3Sqm8LWYJSgNO97EuwBgsM+lncaPosIWiBrQ/klQd6ZL+saF9gA293SuXkHmrBRT9P3SYwy5PTxZ+ttRGE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=baBUa5sY; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="baBUa5sY" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AS3vZao001764; Thu, 28 Nov 2024 12:54:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 29RZB+i2QIszPt3l7EQh/V4QnzI2GEl5xGd2j6YKF5Y=; b=baBUa5sYxYpHdTwr yv0QYlYAbzxSQswVioh+vvlY3SHS9QAHHpZ9QV6/8zE1thEHrzOF5xvklZH+gck2 /s2lfmfT8y/JOPCwMWo0XenZsx3QmtHj02EPXUeyjC/HJPTOh6QnALbgRYoBvNt4 4nKutabSKbESiIcLGpEMcySbkiBoh8FC7QREQFeKxrL7iJLj8V56TQBz7gJPTtRU ay4XL5Q5AnZFZaRrWYtRn2aTzF7yP2Omh23MYS1QFaZw8KWcwFbjjlM7vkonrZaE I3s+B5YVuYuCz6OVROg/eAp8vRN+RNdgd0cG0uyM5pdSuCYRfuNgwuRFPbsH5xBM 4dpBnQ== Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 436h2mhfwv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 28 Nov 2024 12:54:56 +0000 (GMT) Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 4ASCstD5028203 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 28 Nov 2024 12:54:55 GMT Received: from zhonhan-gv.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 28 Nov 2024 04:54:50 -0800 From: Zhongqiu Han To: , , , , , , , , , , , , CC: , , , Subject: [PATCH 1/3] perf header: Fix one memory leakage in process_bpf_btf() Date: Thu, 28 Nov 2024 20:54:30 +0800 Message-ID: <20241128125432.2748981-2-quic_zhonhan@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241128125432.2748981-1-quic_zhonhan@quicinc.com> References: <20241128125432.2748981-1-quic_zhonhan@quicinc.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: BIumSVCJ8Kr6pXFiT_yFHoAb2BmEoTaj X-Proofpoint-ORIG-GUID: BIumSVCJ8Kr6pXFiT_yFHoAb2BmEoTaj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 malwarescore=0 phishscore=0 suspectscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 mlxscore=0 impostorscore=0 clxscore=1011 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2411120000 definitions=main-2411280101 If __perf_env__insert_btf() returns false due to a duplicate btf node insertion, the temporary node will leak. Add a check to ensure the memory is freed if the function returns false. Fixes: 9c51f8788b5d ("perf env: Avoid recursively taking env->bpf_progs.lock") Signed-off-by: Zhongqiu Han --- tools/perf/util/header.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 3451e542b69a..fbba6ffafec4 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3205,7 +3205,8 @@ static int process_bpf_btf(struct feat_fd *ff, void *data __maybe_unused) if (__do_read(ff, node->data, data_size)) goto out; - __perf_env__insert_btf(env, node); + if (!__perf_env__insert_btf(env, node)) + free(node); node = NULL; }