From nobody Tue Sep 30 11:21:30 2025 X-Original-To: dev-commits-src-main@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 4cbbGy5vgyz68x9M; Tue, 30 Sep 2025 11:21:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbbGy4prgz3mtn; Tue, 30 Sep 2025 11:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759231290; 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=6qqvGwVxE6iIXMbkAAzQGXc/f8tiGA8wyk5/xfwwqAY=; b=ZkjOI3hukak7FfQQKp2PBfObWY3Xg5sun2fz0pKjyVE/MFj9ZP2uRhxpNwA0L/TkM4+9qG QQU1Ps3AYT6oNM8aem3ztckfW987csXIkXH6QQ7htiVXy5gQP87g7k8jK8u7Nm8s0TbFsQ +orZDA6rmXlrQeJ4RyESX2wIwAZB7HO2mXRSfhULO61cgng1oORyYYgRgB2l04qWGnbdyW RJtUBAxC7VD+N1J+5fw6i3Wuav9tlxaVD/xbcxO6rzJBMX19zMd06SktBzQJOImsTTL+t6 wWgZrr1PF8fXD+XR2C+T3NSXAT5W6q+BvTzyhgzkGvKOU2nHbRgDM7lXqBiyAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759231290; 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=6qqvGwVxE6iIXMbkAAzQGXc/f8tiGA8wyk5/xfwwqAY=; b=DyRr8qXDgezu+r90QA0xjwzJOWqqkkqk/F/VttRcWSRNTNBSBYP2Lzbu7iOvWcdArLWZcE uKUTqiPWEkfYkgkR9uTrW1+d96gOyKzL9sDD0fnRbH/MoUvG63gPOQ2Wp3B/m7RwuQtyua 0PPdtBeoTTxsEiAtUNQQmw+a41ZaCCtX6z4Q9IkZG2DWUzVSDwg2C9buOdjHw16/u10oqc AZDz51cHzKusctmRNo9Xml1pNWNplVcp1WtG7Qv8e6XK08qA16CSJxTEH8iTC+INvMV+pR am5nG14xTH3RpPCzik4UfpMRINX6kqWIozK5BMfQSHC5GGPEytJwkJOh3EsG7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759231290; a=rsa-sha256; cv=none; b=UTTA70C7hs4oc2475hepF9dfyyGtMxjKjT1rAOKBASEr2iWKSWd6WEpbBox689mAMpZZj/ ZTqC+Dq2kpcyJ2V1rRnpcN9/XtZc0zBf2HQ9yHBDOAtV/+Gv48/MfNf/k1rQv5rg65VUp8 qZCyYjW75vqoXKgK14NiRUtNtar3PfEGKl1AwOvLY2bbqojIZHpcV/HNMNq8jlNWfBHdgV nsB0Lgbo8zypF+UeAnK6HqViazNpB9oozY0T3luwcaPWhRYY5a0tK4+fnEIvYqNVNoNPDX OY4r8U5L56MVr30G9XyTSmVNZzUH02cXuoVYM6bnc7uMU53GsqhHM/DkZda+Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cbbGy4N4mzZjF; Tue, 30 Sep 2025 11:21:30 +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 58UBLUuA087951; Tue, 30 Sep 2025 11:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UBLUV6087948; Tue, 30 Sep 2025 11:21:30 GMT (envelope-from git) Date: Tue, 30 Sep 2025 11:21:30 GMT Message-Id: <202509301121.58UBLUV6087948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: d000adfe41e6 - main - gpioc: fix race in ioctl(GPIOCONFIGEVENTS) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d000adfe41e6f2fe8f3dbe92d8fc2d34ae882086 Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=d000adfe41e6f2fe8f3dbe92d8fc2d34ae882086 commit d000adfe41e6f2fe8f3dbe92d8fc2d34ae882086 Author: Ahmad Khalifa AuthorDate: 2025-09-30 11:09:50 +0000 Commit: Ahmad Khalifa CommitDate: 2025-09-30 11:20:25 +0000 gpioc: fix race in ioctl(GPIOCONFIGEVENTS) A race can occur in gpioc_ioctl when it is called with GPIOCONFIGEVENTS closely followed by GPIOSETCONFIG. GPIOSETCONFIG can alter the priv->pins list, making it no longer empty and opening the door for access to priv->events while we are reallocating it. Fix this by holding priv->mtx while handling GPIOCONFIGEVENTS. Reported by: Qiu-ji Chen PR: 289120 Reviewed by: mmel MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D52783 --- sys/dev/gpio/gpioc.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/sys/dev/gpio/gpioc.c b/sys/dev/gpio/gpioc.c index b56fe6b4c37f..9b297bcb1a77 100644 --- a/sys/dev/gpio/gpioc.c +++ b/sys/dev/gpio/gpioc.c @@ -793,6 +793,7 @@ gpioc_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, struct gpio_access_32 *a32; struct gpio_config_32 *c32; struct gpio_event_config *evcfg; + struct gpioc_pin_event *tmp; uint32_t caps, intrflags; switch (cmd) { @@ -908,27 +909,35 @@ gpioc_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int fflag, res = devfs_get_cdevpriv((void **)&priv); if (res != 0) break; - /* If any pins have been configured, changes aren't allowed. */ - if (!SLIST_EMPTY(&priv->pins)) { - res = EINVAL; - break; - } if (evcfg->gp_report_type != GPIO_EVENT_REPORT_DETAIL && evcfg->gp_report_type != GPIO_EVENT_REPORT_SUMMARY) { res = EINVAL; break; } - priv->report_option = evcfg->gp_report_type; /* Reallocate the events buffer if the user wants it bigger. */ - if (priv->report_option == GPIO_EVENT_REPORT_DETAIL && + tmp = NULL; + if (evcfg->gp_report_type == GPIO_EVENT_REPORT_DETAIL && priv->numevents < evcfg->gp_fifo_size) { - free(priv->events, M_GPIOC); - priv->numevents = evcfg->gp_fifo_size; - priv->events = malloc(priv->numevents * + tmp = malloc(priv->numevents * sizeof(struct gpioc_pin_event), M_GPIOC, M_WAITOK | M_ZERO); + } + mtx_lock(&priv->mtx); + /* If any pins have been configured, changes aren't allowed. */ + if (!SLIST_EMPTY(&priv->pins)) { + mtx_unlock(&priv->mtx); + free(tmp, M_GPIOC); + res = EINVAL; + break; + } + if (tmp != NULL) { + free(priv->events, M_GPIOC); + priv->events = tmp; + priv->numevents = evcfg->gp_fifo_size; priv->evidx_head = priv->evidx_tail = 0; } + priv->report_option = evcfg->gp_report_type; + mtx_unlock(&priv->mtx); break; case FIONBIO: /*