maemachinebroke/hakurei
1
0
Fork 0
forked from security/hakurei
Code Pull Requests Activity

system/tmpfiles: do not fail for smaller files

Browse Source 
The limit is meant to be an upper bound. Handle EOF and print verbose message for it instead of failing.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2025-09-08 03:22:10 +09:00
parent 323d132c40
commit da2b9c01ce
4 changed files with 218 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
system/tmpfiles.go
View File

@@ -28,15 +28,15 @@ type tmpfileOp struct {
func (t *tmpfileOp) Type() Enablement { return Process }
func (t *tmpfileOp) apply(*I) error {
msg.Verbose("copying", t)
func (t *tmpfileOp) apply(sys *I) error {
if t.payload == nil {
// this is a misuse of the API; do not return an error message
// this is a misuse of the API; do not return a wrapped error
return errors.New("invalid payload")
}
if b, err := os.Stat(t.src); err != nil {
sys.verbose("copying", t)
if b, err := sys.stat(t.src); err != nil {
return newOpError("tmpfile", err, false)
} else {
if b.IsDir() {
@@ -47,9 +47,20 @@ func (t *tmpfileOp) apply(*I) error {
}
}
if f, err := os.Open(t.src); err != nil {
var r io.ReadCloser
if f, err := sys.open(t.src); err != nil {
return newOpError("tmpfile", err, false)
} else if _, err = io.CopyN(t.buf, f, t.n); err != nil {
} else {
r = f
}
if n, err := io.CopyN(t.buf, r, t.n); err != nil {
if !errors.Is(err, io.EOF) {
_ = r.Close()
return newOpError("tmpfile", err, false)
}
sys.verbosef("copied %d bytes from %q", n, t.src)
}
if err := r.Close(); err != nil {
return newOpError("tmpfile", err, false)
}