jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check error return values 

Both tty.resize and notifySocket.setupSocket return an error which isn't
handled in the caller. Fix this and either log or propagate the errors.

Found using https://github.com/mvdan/unparam

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
This commit is contained in:
Tobias Klauser 2017-08-17 11:41:19 +02:00
parent c6126b2141
commit 4c5bf649d0
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
signals.go
View File

@ -75,11 +75,15 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
} }
// perform the initial tty resize. // perform the initial tty resize.
tty.resize() if err := tty.resize(); err != nil {
logrus.Error(err)
}
for s := range h.signals { for s := range h.signals {
switch s { switch s {
case unix.SIGWINCH: case unix.SIGWINCH:
tty.resize() if err := tty.resize(); err != nil {
logrus.Error(err)
}
case unix.SIGCHLD: case unix.SIGCHLD:
exits, err := h.reap() exits, err := h.reap()
if err != nil { if err != nil {

5
utils_linux.go
View File

@ -371,7 +371,10 @@ func startContainer(context *cli.Context, spec *specs.Spec, action CtAct, criuOp
} }
if notifySocket != nil { if notifySocket != nil {
notifySocket.setupSocket() err := notifySocket.setupSocket()
if err != nil {
return -1, err
}
} }
// Support on-demand socket activation by passing file descriptors into the container init process. // Support on-demand socket activation by passing file descriptors into the container init process.