Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2487109ybl; Thu, 19 Dec 2019 14:39:58 -0800 (PST) X-Google-Smtp-Source: APXvYqzB6ljJKYacmVtxn5ZT15RV+k4Yx+bLQoRriSuzrFYbiacKP5CijTZsxmIuTNto68Unz08p X-Received: by 2002:a9d:478:: with SMTP id 111mr11177669otc.359.1576795197796; Thu, 19 Dec 2019 14:39:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576795197; cv=none; d=google.com; s=arc-20160816; b=nr3JdFE0D2FmG4tmCwxJjX3u6PAZ39nhDfSEkWZ5OO1vfpEdVe14+HOGCQOJ89JPxr QjkYiRRVedyrhf1ibmhuzJ9qAXWt2xaem/EEP3dyrVoL+93/YndkwU2kWk0iT6pwqqMf zSzxBTCPhl61XBWIuaE9TNqS4GSG2C70ZNP7vXiM9drSP70SxTOz9xXJXkK4SJvWF7VM 7FLBs2vdK/sBSXx8VmxCNj9wZzTbtQUCDG6FqRgtjGOzNfEjsKex/ywgiQe3qcvrg06t xbZrr5deGHqWtgAmcXV1AyYpbq7lXvAmylURD7Zb04hWuFCfOqzcAKaMQXUY9kQ8w5/1 FLVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:mime-version :message-id:date:dkim-signature; bh=nvazpb4jw88w4OfNslVwqIeFJNyWKvTS2T+KBCPseG4=; b=BxP97T1DYmG8sSb/PjplzwZYtl3V9IKpMLf3Qm/PWF8wtQbG/Sx3dPJjh4InFYnDws i3nRqN6k0jePdlZFfcNUkGwf4oje3LW4y/YvS0BNGHlFwzmGbdUeoriLHi9p/wT8f29E 76UfJDBOA7nAqID7lY/sZm9MhhuLUHwMaLV9h1fDnkTgs20ooAsmVh3QDT5lYYkMspZT hNvZQjGOSv315hl6fUOVmOXspJ3BdNzhv9na8finSpJrWzzpmHHGHEKkEFbJvFuRDD79 Vlp5+d/T6WdGWF2c+bl/LRM81yFpmuPer+J/O5SFSj90EjsczLKNV7fnqcLIlq8bAcxs Jsig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=idHt01tO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d17si3563405oij.136.2019.12.19.14.39.45; Thu, 19 Dec 2019 14:39:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=idHt01tO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726952AbfLSWit (ORCPT + 99 others); Thu, 19 Dec 2019 17:38:49 -0500 Received: from mail-pg1-f202.google.com ([209.85.215.202]:45176 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726818AbfLSWis (ORCPT ); Thu, 19 Dec 2019 17:38:48 -0500 Received: by mail-pg1-f202.google.com with SMTP id q1so4007445pge.12 for ; Thu, 19 Dec 2019 14:38:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=nvazpb4jw88w4OfNslVwqIeFJNyWKvTS2T+KBCPseG4=; b=idHt01tOF7Z0+B6Qj4OinGDSJXQwVD7PlZs4aFq7eEzyBWrf9/QRVy/nnYHGAHpUur 4EtlT7ahOScHmQ6EjiMChgE0mq2hWPKcoZahe0iCqQhByskVDPd4VLlWmay+ENvuowok WP8VdOVxBYaLILyVJRb347znk2/mRIOQafVvfJhWvU6M9+Oaf2XBBMSbeU4MF2uNqX3g izSqxIAJrprkN7TH3Dt8Fu+hyOHhDVsBkfkB4H1C0JvN+bJ2zJ7YSKeqzTamFTasHOdB ipcXQmB/m+G0fS4fCDIbqMV5un6odeaeTMQfO23ZX1FTscdYWF726ffVGiEp86AGgs4A eFQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=nvazpb4jw88w4OfNslVwqIeFJNyWKvTS2T+KBCPseG4=; b=HGdYmSLWTzbqr5kg+sRtZ1L5lRgAg1MH77687Vv13PaO+DWXMwB4mkm/hAyWXz5eiZ v3Ad0vhkxgX6pbxP4G9kZKW5x6UfoGdFuv28XBbv5pt/V4HoH339yeir6ymxORVCtIZH AN1Sq0yyZ9gRsRqOi5NLPZFbjub0kQSv0o3V83rsI4ngeDHy0V3QcW1YzdF5kaU4AP/E QymRAl5U+9xc5+H47Xd7S787lnLQq7dl7Nd7JQ9NYhPNHkiqWgUjIo3jNCUJ/sZMDZ8G ttHBDz6aD77V79by+cypQaktmnyBs7Z2M9rOEdZ0LDnG+5fp4PFCKOlVp5ktPTBePUIA JHHw== X-Gm-Message-State: APjAAAUrLm0JiGKnrrQ/CrdOvA0TIeev61hT5LFS70cH+nddZRUAnJuj mleK1YeU4Vfb6yrE5Wwz9m7GtLHK46VnFw== X-Received: by 2002:a63:7311:: with SMTP id o17mr10902166pgc.29.1576795127866; Thu, 19 Dec 2019 14:38:47 -0800 (PST) Date: Thu, 19 Dec 2019 14:38:34 -0800 Message-Id: <20191219223834.233692-1-shakeelb@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH] x86/resctrl: Fix potential memory leak From: Shakeel Butt To: Fenghua Yu , Reinette Chatre Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org, Shakeel Butt Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The set_cache_qos_cfg() is leaking memory when the given level is not RDT_RESOURCE_L3 or RDT_RESOURCE_L2. Fix that. Fixes: 99adde9b370de ("x86/intel_rdt: Enable L2 CDP in MSR IA32_L2_QOS_CFG") Signed-off-by: Shakeel Butt --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 2e3b06d6bbc6..a0c279c7f4b9 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -1748,8 +1748,10 @@ static int set_cache_qos_cfg(int level, bool enable) update = l3_qos_cfg_update; else if (level == RDT_RESOURCE_L2) update = l2_qos_cfg_update; - else + else { + free_cpumask_var(cpu_mask); return -EINVAL; + } r_l = &rdt_resources_all[level]; list_for_each_entry(d, &r_l->domains, list) { -- 2.24.1.735.g03f4e72817-goog