From nobody Fri May 1 02:59:03 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 4g6G2v6CN4z6bbK0 for ; Fri, 01 May 2026 02:59:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6G2v3j9xz4KVQ for ; Fri, 01 May 2026 02:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777604343; 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=vqf/04+giyx+n2pVfC/FsxlNpg4LRgqqyLFVl78hjXE=; b=xUNQ/mHmilj95qii+gi/xTKLE5g6bBKtDe7vQSybBT7QT5xk834aeTdkRaF0/DcDb722jN DCMpn0lv/epW7iaHapi+NHolFzS9h5prV+fzi3WeFdvYbYHq5p10ZWoiMlZdVmiG708Drd yvEOK1SkyWaHnPUrH51/GoBoOX3vhpYHjZgI5ZKL6ASY1NUkXp/NEgr2V2vILlMs22LSGK LFQYmPs1hxFghrgk3l8WkRzceTVkFeGC7zImiGLkCyRjsrvVEhHs9uNyd5P0bgBarSTx4F R9mfw1gJLGPm/1hCT/LLbzBULvifaxG0+6YDD++TNG9mRgQSBtSm5HXHNPY2KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777604343; a=rsa-sha256; cv=none; b=CejZ6Tv2H1Pt8qqH6dSPlyvJmZWJhQQsqslXtgyhphaQdRZRtC7sbkRel9VS/rb2Rvi9Qe KUdlqQ6ZLIQNB98UHMf6LbqWGEgTY6HHJsNYvMwYwCdCH9Zm+o/WSIwAOMpYDzfs1Cl8sI KN0dmZcUzlD0ousouixEQNxLCwXVWibYk9gtCK5ZDD4lzG900ITKhkUL29HswlADiyATPC vlA3Jm1vHKMcbF9xvWfbjjTHcK6QxHoZe0mszx22VFgU6dcK6TRthXzM9ruWhmE8e4DJQ7 BAKxF/GisgfEkpO+nzL6guSOkwn3BLnkwitC9jqkaaYho0L94fxDDnPVY8TcCg== 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=1777604343; 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=vqf/04+giyx+n2pVfC/FsxlNpg4LRgqqyLFVl78hjXE=; b=SP7l2FWRH78im16TNbAs+H7r5wInOzSlB2tzRrxYeGmAWPC+x/lIovdvQB9Kor03vvIRfJ wWgNURNj6yx6rIIh728HCorQFFEu6Dy+evuZssxODTjDocpwBEsbdMgLxZJ/8g0kg7Bgjv 0cKvnMo+cHGfotfKLEw1q0basJcVRtadCbLBghWcWnFX+u9I+n9XNTjZxQ2Q6tAk375UT2 ju/IAVo9KM0L01OkMV7PZ4lrvwpmrwegNH6SB3alQeoLFR7RDoqJQIgUe+XYIXCOODQI77 GaJD5qaZVmYevDFvAXsQyrbICVNkhK5U5rIhClbnUylIJ5D5kyLiVHvylZ50vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6G2v3GKBzgCw for ; Fri, 01 May 2026 02:59:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42943 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 02:59:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: d98f4f0698ef - main - ssp: fix our gets_s implementation under _FORTIFY_SOURCE 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d98f4f0698ef0c5178882c544b4c38542d4780f0 Auto-Submitted: auto-generated Date: Fri, 01 May 2026 02:59:03 +0000 Message-Id: <69f416f7.42943.1330d5e6@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=d98f4f0698ef0c5178882c544b4c38542d4780f0 commit d98f4f0698ef0c5178882c544b4c38542d4780f0 Author: Kyle Evans AuthorDate: 2026-05-01 02:57:51 +0000 Commit: Kyle Evans CommitDate: 2026-05-01 02:58:48 +0000 ssp: fix our gets_s implementation under _FORTIFY_SOURCE Annex K specifies an interface for handling constraint violations from gets_s, but we previously broke this for some classes of get_s misuse. Provide a more nuanced version that tries to dodge errors that would trigger a constraint handler while still providing value. Notably, we don't want to trigger a failure unless the passed-in length reasonably fits within an RSIZE_MAX, because gets_s will immediately call larger lengths bogus and fail. PR: 294881 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56734 --- include/ssp/stdio.h | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/include/ssp/stdio.h b/include/ssp/stdio.h index 630683951e4b..17bda8d3ee2d 100644 --- a/include/ssp/stdio.h +++ b/include/ssp/stdio.h @@ -36,6 +36,10 @@ #include +#if __SSP_FORTIFY_LEVEL > 0 && __EXT1_VISIBLE +#include +#endif + __BEGIN_DECLS #if __SSP_FORTIFY_LEVEL > 0 #if __POSIX_VISIBLE @@ -51,7 +55,31 @@ __ssp_redirect(size_t, fread, (void *__restrict __buf, size_t __len, __ssp_redirect(size_t, fread_unlocked, (void *__restrict __buf, size_t __len, size_t __nmemb, FILE *__restrict __fp), (__buf, __len, __nmemb, __fp)); #if __EXT1_VISIBLE -__ssp_redirect(char *, gets_s, (char *__buf, rsize_t __len), (__buf, __len)); +__ssp_redirect_raw_impl(char *, gets_s, gets_s, + (char *buf, rsize_t len)) +{ + char *retbuf; + size_t bufsz; + int need_fail = 0; + + /* + * If we would have overwritten our buffer, we want to fail the check + * only if these arguments wouldn't have triggered a constraint + * violation. + */ + bufsz = __ssp_bos(buf); + if (bufsz != (size_t)-1 && (size_t)len > bufsz) { + if (len <= RSIZE_MAX) + __chk_fail(); + need_fail = 1; + } + + retbuf = __ssp_real(gets_s)(buf, len); + if (need_fail && retbuf != NULL) + __chk_fail(); + return (retbuf); +} + #endif /* __EXT1_VISIBLE */ __ssp_redirect_raw(char *, tmpnam, tmpnam, (char *__buf), (__buf), 1, __ssp_bos, L_tmpnam);