From nobody Thu Oct 01 15:20:24 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 4hwbFh4dBtz6v5J1 for ; Thu, 01 Oct 2026 15:20:24 +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 4hwbFh2tCHz4KkH for ; Thu, 01 Oct 2026 15:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790868024; 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=7/AT7WCMpwYuZMXQzRXIFZC65eF++3GbmL6iAKReaI0=; b=eSAW5eKC8EOK8hHobcS7ebwf1bFjU4Mto4A8Nj6M+4jrRJ7ZVrN+Fl5NeHeljeerxGTW8Q zTAxPeAkKnjenvQsgX0y0ZizmvYkRqFuNehR6s9YV4BksnptswBkWIi0db3xXX0t7mmY3N 9TDrmNSEnnuPcFNcFzChEYOQXY0Fx2hy7mtEG770M10rfeCsciG7sSBBZ7CcSFEdkrKwFN 4YVPn9z9oqozUjnwfQ8FpMSjXOlH0wyxZZwX2P0sP0hGk6iC/vFuwgLomRF3AR1DjlVtjL cfz4By8lk/LAZWnJ3yFel+OJlfdHJ+VrAlD+U2VJZqcz4tAwvoG0+YHBHL3uAA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790868024; b=sS69sx+cPb7GpwHDs6f04EZM8iEdIvEuo0aj8dRAcJfcnuy+XfmYt/H0WAB38SYZO9TXWh Dj8W46vJxQ8CnBwTHNk328ot/Ck6v19DWL7p2qq7ctv2TuESylpJ+uHsX2BjuSjPJDfhwg Nn/uEfweIOqGpfZEJxKFffu3Wa5IkbD2jjb8/0Y3Nmd7a9bbTBgXmJXiZfoOvgO97Gm37g mFZ1ThYK7FS4iUhETIv5zlV6vXMfkRJpVAxLk2W+iqstr0wXXDOHwRBRcWH9vaRZsu/7oV CVatKDoQ74FfcX4aqBG6zTGtyrYporF5FaNXLcvEYh/fup42ll1Fn1DKviCIFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790868024; 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=7/AT7WCMpwYuZMXQzRXIFZC65eF++3GbmL6iAKReaI0=; b=e8QtCg6KJKmPiBmyiD7q1cYnWb1wBsNwGmZik8gE3Abt6tFchueDYUk3EuZGSuuZ5Ifpwn mmxy1pyDCvFHGUYJS7uhzJHeUl6l1yEmbuTSzhR7hasbJjTT73BrW4jwYtst5nub4srzi0 k1SiGNhLzd6IzX5TeakhhZz/+I1vylS4eDcIw+cO+qudTxg+8JaMdUWQ6gCptCFTNnJ5Cz qVuTceO+qmrystGhG6q9vL+kehaY3uJ3yBvstVezf5u6QyZLAD+PvSfdP3tlUJNz9GJ0/V gr+e/t0+ZMdj6OH6nyNkdzFDewZBjTNPmnZpIWmp29s7IsTeQP+2W3QUdYNtzw== 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 4hwbFh1xr1zdfy for ; Thu, 01 Oct 2026 15:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a0e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 15:20:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6ff5cdcbead5 - stable/15 - ppp: Fix address leaks 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6ff5cdcbead522cb9096d0bfed62e271cb3768d3 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 15:20:24 +0000 Message-Id: <6abe7a38.3a0e4.19d39a8e@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6ff5cdcbead522cb9096d0bfed62e271cb3768d3 commit 6ff5cdcbead522cb9096d0bfed62e271cb3768d3 Author: Mark Johnston AuthorDate: 2026-09-16 12:13:25 +0000 Commit: Mark Johnston CommitDate: 2026-10-01 13:42:29 +0000 ppp: Fix address leaks Avoid printing timer addresses, so as to not divulge information about the address space layout. In ip.c, print the actual SPI instead of a pointer to the SPI in the header buffer. When debug logging is enabled, don't leak pointers when logging function arguments or return values. Reported by: Reo Shiseki MFC after: 2 weeks Sponsored by: The FreeBSD Foundation (cherry picked from commit c91777f23a3b13649cdf303515ee45a04c788af3) --- usr.sbin/ppp/id.c | 4 ++-- usr.sbin/ppp/ip.c | 8 ++++---- usr.sbin/ppp/radius.c | 4 ++-- usr.sbin/ppp/timer.c | 19 +++++++++++-------- usr.sbin/ppp/tty.c | 3 +-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c index c7d512380afa..5dd98cfee024 100644 --- a/usr.sbin/ppp/id.c +++ b/usr.sbin/ppp/id.c @@ -96,7 +96,7 @@ ID0ioctl(int fd, unsigned long req, void *arg) ID0set0(); ret = ioctl(fd, req, arg); - log_Printf(LogID0, "%d = ioctl(%d, %lu, %p)\n", ret, fd, req, arg); + log_Printf(LogID0, "%d = ioctl(%d, %lu)\n", ret, fd, req); ID0setuser(); return ret; } @@ -132,7 +132,7 @@ ID0fopen(const char *path, const char *mode) ID0set0(); ret = fopen(path, mode); - log_Printf(LogID0, "%p = fopen(\"%s\", \"%s\")\n", ret, path, mode); + log_Printf(LogID0, "%s = fopen(\"%s\", \"%s\")\n", ret ? "file" : "null", path, mode); ID0setuser(); return ret; } diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c index aea1a812e2ea..a147f997f786 100644 --- a/usr.sbin/ppp/ip.c +++ b/usr.sbin/ppp/ip.c @@ -780,8 +780,8 @@ PacketCheck(struct bundle *bundle, u_int32_t family, snprintf(logbuf + loglen, sizeof logbuf - loglen, "ESP: %s ---> ", ncpaddr_ntoa(&srcaddr)); loglen += strlen(logbuf + loglen); - snprintf(logbuf + loglen, sizeof logbuf - loglen, "%s, spi %p", - ncpaddr_ntoa(&dstaddr), payload); + snprintf(logbuf + loglen, sizeof logbuf - loglen, "%s", + ncpaddr_ntoa(&dstaddr)); loglen += strlen(logbuf + loglen); } break; @@ -791,8 +791,8 @@ PacketCheck(struct bundle *bundle, u_int32_t family, snprintf(logbuf + loglen, sizeof logbuf - loglen, "AH: %s ---> ", ncpaddr_ntoa(&srcaddr)); loglen += strlen(logbuf + loglen); - snprintf(logbuf + loglen, sizeof logbuf - loglen, "%s, spi %p", - ncpaddr_ntoa(&dstaddr), payload + sizeof(u_int32_t)); + snprintf(logbuf + loglen, sizeof logbuf - loglen, "%s", + ncpaddr_ntoa(&dstaddr)); loglen += strlen(logbuf + loglen); } break; diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c index 77a38dead19e..8b1f6f2a5e45 100644 --- a/usr.sbin/ppp/radius.c +++ b/usr.sbin/ppp/radius.c @@ -1058,7 +1058,7 @@ radius_Authenticate(struct radius *r, struct authinfo *authp, const char *name, else { log_Printf(log_IsKept(LogRADIUS) ? LogRADIUS : LogPHASE, "Radius: Request sent\n"); - log_Printf(LogDEBUG, "Using radius_Timeout [%p]\n", radius_Timeout); + log_Printf(LogDEBUG, "Using radius_Timeout\n"); r->cx.timer.load = tv.tv_usec / TICKUNIT + tv.tv_sec * SECTICKS; r->cx.timer.func = radius_Timeout; r->cx.timer.name = "radius auth"; @@ -1284,7 +1284,7 @@ radius_Account(struct radius *r, struct radacct *ac, struct datalink *dl, if ((got = rad_init_send_request(r->cx.rad, &r->cx.fd, &tv))) radius_Process(r, got); else { - log_Printf(LogDEBUG, "Using radius_Timeout [%p]\n", radius_Timeout); + log_Printf(LogDEBUG, "Using radius_Timeout\n"); r->cx.timer.load = tv.tv_usec / TICKUNIT + tv.tv_sec * SECTICKS; r->cx.timer.func = radius_Timeout; r->cx.timer.name = "radius acct"; diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c index 469f68c715de..4f2b2a98f823 100644 --- a/usr.sbin/ppp/timer.c +++ b/usr.sbin/ppp/timer.c @@ -80,6 +80,7 @@ timer_Start(struct pppTimer *tp) struct pppTimer *t, *pt; u_long ticks = 0; sigset_t mask, omask; + int i; sigemptyset(&mask); sigaddset(&mask, SIGALRM); @@ -89,7 +90,7 @@ timer_Start(struct pppTimer *tp) StopTimerNoBlock(tp); if (tp->load == 0) { - log_Printf(LogTIMER, "%s timer[%p] has 0 load!\n", tp->name, tp); + log_Printf(LogTIMER, "%s timer has 0 load!\n", tp->name); sigprocmask(SIG_SETMASK, &omask, NULL); return; } @@ -102,7 +103,7 @@ timer_Start(struct pppTimer *tp) ticks = RESTVAL(itimer) - TimerList->rest; pt = NULL; - for (t = TimerList; t; t = t->next) { + for (i = 0, t = TimerList; t; t = t->next, i++) { if (ticks + t->rest >= tp->load) break; ticks += t->rest; @@ -113,10 +114,11 @@ timer_Start(struct pppTimer *tp) tp->rest = tp->load - ticks; if (t) - log_Printf(LogTIMER, "timer_Start: Inserting %s timer[%p] before %s " - "timer[%p], delta = %ld\n", tp->name, tp, t->name, t, tp->rest); + log_Printf(LogTIMER, "timer_Start: Inserting %s timer[%d] before %s " + "timer[%d], delta = %ld\n", tp->name, i, t->name, i + 1, + tp->rest); else - log_Printf(LogTIMER, "timer_Start: Inserting %s timer[%p]\n", tp->name, tp); + log_Printf(LogTIMER, "timer_Start: Inserting %s timer[%d]\n", tp->name, i); /* Insert given *tp just before *t */ tp->next = t; @@ -237,6 +239,7 @@ timer_Show(int LogLevel, struct prompt *prompt) struct itimerval itimer; struct pppTimer *pt; long rest; + int i; /* * Adjust the base time so that the deltas reflect what's really @@ -253,14 +256,14 @@ timer_Show(int LogLevel, struct prompt *prompt) #define SECS(val) ((val) / SECTICKS) #define HSECS(val) (((val) % SECTICKS) * 100 / SECTICKS) #define DISP \ - "%s timer[%p]: freq = %ld.%02lds, next = %lu.%02lus, state = %s\n", \ - pt->name, pt, SECS(pt->load), HSECS(pt->load), SECS(rest), \ + "%s timer[%d]: freq = %ld.%02lds, next = %lu.%02lus, state = %s\n", \ + pt->name, i, SECS(pt->load), HSECS(pt->load), SECS(rest), \ HSECS(rest), tState2Nam(pt->state) if (!prompt) log_Printf(LogLevel, "---- Begin of Timer Service List---\n"); - for (pt = TimerList; pt; pt = pt->next) { + for (pt = TimerList, i = 0; pt; pt = pt->next, i++) { rest += pt->rest; if (prompt) prompt_Printf(prompt, DISP); diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c index f0a76d648faf..2c2df6f151d2 100644 --- a/usr.sbin/ppp/tty.c +++ b/usr.sbin/ppp/tty.c @@ -187,8 +187,7 @@ tty_StartTimer(struct physical *p) dev->Timer.func = tty_Timeout; dev->Timer.name = "tty CD"; dev->Timer.arg = p; - log_Printf(LogDEBUG, "%s: Using tty_Timeout [%p]\n", - p->link.name, tty_Timeout); + log_Printf(LogDEBUG, "%s: Using tty_Timeout\n", p->link.name); timer_Start(&dev->Timer); }