Skip to content

fix potential too many open files for xtables.lock #127

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.

Sign up for GitHub

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

Open
ttbug wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −3
Open

fix potential too many open files for xtables.lock #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions iptables/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@ type Unlocker interface {
Unlock() error
}

type nopUnlocker struct{}
type nopUnlocker struct {
fd int
}

func (_ nopUnlocker) Unlock() error { return nil }
func (n *nopUnlocker) Unlock() error {
return syscall.Close(n.fd)
}

type fileLock struct {
// mu is used to protect against concurrent invocations from within this process
Expand All @@ -57,7 +61,7 @@ func (l *fileLock) tryLock() (Unlocker, error) {
switch err {
case syscall.EWOULDBLOCK:
l.mu.Unlock()
return nopUnlocker{}, nil
return &nopUnlocker{l.fd}, nil
case nil:
return l, nil
default:
Expand Down