From nobody Thu Aug 6 23:21:40 2026 X-Original-To: dev-commits-src-branches@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 4hGNZs6b2Yz6nRmt for ; Thu, 06 Aug 2026 23:21:41 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGNZs0hL2z3Xj6 for ; Thu, 06 Aug 2026 23:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786058501; 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=zjjC5fCKGlgiIAWf4byABGxb5VV6ubmg9sxyepYvf/4=; b=fW8QE0QCgsyWhOX/hmMsJQxpRW7wvHkQjPUIaX6LXhZmO4SyAT5A4Hrfk1uYRgWBi4shhP INt4iHVTHI++7pg1dBK4wWJ1V5RToXOEXZu11OYQrjTue6oaRM0/iIf4wbMNteEjKz31z7 SeNNDgfRvHforhC8f85iG+QMUuw1f6Kss4Jv7PWD1WPSI55VnYZu/OFXU6zTgqVx3qXJTn ynfTr954baJYzSr3ClWvUR/g6mfMGOkJ+eg+7FiGY4FejiCFDo3C1qOO+J8RGuIP/Gren9 DihYxHQ5be6zkDaZKIp9kz1oYGTB/VDJY4AZhkEI2vq/l1uazH6OEYUgK4w6Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786058501; a=rsa-sha256; cv=none; b=pkP8ZLaK9M60VQyNxuw548X9d7BvkYcvLrn2q/DmcBuIUCrEkEGsuyMQ4pXIoq6gzbr775 XSJu2gD3o2iFmRHU3+7KBhU9zQLm64gpEHm7y2TQ/JHXs7znCWMYni03dMlGFn6kjA8BaW MQfJZSa4veWOO9rnDNViEw/xCfoaj5QNcJzaK6p0enVyrwkcU3ooa1uMDX+W+/qAaeo/Zm HFcd8nqsaOwYvzsri7ogv6imqi3uGRbw4YqMiRV4CG3m3kZHuW2LfomF6SC/+atcO8iO0j KNp6A06hgGVWFVdZrXqNkWKwerTkTYAr4F5B2IaZvtOkLYLothMsM/bHsh351A== 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=1786058501; 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=zjjC5fCKGlgiIAWf4byABGxb5VV6ubmg9sxyepYvf/4=; b=TGiymm0bk0iRrvjXgwxvkAWoGDnyew791+Lvzt3agSICnsdWOaWcY6fR+guyKcnW0MbI7A IK/hxePx9eKmrivcIEBM1WUc1v3W5qafVXG5Y2oi6TZBIsqdRbJCqDArEeLtdVKKaHcYwh WYswHedVWOtKfvqHFSSFijiW6ca35A2tYc8gFf1wIdyaqKhhI17WVgrVRJZpwfJC7Ydnff 2BzArWj80DF7FttnZ3hWUpSOKIvjLxzByLIvuA4W8H5hyTEKW90C89aXWscjvfY62Kjos+ d5Lta8gL57kulApoTKnMfJA6cW9lnhOBIljVOhsqv9bVNrrWEhkmRmDye6RU0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGNZr5zZ0zhkK for ; Thu, 06 Aug 2026 23:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24865 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 23:21:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 01e37e47d240 - stable/14 - rockchip: fix stack overflow in rk8xx_rtc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 01e37e47d240db81c7daf1388c7f949ff1c78db6 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 23:21:40 +0000 Message-Id: <6a751704.24865.45aa6ff6@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=01e37e47d240db81c7daf1388c7f949ff1c78db6 commit 01e37e47d240db81c7daf1388c7f949ff1c78db6 Author: Kyle Evans AuthorDate: 2026-07-12 14:51:05 +0000 Commit: Kyle Evans CommitDate: 2026-08-06 22:53:13 +0000 rockchip: fix stack overflow in rk8xx_rtc Presumably surfaced by -fstack-protector-strong, rk8xx_settime was triggering SSP when ntpd set the time on the RockPro64, at the very least. A minor oops meant that the weeks mask was getting tossed into the wrong field, and the mask was never populated. The mask is 0x7 for all three of these, thus overflowing the `data` array in settime by one byte. PR: 296719 Reported by: jsm, "Tenkawa" on Discord Reviewed by: mmelt (cherry picked from commit d387a43ec8e2663b2d8bc0c8cb02d3a2ff14b6e6) --- sys/dev/iicbus/pmic/rockchip/rk805.c | 3 ++- sys/dev/iicbus/pmic/rockchip/rk808.c | 3 ++- sys/dev/iicbus/pmic/rockchip/rk817.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/iicbus/pmic/rockchip/rk805.c b/sys/dev/iicbus/pmic/rockchip/rk805.c index c41d2826c7f1..1b07b39b90a4 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk805.c +++ b/sys/dev/iicbus/pmic/rockchip/rk805.c @@ -168,7 +168,8 @@ rk805_attach(device_t dev) sc->rtc_regs.months = RK805_RTC_MONTHS; sc->rtc_regs.months_mask = RK805_RTC_MONTHS_MASK; sc->rtc_regs.years = RK805_RTC_YEARS; - sc->rtc_regs.weeks = RK805_RTC_WEEKS_MASK; + sc->rtc_regs.weeks = RK805_RTC_WEEKS; + sc->rtc_regs.weeks_mask = RK805_RTC_WEEKS_MASK; sc->rtc_regs.ctrl = RK805_RTC_CTRL; sc->rtc_regs.ctrl_stop_mask = RK805_RTC_CTRL_STOP; sc->rtc_regs.ctrl_ampm_mask = RK805_RTC_AMPM_MODE; diff --git a/sys/dev/iicbus/pmic/rockchip/rk808.c b/sys/dev/iicbus/pmic/rockchip/rk808.c index 8ba4c3520793..103a9a910aae 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk808.c +++ b/sys/dev/iicbus/pmic/rockchip/rk808.c @@ -243,7 +243,8 @@ rk808_attach(device_t dev) sc->rtc_regs.months = RK808_RTC_MONTHS; sc->rtc_regs.months_mask = RK808_RTC_MONTHS_MASK; sc->rtc_regs.years = RK808_RTC_YEARS; - sc->rtc_regs.weeks = RK808_RTC_WEEKS_MASK; + sc->rtc_regs.weeks = RK808_RTC_WEEKS; + sc->rtc_regs.weeks_mask = RK808_RTC_WEEKS_MASK; sc->rtc_regs.ctrl = RK808_RTC_CTRL; sc->rtc_regs.ctrl_stop_mask = RK808_RTC_CTRL_STOP; sc->rtc_regs.ctrl_ampm_mask = RK808_RTC_AMPM_MODE; diff --git a/sys/dev/iicbus/pmic/rockchip/rk817.c b/sys/dev/iicbus/pmic/rockchip/rk817.c index 33c24ec33c93..1ef502d22969 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk817.c +++ b/sys/dev/iicbus/pmic/rockchip/rk817.c @@ -499,7 +499,8 @@ rk817_attach(device_t dev) sc->rtc_regs.months = RK817_RTC_MONTHS; sc->rtc_regs.months_mask = RK817_RTC_MONTHS_MASK; sc->rtc_regs.years = RK817_RTC_YEARS; - sc->rtc_regs.weeks = RK817_RTC_WEEKS_MASK; + sc->rtc_regs.weeks = RK817_RTC_WEEKS; + sc->rtc_regs.weeks_mask = RK817_RTC_WEEKS_MASK; sc->rtc_regs.ctrl = RK817_RTC_CTRL; sc->rtc_regs.ctrl_stop_mask = RK817_RTC_CTRL_STOP; sc->rtc_regs.ctrl_ampm_mask = RK817_RTC_AMPM_MODE;