From patchwork Mon Sep 25 13:25:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 13397822 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89371CE7A94 for ; Mon, 25 Sep 2023 13:26:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231766AbjIYN01 (ORCPT ); Mon, 25 Sep 2023 09:26:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbjIYN00 (ORCPT ); Mon, 25 Sep 2023 09:26:26 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01EE410A; Mon, 25 Sep 2023 06:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1695648363; x=1696253163; i=w_armin@gmx.de; bh=Qe06h0Bi3b8dnIdSEPIlPP+FKLAjfJF1Asqt/X6SREI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=RtnCNe075xbF4h002PPb+P87CErOfGjkR5LmaLDmMZRx67D3X3DaRowqCB3673rof4LWWBmZS+/ zBmEV6UEdvyvjTsZjNmsUAmmKrXToMJQooRFBuzvy4ZP2GGeCT0LLCpvwXQG3jb53b5ebVHW+GpCS ohjwu4wc5SfY3piyRKla9+u6bfdxsgWVyZdPeNST/MHKOriv5Y7Lobx5MmfuSzhTfcqMqIwS8xRMR hvLo0tIaYC6pJaAqJONHhBNPYQKajdljeY52O/Z/oyEPljsvSPj4icXfGgfzhIRGkvW9leRjhkR1d CxZqbVPzPUqnY2++vvQb9cM+n9GssLRyqlAQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MfpSl-1rHMWo0NDN-00gHwR; Mon, 25 Sep 2023 15:26:03 +0200 From: Armin Wolf To: markpearson@lenovo.com, jorge.lopez2@hp.com Cc: hdegoede@redhat.com, markgross@kernel.org, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] platform/x86: think-lmi: Fix reference leak Date: Mon, 25 Sep 2023 15:25:56 +0200 Message-Id: <20230925132557.72138-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230925132557.72138-1-W_Armin@gmx.de> References: <20230925132557.72138-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:MdlvI2rMo4ZbRgRZJpII8yGgRGBWT1SmjNKnupMnvboAYdAhAY2 8TPq5ZWrPjcQNwtrkr8S4Uv9pbSuxyAXOGuIuPtUww0l6EDtk5hsITk3hcchD5tCCLuKVh4 NSD4m1FIsNMIJtB/v+h8mC3s+wQYA+wUm8tBiTuGe7n81rLrJxlRmQ0VR4CTRm5gF24I7nQ V4b5TUsvK8TXC3u4aQO0Q== UI-OutboundReport: notjunk:1;M01:P0:olKkaJhfIwc=;oa51/MpZQBVGURUzVJ8ACTj9OH8 VWyPJ21gjdF6ZFd9RNfUdY4JnzA0TiKUAsNZbt4F7kbESFSqe7P1q8kO6RiHzlnsNsMYW3lI6 RVOEhc06QaeY/BLoi6ux0cBaQvaomXZkwVecDTt5+HR2l/+GWMSS5IDqglLOCZI/w3dqsZiLX d02WH+kCqlWVWF3ZhBFIhXZSKUafI+klipjrY96TpqKIpVeWjPgAMkSuUl2Y+3noTUT5TJ8A/ 6ZF2/jvRe2lWnAklwrfG0UEnyu1VLQmT9KnsJJkkfaGt19QVK0jNsUZ7kEllvof1jLET7haFE uPre5pfkW/B0Ue1D+1STIB1SDwG+Z8K5rcnL1w1lrL3n93zZNrUm5h6oa7HNKJlUxCav6OOTd sfmAQWdYH2YoXS7TdEgX8e9kF30FgGjshkfP3mvDKSkwqmXrZW00qFNkscxjMijzdoQB9/Tpe mZtSMKSr/2/Plc/7K1n/LVqKI2hvt0tClszPwWCDtUnmB8FBbiTd+5kNSnfv5IQuUUVQ9Qu6G NF2SMpwMNUi07cn6B73HUE+scWh21tppUgmd8HSrWAmIWAncbMvLi2Ol/tM18j+Nw6c61+txu 73P35Qyq+zxfXu5jsw1X1VzkyByWU7wPYkWINBGKTJOGSE4VGFhrdVWMRD0wBTTAMr0rguvIf ctewVpR16DFjMvxZvKdNWDszCdgbqWT7qi0k8ndFES0ULAlRz1X+a3lP9bRIvuR/nnBeTYNtr 99j3cWWQS3HMhp8K0umoTazM5we/sg3c4SCBrTc43BY05+FwbTcvf0EFO2kln8k468d+O1fQ2 7gFNj9CwrkkoCL5eZKsCl04u5Lqyv+QQsZ0Tij+SyuyuhTrp4YS4suAUe0cuddEXTjt8S9kbN G6d/ZMeMdIDG4dJTSPr4XGJj4Bjt1fAH9lasfJaHTeBUNOD0WdjhOwH++GQRxjVXqb4cVxARk vEQpuQ== Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org If a duplicate attribute is found using kset_find_obj(), a reference to that attribute is returned which needs to be disposed accordingly using kobject_put(). Move the setting name validation into a separate function to allow for this change without having to duplicate the cleanup code for this setting. As a side note, a very similar bug was fixed in commit 7295a996fdab ("platform/x86: dell-sysman: Fix reference leak"), so it seems that the bug was copied from that driver. Compile-tested only. Fixes: 1bcad8e510b2 ("platform/x86: think-lmi: Fix issues with duplicate attributes") Signed-off-by: Armin Wolf --- Changes in v2: - no changes --- drivers/platform/x86/think-lmi.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- 2.39.2 diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index 4be6f28d4600..3a396b763c49 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -1344,6 +1344,24 @@ static void tlmi_release_attr(void) kset_unregister(tlmi_priv.authentication_kset); } +static int tlmi_validate_setting_name(struct kset *attribute_kset, char *name) +{ + struct kobject *duplicate; + + if (!strcmp(name, "Reserved")) + return -EINVAL; + + duplicate = kset_find_obj(attribute_kset, name); + if (duplicate) { + pr_debug("Duplicate attribute name found - %s\n", name); + /* kset_find_obj() returns a reference */ + kobject_put(duplicate); + return -EBUSY; + } + + return 0; +} + static int tlmi_sysfs_init(void) { int i, ret; @@ -1372,10 +1390,8 @@ static int tlmi_sysfs_init(void) continue; /* check for duplicate or reserved values */ - if (kset_find_obj(tlmi_priv.attribute_kset, tlmi_priv.setting[i]->display_name) || - !strcmp(tlmi_priv.setting[i]->display_name, "Reserved")) { - pr_debug("duplicate or reserved attribute name found - %s\n", - tlmi_priv.setting[i]->display_name); + if (tlmi_validate_setting_name(tlmi_priv.attribute_kset, + tlmi_priv.setting[i]->display_name) < 0) { kfree(tlmi_priv.setting[i]->possible_values); kfree(tlmi_priv.setting[i]); tlmi_priv.setting[i] = NULL; From patchwork Mon Sep 25 13:25:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 13397823 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59DD9CE7A95 for ; Mon, 25 Sep 2023 13:26:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230505AbjIYN0a (ORCPT ); Mon, 25 Sep 2023 09:26:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231676AbjIYN02 (ORCPT ); Mon, 25 Sep 2023 09:26:28 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB9A9FE; Mon, 25 Sep 2023 06:26:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1695648364; x=1696253164; i=w_armin@gmx.de; bh=HuxM/YA2tL+Nxb3XbOiEayEMzeuXm9d7Y7jDyRhIyiI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VKVc/BWvHKGaj+bdhNV7t6yB429gQ6Bt6haE/svnGm63xPd2Dy2oDDq4/KDA7J26meRsL7Iw3/o nYGleMmIBdgUo8NOwdxznnGewqRxuOdDLCgMXdZ6CvW4f51DjUD4gkxUa2kFzm532AEwAcG3/bQdN LjBB1VkMR6APrX7pkbQBzpo5aW2w/P7UifE1E/Nh1Yf8xqcQgaLRelSrKt0c611VJP/LVwJHBLw5J O9mKDS1dArKNlNia5VmFAD6kDDFdl0gmBwH7uwfVc+H9e3mbGDoO7/+hQIk14s6sVC16p7lPofZVD xBge58yq4t8TkkZbwsvHhJb8sIlD2dRJicJA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MBUqL-1qxAaR1PJv-00D3cD; Mon, 25 Sep 2023 15:26:04 +0200 From: Armin Wolf To: markpearson@lenovo.com, jorge.lopez2@hp.com Cc: hdegoede@redhat.com, markgross@kernel.org, ilpo.jarvinen@linux.intel.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] platform/x86: hp-bioscfg: Fix reference leak Date: Mon, 25 Sep 2023 15:25:57 +0200 Message-Id: <20230925132557.72138-3-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230925132557.72138-1-W_Armin@gmx.de> References: <20230925132557.72138-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:9azWTG25P1Zwv+Vklh1b4AJuOY/Ayb+9h38VSE0fLLG1HLeCbpT IYO0wioZb73wugkZrI2dd8cAED4fhiYRCKCo4c1r87FS0qSsGDSMQAQj0BwF5Wb7Rw/2XWT Zf+EmGW/yuvsqMH3+mXXt8kTtojsNzZ9TbIxmuyvxL229rJwQbTcIy9CUMhIjer6pUuo+/a Yyl1nt0BlK58Wk/PfiJAA== UI-OutboundReport: notjunk:1;M01:P0:BxGyA+hcLDo=;ji+C+bzn2UDVWoQ3hjpkQAPx4+w uVsI5UdC3pFqp/cn4mMOrSPn1g6o5o/6JkhzOfB4nYIV470qYisKbSRFJfmbRwDjufkRjg3kV 0dN0N9JIcRGnPu12Jts0mI36rrS6FJSt7cZKIZlaDY4cN8JWvlpzzuW9lewQfp2Z4nj4hk89x E4rjpwO7a4PcLwPUJ9b9cMwoWzynCfSthJn7jsgbZ5A/ZoKXjY3VUchnqPqZ+c+wu2LySdtlE rYNgXyIhDZzob8QDSfIKSmLWJZE6pECVhA1vim5ljzgZa4lijbtK1ntzqhQIWJeWtVHXD23Rq Ac/D1KOUs32iBw3yFPw1/iCb2FD3cseR3+Ead4Eo/60dYiubtpW9kD0HMqme6w6Sg0/BykJw9 QcH/aimCA80cxS2Y0+H4iDc5W4GDHyDNE0hvP+YvbuUrgGElbdujD8E/llpYgIWy3Gdcf5cgZ 6bZeTJWcyHqtcC/z65i0ArrKxdDcaZ/D04UNDroKVUgwd6UOhbWTxtrgzBu0fio1Coty3dPN9 XNK348ibeblWi7ZshqxXEwToVF+mGBLqspUwlk3MZ4avAFb79YnbSVcPl1g/w4CunnHNXeKBs 3whFd4SBwg12lGYb+09KpFKhZTRHfIM3K+lVt2rFvU26fMITtP2LO+z0pj6VJGGKGlXyObuH0 vkygQahNijZilicVIQTscveAMsQMVp+XQZRu0O+RZlw4oxoDnLJo71pCz/U/7y2krlVrpWDny spwuxouhBhWw8rTUfC5jwz+KD1XxKhsXYV2HP3eC+sd0pRwmwwI64Cjjg4XHb4FnqdRqcZtC+ nZi6ukjK/BJW0ibJTyeBkxRufDXL0LVZ2mXcU2m1zhT/+q64aPmSKc8OzlQu3SvJRb9zHicDV U4awbguxuGYJFU122MAWstQ+bRqW7V+4tujYJ+NIv8Kol/oxblIoUQ3XXnmKnjwzTtgJaWHmE s9e92aUPgqY4UrKtnahBHheMYlM= Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org If a duplicate attribute is found using kset_find_obj(), a reference to that attribute is returned which needs to be disposed accordingly using kobject_put(). Use kobject_put() to dispose the duplicate attribute in such a case. As a side note, a very similar bug was fixed in commit 7295a996fdab ("platform/x86: dell-sysman: Fix reference leak"), so it seems that the bug was copied from that driver. Compile-tested only. Fixes: a34fc329b189 ("platform/x86: hp-bioscfg: bioscfg") Suggested-by: Ilpo Järvinen Signed-off-by: Armin Wolf --- Changes in v2: - add patch --- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) -- 2.39.2 diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c index 8c4f9e12f018..0c83e66f8d0b 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -659,7 +659,7 @@ static int hp_init_bios_package_attribute(enum hp_wmi_data_type attr_type, const char *guid, int min_elements, int instance_id) { - struct kobject *attr_name_kobj; + struct kobject *attr_name_kobj, *duplicate; union acpi_object *elements; struct kset *temp_kset; @@ -704,8 +704,11 @@ static int hp_init_bios_package_attribute(enum hp_wmi_data_type attr_type, } /* All duplicate attributes found are ignored */ - if (kset_find_obj(temp_kset, str_value)) { + duplicate = kset_find_obj(temp_kset, str_value); + if (duplicate) { pr_debug("Duplicate attribute name found - %s\n", str_value); + /* kset_find_obj() returns a reference */ + kobject_put(duplicate); goto pack_attr_exit; } @@ -768,7 +771,7 @@ static int hp_init_bios_buffer_attribute(enum hp_wmi_data_type attr_type, const char *guid, int min_elements, int instance_id) { - struct kobject *attr_name_kobj; + struct kobject *attr_name_kobj, *duplicate; struct kset *temp_kset; char str[MAX_BUFF_SIZE]; @@ -794,8 +797,11 @@ static int hp_init_bios_buffer_attribute(enum hp_wmi_data_type attr_type, temp_kset = bioscfg_drv.main_dir_kset; /* All duplicate attributes found are ignored */ - if (kset_find_obj(temp_kset, str)) { + duplicate = kset_find_obj(temp_kset, str); + if (duplicate) { pr_debug("Duplicate attribute name found - %s\n", str); + /*kset_find_obj() returns a reference */ + kobject_put(duplicate); goto buff_attr_exit; }