From patchwork Thu Mar 9 04:01:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 66591 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp87859wrd; Wed, 8 Mar 2023 20:21:35 -0800 (PST) X-Google-Smtp-Source: AK7set/eYr/AFyEQe+4aErcWVBW+IYJOsRZb5hwXQog6vIZjCEAWJ78Ioz/jDfUlRfFvOvitLE4n X-Received: by 2002:a17:902:d2c9:b0:19a:c4a0:5b1b with SMTP id n9-20020a170902d2c900b0019ac4a05b1bmr25586926plc.1.1678335695623; Wed, 08 Mar 2023 20:21:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678335695; cv=none; d=google.com; s=arc-20160816; b=RtSo7k+hSQEKF/ZPPkywMFrTsqNexv1uiCaOZ315v+COJIeXaXldhd2GRosIBjUoDb gfhqZg+8evSXoEtJikhqSwanaUgZoF1Vmi5CRg62L/cIcXpjZgGmgFY6mE+UFlkcVED6 KtUYASFBtcLXU7UZNk5s+tEuX/sXOdFI4smT3tzrV8gpdWu91GxLpyPov7zbb9QJQWcj 2YFjMo3tSXJ0QX5Uy0ddC6qT2/AgCoaMlEK862Og5LWVwIOpw2hu2Ov/XnjjcEs+Hkst bttXBObrHUB5ND/xw6GdNEpJiYSsrxuN41cpTwtZDd7VfLkv5bpfF+7iGeXmVDNCairu 7J/Q== 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; bh=S1UmzfbYLGxgntmMfhKviSF9Su7iadKSR2IbvN+sctg=; b=DMlvz82ipwN16CRW4YgLwAm2T4UUHarX9CknQMnjNOy4DfAlQwdzV8CajMIYXYSu+k n4zsL+ej5UEgnyG6trwLwLi/hHwt7j3SSyxaCkY0dkvRMJ5obtA6EOmsxisyeRHJ310I yMqsR4HM0ujlN/LZmRAmORiMQiJ2SOvkl7ystDRDH8q4pULajtna/fdCTBJtG4wpTZFN HYXRGOSaTSuoLsx0OF0aPY7k3CHuqAvQ9tnuLmKdw7Hbd44slN5UO7/u8BdM3Shmv9jc svYlQON37y9cc8aiPdVLLhxHAAbkWvtr85s9YVKl3Q8oKnc+Vpi/5F2OO1pAPnQv0Qbv MvDw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cm22-20020a17090afa1600b00230c717f66esi1102685pjb.172.2023.03.08.20.21.20; Wed, 08 Mar 2023 20:21:35 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229947AbjCIEES (ORCPT + 99 others); Wed, 8 Mar 2023 23:04:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229708AbjCIEEP (ORCPT ); Wed, 8 Mar 2023 23:04:15 -0500 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED44169CD6 for ; Wed, 8 Mar 2023 20:04:13 -0800 (PST) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 32943g7q028914-32943g7u028914 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 9 Mar 2023 12:03:54 +0800 From: Dongliang Mu To: Srinivas Pandruvada , Hans de Goede , Mark Gross Cc: Dongliang Mu , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH linux-next v2 1/3] platform/x86/intel/tpmi: Fix double free in tpmi_create_device() Date: Thu, 9 Mar 2023 12:01:05 +0800 Message-Id: <20230309040107.534716-2-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309040107.534716-1-dzm91@hust.edu.cn> References: <20230309040107.534716-1-dzm91@hust.edu.cn> MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759862530596653374?= X-GMAIL-MSGID: =?utf-8?q?1759862530596653374?= The previous commit 6a192c0cbf38 ("platform/x86/intel/tpmi: Fix double free reported by Smatch") incorrectly handle the deallocation of res variable. As shown in the comment, intel_vsec_add_aux handles all the deallocation of res and feature_vsec_dev. Therefore, kfree(res) can still cause double free if intel_vsec_add_aux returns error. Fix this by adjusting the error handling part in tpmi_create_device, following the function intel_vsec_add_dev. Fixes: 6a192c0cbf38 ("platform/x86/intel/tpmi: Fix double free reported by Smatch") Signed-off-by: Dongliang Mu Reviewed-by: Dan Carpenter Acked-by: Srinivas Pandruvada --- drivers/platform/x86/intel/tpmi.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/platform/x86/intel/tpmi.c b/drivers/platform/x86/intel/tpmi.c index c999732b0f1e..882fe5e4763f 100644 --- a/drivers/platform/x86/intel/tpmi.c +++ b/drivers/platform/x86/intel/tpmi.c @@ -215,8 +215,8 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info, feature_vsec_dev = kzalloc(sizeof(*feature_vsec_dev), GFP_KERNEL); if (!feature_vsec_dev) { - ret = -ENOMEM; - goto free_res; + kfree(res); + return -ENOMEM; } snprintf(feature_id_name, sizeof(feature_id_name), "tpmi-%s", name); @@ -242,17 +242,8 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info, * feature_vsec_dev memory is also freed as part of device * delete. */ - ret = intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev, - feature_vsec_dev, feature_id_name); - if (ret) - goto free_res; - - return 0; - -free_res: - kfree(res); - - return ret; + return intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev, + feature_vsec_dev, feature_id_name); } static int tpmi_create_devices(struct intel_tpmi_info *tpmi_info) From patchwork Thu Mar 9 04:01:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 66592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp88234wrd; Wed, 8 Mar 2023 20:22:46 -0800 (PST) X-Google-Smtp-Source: AK7set8W/AjyXVA+t7ocTBwD5OpA2uaEwRWCaWfk21w8YDCzPBqeZKagrjZ0DRUQCz4PJMBJhmnk X-Received: by 2002:a17:902:ec91:b0:19b:2332:18cb with SMTP id x17-20020a170902ec9100b0019b233218cbmr25836194plg.1.1678335766184; Wed, 08 Mar 2023 20:22:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678335766; cv=none; d=google.com; s=arc-20160816; b=DNCRoPTHvFn4BUVmysW4PbC5cvhI8ERoO2k6A9slYu0lHgBzG5Aa+YcKSC4YHXlgCc i4RdYf/2xTvZT5n1c9RgPvOxNhTZu4EQNElBPEN5G3eBbUQbm15nKJRJeJuj+r69lYr8 Q94iLEjY5rGT7ygJwPME14ttMcCldPHtkmU7kxFuF33tlWdY9DV+UBz66dKP/O27f8Ff dMWgC4Z6qpeNBxCIGXGhEhU9kiR5RyNx15hveXOZlZD7hA80qZPHJDhPTPxvhQPoNRCm mg6R8KCMP1Lqkzu4VksdCqv7Y/VnObY0LfQzvJpPPA0HveH5won78li5Tg3oYlWvVz57 K9AQ== 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; bh=dtX/ECirPmG3UOQX7t8czU7sfmu0oPe0FSG0pwUf0C8=; b=XLYxjuZQDCJ7hXOC1oykkWlCxqpc9ZMubZoA+SEYjXNNtqubMqlwhPHa0Nte9Ksbwu nyry+CaH2MppGjwcPT0NqiFTN3q0eBLpho3LQXp0+hY+yhuZh/iPbvwa7qbQ7AzScUyL gHlfuHxTLb70H6Z6YbFii3gCBsmdDWc6LC0lgtSyUiUMDxV3U2IUo82VF0GZIxow3OxT rE8BfJ01jW8Nbysn3Xtahebnq19jm3xBX6Ou+dyDIDHBwGxhDDHleAjx1C4oq2SeMN6n BGuHFw1UgLEJVChqk54OZwwKqfEoFMv8ESENVJmWUAAibpZ+/sRnVBjFA2YeyzAoH3BY K5nw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u10-20020a170902e5ca00b0019c9648fa32si18983680plf.109.2023.03.08.20.22.33; Wed, 08 Mar 2023 20:22:46 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229965AbjCIEEW (ORCPT + 99 others); Wed, 8 Mar 2023 23:04:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229695AbjCIEER (ORCPT ); Wed, 8 Mar 2023 23:04:17 -0500 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EB1B69CD3 for ; Wed, 8 Mar 2023 20:04:15 -0800 (PST) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 32943g7q028914-32943g7v028914 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 9 Mar 2023 12:03:56 +0800 From: Dongliang Mu To: Srinivas Pandruvada , Hans de Goede , Mark Gross Cc: Dongliang Mu , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH linux-next v2 2/3] drivers/platform/x86/intel/tpmi: revise the comment of intel_vsec_add_aux Date: Thu, 9 Mar 2023 12:01:06 +0800 Message-Id: <20230309040107.534716-3-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309040107.534716-1-dzm91@hust.edu.cn> References: <20230309040107.534716-1-dzm91@hust.edu.cn> MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759862604372941385?= X-GMAIL-MSGID: =?utf-8?q?1759862604372941385?= intel_vsec_add_aux() is resource managed including res and feature_vsec_dev memory. Fix this by revising the comment of intel_vsec_add_aux since res variable will also be freed in the intel_vsec_add_aux. Signed-off-by: Dongliang Mu --- drivers/platform/x86/intel/tpmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel/tpmi.c b/drivers/platform/x86/intel/tpmi.c index 882fe5e4763f..036d0e0dba19 100644 --- a/drivers/platform/x86/intel/tpmi.c +++ b/drivers/platform/x86/intel/tpmi.c @@ -239,8 +239,8 @@ static int tpmi_create_device(struct intel_tpmi_info *tpmi_info, /* * intel_vsec_add_aux() is resource managed, no explicit * delete is required on error or on module unload. - * feature_vsec_dev memory is also freed as part of device - * delete. + * feature_vsec_dev and res memory are also freed as part of + * device deletion. */ return intel_vsec_add_aux(vsec_dev->pcidev, &vsec_dev->auxdev.dev, feature_vsec_dev, feature_id_name); From patchwork Thu Mar 9 04:01:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dongliang Mu X-Patchwork-Id: 66594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp94004wrd; Wed, 8 Mar 2023 20:41:42 -0800 (PST) X-Google-Smtp-Source: AK7set/8L9La7VY5M1opfxZ5AJiTWrp257VImqOSO88zw6cp7UtY/pUenE7hT8sYS9j28J5Jg4S9 X-Received: by 2002:a17:90b:3e8e:b0:236:99c4:6096 with SMTP id rj14-20020a17090b3e8e00b0023699c46096mr21068569pjb.35.1678336902351; Wed, 08 Mar 2023 20:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678336902; cv=none; d=google.com; s=arc-20160816; b=hdGa+UQA+XvifupIe3nsW+fC3hAL4WZRrwt2eoWBbXymXNU96kT/adqD0mtvFkqFFL 7BT1z8C1/cR7I0FZeg72PdKkXQpl1bjdT71VaETZPT/b0mi1GlGzAsoHjcXDVUGe5aq/ 4cFog9S3w/HsKoG5QCJ4bOf7UFbCMlDJbn7JttkSDeeQV9vPMhzCWi07pYeFRYM6TWn2 /auuJaLwGJeWAf5JDlBWcdW1wqBcMc04EbcSdNxrIuxVylxvsb2/Ac/3LAzIY2OP440f iYyW6XcP+89+iBne7sCaRrhWHAkwlw4GyTGidIMweTfGsPBJWPH2e8snHj6IkBjsYfJW uRCA== 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; bh=fjcRX6Iqeh2KFB4cCBQwLWAdXHFrQBcXhlcTGKQOAIc=; b=CwJpbijNvMiM6qzDBzdSAgiLAg0/i4c+uBzS5CW+W8ab7aT6xfnTT9dS4BCWblfQjC oH2wkVFlf3mCQ42GRAQGnHBqq8UvRlXfWi3uWCA8HIEWoOIIQXt2k16PwxkIrjoXfRUJ YLSRQ2uWfWLCKoFRw9nkK0V03D60WLmdNPfCCPgBGOmDeLOkssIjAQzFQAi3tsj/hDYD cdUfJ7lA2WkBsHwXrrmbHghmLsof/I7Q5qCzJBtQqBBpU7d7C2yCR6/OkgXbT9zVkqgF OMvFsPQHZbFvv4SV0XV/Cgm4s4rUPg5xPbCLtOkGfNH5iqgrtYBlDs0N9oudpKnvKveq 1wyg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i184-20020a6387c1000000b00502ea97a70csi15734782pge.837.2023.03.08.20.41.27; Wed, 08 Mar 2023 20:41:42 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229968AbjCIEE0 (ORCPT + 99 others); Wed, 8 Mar 2023 23:04:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229954AbjCIEES (ORCPT ); Wed, 8 Mar 2023 23:04:18 -0500 Received: from hust.edu.cn (mail.hust.edu.cn [202.114.0.240]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF05769CD6 for ; Wed, 8 Mar 2023 20:04:16 -0800 (PST) Received: from localhost.localdomain ([172.16.0.254]) (user=dzm91@hust.edu.cn mech=LOGIN bits=0) by mx1.hust.edu.cn with ESMTP id 32943g7q028914-32943g7w028914 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 9 Mar 2023 12:03:57 +0800 From: Dongliang Mu To: "David E. Box" , Hans de Goede , Mark Gross Cc: Dongliang Mu , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH linux-next v2 3/3] drivers/platform/x86/intel: fix a memory leak in intel_vsec_add_aux Date: Thu, 9 Mar 2023 12:01:07 +0800 Message-Id: <20230309040107.534716-4-dzm91@hust.edu.cn> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230309040107.534716-1-dzm91@hust.edu.cn> References: <20230309040107.534716-1-dzm91@hust.edu.cn> MIME-Version: 1.0 X-FEAS-AUTH-USER: dzm91@hust.edu.cn X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759863796036333200?= X-GMAIL-MSGID: =?utf-8?q?1759863796036333200?= The first error handling code in intel_vsec_add_aux misses the deallocation of intel_vsec_dev->resource. Fix this by adding kfree(intel_vsec_dev->resource) in the error handling code. Reviewed-by: David E. Box Signed-off-by: Dongliang Mu --- drivers/platform/x86/intel/vsec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/platform/x86/intel/vsec.c b/drivers/platform/x86/intel/vsec.c index 13decf36c6de..2311c16cb975 100644 --- a/drivers/platform/x86/intel/vsec.c +++ b/drivers/platform/x86/intel/vsec.c @@ -154,6 +154,7 @@ int intel_vsec_add_aux(struct pci_dev *pdev, struct device *parent, ret = ida_alloc(intel_vsec_dev->ida, GFP_KERNEL); mutex_unlock(&vsec_ida_lock); if (ret < 0) { + kfree(intel_vsec_dev->resource); kfree(intel_vsec_dev); return ret; }