From patchwork Tue Jul 25 22:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Lopez X-Patchwork-Id: 125833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp34822vqo; Tue, 25 Jul 2023 15:04:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlG0D3odToHOkDOl+2V60hAk6q9rKhkcqvg5CYuvBKY+5lUK5VjjzcdKajnv8XXc3tICLrjo X-Received: by 2002:a17:90a:a587:b0:25e:a8ab:9157 with SMTP id b7-20020a17090aa58700b0025ea8ab9157mr377622pjq.22.1690322673510; Tue, 25 Jul 2023 15:04:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690322673; cv=none; d=google.com; s=arc-20160816; b=nH6gxPv//pkczxqhdVOA84PgT0yJhJXfRlkr/1B5WtQvGcdGGLSQT7Mi9fZmu6bwSV bcDe3oQ3Jo1s9Jbivmq0xFX1X7L8lZarZmVTBkE/xd8lFEpj0rOC7MdBqHp3XH8loa9y /hviTdwHP1oFKKHEph2QAADflJ4WjiSKUUjH6eXFwSlmjiMSEuPTukNoyH5HCt3XU7R8 HaCmOoEz833/SKLpGfi7igOUAm9DWEvnWZ2DcPBhlxO6dmkrK1+m/i459R/qD2kPzRzp 10QPFftJK8tAl48nuBIZmbFjdzljGxb+aoq4U4CYBgQxWXAI3c9CR9RsO00rCT+MHmCH ry3A== 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:to:from :dkim-signature; bh=lUZnk3BJHa8i4G+I5FHI1a5ZCFbsEeNLgSVmJzgYbxk=; fh=UacUO69mcEnj0l/Sq8pQtbEaDl3n3IL5+ouzhHjbiDo=; b=gS8lEXvbFgutSXUZmUKmz45CPLi0b9j2eyHRaXTG2t9w5kVENepEogkLJBrZNpq5w0 PmKE3T5UpEz4aEn1CF7UmUFUq0liBiMCRVEceN5DZ4IxilrHuoezhu5t0xJsyzdmrPA4 EODd7hpd6dHo1hPe0kCfKjDPcNEYs9rs8YoHWnJR891p2SqZdyQfIQaCqR/6fpeD3wFB zIVWCyCGaCj6vKtMae/5EhnQFV5lxXjpJzWOD3IfUfgX2UO5Nss2SWnN47XLTUlbOUnh Ng1l+hBzRiMQVYm6K1HxE48dIsyMNhD+VvdJWeG8foS/JZ32PBcDHnAVWvinFgDX3jE2 qagg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=XVK1FzTn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lp16-20020a17090b4a9000b0026341fc8ae2si91484pjb.122.2023.07.25.15.04.07; Tue, 25 Jul 2023 15:04:33 -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=@gmail.com header.s=20221208 header.b=XVK1FzTn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231655AbjGYWBD (ORCPT + 99 others); Tue, 25 Jul 2023 18:01:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231157AbjGYWBB (ORCPT ); Tue, 25 Jul 2023 18:01:01 -0400 Received: from mail-oo1-xc32.google.com (mail-oo1-xc32.google.com [IPv6:2607:f8b0:4864:20::c32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FA97BC; Tue, 25 Jul 2023 15:01:00 -0700 (PDT) Received: by mail-oo1-xc32.google.com with SMTP id 006d021491bc7-565db4666d7so3761602eaf.0; Tue, 25 Jul 2023 15:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690322459; x=1690927259; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lUZnk3BJHa8i4G+I5FHI1a5ZCFbsEeNLgSVmJzgYbxk=; b=XVK1FzTn/TccXCjpTjt4Pf6a69wnwkxxmHdsFbn42YM2M4vBpG1M4prm2pxLW7iMwb uZQbixtobzfmh9gLPJ+pgLfuyfWnGX2TiVWggmdqsfsxE/zrHdbRUbvWB3USqA3bEtMI PjPLe32eJNSaKLmxx4YIeiF2PLzzAHnp7WVo/wPq34UgfQvRjJ34u9jeGQgz1s2qmIvF g9c55G8A1MynG6olwvA77cUcjqSdyAgtw/DVD81YZGnjmZgw9wySkd5jHjom/NPTD9CB w2KU9o+XcURSi03JKAtuk1kts/CReVvTu6TU2tIFkYWvpDhaKbMAKw5EdrM9yFDW4cSL fjhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690322459; x=1690927259; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lUZnk3BJHa8i4G+I5FHI1a5ZCFbsEeNLgSVmJzgYbxk=; b=UqzTTOJ+IWgBLKsd6Bhm25yfFxoI3b9eAw+7HgWnmaYY/1SMI95fhAwoWSRZutG1Wr v9bvUGsz8DIjAv2IGo3b84NKHt+nGBwXw6C0gXa2ZSBETUmFGT7/6dkls1ioQq2xLt9L cnvKcmcQ5MNAXEPZ4pm8PmMKJdvGSrOoNuHYngOKaaMNUns8wviGb9JTCuOu9KGgBbqP jAyJ06Z3GlwL69TMe+RikjyJKzfZHZhaVZYCqiVVBK2TICltF80TH1e8uDLyuwxpPJRX Q3CsJFE/rVm7t6krd8NNXE6PnGfu3suqNw7znyoTk+V2Zcz6fdtltghWFbJrb+tEZZab Xihg== X-Gm-Message-State: ABy/qLaBvn0FsSAA/W6zK3BtZhMT4xYge6df/VozL5nhuayi7ZuAzqIP g52g3PYGAKe/ZlCC3tNdS3M= X-Received: by 2002:a4a:3c17:0:b0:565:bbc0:2e36 with SMTP id d23-20020a4a3c17000000b00565bbc02e36mr98675ooa.3.1690322459704; Tue, 25 Jul 2023 15:00:59 -0700 (PDT) Received: from grumpy-VECTOR.hsd1.tx.comcast.net ([2601:2c3:480:7390:871d:ebb3:c6e2:8ac3]) by smtp.gmail.com with ESMTPSA id v40-20020a4a8c6b000000b0056688eea98csm5870026ooj.27.2023.07.25.15.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 15:00:59 -0700 (PDT) From: Jorge Lopez X-Google-Original-From: Jorge Lopez To: hdegoede@redhat.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@t-8ch.de, ilpo.jarvinen@linux.intel.com Subject: [PATCH 1/5] hp-bioscfg: Fix memory leaks in string_elements_from_package() Date: Tue, 25 Jul 2023 17:00:52 -0500 Message-Id: <20230725220056.25560-2-jorge.lopez2@hp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725220056.25560-1-jorge.lopez2@hp.com> References: <20230725220056.25560-1-jorge.lopez2@hp.com> 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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: 1772431787499603056 X-GMAIL-MSGID: 1772431787499603056 Address memory leaks in hp_populate_string_elements_from_package() and uninitialized variable errors. Signed-off-by: Jorge Lopez --- Based on the latest platform-drivers-x86.git/for-next --- drivers/platform/x86/hp/hp-bioscfg/string-attributes.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c index 1b62e372fb9e..e0ecdfca4def 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c +++ b/drivers/platform/x86/hp/hp-bioscfg/string-attributes.c @@ -133,7 +133,7 @@ static int hp_populate_string_elements_from_package(union acpi_object *string_ob char *str_value = NULL; int value_len; int ret = 0; - u32 int_value; + u32 int_value = 0; int elem; int reqs; int eloc; @@ -171,6 +171,7 @@ static int hp_populate_string_elements_from_package(union acpi_object *string_ob if (expected_string_types[eloc] != string_obj[elem].type) { pr_err("Error expected type %d for elem %d, but got type %d instead\n", expected_string_types[eloc], elem, string_obj[elem].type); + kfree(str_value); return -EIO; } @@ -232,6 +233,7 @@ static int hp_populate_string_elements_from_package(union acpi_object *string_ob str_value, sizeof(string_data->common.prerequisites[reqs])); kfree(str_value); + str_value = NULL; } break; @@ -250,6 +252,7 @@ static int hp_populate_string_elements_from_package(union acpi_object *string_ob } kfree(str_value); + str_value = NULL; } exit_string_package: From patchwork Tue Jul 25 22:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Lopez X-Patchwork-Id: 125834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp35159vqo; Tue, 25 Jul 2023 15:05:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlFzCWgp0TO2y7lHwUse1pWnVc7Q+G3Z2AhBgQ+th6uhBn9MWD12x/ZN+NkS7U5bYWyB2C9e X-Received: by 2002:a17:902:d4cd:b0:1ac:aba5:7885 with SMTP id o13-20020a170902d4cd00b001acaba57885mr500300plg.47.1690322710182; Tue, 25 Jul 2023 15:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690322710; cv=none; d=google.com; s=arc-20160816; b=YBg712cXvvBSS65Wv6xDNo2GN55TJAI3B8LnIKlR8uAq+YvBcLGLSMh1iR0UnhQ1Rq nC9ywRTOuPo7jCT8hwXenjdRW41u3MhQcxYqqt2OySFdocLSm2Vl3W9pDU6zsWSjnRnT PJeiTET0ovDvlKiaJOz9aAC8G8O6ubqjZzAZIylD2S1HuUJ+nTDRHnb2mGe6oAMjdEBv WmPqY5O8nfQoiGz1J6wNpCuEa/jqNrlx3lcCXsxPqtm2l1u/UEL5wP2WCqkeptk9cSIw 41rKcID0weti9m7n8Q9U6mIKpGX2x2dUDeZVGpN6tBARTZ9SXk0YYQFKctkheMethzBW aO2A== 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:to:from :dkim-signature; bh=xUKWe23SezTiM/kRUdKBl5wmSf4mUZBR+Z+CLpUrp98=; fh=UacUO69mcEnj0l/Sq8pQtbEaDl3n3IL5+ouzhHjbiDo=; b=vxUriTCSvKwrPXZxy6HhxATYZgTNI+5Jtr+BYOMr7VJi1A19CtAzNyDO2edIe9iXwp oT1RktR6iw/CBawT4ovA2vqWGfTYnebNg0b9sCafvxEFbF1cHpwwUq77XzEf+qdlUUqs 0hRb6BBiB12HiE2TGXP4OR5ihaEQJnXg0QvLrKHolZOfXL/ISc4nPJOLVP7gnXSFQgHI 7Za7nfZ4epRA2V0ZWll1gVpeljekuE6eO7daNvATlGRsQMqOIFYZjXTk92m6t6jqVDuC 2aWiOOUmGL7TJNksW5VG7ddHWkVMes9sp4yDbc2n8eAPZ7t4ZSmorf/orqc4upmNLbew nShQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=H+d1jGaj; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bc6-20020a170902930600b001b9da8b4eb8si11580083plb.373.2023.07.25.15.04.30; Tue, 25 Jul 2023 15:05: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=@gmail.com header.s=20221208 header.b=H+d1jGaj; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231700AbjGYWBM (ORCPT + 99 others); Tue, 25 Jul 2023 18:01:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231652AbjGYWBD (ORCPT ); Tue, 25 Jul 2023 18:01:03 -0400 Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E7F3BC; Tue, 25 Jul 2023 15:01:02 -0700 (PDT) Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1bba1816960so680462fac.3; Tue, 25 Jul 2023 15:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690322461; x=1690927261; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xUKWe23SezTiM/kRUdKBl5wmSf4mUZBR+Z+CLpUrp98=; b=H+d1jGajJSEzB3DvvT22YBnAf0zVpenbkl00bJpOlYhvKDQGRxnHB/z99wTBpVQGdu dwNmghwF+rGPqJ18uIg7Fiw4GokkurKyCkhtPejeI2YousXpG8bpEdFmNrsHXICE8+Gv YLLhieE7+OCxoq7vxVQ3BAFRrMs8FY4+cKkWBp+hRNUrOwevCFuxYSbs0J6CbxIPIWrO gUajJ2H6AoQmX3UfU+wO6d1FOesOWvTqcWPSi1x+QgOsl0DcuC8dGcWai98H7tmr5kzv /du5AfOLoP3cyxNKt0mtsJO+EXB2LOqf/ypmR7412uiWXxr/zlkYfdFJb6d+SMs7dx57 uqeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690322461; x=1690927261; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xUKWe23SezTiM/kRUdKBl5wmSf4mUZBR+Z+CLpUrp98=; b=VYz8LGkG9YU5i2MkL0uVtB8Zw/kA8/OH68Sk/c1IWqZODOEPxzufBX45rasdEyq0l2 Td9X+vbRypdghclNl15xR6lvrKCOxD1IoVxjAanjbFBCWSJPfclHREFlcjB/QUynGiZ2 Sz6xAZUl+NTUx/TXG3CyTeabaHyzcdIHitTjTfXCqtUryHuOW/19mlkcCaMuqtDk3B/m 9U9XfmNLBDV33vf2Mt0MxpynI1umEbvjhJnG1FrzKhjX3hCWmCH2uA8eT3K1aw98uoKW D73f9pggMODGclb4BwEMrZFdat3ZWsBp3XjEETXCIgkYm62zK9YdUxEmKnW7w5eB/ag9 czgQ== X-Gm-Message-State: ABy/qLZwWBEZGqapQ/B/Dr+YcSVlV5sLJ/64ENgU8Dc8PSIvm5h5nw7F yQo3nCjJNxM9HDDG6Yu6CVUSrv/WnJc= X-Received: by 2002:a05:6870:40ca:b0:1b7:6158:621a with SMTP id l10-20020a05687040ca00b001b76158621amr370690oal.47.1690322461369; Tue, 25 Jul 2023 15:01:01 -0700 (PDT) Received: from grumpy-VECTOR.hsd1.tx.comcast.net ([2601:2c3:480:7390:871d:ebb3:c6e2:8ac3]) by smtp.gmail.com with ESMTPSA id v40-20020a4a8c6b000000b0056688eea98csm5870026ooj.27.2023.07.25.15.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 15:01:01 -0700 (PDT) From: Jorge Lopez X-Google-Original-From: Jorge Lopez To: hdegoede@redhat.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@t-8ch.de, ilpo.jarvinen@linux.intel.com Subject: [PATCH 2/5] hp-bioscfg: Fix memory leaks in ordered_list_elements_from_package Date: Tue, 25 Jul 2023 17:00:53 -0500 Message-Id: <20230725220056.25560-3-jorge.lopez2@hp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725220056.25560-1-jorge.lopez2@hp.com> References: <20230725220056.25560-1-jorge.lopez2@hp.com> 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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: 1772431826440298018 X-GMAIL-MSGID: 1772431826440298018 Address memory leaks in hp_populate_ordered_list_elements_from_package() and uninitialized variable errors. Signed-off-by: Jorge Lopez --- Based on the latest platform-drivers-x86.git/for-next --- .../platform/x86/hp/hp-bioscfg/order-list-attributes.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c index 7e49a8427c06..89e67db733eb 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c +++ b/drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c @@ -131,10 +131,10 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord int instance_id) { char *str_value = NULL; - int value_len; + int value_len = 0; int ret; u32 size; - u32 int_value; + u32 int_value = 0; int elem; int reqs; int eloc; @@ -174,6 +174,7 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord if (expected_order_types[eloc] != order_obj[elem].type) { pr_err("Error expected type %d for elem %d, but got type %d instead\n", expected_order_types[eloc], elem, order_obj[elem].type); + kfree(str_value); return -EIO; } @@ -231,6 +232,7 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord sizeof(ordered_list_data->common.prerequisites[reqs])); kfree(str_value); + str_value = NULL; } break; @@ -277,13 +279,17 @@ static int hp_populate_ordered_list_elements_from_package(union acpi_object *ord part = strsep(&part_tmp, SEMICOLON_SEP); } + kfree(str_value); + str_value = NULL; break; default: pr_warn("Invalid element: %d found in Ordered_List attribute or data may be malformed\n", elem); break; } kfree(tmpstr); + tmpstr = NULL; kfree(str_value); + str_value = NULL; } exit_list: From patchwork Tue Jul 25 22:00:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Lopez X-Patchwork-Id: 125845 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp40484vqo; Tue, 25 Jul 2023 15:16:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlELHIGlsZyPNhItrg9Tqa5ZY9a6aFXU2izqPHHPzVv46vawEdBKr8QXAD9Ph+2ltw/ypZgx X-Received: by 2002:a17:907:60c7:b0:993:f4cd:34b5 with SMTP id hv7-20020a17090760c700b00993f4cd34b5mr119878ejc.29.1690323408588; Tue, 25 Jul 2023 15:16:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690323408; cv=none; d=google.com; s=arc-20160816; b=QCWEiE4OPLEJNlgmnKLTgUoj178PYywSxlGTpR3CUzs+fyjrj+NAqcsSTHx0u4yyiC Tjpa/EUK4n1nEEdfcuFNzGHg6ZKDGIpmWrFCo15HX68T0AaC1VTuO2RlsIj3KyJ14EJu Uwa6zeDBD01vZpZDicJAk5uxF7C84WZpbe4vEnIHVLHoVc91Sj6WmRWJvtoIXK+j3quS Nzc1s2uhPj8lo7qlzKiqNQj/VjXfe342Ry0Z3c7RtHHiueugeGNZGBkmORatJi7jLuwm 3I82SzqB3zumd6HtIHvMplxamuOBPgmiav7z3eFWYWewaWx1USnePviVZRIW7jOG5j0q otvA== 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:to:from :dkim-signature; bh=QX7T2RPgbuYmgoQOJwoEsgAUtn61DiADmPjBuL7fWDc=; fh=UacUO69mcEnj0l/Sq8pQtbEaDl3n3IL5+ouzhHjbiDo=; b=N8Ckl/Pj85LjVL7UC2LPkOinTf+7twbu7BaP09qOy5ofEwdKkwhzHY4tYURTLFhdIv raXXjDZ7Nu8yVStXEtm0WI9WSFw9Krg5/t/upyUf0JwqPLCjWUh8DZaDSgoDq9IPXZbR LEehw7D9KQxsGMNSDYfhpwE7FJTlzXkPcpX478ZbEU7RRwQxZ+iAGeaW0/0Sbo5dDe5d xlKWQgQQBegyXoDDZcU4z9aFJD8+C1l7vW2YuRo619Wihhh0f/CoZo3OEWuBl+4TKF4b uiWTn9BV8QKCXWVB0f3/eAfEh72dHIobq6tV4QpemMNwsxXUA+ZweGMU12O9GLAgyDES qJ8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=hFVnEW+U; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y20-20020a1709064b1400b0098865b84499si8527529eju.433.2023.07.25.15.16.24; Tue, 25 Jul 2023 15:16:48 -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=@gmail.com header.s=20221208 header.b=hFVnEW+U; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230125AbjGYWBO (ORCPT + 99 others); Tue, 25 Jul 2023 18:01:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230469AbjGYWBE (ORCPT ); Tue, 25 Jul 2023 18:01:04 -0400 Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0022E0; Tue, 25 Jul 2023 15:01:03 -0700 (PDT) Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-5634d8d1db0so3836682eaf.0; Tue, 25 Jul 2023 15:01:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690322463; x=1690927263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QX7T2RPgbuYmgoQOJwoEsgAUtn61DiADmPjBuL7fWDc=; b=hFVnEW+UvIkZfF9U6GFwGnUmRFoV5LNdQd7RH61zvA4z8nURZU4gp3EszcF63CMdI0 FygbNn7LHdbZ5MBZFW+YcdR8ndLv98WAgRJPj673nOrK1e3iTpgW/2Jn/507ZlaOw32w JfRENeqIqwMfPFTa8U7Goo/9WIYxrHYSrxAVHJfl5lbHD6ewUthSxKNXst56HxOA9abw 6day8S0+bW6+KdGQWYYxRAHIouf8XH4zqWBvJeza0DYEvIjEi0+D18UXxWSSooW26wOe cuPpHWDHnKhrJD5Ce/OayN1cuxnAnoCYArLZtPB36035XIKy/9RD4eg5F2Sj3H4Nt0rE 0r/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690322463; x=1690927263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QX7T2RPgbuYmgoQOJwoEsgAUtn61DiADmPjBuL7fWDc=; b=J0cXrQGfn0wrsIofuIb3mo85XbFRTOTsZqwAMJYoLEzJR4/VLrxxgnEvAar+6CiaER iFpTDSm20XBt0nSOSavJL1G/1qMG/EvsU+zrqjTQVrCtLBVAmoXA7LD/ZUUb+x2JDHVL hpZ+XsCIgCRl2XO05rpcKWq1vb36F7UlIbN3CnW4H5/raCdTGHkNmc5sAOYJ32ALAKMb le6VmQsNNguZ6UjcXxqH3KjE+eHzqUBew8eSjapTHIyxxEde7mmEkTrxnfYyOwdhkVxP QpT3a3/s7unehDHJ/U6o7ezaUaVhaW74LGFQ1DApJmHb+jxvWoxVuNTDATr9q2BOyHh5 jtMQ== X-Gm-Message-State: ABy/qLYW0HapcZrSYZ2pT9dybN0Kp0fig8bx0T3stUq18As55sie4gF2 RY3u/Mx55htzDCpp/eYdHys= X-Received: by 2002:a4a:3107:0:b0:566:fcc8:5b6e with SMTP id k7-20020a4a3107000000b00566fcc85b6emr79987ooa.6.1690322463049; Tue, 25 Jul 2023 15:01:03 -0700 (PDT) Received: from grumpy-VECTOR.hsd1.tx.comcast.net ([2601:2c3:480:7390:871d:ebb3:c6e2:8ac3]) by smtp.gmail.com with ESMTPSA id v40-20020a4a8c6b000000b0056688eea98csm5870026ooj.27.2023.07.25.15.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 15:01:02 -0700 (PDT) From: Jorge Lopez X-Google-Original-From: Jorge Lopez To: hdegoede@redhat.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@t-8ch.de, ilpo.jarvinen@linux.intel.com Subject: [PATCH 3/5] hp-bioscfg: Fix memory leaks in integer_elements_from_package Date: Tue, 25 Jul 2023 17:00:54 -0500 Message-Id: <20230725220056.25560-4-jorge.lopez2@hp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725220056.25560-1-jorge.lopez2@hp.com> References: <20230725220056.25560-1-jorge.lopez2@hp.com> 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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: 1772432558640893443 X-GMAIL-MSGID: 1772432558640893443 Address memory leaks in hp_populate_integer_elements_from_package() and uninitialized variable errors. Signed-off-by: Jorge Lopez --- Based on the latest platform-drivers-x86.git/for-next --- drivers/platform/x86/hp/hp-bioscfg/int-attributes.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c index 7364c5ef9ef8..97f88e0ef0cc 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c +++ b/drivers/platform/x86/hp/hp-bioscfg/int-attributes.c @@ -143,7 +143,7 @@ static int hp_populate_integer_elements_from_package(union acpi_object *integer_ char *str_value = NULL; int value_len; int ret; - u32 int_value; + u32 int_value = 0; int elem; int reqs; int eloc; @@ -179,6 +179,7 @@ static int hp_populate_integer_elements_from_package(union acpi_object *integer_ if (expected_integer_types[eloc] != integer_obj[elem].type) { pr_err("Error expected type %d for elem %d, but got type %d instead\n", expected_integer_types[eloc], elem, integer_obj[elem].type); + kfree(str_value); return -EIO; } /* Assign appropriate element value to corresponding field*/ @@ -239,6 +240,7 @@ static int hp_populate_integer_elements_from_package(union acpi_object *integer_ str_value, sizeof(integer_data->common.prerequisites[reqs])); kfree(str_value); + str_value = NULL; } break; @@ -258,6 +260,9 @@ static int hp_populate_integer_elements_from_package(union acpi_object *integer_ pr_warn("Invalid element: %d found in Integer attribute or data may be malformed\n", elem); break; } + + kfree(str_value); + str_value = NULL; } exit_integer_package: kfree(str_value); From patchwork Tue Jul 25 22:00:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Lopez X-Patchwork-Id: 125853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp40697vqo; Tue, 25 Jul 2023 15:17:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlHPWvRr5UdzP1GRNpFsCHlooPL3re+ZzY8DAQDhOZWIKTMoYKj+51IALJiLMzkgd9aX3l+W X-Received: by 2002:a19:5e56:0:b0:4fb:242:6dfa with SMTP id z22-20020a195e56000000b004fb02426dfamr99605lfi.57.1690323435129; Tue, 25 Jul 2023 15:17:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690323435; cv=none; d=google.com; s=arc-20160816; b=0bXCoe84EmUfWFXt/CPm+esLNSaQ69Xs7nyrVgUfuanVAZExh6v3AQnZS+LvKxr1FD dshQBQLiOR9zq+tFoTve8BRLcwhFKdrkpFIra9wNlqFDQ8FPJC1GJTNFDPQEYSkh24jP euwE5imZfEhAKQzW2D8zM2wv+SPxbp0Ft3UYCTiOQMFberk9u9S8PW4Qt6gTQXO7jJS1 wiX+dI003hb1+lHHxk9wD2T3hu6VNMuilqcd2NuwG172MVIGKzagqkX6HQyPVOu2e5lF chskIhtN2PsehwPKXu1DsiVUWwAv+nVHH9+TLJqgRzYG6ZotRs5rYujqgkC06KMLi0Zx F2zg== 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:to:from :dkim-signature; bh=YlHDiRN/74XK66bPeSMdSDzuItYNuBd/sWX4Lk9V5K4=; fh=UacUO69mcEnj0l/Sq8pQtbEaDl3n3IL5+ouzhHjbiDo=; b=xaxyfHRWNdBvW0LyBezAxWWHGsvr4zRE1cZDN9+c9b7wVdZSQYoK0G75malec2Hn5L ZNjwNwbHOzx0GMoCLIiVkPoUnosg4ExV7d2goanV+/NtBz3IXWP+TZnCf5jJBfiLBIhK D59+8RsnHA4UEnxeZg575g1vguIDdPhXUoREgB21OrV+G0mGPwrRCGALda5Am28ICpQk 6DCrK2MIWLx9ckdgzC22G2BRM5Wmo94JKU7V7F0lP42+nyHEgwZXFvunuOXtU8FahxTL fYbLNZPHFKsGY8R4Eb9LyDxXOCODtw+HUSPM8u6FWrOE3gVjsp2EyhHj/kRhfhvTHFqM dE4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="KsOoW0/U"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j22-20020aa7c0d6000000b005221c27b489si5453039edp.534.2023.07.25.15.16.51; Tue, 25 Jul 2023 15:17:15 -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=@gmail.com header.s=20221208 header.b="KsOoW0/U"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231672AbjGYWBS (ORCPT + 99 others); Tue, 25 Jul 2023 18:01:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231663AbjGYWBF (ORCPT ); Tue, 25 Jul 2023 18:01:05 -0400 Received: from mail-oo1-xc31.google.com (mail-oo1-xc31.google.com [IPv6:2607:f8b0:4864:20::c31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFE2C10F7; Tue, 25 Jul 2023 15:01:04 -0700 (PDT) Received: by mail-oo1-xc31.google.com with SMTP id 006d021491bc7-56597d949b1so3705463eaf.1; Tue, 25 Jul 2023 15:01:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690322464; x=1690927264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YlHDiRN/74XK66bPeSMdSDzuItYNuBd/sWX4Lk9V5K4=; b=KsOoW0/UYyCasvjpUcBWZGybkq77ggoF64/KVTROZHUg7t4UsJHRhNJhFDaCaJHmT+ mbS2cKxdL+VcKh1Tkgg9OAO4+b1/os+zBgduv1/4TCNUbID9oNrwl+BKKshjntdAP0wX jmF6tom/PS4EXxGSdIoRPFb4IBGV5OHOfY+IntfdGIbWMCIHTyTBLzILazAiEfdn2Uv+ GQPmw1muwn0GzkhnKYuBo+31b0r1DfuN8V/UDbgSbS0N9Aie9eQK4nxd48ACx2UmZ+5p Tm/A6x99m4ZyuNJK2RZXRhvA2BiCT6kX6foiUMx9oJgFJWDqb9UmFlgZfl4ZcpVmtcHI ocQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690322464; x=1690927264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YlHDiRN/74XK66bPeSMdSDzuItYNuBd/sWX4Lk9V5K4=; b=XyTB/fz5SjrEKH9/LIoI7BiYvS5MKj5EEHUa5I+Ke7SO7JohLUAJGmT2HCOpn+d5gz HmI259XD/jsmj4Ov8SVqg3v4rNgBf/H5sw9ce0OQ1eKh+upZGUv068nPdkOHspphq80r vK88zASILZ8uGol5f6pejgIzUIyZULiQKlzknrHTCiRLey1ffKzPGbJ9IFUkMVqA7ufq SHbBL1HsJ6ntQLsYCHxAcdR3TMNHruiUQ+9Dlk/1zwVRfD4fGjHqPaYD6MWqnAbRb8g8 /JW7TcLzs1BVeXo5RFlaj79QRHgwaBWeGlaVtVjz9BLtMLN2wap6seNCaEt+Ec5Z1S09 g4/Q== X-Gm-Message-State: ABy/qLbypEYva8Dmcaff0xjeKTrpl7vT0MkA735sFe04vfSu7m3N6S8V 9+/+/gOuqLfKWiwHFLwkde0= X-Received: by 2002:a4a:344a:0:b0:566:f763:8fb7 with SMTP id n10-20020a4a344a000000b00566f7638fb7mr88949oof.2.1690322464072; Tue, 25 Jul 2023 15:01:04 -0700 (PDT) Received: from grumpy-VECTOR.hsd1.tx.comcast.net ([2601:2c3:480:7390:871d:ebb3:c6e2:8ac3]) by smtp.gmail.com with ESMTPSA id v40-20020a4a8c6b000000b0056688eea98csm5870026ooj.27.2023.07.25.15.01.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 15:01:03 -0700 (PDT) From: Jorge Lopez X-Google-Original-From: Jorge Lopez To: hdegoede@redhat.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@t-8ch.de, ilpo.jarvinen@linux.intel.com Subject: [PATCH 4/5] hp-bioscfg: Fix memory leaks in enumeration_elements_from_package() Date: Tue, 25 Jul 2023 17:00:55 -0500 Message-Id: <20230725220056.25560-5-jorge.lopez2@hp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725220056.25560-1-jorge.lopez2@hp.com> References: <20230725220056.25560-1-jorge.lopez2@hp.com> 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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: 1772432586202960193 X-GMAIL-MSGID: 1772432586202960193 Address memory leaks in hp_populate_enumeration_elements_from_package() and uninitialized variable errors. Signed-off-by: Jorge Lopez --- Based on the latest platform-drivers-x86.git/for-next --- drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c index b1b241f0205a..7f77963cd7fa 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c +++ b/drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c @@ -129,7 +129,7 @@ static int hp_populate_enumeration_elements_from_package(union acpi_object *enum char *str_value = NULL; int value_len; u32 size = 0; - u32 int_value; + u32 int_value = 0; int elem = 0; int reqs; int pos_values; @@ -164,6 +164,7 @@ static int hp_populate_enumeration_elements_from_package(union acpi_object *enum if (expected_enum_types[eloc] != enum_obj[elem].type) { pr_err("Error expected type %d for elem %d, but got type %d instead\n", expected_enum_types[eloc], elem, enum_obj[elem].type); + kfree(str_value); return -EIO; } @@ -224,6 +225,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 +277,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 +288,7 @@ static int hp_populate_enumeration_elements_from_package(union acpi_object *enum } kfree(str_value); + str_value = NULL; } exit_enumeration_package: From patchwork Tue Jul 25 22:00:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Lopez X-Patchwork-Id: 125842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp38561vqo; Tue, 25 Jul 2023 15:12:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlE0QhPDqBaSz8b06HMm69ep7ZHrrzdoebrH9HWeZK9L5l4hCotmgVGOy+hN2g1pv+VXMA0L X-Received: by 2002:aa7:d287:0:b0:521:985d:7314 with SMTP id w7-20020aa7d287000000b00521985d7314mr498569edq.18.1690323134731; Tue, 25 Jul 2023 15:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690323134; cv=none; d=google.com; s=arc-20160816; b=YNLUOuxB57M2/lROy6Vq+fx9DkZU5joE2QE2ShVSkOpPcpfrCvtooXvbX7RgB9TtjS G3xKhqG2iztmrLtumcD1ElkK+WVIQ1Zx7v7V0bUEK7MHx+wG1hJOH6eczTu6ssLOClrY w06gZ+I7FqOywxIJafCe3tAmY4LRcrHU/9Xq1YvPZjmDhPlMvQS+IDBGqYisFMWVbkcM e1upk7LjzsxZ9bVO/2elpm9o6snnlXBuVlU30cd0ElxBPu28un1KzBSqbwzk7n0RKrfE 1s1wP20XBq+M5P4feIcC9LniIzlnXhMDWYZMwIPiFH5ktxnbGLnGUPJS5bjdm8aOeC4f /L6w== 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:to:from :dkim-signature; bh=sNrWzLvwqEWfm83K2uRioAjV1pOkPLb6ELuVS9z3syU=; fh=UacUO69mcEnj0l/Sq8pQtbEaDl3n3IL5+ouzhHjbiDo=; b=KIRntMud3eLt+8RKqF+qhyMTCeXRD8i2/LHUo7Ub8k/JfYgZ0+EqjY4Jhoj6T21pqH FMatjd0KOcEsSQQ6LtW3l7Wdw1Wrlf00JWWMkAg1CeUXe+2FfWuPKrt8pbBYt5v6jzvq 6fPPiXF5RchcBomepINPGm8F9vTekSFo5BvdlyiHSVrGh4n61Dv/OrZebHkZQEAIRJsZ kvvTM7WwYkT70QUMYRwpMicMm9uvB3Ya2SlZHTpzQ7YVEcQolWlQVuYagruoHI1vVYvH 9Bh+lpIWfNTMW7rUPWqV4Vbwb/JCS1zPb5KHEYQ5rM+CI3ApPZfx+quFcCQJzQwHfD6j +z0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=h+XCLvqs; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c10-20020aa7c98a000000b0051e24097920si9261192edt.559.2023.07.25.15.11.07; Tue, 25 Jul 2023 15:12:14 -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=@gmail.com header.s=20221208 header.b=h+XCLvqs; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231685AbjGYWBW (ORCPT + 99 others); Tue, 25 Jul 2023 18:01:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231665AbjGYWBJ (ORCPT ); Tue, 25 Jul 2023 18:01:09 -0400 Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A82E1FEC; Tue, 25 Jul 2023 15:01:06 -0700 (PDT) Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-1bba254a7d4so650191fac.2; Tue, 25 Jul 2023 15:01:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690322465; x=1690927265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sNrWzLvwqEWfm83K2uRioAjV1pOkPLb6ELuVS9z3syU=; b=h+XCLvqsjKeM7GRAO2yvRxh7nYDqyHfpp/xhltHZEyOy8xi3kh4p/43Kca21j94dN3 JU8KtiHQXU4S4xjhu+I9+HYE/8vAyKznNDmTb6vbWUeRTF/Vixp8ulGmxFFBwZmHeJhs ObLpFFZoRkY1Fgfju5iYjyYTzZSZw4bYq7pa61HP8/1q5YpMXb3Cbarj9T7x0DJQIIek YctXQDYeVsUTwwxLGniQE1Hkw+gQzI1j1HWuGsk+DYB/rUMNzt6MjJLoeSn+InVoITnY QeiUrhezi3i79M66btXVMDqFtwBK00QXUI5qUSrxvUefTJDQcnZL6F7dmIQP3r3HuuZq xULw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690322465; x=1690927265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sNrWzLvwqEWfm83K2uRioAjV1pOkPLb6ELuVS9z3syU=; b=TZ6gmXxHOEVbXBPNmyx78mDlIr1P6hKRtMW5dOw4n/pkW9Kil7CLz/TSaCZ5PJt1jx ShzaN2Z1B40gjKdjTzv2UUUvGg9kM0KCiExxzWVWrh7Ht3hsQdXz5XXMBiP/d4u8j4n6 cPHJvlp9hPbb4ayZAfV1JCI8euHyMgrGFlp/nXIH1ximtsfeugUi0R9bfOi0kkR4VpEe LH2aTzmasBER1QjohYVL0QEdIMrR9vAphWn0QKgAEjZioSsFKo76tHQGo60Y8ls9h/CZ G0q4mFC9G28juy8nsGRz9bI/5TdcTgckM/OR9gvF/Yj5KFZYAWITcB7anFDjEk9OnwqI Nb0Q== X-Gm-Message-State: ABy/qLaNcXlUYhMnmHVQJBm0ZivwY2w4V65EvKGbSUMxdr+Qn3mwYcAo GKDG7jloJQu0VZm6Gx3JHRo= X-Received: by 2002:a05:6870:f615:b0:1b0:5bf7:3bac with SMTP id ek21-20020a056870f61500b001b05bf73bacmr366061oab.37.1690322465502; Tue, 25 Jul 2023 15:01:05 -0700 (PDT) Received: from grumpy-VECTOR.hsd1.tx.comcast.net ([2601:2c3:480:7390:871d:ebb3:c6e2:8ac3]) by smtp.gmail.com with ESMTPSA id v40-20020a4a8c6b000000b0056688eea98csm5870026ooj.27.2023.07.25.15.01.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 15:01:04 -0700 (PDT) From: Jorge Lopez X-Google-Original-From: Jorge Lopez To: hdegoede@redhat.com, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, thomas@t-8ch.de, ilpo.jarvinen@linux.intel.com Subject: [PATCH 5/5] hp-bioscfg: Fix memory leaks in password_elements_from_package() Date: Tue, 25 Jul 2023 17:00:56 -0500 Message-Id: <20230725220056.25560-6-jorge.lopez2@hp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230725220056.25560-1-jorge.lopez2@hp.com> References: <20230725220056.25560-1-jorge.lopez2@hp.com> 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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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: 1772432271471147908 X-GMAIL-MSGID: 1772432271471147908 Address memory leaks in hp_populate_password_elements_from_package() and uninitialized variable errors. Signed-off-by: Jorge Lopez --- Based on the latest platform-drivers-x86.git/for-next --- .../platform/x86/hp/hp-bioscfg/passwdobj-attributes.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c b/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c index 52e4d346b529..5e833ea0c5e3 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c +++ b/drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c @@ -227,7 +227,7 @@ static int hp_populate_password_elements_from_package(union acpi_object *passwor int value_len; int ret; u32 size; - u32 int_value; + u32 int_value = 0; int elem; int reqs; int eloc; @@ -264,6 +264,7 @@ static int hp_populate_password_elements_from_package(union acpi_object *passwor if (expected_password_types[eloc] != password_obj[elem].type) { pr_err("Error expected type %d for elem %d, but got type %d instead\n", expected_password_types[eloc], elem, password_obj[elem].type); + kfree(str_value); return -EIO; } @@ -318,6 +319,8 @@ static int hp_populate_password_elements_from_package(union acpi_object *passwor sizeof(password_data->common.prerequisites[reqs])); kfree(str_value); + str_value = NULL; + } break; case SECURITY_LEVEL: @@ -356,6 +359,8 @@ static int hp_populate_password_elements_from_package(union acpi_object *passwor str_value, sizeof(password_data->encodings[pos_values])); kfree(str_value); + str_value = NULL; + } break; case PSWD_IS_SET: @@ -365,6 +370,9 @@ static int hp_populate_password_elements_from_package(union acpi_object *passwor pr_warn("Invalid element: %d found in Password attribute or data may be malformed\n", elem); break; } + + kfree(str_value); + str_value = NULL; } exit_package: