From nobody Thu Feb 27 15:14:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z3ZcV5ZlHz5qJ0H; Thu, 27 Feb 2025 15:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3ZcV4wN7z41qW; Thu, 27 Feb 2025 15:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740669242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekxX2BCmQ9uQVvSOLHUb2IhLV0bsq41P8MWrqRW/+q8=; b=cottKsExjvcqaziIHwXvOijzFG8g9rdrVHRHhQ7xkB7j/Bt0DHF3Zq2xTUF7tUrSQKpGss oloK3pWcbAgGQgHhqMmzYwT6C6+LzPeTx7tvsxm/x9pkoOnakzXxsu2XMtA2Ni7865YY9d HbwyW9qvQmILJ2vR3alb9yRaHkIgJhTcbGxzAoYj9+r2rFH1gjlsbge+SRsUQjHbczTWqj nLdFQLQKNIoHPruTGauLN6QyQC3kFQGWDTJ9JElOeYiaEqMjeORqwmhsN26lPV3Bn8GbXH fA0jDobqa+vhB5opaWEP1gQFzn9EF9KXK2torEluk96KXGGXaXEQ7DFCtggkvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740669242; a=rsa-sha256; cv=none; b=ai5gsTOB2wcUYKuwoWqxOwGj8qbl6lFgMdTYfjKAM0mjR4bVETYkeCuVYNr97c0XmSfhw+ r4odf3k2VGUxSz4W4m35eR62YlnlPv3yPYTvY9jMooODC684TQkZUTMZT1uHtODhAdGmIy aBAbyKHg6bs4vEJhaZWeHNr3noSBoxrkSea5qnzIvNriQeD4p7vV2CAzoaDm+xQ17udRrZ bP0D8HgL45jBYlAvVpMtwMPwupS+FKg2urpcCOQZrU4UAk+MdC45FvcPuA3TRyIQcE/6es hNnF7jX03e7sK6Z7Ulnd2099l7jumEtkkeTUkZ81QkfYZRzTEN3EK/xXFvYHfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740669242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ekxX2BCmQ9uQVvSOLHUb2IhLV0bsq41P8MWrqRW/+q8=; b=ZP/rJpjao4SI9h7J29hBPf5R8FaBrBLzrQsE93NUqBvZEACOrJAO7l1fnWAjeQyNsf3kHi AICNSFhrrS1op0YK6D/LChfFHH8STwd3UXmRT4SCohcFD6PkDT3ZGUJw/bn36sJQspi0Ek +o84Ub+44OZeAg9YNav4Ou2orEP6Am4t47rl2yAmL/M4Lm7B3s2UdxSKEGD2uVCVur+hms OdyAq3wdY3xCjC1bop5VXG2uusbkaO2duXt6BG8nGciVqaHWjyVjoM9uEYg1MIVqgh3zdi VWTjfM+f1ct/aVM8Dv0l5eo3r2pKhm+lR4ILWGmk4NuronyOo2BGfwEw8/jJUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z3ZcV4Vxfzp7l; Thu, 27 Feb 2025 15:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51RFE2aD029016; Thu, 27 Feb 2025 15:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RFE2Qs029013; Thu, 27 Feb 2025 15:14:02 GMT (envelope-from git) Date: Thu, 27 Feb 2025 15:14:02 GMT Message-Id: <202502271514.51RFE2Qs029013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 32de28db2327 - stable/14 - acpi_gpiobus: Fix cleanup on set flags failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32de28db2327014b320d2f3b29b5438dcdfd928c Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=32de28db2327014b320d2f3b29b5438dcdfd928c commit 32de28db2327014b320d2f3b29b5438dcdfd928c Author: Andrew Turner AuthorDate: 2024-12-09 15:14:13 +0000 Commit: John Baldwin CommitDate: 2025-02-27 15:10:09 +0000 acpi_gpiobus: Fix cleanup on set flags failure When GPIOBUS_PIN_SETFLAGS fails we called gpiobus_free_ivars to clean up the contents of the ivar, then would free the ivar. This lead to a use-after-free as the ivar had already been set on the child so gpiobus_child_deleted would try to free it again. Fix this by removing the early cleanup and letting gpiobus_child_deleted handle it. Fixes: c9e880c0ceef ("gpiobus: Use a bus_child_deleted method to free ivars for children") Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47670 (cherry picked from commit bb8c68b25333638a20838500ccffee23b4291427) --- sys/dev/gpio/acpi_gpiobus.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c index 14ded4539a5e..254bb951177d 100644 --- a/sys/dev/gpio/acpi_gpiobus.c +++ b/sys/dev/gpio/acpi_gpiobus.c @@ -201,8 +201,6 @@ acpi_gpiobus_enumerate_aei(ACPI_RESOURCE *res, void *context) for (int i = 0; i < devi->gpiobus.npins; i++) { if (GPIOBUS_PIN_SETFLAGS(bus, child, 0, devi->flags)) { - gpiobus_free_ivars(&devi->gpiobus); - free(devi, M_DEVBUF); device_delete_child(bus, child); return (AE_OK); }