Paths

Table of Contentst

Differential D41023

xargs: Prevent overflow in linelen calculation if nargs is large.
ClosedPublic
Actions

Authored by des on Jul 13 2023, 7:59 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Thu, May 2, 12:48 PM

	Unknown Object (File)
	Thu, May 2, 12:48 PM

	Unknown Object (File)
	Thu, May 2, 11:08 AM

	Unknown Object (File)
	Thu, May 2, 10:38 AM

	Unknown Object (File)
	Fri, Apr 26, 1:10 AM

	Unknown Object (File)
	Sat, Apr 20, 4:00 AM

	Unknown Object (File)
	Apr 4 2024, 9:03 AM

	Unknown Object (File)
	Mar 31 2024, 8:45 PM

View All 16 Files

Subscribers

jlduran_gmail.com

Details

Reviewers

Group Reviewers

Commits

rGeab91d008165: xargs: Prevent overflow in linelen calculation if nargs is large.

Summary

MFC after: 1 week
Sponsored by: Klara, Inc.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

des created this revision.Jul 13 2023, 7:59 PM

Herald added a subscriber: imp. · View Herald TranscriptJul 13 2023, 7:59 PM

des requested review of this revision.Jul 13 2023, 7:59 PM

Harbormaster completed remote builds in B52626: Diff 124624.Jul 13 2023, 7:59 PM

des added a parent revision: D41022: xargs: disallow -R0 and -L0.Jul 13 2023, 7:59 PM

kevans accepted this revision.Jul 13 2023, 8:03 PM

This revision is now accepted and ready to land.Jul 13 2023, 8:03 PM

Nice catch! Thank you!
Just a few minor suggestions in the tests.

usr.bin/xargs/tests/regress.n2147483647.out
2	This file needs to be included in `usr.bin/xargs/tests/Makefile`
usr.bin/xargs/tests/regress.sh
3	This needs to be bumped (+1).

For some reason this patch is not working for me, It works fine on macOS. I'll take a closer look later.

Closed by commit rGeab91d008165: xargs: Prevent overflow in linelen calculation if nargs is large. (authored by des). · Explain WhyJul 13 2023, 9:38 PM

This revision was automatically updated to reflect the committed changes.

des added a commit: rGeab91d008165: xargs: Prevent overflow in linelen calculation if nargs is large..

jlduran_gmail.com mentioned this in D41033: xargs/tests: Include expected output file for -nMAX_INT.Jul 13 2023, 11:01 PM

jlduran_gmail.com added inline comments.Jul 14 2023, 6:28 PM

usr.bin/xargs/xargs.c
261	@des, sorry to insist, but I had to `malloc` -> `calloc` in order to get your test passing. Maybe I'm missing something here.

I reverted the addition of the regression test since it triggers OOM kills in ci.freebsd.org and in my local testing environment. The problem is that the test triggers an allocation of 16GB when jemalloc debugging is enabled, and most environments don't have that much RAM available.

Is there any need to allow values for -n larger than ARG_MAX?

des mentioned this in rG15991a682445: xargs: fix -R so that it accepts negative numbers again.Sep 7 2023, 2:52 PM

Revision Contents
Changeset List

Path

Size

usr.bin/

xargs/

tests/

regress.n2147483647.out

1 line

1 line

2 lines

Diff 124634

usr.bin/xargs/tests/regress.n2147483647.out

Loading...

usr.bin/xargs/tests/regress.sh

Loading...

usr.bin/xargs/xargs.c

Loading...