From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A5F90189910; Tue, 8 Oct 2024 12:58:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728392309; cv=none; b=pIEV2Fd1lI64pKfazAaYkRiuM2h9F+7x+A0oINubSeedsSqAx6M7VEZvS6F01waE61p7xfQNyxnRpKvcYXkIdJVU6uffBvQQwUiQ2zUU4+OSOq9di6VQXOvFbaQVJAxlbSjn+x5nFKASBenFMfM6b9FJF0GND82prAYtN+wSa3U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728392309; c=relaxed/simple; bh=ioVm7Bopmtaij3vJgTgg/cwadWFufMZXFzkmp63SHvk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HufeCVq/uARZX/gGtx+6FW6Bx7BxG5293T3Iv9sA6IhGhH2uSsLsl+XCWxND5z3zfXDn7+Le22O+70WQzQMF2Tp3DR1VM9i6umeIaZOQ6WaUcTqXmqMDeVHAww/SPgOtD54+vuykVYjM5i+owsVUxlG2dLSZeMZtN47SbyAyrGU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fSEaw4my; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fSEaw4my" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 132BAC4CEC7; Tue, 8 Oct 2024 12:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728392309; bh=ioVm7Bopmtaij3vJgTgg/cwadWFufMZXFzkmp63SHvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fSEaw4my/1eVOr+DnIkASozNDzu6mr3bL1Kb68JO2uOq44eApQopeUHieWfO4rqEw ONF4sxuBcZyBomYAJeyQYmirC8NgIrjouQs2jkYauZWYbcZzRbCfA+1Saj8iRBcyCT l/yzOL3glNYKeHxib0aJSGTg+bgEC/aN6h+UUd4A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aleksandr Burakov , Hans de Goede Subject: [PATCH 6.11 346/558] platform/x86: x86-android-tablets: Fix use after free on platform_device_register() errors Date: Tue, 8 Oct 2024 14:06:16 +0200 Message-ID: <20241008115715.915150713@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115702.214071228@linuxfoundation.org> References: <20241008115702.214071228@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede commit 2fae3129c0c08e72b1fe93e61fd8fd203252094a upstream. x86_android_tablet_remove() frees the pdevs[] array, so it should not be used after calling x86_android_tablet_remove(). When platform_device_register() fails, store the pdevs[x] PTR_ERR() value into the local ret variable before calling x86_android_tablet_remove() to avoid using pdevs[] after it has been freed. Fixes: 5eba0141206e ("platform/x86: x86-android-tablets: Add support for instantiating platform-devs") Fixes: e2200d3f26da ("platform/x86: x86-android-tablets: Add gpio_keys support to x86_android_tablet_init()") Cc: stable@vger.kernel.org Reported-by: Aleksandr Burakov Closes: https://lore.kernel.org/platform-driver-x86/20240917120458.7300-1-a.burakov@rosalinux.ru/ Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20241005130545.64136-1-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman --- drivers/platform/x86/x86-android-tablets/core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/platform/x86/x86-android-tablets/core.c +++ b/drivers/platform/x86/x86-android-tablets/core.c @@ -390,8 +390,9 @@ static __init int x86_android_tablet_pro for (i = 0; i < pdev_count; i++) { pdevs[i] = platform_device_register_full(&dev_info->pdev_info[i]); if (IS_ERR(pdevs[i])) { + ret = PTR_ERR(pdevs[i]); x86_android_tablet_remove(pdev); - return PTR_ERR(pdevs[i]); + return ret; } } @@ -443,8 +444,9 @@ static __init int x86_android_tablet_pro PLATFORM_DEVID_AUTO, &pdata, sizeof(pdata)); if (IS_ERR(pdevs[pdev_count])) { + ret = PTR_ERR(pdevs[pdev_count]); x86_android_tablet_remove(pdev); - return PTR_ERR(pdevs[pdev_count]); + return ret; } pdev_count++; }