Page MenuHomeFreeBSD
Differential D50391

cp: Avoid closing an invalid file descriptor.
ClosedPublic
Actions

Authored by des on Sat, May 17, 7:57 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, May 21, 6:57 PM
Unknown Object (File)
Sun, May 18, 7:11 PM
Subscribers
imp
markj

Details

Reviewers
markj
Group Reviewers
Klara
Commits
rGa8aaf8039f2d: cp: Avoid closing an invalid file descriptor.
Summary
  • At the end of copy(), we always close to.dir, even though it can be AT_FDCWD (in the file-to-file case) or even -1 (if we failed to open or create the destination directory). While closing an invalid file descriptor is harmless, it's still bad form.
  • In the DIR_TO_DNE case, initialize to.dir to -1 to guard against the case where mkdir() fails so we never assign anything to to.dir and end up (harmlessly, luckily) closing stdin on our way to the exit.

Coverity ID: 1609954
Fixes: 82fc0d09e862
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.Sat, May 17, 7:57 AM
Herald added a subscriber: imp. · View Herald TranscriptSat, May 17, 7:57 AM
des requested review of this revision.Sat, May 17, 7:57 AM
Harbormaster completed remote builds in B64240: Diff 155606.Sat, May 17, 7:58 AM
markj accepted this revision as: markj.Sat, May 17, 1:35 PM
markj added a subscriber: markj.
markj added inline comments.
bin/cp/cp.c
642

I might also explicitly check to.dir != AT_FDCWD rather than assuming that its value is negative instead of, say, INT_MAX.

This revision is now accepted and ready to land.Sat, May 17, 1:35 PM
Closed by commit rGa8aaf8039f2d: cp: Avoid closing an invalid file descriptor. (authored by des). · Explain WhySun, May 18, 7:10 PM
This revision was automatically updated to reflect the committed changes.
des added a commit: rGa8aaf8039f2d: cp: Avoid closing an invalid file descriptor..

Revision Contents
Changeset List

PathSize
bin/
cp/
10 lines

Diff 155661

View Options

bin/cp/cp.c

Loading...