From patchwork Fri Mar 31 18:09:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 77942 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp752031vqo; Fri, 31 Mar 2023 11:19:07 -0700 (PDT) X-Google-Smtp-Source: AKy350ZQWk7geg18zJHsqgycwYsa8vg97PxgyrKzIQtJRN2ksB+wZwV0ir16pqT0Yc2kFO3Gs0zR X-Received: by 2002:a17:907:2cf1:b0:92e:a1d8:bf1 with SMTP id hz17-20020a1709072cf100b0092ea1d80bf1mr27362708ejc.13.1680286747447; Fri, 31 Mar 2023 11:19:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680286747; cv=none; d=google.com; s=arc-20160816; b=KUe17WT33zG1+3W8JIht/sMj9MMb/dD12FW2TWXMJMuwPS+Y4AjN+xRe10aYKjIcrG k+PLOKnkYxBQsGxol0CBN/yfFaCSVN6YxpJLvEv9d1I3UtbuxNIgv2SnoFgnmSixqbXL DUnN2YtL/6MgO/Bu75LRAc0jPv0B0jr/ZSMP6C+QuuNXtSulJYJ502vlqXb/+p7IeMao Y3E6XYJBdl8HeeF0I/NsMoX+U/mQLm2TMd9W0F1OCoXVfVnv6T37s4WSBv+vDdudqXFD PkqMisErD4cUaKGTfj5bD1RQ0k/LAf9N++mQOhmrj89exfrWQfAxqbe2YWAPQbXM8oYm WkVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:ui-outboundreport:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=L4uGe3D+8FlrW3q+1/IQggtTBzksh3Cy5JwEmswIUTQ=; b=yVrG8yppw8qgLS7zU6jhaKT1J4onIXX3w7EUJhzhaKa/H5jYsX+JSPWW7jeua5yLz2 Iu3w2m9rux00Wc5Wrur1kVX11czUKlXZLGJ9HLnj+Zj4hPbhe1pPJnsb6+hpcJL1Mzd4 veo06PBLrVkdyIMc1LMHXN+GxPaAMFMn5BJgx4AfnOdZl15PnUt73aNEDeaQ5VFmftqt GJED5vm/sCaRMzKCA4t5pCkbMpLRQqFZDN4wAMpG450XmVpwho00/mmA2MhmJGKEVw4c A2BGKciuSDDG3gOfZ6jLCD5Eh7mqdzTabN+1G00WYga/H5zcPnRFYVotMLYSeru0qYmK Ipbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b=j7oorQ+K; 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=gmx.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dk13-20020a170906f0cd00b0092522118ef4si2235825ejb.949.2023.03.31.11.18.43; Fri, 31 Mar 2023 11:19:07 -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=@gmx.de header.s=s31663417 header.b=j7oorQ+K; 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=gmx.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231923AbjCaSJe (ORCPT + 99 others); Fri, 31 Mar 2023 14:09:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231609AbjCaSJc (ORCPT ); Fri, 31 Mar 2023 14:09:32 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 247D510FA; Fri, 31 Mar 2023 11:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1680286155; i=w_armin@gmx.de; bh=Am7Nhw3dTswBeMtyeu1EM5iLerWvPqMeO4mcyN/Sagw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=j7oorQ+K9UXIQ+cwJucUFBmWN7x+UAPcUH05jLK5CJGAy25xKL/x/Ko2hfhvl7y3A tObP2+vvE2UAyS1uq3TY8mgkec8oTR/P/m0OMlTQPhALTBl5VGkvAY5WFw/09cL1YV g2dR8V6h8ty6+EaIinCRkqgIPasckj2BvUK/2RBLIFEPL7vWoRieweT/qkgXJ0yczc S6aaw886PMNTAdq23ebOOS3K4ijBGh1iLmyh2KnBWhs/GFzmUf///6ur3w9UUMY9dd 1KCsQxWhuWB0oJTLyrdhl8/o10GpdWnWPDx7C4Xu/LwVj/OE4UBi+sMqoPqSjNHI8D 628OZ6o8cTrUA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from esprimo-mx.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MHG8m-1pdtLn0oMK-00DE59; Fri, 31 Mar 2023 20:09:15 +0200 From: Armin Wolf To: markpearson@lenovo.com, mirsad.todorovac@alu.unizg.hr Cc: hdegoede@redhat.com, markgross@kernel.org, thomas@t-8ch.de, gregkh@linuxfoundation.org, rafael@kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] platform/x86: think-lmi: Fix memory leak when showing current settings Date: Fri, 31 Mar 2023 20:09:12 +0200 Message-Id: <20230331180912.38392-1-W_Armin@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:dOb2W6pt4BTY8NZxprhaSQSTlNEUARb01MBam187alshfjHp2GI R/Ax8hMw+yFfQ77jh3YDlEAiAhsH9tAlC7meTfHmuMeV0pQA2gZQMCaNztbgatf+URWOsPk KMvEZOzNpU2VYpbabOuTBErll/x6Y4JuGrGcc2KBrtNlzfxPwVuGO9k3R6kySUs+NcGj2Rf NeuZ7gPHe9/8+fW54o7OQ== UI-OutboundReport: notjunk:1;M01:P0:o+H64xJYP30=;WDH1W3NNdk3p5InRRtW7K+q0T+4 EzZS/mbniABKHkWXgOiJUAez678uato/IBsCwDJm2gPWlvcRczBDaLqqrJPYZjwf9QhSDjs3u WeCAOJUXUpVQplPA7XXCCX7Yi70TDrBIcFI+18WOWumJiQzgOVPOdhjTfOrNFE2aX5iFBTXku bs9fqiGkvfekmd745jTrXXJpzREjDqsTKdAIL5RRv1y+FP54dol9lRzsbWdSNWqX7oKZ4LveX zL/2CfINU9EIvbiB5Ec9Ruj8BJ8Gv1Lak5CGzeaS2+J4k34AjECch6Z57ectoxFTIQgleKswa IqP3MNep8MenhKG0Zaj8F9P0OpCYifK21PjruN/GcgYjFyjJc5oxbXDlwrU6U942TiXZyYUA+ zbh24laozwIiUH0rYMgtbq0Sprlm7X8o+8o1hjcqx+yNDGe4PfX7OIcBvGM6UjvgGN28idXos 88ytvsnU330yHvBE3CkDkLX9rSE8T8mTNAn4zHp98oRd/scAQL4Hhl9uEfNESJ7odVxcxsGMJ YVeCnMBHtU03GNlxXNq6sHQFi5Z2p1I62wHpAq712ZPSzH/J8ZkYjfkWvIa74H1t2yKjs/VJ2 X9lNxJ4CxjYmhTAHhXlP8lPpS8PaPU6ZcphFv0cVzY2X8M4kdmSgp/Dpo2RYv+EMTe+SK9Sc2 p9XWkjedfW/jBRLxDizILWIJq/elQURrRmXocfBKuNVvGX89urcV+y4HelkNyW6ga7ONWP+IE wCgXCNZq6McMw1omZltSnCStmj8AnuJ6dlH/vJmR9Moy9miLBTLHSbaNZfHSrvlW19jccxamS vBaJYwPBSvV2vX8BIQYdkRb0mee8RGWIN0DneB5+QAiUE7ima+skP+tJrADj+RVBDJ9v2Rxur TAxqqDZy01c+Cn1CW222/Jv6GchYcy4dD80JDkvUgESfg0GLZrbBib7fgJdXRO5g1yxpkkT7S XRrtPLWAsafxzSH9QiEmoDg+SHU= X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761908102359129645?= X-GMAIL-MSGID: =?utf-8?q?1761908356241464515?= When retriving a item string with tlmi_setting(), the result has to be freed using kfree(). In current_value_show() however, malformed item strings are not freed, causing a memory leak. Fix this by eliminating the early return responsible for this. Reported-by: Mirsad Goran Todorovac Link: https://lore.kernel.org/platform-driver-x86/01e920bc-5882-ba0c-dd15-868bf0eca0b8@alu.unizg.hr/T/#t Fixes: a40cd7ef22fb ("platform/x86: think-lmi: Add WMI interface support on Lenovo platforms") Signed-off-by: Armin Wolf Tested-by: Mirsad Goran Todorovac --- Changes in v2: - Add Reported-by: and Link: tags --- drivers/platform/x86/think-lmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/platform/x86/think-lmi.c b/drivers/platform/x86/think-lmi.c index cc66f7cbccf2..8cafb9d4016c 100644 --- a/drivers/platform/x86/think-lmi.c +++ b/drivers/platform/x86/think-lmi.c @@ -930,10 +930,12 @@ static ssize_t current_value_show(struct kobject *kobj, struct kobj_attribute *a /* validate and split from `item,value` -> `value` */ value = strpbrk(item, ","); if (!value || value == item || !strlen(value + 1)) - return -EINVAL; + ret = -EINVAL; + else + ret = sysfs_emit(buf, "%s\n", value + 1); - ret = sysfs_emit(buf, "%s\n", value + 1); kfree(item); + return ret; }