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 9518723D7FF; Wed, 30 Sep 2026 18:36:07 +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=1790793368; cv=none; b=jiMRWuC7/oYHBR85D+70EW41lQzelKt4pCB7xNxtkqk4cleOmiQBHvpQjtYR7BJh8myg3iI+eNrcqOxSfSElLHyL4jkODqmyTVzp5SbDXm4y+byo/5x0xrV0CHUYHcye0lloA90ViP5AZ+hW5IW2HLhyXd7aYNu5F0HE/ZTHwXQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793368; c=relaxed/simple; bh=KGMp9nLBQ5ArO9hlJscyeoSx473n5BwjhHhe1mDqMHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XIfeLRQHjIiLw//C9dDLOAJLJQYzGp3SKkzMPEbTc7XbPqKk6pHOwCBc3+K2xaJU1fMwEB3w/rOyu7ogJOuHpykBSyuoawgY+TCkUqGDnnty+Iup2/HLpdWZFvASFuMV2SzFGyDUnDhpoNfu02rYIsaPjiN9xsRf8qmjNeBFUWY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gLu6g4XE; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gLu6g4XE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABB2D1F000FF; Wed, 30 Sep 2026 18:36:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790793367; bh=u9Z4c2VFyLpeVkVHcOqr7xXmcSMp24ZU7qUasi6iQv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gLu6g4XE0X2j2Z8JXh6upM/xEj1seKmXEzfLSi9P0ysX0VQP3txjHp3D/0D2lJ/tb 4YOg/itX0zZI31RR5GQeFJtzZQEjH/gz18slNAlVPFswv3GIBOrD+V4VKcQ4F7kTKU BsMHXMSfBTFjkC3kOAWaO77P48x27ZCMGqU2yv54= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Kent Gibson , Bartosz Golaszewski Subject: [PATCH 6.18 231/395] gpio: cdev: fix kernel stack leak to user-space in error path Date: Wed, 30 Sep 2026 17:28:13 +0200 Message-ID: <20260930152345.674248826@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152340.591469096@linuxfoundation.org> References: <20260930152340.591469096@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bartosz Golaszewski commit 1feb5d39b05afd902ed9fc902ec5b15be03a4bdb upstream. If we fail to acquire the GPIO chip guard in gpio_desc_to_lineinfo(), we return immediately before zeroing the info struct we'll end up passing to the user-space later in lineinfo_get_v1(). This may leak the kernel stack contents. Make gpio_desc_to_lineinfo() return int so that the -ENODEV returned on failure to acquire the guard can be propagated to the callers. While not strictly necessary: move the memset() before trying to acquire the SRCU read lock too for good measure. Fixes: d83cee3d2bb1 ("gpio: protect the pointer to gpio_chip in gpio_device with SRCU") Cc: stable@vger.kernel.org Reported-by: Sashiko Closes: https://sashiko.dev/#/patchset/20260912123529.7951-1-tzungbi%40kernel.org?part=3 Reviewed-by: Kent Gibson Link: https://patch.msgid.link/20260922-gpio-cdev-stack-leak-fixes-v3-1-7a0c7a4299d5@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski Signed-off-by: Greg Kroah-Hartman --- drivers/gpio/gpiolib-cdev.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) --- a/drivers/gpio/gpiolib-cdev.c +++ b/drivers/gpio/gpiolib-cdev.c @@ -2245,18 +2245,19 @@ static void gpio_v2_line_info_changed_to #endif /* CONFIG_GPIO_CDEV_V1 */ -static void gpio_desc_to_lineinfo(struct gpio_desc *desc, - struct gpio_v2_line_info *info, bool atomic) +static int gpio_desc_to_lineinfo(struct gpio_desc *desc, + struct gpio_v2_line_info *info, bool atomic) { u32 debounce_period_us; unsigned long dflags; const char *label; + memset(info, 0, sizeof(*info)); + CLASS(gpio_chip_guard, guard)(desc); if (!guard.gc) - return; + return -ENODEV; - memset(info, 0, sizeof(*info)); info->offset = gpiod_hwgpio(desc); if (desc->name) @@ -2331,6 +2332,8 @@ static void gpio_desc_to_lineinfo(struct debounce_period_us; info->num_attrs++; } + + return 0; } struct gpio_chardev_data { @@ -2382,6 +2385,7 @@ static int lineinfo_get_v1(struct gpio_c struct gpio_desc *desc; struct gpioline_info lineinfo; struct gpio_v2_line_info lineinfo_v2; + int ret; if (copy_from_user(&lineinfo, ip, sizeof(lineinfo))) return -EFAULT; @@ -2399,7 +2403,10 @@ static int lineinfo_get_v1(struct gpio_c return -EBUSY; } - gpio_desc_to_lineinfo(desc, &lineinfo_v2, false); + ret = gpio_desc_to_lineinfo(desc, &lineinfo_v2, false); + if (ret) + return ret; + gpio_v2_line_info_to_v1(&lineinfo_v2, &lineinfo); if (copy_to_user(ip, &lineinfo, sizeof(lineinfo))) { @@ -2417,6 +2424,7 @@ static int lineinfo_get(struct gpio_char { struct gpio_desc *desc; struct gpio_v2_line_info lineinfo; + int ret; if (copy_from_user(&lineinfo, ip, sizeof(lineinfo))) return -EFAULT; @@ -2436,7 +2444,10 @@ static int lineinfo_get(struct gpio_char if (test_and_set_bit(lineinfo.offset, cdev->watched_lines)) return -EBUSY; } - gpio_desc_to_lineinfo(desc, &lineinfo, false); + + ret = gpio_desc_to_lineinfo(desc, &lineinfo, false); + if (ret) + return ret; if (copy_to_user(ip, &lineinfo, sizeof(lineinfo))) { if (watch) @@ -2562,6 +2573,7 @@ static int lineinfo_changed_notify(struc struct lineinfo_changed_ctx *ctx; struct gpio_desc *desc = data; struct file *fp; + int ret; if (!test_bit(gpiod_hwgpio(desc), cdev->watched_lines)) return NOTIFY_DONE; @@ -2592,7 +2604,13 @@ static int lineinfo_changed_notify(struc ctx->chg.event_type = action; ctx->chg.timestamp_ns = ktime_get_ns(); - gpio_desc_to_lineinfo(desc, &ctx->chg.info, true); + + ret = gpio_desc_to_lineinfo(desc, &ctx->chg.info, true); + if (ret) { + fput(fp); + return NOTIFY_DONE; + } + /* Keep the GPIO device alive until we emit the event. */ ctx->gdev = gpio_device_get(desc->gdev); ctx->cdev = cdev;