From nobody Sun Jul 12 14:51:14 2026 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 4gypRW6cX8z6lT8v for ; Sun, 12 Jul 2026 14:51:19 +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 4gypRW66qWz3sxP for ; Sun, 12 Jul 2026 14:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783867879; 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=HnZMUJRm3ST1ThF5nTV+1/+rwPcXFAPWwM1/12BNTbQ=; b=HTniMKc1wvnZTGojhwm+LqH7vBsXrccY6eEgSmXvZsqXXVC31qalri6Xd/8ZUsuGLTseaY 8/g4a71slfKx7GCVf2wzkidjZb1OxEW68UOsi0gId2g0wqRxx1LL/kwmp70Ue+TonI+XEd QrZUSn2cc9rMK8uncOUpz45Kk0mj20ubJmP064ewDArx+YAKYfqHs7g3oA226gGBZ3AWLw 4RRnPQ/1he67l8Em94fEEZdja+LcHmixBh+OzsNjyN7cWqCkTXsprzDlitVwBzA18R5p07 5PeTmwg3HSfJl/ZyHzWSKfnj71hRuKdkY92KQk4ZcTycoWf+b6biO306px465w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783867879; a=rsa-sha256; cv=none; b=mqupV2/TMxxMmpJYaGKsTmz6RB0usqjm58RS8ETqNvU3uQyuDtgpgWHSObg4Ly8a+giPnj n+Tk6YxCnfC9ut0uaQMdPunozjkPjcEzZnbiTcoA64PP/tWsp2n1OwUvA9iuDGrYIwOpsR ZY9Yiel+iVC1EmzCAUvCIg9vY18TXTktkpaadgG2LyZUTtfv1YBMN7MDc4oGMtjkUQlI46 mP+/WAE2fR4kXprs4Q7v5hEm7KA6D/XAOJbILVVfs8leKIM8dilbpv6EC8DT/VKwmxzWnC bMz5WoplfdW0slJNpOLqPk3wVCye4cxOLkaoRVE+AfoCAJQP1JixzuguEDqTCA== 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=1783867879; 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=HnZMUJRm3ST1ThF5nTV+1/+rwPcXFAPWwM1/12BNTbQ=; b=Jn/tOLbbQiNTkVeItMRUkt/sAlYGzPif70ZQXQxR2vDr7tut/FWOgvWZUh8E0+74zl42pA aofuVcLkJEjFwB01U5083tPUUqYgV7ESChoj/Fu/xyoZfQ33/xBGpu04hWNtYpKssc5KrK BcjdPtVE0cBjRPuc8JUhnXpN6Xp+hyg5pxSwjapCPgv+gcnULAnbS2vUordT633I4B/lmO ARMEo3J4335rsPMr2aq7XfLcm4b3H0AhK95ZB511B57n3nIcjqk6WWU3PqEyhYjVcq8DCl GN8jJzeHnmVMHHlHMHF0QS51rhYDE+Cv+FXcvlnQXjj4aA4dlvgNenZN8G3ysw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gypRW50jtz1dP for ; Sun, 12 Jul 2026 14:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b1eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Jul 2026 14:51:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d387a43ec8e2 - main - rockchip: fix stack overflow in rk8xx_rtc 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 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/main X-Git-Reftype: branch X-Git-Commit: d387a43ec8e2663b2d8bc0c8cb02d3a2ff14b6e6 Auto-Submitted: auto-generated Date: Sun, 12 Jul 2026 14:51:14 +0000 Message-Id: <6a53a9e2.3b1eb.641ee5c0@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d387a43ec8e2663b2d8bc0c8cb02d3a2ff14b6e6 commit d387a43ec8e2663b2d8bc0c8cb02d3a2ff14b6e6 Author: Kyle Evans AuthorDate: 2026-07-12 14:51:05 +0000 Commit: Kyle Evans CommitDate: 2026-07-12 14:51:05 +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: mmel Differential Revision: https://reviews.freebsd.org/D58182 --- 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 4b18aaba053d..5cdc27cd035f 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk805.c +++ b/sys/dev/iicbus/pmic/rockchip/rk805.c @@ -167,7 +167,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 1227fd47ee7b..f3974c5ec31b 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk808.c +++ b/sys/dev/iicbus/pmic/rockchip/rk808.c @@ -242,7 +242,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 6d14a26a87af..461a832d4d42 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk817.c +++ b/sys/dev/iicbus/pmic/rockchip/rk817.c @@ -498,7 +498,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;