From nobody Tue Aug 5 11:51:53 2025 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 4bxBbs4393z64N9T; Tue, 05 Aug 2025 11:51:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bxBbs2NXqz3sWM; Tue, 05 Aug 2025 11:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754394713; 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=t7h1fLj4k+wAdS/lFaVyNXFFwPp6P+nEf7naK0P2zzs=; b=xKtoWKC28He+wPZH+/vlrU8jM2qOI5dohgcXzlRr3BmYOrhlmbJBjfoN1t1TI/nOsFnD/e VsK9EsciZujgYeGnXa1Zp1XA6bxzBlS6GvMBF3EyW18fOkzgFqcMeupxVXHKXtnAqrfr0T bdcTNduRnGAmUC2wwIaT2b2n5qn+Ohf2Ku7w1wBrNZK0UgY/cIdA9JHazjYFINPcGiROG5 0to84/OV+gNrQzj4u3WGLcQpdDFTWoaYutFbhXWj3j7B2NSNJEV4g+408q0oi0vHwhfnfd PFA+ScCBAnreLrhsMr0Qpl15sRio3DO/eGRK0Ub/au7L/9lRow+GmAYGkEJvSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754394713; 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=t7h1fLj4k+wAdS/lFaVyNXFFwPp6P+nEf7naK0P2zzs=; b=V0h/mm/92El1S3zH3fm71S41R2qwEnPp1Kbek5mCQ2MK0qgU/6GGbbzBhDF+A2p164ZnKS Y6VhDLlaJnSu+CPc7uvFdeSrxz53wRqoAKXDAKEHPFTnTbfk7dn60RXo50Hb/rCPJm9oKq HAEMmJDAlDPfYJth9AqIJiZkYj6qCa4CeKY+itDSuFg653QAjh0wetkzEWIMOcK8XWAr2b WSK6/lMa7TAessRY7/x8Hi/IA5isR9y3XJ6Y4qBMaAI7wqPjga7m32GMRWDS8LLQLEDfmH q4lXhbFl87HleT1B/E6Qu0JxCFiQdrCK+Q087dAYTILdH/JkcCTWCDgw6/jBZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754394713; a=rsa-sha256; cv=none; b=mXPdSShvgN02WmF+Enm2kLVhUtXwvosn7Vfo0lT1kpWLipU8Nh/B8EJWx3K2K9webgt5qI 3bD9lME9j6dGEcOV7MzlAVVadiumrXpSGAbUe0OHSQmWGhPjW5qBpEErTXz5VRZy4lD+j6 SUkzxQoT+Bt0pT38ksvDo2omGn50e40sfkyGjQuDdcSKfj1IZXGzhb0kfiogMw5la7u4Ry otpHTo6K/dXTwphMAIAheGczuF+FJqhaLgll/S2VUY6XbCJQJJUx7WvQoDO9mhB6xiEtar nc6RPvdT6FldWIKktTO9I0VMWg2cN6Bt4xL56/m7S1KA18RR8WRMagJoj/XViw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bxBbs1Yf7zZX5; Tue, 05 Aug 2025 11:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 575Bpr4H023081; Tue, 5 Aug 2025 11:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 575BprId023078; Tue, 5 Aug 2025 11:51:53 GMT (envelope-from git) Date: Tue, 5 Aug 2025 11:51:53 GMT Message-Id: <202508051151.575BprId023078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b1e5e3b668e5 - stable/14 - xargs: Limit -n to {ARG_MAX} 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b1e5e3b668e587cce59e03c080432d920b23e255 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b1e5e3b668e587cce59e03c080432d920b23e255 commit b1e5e3b668e587cce59e03c080432d920b23e255 Author: Dag-Erling Smørgrav AuthorDate: 2025-07-26 16:44:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-05 09:30:01 +0000 xargs: Limit -n to {ARG_MAX} Since it's not possible to pass more than {ARG_MAX} bytes on the command line, it's also not possible to pass more than {ARG_MAX} individual arguments. Therefore, {ARG_MAX} is a reasonable upper bound for the -n option. This resolves both the arithmetic overflow issue and the CI OOM issue, so we can safely re-enable the test. Fixes: eab91d008165 Fixes: 2682a1552724 MFC after: 1 week Reviewed by: jlduran, emaste Differential Revision: https://reviews.freebsd.org/D51536 (cherry picked from commit a7fa987abe1fb0b25a7dd83dc81f14f64a82efc9) --- ObsoleteFiles.inc | 3 +++ usr.bin/xargs/tests/Makefile | 2 +- .../xargs/tests/{regress.n2147483647.out => regress.nargmax.out} | 0 usr.bin/xargs/tests/regress.sh | 8 ++++---- usr.bin/xargs/xargs.c | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8edc2a281ae9..249eb2b127bc 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250805: Test case renamed +OLD_FILES+=usr/tests/usr.bin/xargs/regress.n2147483647.out + # 20250728: Machine versions of 'runq.h' do not exist anymore OLD_FILES+=usr/include/machine/runq.h diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile index 50545c11f90e..3cbdbbe5af17 100644 --- a/usr.bin/xargs/tests/Makefile +++ b/usr.bin/xargs/tests/Makefile @@ -18,7 +18,7 @@ ${PACKAGE}FILES+= regress.R-1.out ${PACKAGE}FILES+= regress.in ${PACKAGE}FILES+= regress.n1.out ${PACKAGE}FILES+= regress.n2.out -${PACKAGE}FILES+= regress.n2147483647.out +${PACKAGE}FILES+= regress.nargmax.out ${PACKAGE}FILES+= regress.n2P0.out ${PACKAGE}FILES+= regress.n3.out ${PACKAGE}FILES+= regress.normal.out diff --git a/usr.bin/xargs/tests/regress.n2147483647.out b/usr.bin/xargs/tests/regress.nargmax.out similarity index 100% rename from usr.bin/xargs/tests/regress.n2147483647.out rename to usr.bin/xargs/tests/regress.nargmax.out diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index 9b4839d2a8ec..e65a5a703505 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -1,5 +1,5 @@ -echo 1..21 +echo 1..23 REGRESSION_START($1) @@ -12,9 +12,8 @@ REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % <${SRCDIR}/regress.in' REGRESSION_TEST(`R-1', `xargs -I% -R-1 echo The % % % %% % % <${SRCDIR}/regress.in') REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in') -# This test may consume a large amount of memory, making it unsuited to CI -# environments. Disable it for now. -#REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in') +argmax=$(sysctl -n kern.argmax) +REGRESSION_TEST(`nargmax', `xargs -n$argmax <${SRCDIR}/regress.in') REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in | sort') REGRESSION_TEST(`n3', `xargs -n3 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`0', `xargs -0 -n1 echo <${SRCDIR}/regress.0.in') @@ -28,5 +27,6 @@ REGRESSION_TEST_FREEFORM(`parallel1', `echo /var/empty /var/empty | REGRESSION_TEST_FREEFORM(`parallel2', `echo /var/empty /var/empty/nodir | xargs -n1 -P2 test -d; [ $? = 1 ]') REGRESSION_TEST_FREEFORM(`parallel3', `echo /var/empty/nodir /var/empty | xargs -n1 -P2 test -d; [ $? = 1 ]') REGRESSION_TEST_FREEFORM(`parallel4', `echo /var/empty/nodir /var/empty/nodir | xargs -n1 -P2 test -d; [ $? = 1 ]') +REGRESSION_TEST_FREEFORM(`ntoobig', `seq 42 | xargs -n$((argmax+1)); [ $? = 1 ]') REGRESSION_END() diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 51f42ba2c842..9becf6cf9ba1 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -178,7 +178,7 @@ main(int argc, char *argv[]) break; case 'n': nflag = 1; - nargs = (int)strtonum(optarg, 1, INT_MAX, &errstr); + nargs = (int)strtonum(optarg, 1, arg_max, &errstr); if (errstr) errx(1, "-%c %s: %s", ch, optarg, errstr); break;