diff options
author | Michael Pratt <mpratt@google.com> | 2019-05-20 16:52:03 -0700 |
---|---|---|
committer | Shentubot <shentubot@google.com> | 2019-05-20 16:53:08 -0700 |
commit | 80cc2c78e52389015459114b1689cd3265726679 (patch) | |
tree | 7e22337fdd4dbaa91b7124e863e48368cf4ea83f /pkg/p9/messages.go | |
parent | 6588427451c605ee00c8b1a9b6cba06724627ccb (diff) |
Forward named pipe creation to the gofer
The backing 9p server must allow named pipe creation, which the runsc
fsgofer currently does not.
There are small changes to the overlay here. GetFile may block when
opening a named pipe, which can cause a deadlock:
1. open(O_RDONLY) -> copyMu.Lock() -> GetFile()
2. open(O_WRONLY) -> copyMu.Lock() -> Deadlock
A named pipe usable for writing must already be on the upper filesystem,
but we are still taking copyMu for write when checking for upper. That
can be changed to a read lock to fix the common case.
However, a named pipe on the lower filesystem would still deadlock in
open(O_WRONLY) when it tries to actually perform copy up (which would
simply return EINVAL). Move the copy up type check before taking copyMu
for write to avoid this.
p9 must be modified, as it was incorrectly removing the file mode when
sending messages on the wire.
PiperOrigin-RevId: 249154033
Change-Id: Id6637130e567b03758130eb6c7cdbc976384b7d6
Diffstat (limited to 'pkg/p9/messages.go')
-rw-r--r-- | pkg/p9/messages.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/p9/messages.go b/pkg/p9/messages.go index 703753c31..75d6bc832 100644 --- a/pkg/p9/messages.go +++ b/pkg/p9/messages.go @@ -1163,8 +1163,8 @@ type Tmknod struct { // Name is the device name. Name string - // Permissions are the device permissions. - Permissions FileMode + // Mode is the device mode and permissions. + Mode FileMode // Major is the device major number. Major uint32 @@ -1180,7 +1180,7 @@ type Tmknod struct { func (t *Tmknod) Decode(b *buffer) { t.Directory = b.ReadFID() t.Name = b.ReadString() - t.Permissions = b.ReadPermissions() + t.Mode = b.ReadFileMode() t.Major = b.Read32() t.Minor = b.Read32() t.GID = b.ReadGID() @@ -1190,7 +1190,7 @@ func (t *Tmknod) Decode(b *buffer) { func (t *Tmknod) Encode(b *buffer) { b.WriteFID(t.Directory) b.WriteString(t.Name) - b.WritePermissions(t.Permissions) + b.WriteFileMode(t.Mode) b.Write32(t.Major) b.Write32(t.Minor) b.WriteGID(t.GID) @@ -1203,7 +1203,7 @@ func (*Tmknod) Type() MsgType { // String implements fmt.Stringer. func (t *Tmknod) String() string { - return fmt.Sprintf("Tmknod{DirectoryFID: %d, Name: %s, Permissions: 0o%o, Major: %d, Minor: %d, GID: %d}", t.Directory, t.Name, t.Permissions, t.Major, t.Minor, t.GID) + return fmt.Sprintf("Tmknod{DirectoryFID: %d, Name: %s, Mode: 0o%o, Major: %d, Minor: %d, GID: %d}", t.Directory, t.Name, t.Mode, t.Major, t.Minor, t.GID) } // Rmknod is a mknod response. |