Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[podman-remote] Fix closed connection on pull causes service panic #7899

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions pkg/channel/writer.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package channel

import (
"fmt"
"io"
"sync"

Expand Down Expand Up @@ -32,16 +33,24 @@ func (w *writeCloser) Chan() <-chan []byte {
}

// Write method for WriteCloser
func (w *writeCloser) Write(b []byte) (int, error) {
func (w *writeCloser) Write(b []byte) (bLen int, err error) {
// https://github.com/containers/podman/issues/7896
// when podman-remote pull image, if it was killed, the server will panic: send on closed channel
// so handle it
defer func() {
if rErr := recover(); rErr != nil {
err = fmt.Errorf("%s", rErr)
}
}()
if w == nil || w.ch == nil {
return 0, errors.New("use channel.NewWriter() to initialize a WriteCloser")
}

w.mux.Lock()
defer w.mux.Unlock()
buf := make([]byte, len(b))
copy(buf, b)
w.ch <- buf
w.mux.Unlock()

return len(b), nil
}
Expand Down