From nobody Wed Nov 18 07:40:27 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 4jTtmq4V26z6yxX2 for ; Wed, 18 Nov 2026 07:40:27 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTtmq3Yckz4HQ8 for ; Wed, 18 Nov 2026 07:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794987627; 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=/qDbL88HewsRjDIshhEHKQkJ/ie7Xw6J9liI1ZL5dr4=; b=mYZhMY/6tDYStGHK+TQXvLA/S+c0PE05Cz4tCqlBIila0dVHTobYg1Xvdr1DOlJm2EKBRr Mms10iw/uyP7FXoCsYaLGITljHSA47aPcbfIi/XtBkGBwODSNhU9flnGBK+D4HGdCmG7Lt hBsfA7rJOQ3nM7WexcR0vtxZ0JV8QI0+ljCIipLY1VVL7KvMZK+8UWeMEkg8nOvbNxkjEI hW4KFeZ6sVxVh3HhR4bFwm8dHx7P8qbm/9AYkXce2eMejtJ6sRye1nOwB9TSk5oNYYa12Z KCYrOiq5ZpL0QxuS/c9R4cAYvbC19sGJqOr9hd9EKE+sRWyFyp44mInconfGvA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794987627; b=kS4h+9iF6V4x8zAp+fG/VwmxVyb/giPLs2zrksydGG382TzKM05JPVArWF6b6Oqna/TGHq sfeASI9ujkebn8CQtj1vh6oDiiBbjdiUOtgK71TeH4tMM7hwz3PBZp+NcMvrzc3LP9cLdT 6a9yyYUyhy8wrakRxlrJQ+RFL+wjEcYoP2fPnUgYsEbu+RtaNfR2ei8f9Dj6dvG/dGZWNg tDPE39GKfb2CCS18WmhU20M74097vOmdzTepcvvfhsz2jHIO3oUw9KDL4a+2RVlffYXACF Wim1v2NetJXAQE9LXFTdcOI6vgH1uY9o64qKwXYZkja2rJVghgc9y9SUMmtVMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794987627; 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=/qDbL88HewsRjDIshhEHKQkJ/ie7Xw6J9liI1ZL5dr4=; b=KpPSRfxonjAeA1OtUEKhsCWkZWZeVWWHqvph91zvX+6jz4G4Uzc10qNaL5+W/58+DjThcq kkptsgV84+OZ77ApPtyybH9CPWQm0b/HnQCd0oZDgHcJ2R/EET11yNLpxIX/4ULJb03+cE otICMRGX6ENDmeWqs2KuxlwTC/94BVEQV/PnJiSjrUvrke5XmDMwSEfoEW0B44kTlk10Nk RbFhMFxaF2a97lKI9ClBIecfdpN3A2trYgNCbMkk+za4Kx30msEEEbVb/lAfa+6ZjV/RQL XxA3VuHOh2IwzA1Gq3fLx6wA26f7582L/kpA97Zw7FcCk1j0B6IhAMxcIHBU+g== 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 4jTtmq2rF6z1JcF for ; Wed, 18 Nov 2026 07:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 12967 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Nov 2026 07:40:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5f4a02c1d889 - main - soelim: bound include recursion to 64 levels List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f4a02c1d8890c2a42b65967d7479aac3ec508e8 Auto-Submitted: auto-generated Date: Wed, 18 Nov 2026 07:40:27 +0000 Message-Id: <6afd566b.12967.615f9c0f@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5f4a02c1d8890c2a42b65967d7479aac3ec508e8 commit 5f4a02c1d8890c2a42b65967d7479aac3ec508e8 Author: Baptiste Daroussin AuthorDate: 2026-11-18 06:17:00 +0000 Commit: Baptiste Daroussin CommitDate: 2026-11-18 07:40:20 +0000 soelim: bound include recursion to 64 levels --- usr.bin/soelim/soelim.c | 18 +++++++++++++++--- usr.bin/soelim/tests/soelim_test.sh | 8 ++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c index 51f3203c067f..fe363b9e8827 100644 --- a/usr.bin/soelim/soelim.c +++ b/usr.bin/soelim/soelim.c @@ -37,7 +37,11 @@ #define C_OPTION 0x1 +/* Maximum number of nested .so files to process. */ +#define MAX_INCLUDE_DEPTH 64 + static StringList *includes; +static int include_depth; static void usage(void) @@ -90,6 +94,7 @@ soelim_file(FILE *f, const char *name, int flag) if (f == NULL) return (1); + include_depth++; ret = 0; while ((linelen = getline(&line, &linecap, f)) > 0) { if (strncmp(line, ".so", 3) != 0) { @@ -117,20 +122,27 @@ soelim_file(FILE *f, const char *name, int flag) printf("%s", line); continue; } + if (include_depth >= MAX_INCLUDE_DEPTH) { + warnx("%s: too many nested includes", walk); + ret = 1; + break; + } if (soelim_file(soelim_fopen(walk), walk, flag) == 1) { - free(line); - return (1); + ret = 1; + break; } if (*cp != '\0') printf("%s", cp); } + include_depth--; if (ferror(f)) { warn("%s", name); ret = 1; } free(line); - fclose(f); + if (f != stdin) + fclose(f); return (ret); } diff --git a/usr.bin/soelim/tests/soelim_test.sh b/usr.bin/soelim/tests/soelim_test.sh index 5624a991ca35..bf126d35260b 100755 --- a/usr.bin/soelim/tests/soelim_test.sh +++ b/usr.bin/soelim/tests/soelim_test.sh @@ -126,6 +126,14 @@ errors_body() -e ignore \ -s exit:1 \ sh -c 'soelim basic.in > /dev/full' + + # Self-inclusion is bounded. + printf '.so self\n' > self + atf_check \ + -o empty \ + -e match:"too many nested includes" \ + -s exit:1 \ + soelim self } atf_init_test_cases()