From nobody Thu Oct 08 20:43:37 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 4j125Q1Pdfz6wCjZ for ; Thu, 08 Oct 2026 20:43:38 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j125Q0YKMz4bNh for ; Thu, 08 Oct 2026 20:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492218; 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=mYQX84+VfNDg6SjWTLZOm2aWtvbitobryWZEKkpnK0w=; b=Ow70YjT+UMunxatTNzHwrrYRpuK2XoRqExbN7/n+iGfIHCWqoALWbMAoyaMTr69/3tcana Y15DmK1uuDlV5j20sES8xKMIwoZRQUaWnnh2JFSa4rR6981etV6FASi+KzobmEK4PVmuoM xnO2E6frPX5yYVALBDpYC8SHQ+3fApBnFy/CUfYRx8mad2inbJ/A0zXOB4GadPPUfZX2++ 5r/YpzdmD0xn6O4jkM29iM5zwj0/bwld7UKieGCvt/FIEKjI9mBf9zRo7hxmUIfl2myOuq YYxdF9ikkTCKYI7u/rRZxeJ8uqL5vgaviAhWEOSJyeIq15KJNGCArvyFFEQvPQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492218; b=o8KMt6ywvatyvNyWabdk+ZuDugwK62T62ViPrqjsJYnpjpnft6wgHtGHgLk8l5nYQ0aAaY NTohqrOoOX4p1EyqBSI5z5CHWTzTPb8NMpsgVsnVJ53F4RUPDgjDRURU56YkQHjlwbBWYQ FsP1Yet9yqzMGYEmbpgV00aMmEPVF0UuljChOx7ZK4UP99xVlhjVyFC1mgMrV7ogkViIXq pFvSitLzG2G3pJW7S+Q/tPZeAZcf/OZby6hi8kwOvMmbzmbIpBk+MMnZaB0Ysu37RvK/TK /s6+8QteZ27RVZjH/ZuWkHI6CJAYiNcHkZSNIrbhsYVj2+LTPbiBKRBST+7+vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492218; 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=mYQX84+VfNDg6SjWTLZOm2aWtvbitobryWZEKkpnK0w=; b=clHBnhl/KVFkaneSkQY0Se66LlbSJYXPH4ldThu9MyI05NFC643fifVLcazoxsEo+KSc5E jUTkHydhsWcv/GfxoltC+YKP8IxwjtI4OABhxjXWc6F7bOIkQMY2IFZOVrvoYE5N6FMSgI xoIhXCXHlXhjcfm8NTbncwIyD4RFpNeCMdBRVvpXLOeWTVOLdNo/9uo3FeQcrzgB/bYHGp 6tFR1GHSogiQhZp84cAy6eF5+I3gmONo5t3xdVTNqSikuu0iJymeDJ9OLcpkzxxeXbV+5B POE0Ra9UGaRSwfJhWXhu+rymBLbR9rXKS4zXmPOjUFuNS3gyLTm+roYeEB2oHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j125P6m1SzwWH for ; Thu, 08 Oct 2026 20:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33112 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:43:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: cf5b5966f52c - stable/15 - ppp: Don't fetch a non-existent variadic argument 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cf5b5966f52c8451001fd9fb72e22d0c113504ea Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:43:37 +0000 Message-Id: <6ac80079.33112.32da90ac@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cf5b5966f52c8451001fd9fb72e22d0c113504ea commit cf5b5966f52c8451001fd9fb72e22d0c113504ea Author: John Baldwin AuthorDate: 2026-06-10 13:44:10 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:30 +0000 ppp: Don't fetch a non-existent variadic argument Only fetch the optional mode argument to ID0open to pass to open(2) if O_CREAT is present in the flags argument. It is UB to fetch an argument that doesn't exist. On CHERI this UB results in a fault. Reviewed by: brooks Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D57137 (cherry picked from commit b5a8b933d4994835e10226562ff8126298c96693) --- usr.sbin/ppp/id.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c index 5dd98cfee024..015218184b23 100644 --- a/usr.sbin/ppp/id.c +++ b/usr.sbin/ppp/id.c @@ -145,7 +145,10 @@ ID0open(const char *path, int flags, ...) va_start(ap, flags); ID0set0(); - ret = open(path, flags, va_arg(ap, int)); + if (flags & O_CREAT) + ret = open(path, flags, va_arg(ap, int)); + else + ret = open(path, flags); log_Printf(LogID0, "%d = open(\"%s\", %d)\n", ret, path, flags); ID0setuser(); va_end(ap);