From patchwork Mon Jul 17 20:53:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 121605 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1349315vqt; Mon, 17 Jul 2023 14:17:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlG9j2TJGWrciCwmDQEh+mSKN0O/Ov5/40SM0ThDnIUx54BYBwMfynOqiFK7+vo8/Urq1qUc X-Received: by 2002:a9d:4e85:0:b0:6b8:7c43:50ac with SMTP id v5-20020a9d4e85000000b006b87c4350acmr12732430otk.21.1689628630536; Mon, 17 Jul 2023 14:17:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689628630; cv=none; d=google.com; s=arc-20160816; b=OLK/99Il3PXkWUo4EkRQzkRMusWflngVp6XH1tovlwsa5qDLkaeTMlyP28GplYJ9Ab qHWF18ux8DCEU77GT5w9EtRHIeaP9+miwiLfAyeX6CsRvZI0EtZpkP39gN2OtTJx+HXx RQwhf2l22QHHutWZOzeRFba35E+qi/bAEZi6S+9m4LRM+VPoMudZ75vwBiLzcYC5rGZa P1sQUEyvgvTqtdeIjlvgDHxHp54RF7UbNavq4f7r7DaaQXD1QLRCzau11XVT3mhkgJYX VmvFUrRiOW4k09W6/CdX8uxizh6o8OZDaffeT4fqcqAlCnC+2w7z2DV9D6K8AqiA7kW+ wH5w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=gH/CT643ZS5ZguiPFDy4NfnRiWDoPJy5TfU7apbBTY4=; fh=3kO181L50Qcr0y55afcdcyD39TL/YS79tVW5ZtpSGcY=; b=ZKlTOGJ+kkzOcbVKqxVKGgvkUHY+xZzao+q6oFv2/tBl5qGTYr5plqs25Uib3/WtdT e90viDkPbUK6+YIYdDdRPtCTyEDBRKKbJ4u6yoMp4If4eu8JNMTfCULGTSWWqidEO2m2 OybRY5pTIaNdtmwT2h3ubcY3oPOx7o4e9SAgTVXZkdE2yvukLJHZdbQ+WdiEdlebJ+ew NBAhnkcNmp7WhRBxrrgFK9X+sFXZo2fnOxrVQTlRvWS6ZzNn/bdfivJAkQV1vO3EJS5O H2UYQkuSuDWQbaFR7NkfHYOZDaz1jd5Reebc7tBDiEL6VU37BVZasyLumKIpgK2uJAl/ vVVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=EUxW+eBq; 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 n11-20020a63ee4b000000b0054fe295d487si374516pgk.434.2023.07.17.14.16.57; Mon, 17 Jul 2023 14:17:10 -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=@wanadoo.fr header.s=t20230301 header.b=EUxW+eBq; 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 S231294AbjGQUxt (ORCPT + 99 others); Mon, 17 Jul 2023 16:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231425AbjGQUxo (ORCPT ); Mon, 17 Jul 2023 16:53:44 -0400 Received: from smtp.smtpout.orange.fr (smtp-23.smtpout.orange.fr [80.12.242.23]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CD29BB for ; Mon, 17 Jul 2023 13:53:43 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id LVDvqk82e2ts4LVDvqgmhS; Mon, 17 Jul 2023 22:53:41 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1689627221; bh=gH/CT643ZS5ZguiPFDy4NfnRiWDoPJy5TfU7apbBTY4=; h=From:To:Cc:Subject:Date; b=EUxW+eBqx0/fwJQ4mgi6TBoMfh2JIImC5lXvo4ECT562e2t/Pe25+tCgrwogyu7TW 34f6skb/GVFv9oRX95oCPkM0o2XzJilSzDsFzjB1pxM5q5vqzomhi3fAB8d11h4DZZ pCrsK4Yfm2hSz5L8D6b8Jr7olrJgiBMFaG7u3OwMHbV6O6PJB8A20qLxtd1W3gb54U HZ2WLgmx7vG9PuCOHL8HjbZA+ROG2YNwNWJ3W3vHS9FSaWu12UXGVvMhRKND0vNznj swWYgfwcqIjMRk9ADNPg6mER/KqK0vCheGn94fEkkwiHqm/Bfi53yE+gW5QQarZhCa TvcXmXOrFSYaw== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Mon, 17 Jul 2023 22:53:41 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Jorge Lopez , Hans de Goede , Mark Gross , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , platform-driver-x86@vger.kernel.org Subject: [PATCH] platform/x86: hp-bioscfg: Fix some memory leaks in hp_populate_enumeration_elements_from_package() Date: Mon, 17 Jul 2023 22:53:37 +0200 Message-Id: <9770122e4e079dfa87d860ed86ba1a1237bcf944.1689627201.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771704030740438967 X-GMAIL-MSGID: 1771704030740438967 In the loop in the ENUM_POSSIBLE_VALUES case, we allocate some memory that is never freed. While at it, add some "str_value = NULL" to avoid some potential double free. Fixes: 6b2770bfd6f9 ("platform/x86: hp-bioscfg: enum-attributes") Signed-off-by: Christophe JAILLET --- /!\ Speculative /!\ This patch is based on analysis of the surrounding code and should be reviewed with care ! /!\ Speculative /!\ --- drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c index b1b241f0205a..dd173020c747 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c +++ b/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c @@ -224,6 +224,7 @@ static int hp_populate_enumeration_elements_from_package(union acpi_object *enum sizeof(enum_data->common.prerequisites[reqs])); kfree(str_value); + str_value = NULL; } break; @@ -275,6 +276,9 @@ static int hp_populate_enumeration_elements_from_package(union acpi_object *enum strscpy(enum_data->possible_values[pos_values], str_value, sizeof(enum_data->possible_values[pos_values])); + + kfree(str_value); + str_value = NULL; } break; default: @@ -283,6 +287,7 @@ static int hp_populate_enumeration_elements_from_package(union acpi_object *enum } kfree(str_value); + str_value = NULL; } exit_enumeration_package: