From patchwork Thu Jul 13 13:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 119888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1821660vqm; Thu, 13 Jul 2023 06:23:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlF5LFP9KhhO2MLHHYC5m388LXSWMEf5iDIiSC+N/EeI/D+WHnCacTtO8q+J16PXuRnn6uj/ X-Received: by 2002:a17:907:98af:b0:98d:f4a7:71cf with SMTP id ju15-20020a17090798af00b0098df4a771cfmr1422646ejc.62.1689254599464; Thu, 13 Jul 2023 06:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689254599; cv=none; d=google.com; s=arc-20160816; b=Ofm6WDSxvhtHT+JHnd1ObtsbOwkD8aLoUIlBMmljGtQFmNh9lFeJz++ikEPHKF0PzR dO5D9QBgdtq9JC4vYSzx0+tGARbSyKashgtLrenvOyeM+pmsYzgbS7qrzWDcsZGj9NR3 oU+IeKgxbLagqRSyO6/lKFlIHguZCEBJFa44oKXgrtBCkgndtTUmvTT7ZxMcUp3FYNz3 cVKcyRX/dKcs1GEkf4ihj1eCGrcjZqP4Smes4aP1cRxlYNkEUIqvkAXSfedDWLpSG+iR w+MfvHZAZfqY15ASeohTBA2EtDYE6M+Tg0HuAVqQ8FPTw2gCa7+ZnAPulYwDzj/G2iuh eaNA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m3b7ZAhCMxSN1BcImyV0DQCirPKWDf2KMZx9LMdHM2Q=; fh=JGvS7F4GRFByFUotgL/hNTn+YJdI1o7ASnYprHkHKig=; b=MhVdtbVXTX3FlMTdKsIKiLtGMp2z/iHmBJ55w8OmxXbMFANBMRi/WQwkA23mv1+MPR hCplzkHWbUb1Oj0xruknMdKtfwyWmmKuVjGhI03CBHt7nn1cEFrUm/qwf/LsmVvPgL8k mZBzLrgEtethIqkUYcy5amR2tEde/Fn9rWOBbYbChYfeCms1W8k64Rwq2xl9hd+6+vV+ zwO+5FcKa/x48U/KId0gLO3jlxfK98s8OqXy78MqN78pVsl5pHpuj6X8i+nMuUFIlEn3 Xl02uxiD4tBrUAmzqWfnwWXdW2oLcA7OCfIEx9HZMjLQztnuChc7meLcW9Hte4cM+gU5 FGNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dfi3BudE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rv17-20020a17090710d100b0098d52a2bc16si7594520ejb.438.2023.07.13.06.22.55; Thu, 13 Jul 2023 06:23:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dfi3BudE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235145AbjGMNUv (ORCPT + 99 others); Thu, 13 Jul 2023 09:20:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234797AbjGMNUa (ORCPT ); Thu, 13 Jul 2023 09:20:30 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 553572D7D; Thu, 13 Jul 2023 06:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689254423; x=1720790423; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eyfFQOIKAZuYYHklcPqdTE2gmRhrKpH4qZtrSJz6apA=; b=dfi3BudECKBmEr/Ori08aoyjCFjc9CciZYn/IlKMbXY717cJXuBMErzh rfgWVfavlAU9ldNMgjHDB05cRSzbpJnb8XFGoS6Y7DalpXNX0bqjtkW4x NGGw+SD6RqZM8OH+U1euXqvurBeqBN166rxoC7iyq2uU5GR67QM43KKsi +433hXBrDhmCksx+D9Y0bEfzg0Do05v+NypgOJ4/sqb4Hwuwj+wyvVMlj pvufA+mRf0+Iyd2g5wH3gOPfjN8umvzdLHpKslkK5dky0yNiwtvHmBtN0 dQNsNstcqNgEE5EFU5CHuJ0GTLWF4KH/NancnkDsObwfkImE4xiQ1Jz8j g==; X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="345496538" X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="345496538" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2023 06:20:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10770"; a="968615700" X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="968615700" Received: from ijarvine-mobl2.ger.corp.intel.com ([10.251.222.39]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2023 06:20:20 -0700 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: linux-kselftest@vger.kernel.org, Reinette Chatre , Shuah Khan , Shaopeng Tan , Fenghua Yu , Colin Ian King , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v4 02/19] selftests/resctrl: Don't leak buffer in fill_cache() Date: Thu, 13 Jul 2023 16:19:15 +0300 Message-Id: <20230713131932.133258-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230713131932.133258-1-ilpo.jarvinen@linux.intel.com> References: <20230713131932.133258-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771311831010155316 X-GMAIL-MSGID: 1771311831010155316 The error path in fill_cache() does return before the allocated buffer is freed leaking the buffer. The leak was introduced when fill_cache_read() started to return errors in c7b607fa9325 ("selftests/resctrl: Fix null pointer dereference on open failed"), before that both fill functions always returned 0. Move free() earlier to prevent the mem leak. Fixes: c7b607fa9325 ("selftests/resctrl: Fix null pointer dereference on open failed") Signed-off-by: Ilpo Järvinen Reviewed-by: Reinette Chatre --- tools/testing/selftests/resctrl/fill_buf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/resctrl/fill_buf.c b/tools/testing/selftests/resctrl/fill_buf.c index 341cc93ca84c..3b328c844896 100644 --- a/tools/testing/selftests/resctrl/fill_buf.c +++ b/tools/testing/selftests/resctrl/fill_buf.c @@ -177,12 +177,13 @@ fill_cache(unsigned long long buf_size, int malloc_and_init, int memflush, else ret = fill_cache_write(start_ptr, end_ptr, resctrl_val); + free(startptr); + if (ret) { printf("\n Error in fill cache read/write...\n"); return -1; } - free(startptr); return 0; }