From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968045AbdDSXtl (ORCPT ); Wed, 19 Apr 2017 19:49:41 -0400 Received: from mga11.intel.com ([192.55.52.93]:63771 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967894AbdDSXta (ORCPT ); Wed, 19 Apr 2017 19:49:30 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,222,1488873600"; d="scan'208";a="1158497248" From: Vikas Shivappa To: vikas.shivappa@intel.com, x86@kernel.org, linux-kernel@vger.kernel.org Cc: sai.praneeth.prakhya@intel.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, ravi.v.shankar@intel.com, tony.luck@intel.com, fenghua.yu@intel.com, vikas.shivappa@linux.intel.com Subject: [PATCH 3/3] x86/intel_rdt: Return error for incorrect resource names in schemata Date: Wed, 19 Apr 2017 16:50:04 -0700 Message-Id: <1492645804-17465-4-git-send-email-vikas.shivappa@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1492645804-17465-1-git-send-email-vikas.shivappa@linux.intel.com> References: <1492645804-17465-1-git-send-email-vikas.shivappa@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When schemata parses the resource names, currently it may not return error for incorrect resource names and fail quietly without updating the control values. This is because for_each_enabled_rdt_resource(r) leaves "r" pointing beyond the end of the rdt_resources_all[] array, and we check for !r->name which results in an out of bounds access and also may not be NULL, hence we may not detect that we did not find the name user supplied. Update this to check (r == (rdt_resources_all + RDT_NUM_RESOURCES)) instead. Reported-by: Prakhya, Sai Praneeth Signed-off-by: Vikas Shivappa Tested-by: Prakhya, Sai Praneeth --- arch/x86/kernel/cpu/intel_rdt_schemata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/intel_rdt_schemata.c b/arch/x86/kernel/cpu/intel_rdt_schemata.c index 3cfa1ca..bb99bd8 100644 --- a/arch/x86/kernel/cpu/intel_rdt_schemata.c +++ b/arch/x86/kernel/cpu/intel_rdt_schemata.c @@ -228,7 +228,7 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of, break; } } - if (!r->name) { + if (r == (rdt_resources_all + RDT_NUM_RESOURCES)) { ret = -EINVAL; goto out; } -- 1.9.1