From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21738581225 for ; Wed, 9 Sep 2026 16:27:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788971232; cv=none; b=eyIpWr4vJb7htLmUGWtTa2zCvU1iiPOuPa1cdOr9CGZbbWhl96ZubUykGt+cSyHdljkubMCpzfqz6gntBj4+JkeWXDQEGi0olGiweg6CxV+ULclpSS1Ddq/r5o/2BADd66GORBFUogt5pQ4fAcs4lVL8A3f05BFr3X5DNCt9+IQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788971232; c=relaxed/simple; bh=eMXDZjqeTkAw/MXp/Br6yDGG9EvdfbP9jnKOncnJkEM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=frGXyrsmZOQYE51EFq3ybS1ZUfQC4fog9yJ7V1AWRMammuzUFi8sR2lsIB+BB2RSJ7DdhxlqQfvLmvxXLTFkRxxArNqrEm6KZLcACVSjnhzCzjZEbF/KluzicyYuGlnutPHi/rmEEx5xkCfiMEGvveBfd51VCOlBntdzEiWXeOw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ANNcLkLy; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ANNcLkLy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87E241F00898; Wed, 9 Sep 2026 16:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788971231; bh=pGOM5IWa6beV3UIrS7xbWKxWKFRX6VNBcD/QXQif27s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ANNcLkLypYh/u8xaXHVh04mj2VZ8xuCBwBVkeJ8eHyXh72pwHvjwRNtsH2iOOtMdk Jdg7lkhUgmFR29iFSZIHAtl5+5L0FC6tf5MLeeJUFJYu/+eFcNcsd/JDMf7a7etVZG 2nWBRJClB7gtgVgzwxX8+tdAvCnnMcJU624NSqYScunN18+TGhyti80IGyOrBc9rbR G4kLknkdGjHKdzekpCcz16nsPdV/pn1zZ39x2phtUdSofKsebZjLlktdQY4/OT8TcC dzl1YhmenXvdnbC3IrZ1pC1Za2XEt4DKKYl/PtotcGjGVPvSvFSPcl1QRbsZmK4Y24 RZcUt8SSaaOog== From: Sasha Levin To: stable@vger.kernel.org Cc: Abdun Nihaal , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.1.y 2/2] platform/x86: int1092: Fix potential memory leak in sar_probe() Date: Wed, 9 Sep 2026 12:27:07 -0400 Message-ID: <20260909162707.2982951-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260909162707.2982951-1-sashal@kernel.org> References: <2026090358-venomous-devotedly-9b77@gregkh> <20260909162707.2982951-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Abdun Nihaal [ Upstream commit 30c906cff490c3601ee9ff110fe8115fabe75fd4 ] The memory allocated for device_mode_info in parse_package() called by sar_get_data() is not freed in some of the error paths in sar_probe(). Fix that by converting to use device managed allocations. Fixes: dcfbd31ef4bc ("platform/x86: BIOS SAR driver for Intel M.2 Modem") Cc: stable@vger.kernel.org Signed-off-by: Abdun Nihaal Link: https://patch.msgid.link/20260723-platx86-v4-1-93b4a178b595@cse.iitm.ac.in Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen Signed-off-by: Sasha Levin --- .../platform/x86/intel/int1092/intel_sar.c | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/drivers/platform/x86/intel/int1092/intel_sar.c b/drivers/platform/x86/intel/int1092/intel_sar.c index 50495c3855474..e9eb0bb79ab83 100644 --- a/drivers/platform/x86/intel/int1092/intel_sar.c +++ b/drivers/platform/x86/intel/int1092/intel_sar.c @@ -95,8 +95,10 @@ static acpi_status parse_package(struct wwan_sar_context *context, union acpi_ob item->package.count <= data->total_dev_mode) return AE_ERROR; - data->device_mode_info = kmalloc_objs(struct wwan_device_mode_info, - data->total_dev_mode); + data->device_mode_info = devm_kmalloc_array(&context->sar_device->dev, + data->total_dev_mode, + sizeof(*data->device_mode_info), + GFP_KERNEL); if (!data->device_mode_info) return AE_ERROR; @@ -258,7 +260,7 @@ static int sar_probe(struct platform_device *device) if (!handle) return -ENODEV; - context = kzalloc_obj(*context); + context = devm_kzalloc(&device->dev, sizeof(*context), GFP_KERNEL); if (!context) return -ENOMEM; @@ -269,7 +271,7 @@ static int sar_probe(struct platform_device *device) result = guid_parse(SAR_DSM_UUID, &context->guid); if (result) { dev_err(&device->dev, "SAR UUID parse error: %d\n", result); - goto r_free; + return result; } for (reg = 0; reg < MAX_REGULATORY; reg++) @@ -277,43 +279,29 @@ static int sar_probe(struct platform_device *device) if (sar_get_device_mode(device) != AE_OK) { dev_err(&device->dev, "Failed to get device mode\n"); - result = -EIO; - goto r_free; + return -EIO; } result = sysfs_create_group(&device->dev.kobj, &intcsar_group); if (result) { dev_err(&device->dev, "sysfs creation failed\n"); - goto r_free; + return result; } if (acpi_install_notify_handler(ACPI_HANDLE(&device->dev), ACPI_DEVICE_NOTIFY, sar_notify, (void *)device) != AE_OK) { dev_err(&device->dev, "Failed acpi_install_notify_handler\n"); - result = -EIO; - goto r_sys; + sysfs_remove_group(&device->dev.kobj, &intcsar_group); + return -EIO; } return 0; - -r_sys: - sysfs_remove_group(&device->dev.kobj, &intcsar_group); -r_free: - kfree(context); - return result; } static void sar_remove(struct platform_device *device) { - struct wwan_sar_context *context = dev_get_drvdata(&device->dev); - int reg; - acpi_remove_notify_handler(ACPI_HANDLE(&device->dev), ACPI_DEVICE_NOTIFY, sar_notify); sysfs_remove_group(&device->dev.kobj, &intcsar_group); - for (reg = 0; reg < MAX_REGULATORY; reg++) - kfree(context->config_data[reg].device_mode_info); - - kfree(context); } static struct platform_driver sar_driver = { -- 2.53.0