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 #9339 from kevinGC:tcsetsf2

Browse Source 
PiperOrigin-RevId: 563207341
This commit is contained in:
gVisor bot
2023-09-06 13:58:08 -07:00
parent 0230a371c2 7928ff6f0c
commit 4146284b60
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/fsimpl/devpts/master.go
+4
View File
@@ -158,6 +158,10 @@ func (mfd *masterFileDescription) Ioctl(ctx context.Context, io usermem.IO, sysn
case linux.TCSETSW:
// TODO(b/29356795): This should drain the output queue first.
return mfd.t.ld.setTermios(t, args)
case linux.TCSETSF:
// TODO(b/29356795): This should drain the output queue and
// clear the input queue first.
return mfd.t.ld.setTermios(t, args)
case linux.TIOCGPTN:
nP := primitive.Uint32(mfd.t.n)
_, err := nP.CopyOut(t, args[2].Pointer())
pkg/sentry/fsimpl/devpts/replica.go
+4
View File
@@ -170,6 +170,10 @@ func (rfd *replicaFileDescription) Ioctl(ctx context.Context, io usermem.IO, sys
case linux.TCSETSW:
// TODO(b/29356795): This should drain the output queue first.
return rfd.inode.t.ld.setTermios(t, args)
case linux.TCSETSF:
// TODO(b/29356795): This should drain the output queue and
// clear the input queue first.
return rfd.inode.t.ld.setTermios(t, args)
case linux.TIOCGPTN:
nP := primitive.Uint32(rfd.inode.t.n)
_, err := nP.CopyOut(t, args[2].Pointer())
test/syscalls/linux/pty.cc
+34
View File
@@ -777,6 +777,40 @@ TEST_F(PtyTest, TermiosONLCR) {
ExpectFinished(replica_);
}
// ICRNL rewrites input \r to \n.
TEST_F(PtyTest, TCSETSFTermiosICRNL) {
struct kernel_termios t = DefaultTermios();
t.c_iflag |= ICRNL;
t.c_lflag &= ~ICANON; // for byte-by-byte reading.
ASSERT_THAT(ioctl(replica_.get(), TCSETSF, &t), SyscallSucceeds());
char c = '\r';
ASSERT_THAT(WriteFd(master_.get(), &c, 1), SyscallSucceedsWithValue(1));
ExpectReadable(replica_, 1, &c);
EXPECT_EQ(c, '\n');
ExpectFinished(replica_);
}
// ONLCR rewrites output \n to \r\n.
TEST_F(PtyTest, TCSETSFTermiosONLCR) {
struct kernel_termios t = DefaultTermios();
t.c_oflag |= ONLCR;
t.c_lflag &= ~ICANON; // for byte-by-byte reading.
ASSERT_THAT(ioctl(replica_.get(), TCSETSF, &t), SyscallSucceeds());
char c = '\n';
ASSERT_THAT(WriteFd(replica_.get(), &c, 1), SyscallSucceedsWithValue(1));
// Extra byte for NUL for EXPECT_STREQ.
char buf[3] = {};
ExpectReadable(master_, 2, buf);
EXPECT_STREQ(buf, "\r\n");
ExpectFinished(replica_);
}
TEST_F(PtyTest, TermiosIGNCR) {
struct kernel_termios t = DefaultTermios();
t.c_iflag |= IGNCR;