netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9956 from thecodingwizard:pty-empty-write

Browse Source 
PiperOrigin-RevId: 603485764
This commit is contained in:
gVisor bot
2024-02-01 14:40:57 -08:00
parent 67f4cf66f7 89c034566e
commit 3c2e5c6ca2
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/fsimpl/devpts/line_discipline.go
+2 -5
View File
@@ -271,11 +271,8 @@ func (l *lineDiscipline) outputQueueWrite(ctx context.Context, src usermem.IOSeq
if err != nil {
return 0, err
}
if n > 0 {
l.masterWaiter.Notify(waiter.ReadableEvents)
return n, nil
}
return 0, linuxerr.ErrWouldBlock
l.masterWaiter.Notify(waiter.ReadableEvents)
return n, nil
}
// replicaOpen is called when a replica file descriptor is opened.
test/syscalls/linux/pty.cc
+20
View File
@@ -1384,6 +1384,26 @@ TEST_F(PtyTest, PartialBadBuffer) {
EXPECT_THAT(munmap(addr, 2 * kPageSize), SyscallSucceeds()) << addr;
}
// Test that writing nothing to the PTY replica's output queue does not return
// an error.
TEST_F(PtyTest, ReplicaWriteNothingCanonical) {
constexpr char kInput[] = "";
EXPECT_THAT(WriteFd(replica_.get(), kInput, strlen(kInput)),
SyscallSucceedsWithValue(strlen(kInput)));
ExpectFinished(master_);
}
TEST_F(PtyTest, ReplicaWriteNothingNonCanonical) {
DisableCanonical();
constexpr char kInput[] = "";
EXPECT_THAT(WriteFd(replica_.get(), kInput, strlen(kInput)),
SyscallSucceedsWithValue(strlen(kInput)));
ExpectFinished(master_);
}
TEST_F(PtyTest, SimpleEcho) {
constexpr char kInput[] = "Mr. Eko";
EXPECT_THAT(WriteFd(master_.get(), kInput, strlen(kInput)),