RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:27:35 +00:00
Code Issues Activity Actions

Kernel: Modify the IOCTL API to return KResult

Browse source 
The kernel has been gradually moving towards KResult from just bare
int's, this change migrates the IOCTL paths.
This commit is contained in:
Brian Gianforcaro 2021-07-26 03:47:25 -07:00 • committed by Ali Mohammad Pur
parent 46c9b1d81c
commit de9ff0af50
16 changed files with 151 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/TTY/MasterPTY.cpp
View file

@ -106,14 +106,14 @@ KResult MasterPTY::close()
return KSuccess;
}
int MasterPTY::ioctl(FileDescription& description, unsigned request, Userspace<void*> arg)
KResult MasterPTY::ioctl(FileDescription& description, unsigned request, Userspace<void*> arg)
{
REQUIRE_PROMISE(tty);
if (!m_slave)
return -EIO;
return EIO;
if (request == TIOCSWINSZ || request == TIOCGPGRP)
return m_slave->ioctl(description, request, arg);
return -EINVAL;
return EINVAL;
}
String MasterPTY::absolute_path(const FileDescription&) const

2
Kernel/TTY/MasterPTY.h
View file

@ -40,7 +40,7 @@ private:
virtual bool can_write(const FileDescription&, size_t) const override;
virtual KResult close() override;
virtual bool is_master_pty() const override { return true; }
virtual int ioctl(FileDescription&, unsigned request, Userspace<void*> arg) override;
virtual KResult ioctl(FileDescription&, unsigned request, Userspace<void*> arg) override;
virtual StringView class_name() const override { return "MasterPTY"; }
RefPtr<SlavePTY> m_slave;

60
Kernel/TTY/TTY.cpp
View file

@ -360,9 +360,9 @@ void TTY::flush_input()
evaluate_block_conditions();
}
int TTY::set_termios(const termios& t)
KResult TTY::set_termios(const termios& t)
{
int rc = 0;
KResult rc = KSuccess;
m_termios = t;
dbgln_if(TTY_DEBUG, "{} set_termios: ECHO={}, ISIG={}, ICANON={}, ECHOE={}, ECHOK={}, ECHONL={}, ISTRIP={}, ICRNL={}, INLCR={}, IGNCR={}, OPOST={}, ONLCR={}",
@ -402,7 +402,7 @@ int TTY::set_termios(const termios& t)
for (auto flag : unimplemented_iflags) {
if (m_termios.c_iflag & flag.value) {
dbgln("FIXME: iflag {} unimplemented", flag.name);
rc = -ENOTIMPL;
rc = ENOTIMPL;
}
}
@ -416,7 +416,7 @@ int TTY::set_termios(const termios& t)
for (auto flag : unimplemented_oflags) {
if (m_termios.c_oflag & flag.value) {
dbgln("FIXME: oflag {} unimplemented", flag.name);
rc = -ENOTIMPL;
rc = ENOTIMPL;
}
}
@ -436,7 +436,7 @@ int TTY::set_termios(const termios& t)
for (auto flag : unimplemented_cflags) {
if (m_termios.c_cflag & flag.value) {
dbgln("FIXME: cflag {} unimplemented", flag.name);
rc = -ENOTIMPL;
rc = ENOTIMPL;
}
}
@ -447,14 +447,14 @@ int TTY::set_termios(const termios& t)
for (auto flag : unimplemented_lflags) {
if (m_termios.c_lflag & flag.value) {
dbgln("FIXME: lflag {} unimplemented", flag.name);
rc = -ENOTIMPL;
rc = ENOTIMPL;
}
}
return rc;
}
int TTY::ioctl(FileDescription&, unsigned request, Userspace<void*> arg)
KResult TTY::ioctl(FileDescription&, unsigned request, Userspace<void*> arg)
{
REQUIRE_PROMISE(tty);
auto& current_process = *Process::current();
@ -473,42 +473,42 @@ int TTY::ioctl(FileDescription&, unsigned request, Userspace<void*> arg)
auto user_pgid = static_ptr_cast<pid_t*>(arg);
auto pgid = this->pgid().value();
if (!copy_to_user(user_pgid, &pgid))
return -EFAULT;
return 0;
return EFAULT;
return KSuccess;
}
case TIOCSPGRP: {
ProcessGroupID pgid = static_cast<pid_t>(arg.ptr());
if (pgid <= 0)
return -EINVAL;
return EINVAL;
InterruptDisabler disabler;
auto process_group = ProcessGroup::from_pgid(pgid);
// Disallow setting a nonexistent PGID.
if (!process_group)
return -EINVAL;
return EINVAL;
auto process = Process::from_pid(ProcessID(pgid.value()));
SessionID new_sid = process ? process->sid() : Process::get_sid_from_pgid(pgid);
if (!new_sid || new_sid != current_process.sid())
return -EPERM;
return EPERM;
if (process && pgid != process->pgid())
return -EPERM;
return EPERM;
m_pg = process_group;
if (process) {
if (auto parent = Process::from_pid(process->ppid())) {
m_original_process_parent = *parent;
return 0;
return KSuccess;
}
}
m_original_process_parent = nullptr;
return 0;
return KSuccess;
}
case TCGETS: {
user_termios = static_ptr_cast<termios*>(arg);
if (!copy_to_user(user_termios, &m_termios))
return -EFAULT;
return 0;
return EFAULT;
return KSuccess;
}
case TCSETS:
case TCSETSF:
@ -516,8 +516,8 @@ int TTY::ioctl(FileDescription&, unsigned request, Userspace<void*> arg)
user_termios = static_ptr_cast<termios*>(arg);
termios termios;
if (!copy_from_user(&termios, user_termios))
return -EFAULT;
int rc = set_termios(termios);
return EFAULT;
auto rc = set_termios(termios);
if (request == TCSETSF)
flush_input();
return rc;
@ -528,9 +528,9 @@ int TTY::ioctl(FileDescription&, unsigned request, Userspace<void*> arg)
if (operation == TCIFLUSH || operation == TCIOFLUSH) {
flush_input();
} else if (operation != TCOFLUSH) {
return -EINVAL;
return EINVAL;
}
return 0;
return KSuccess;
}
case TIOCGWINSZ:
user_winsize = static_ptr_cast<winsize*>(arg);
@ -540,30 +540,30 @@ int TTY::ioctl(FileDescription&, unsigned request, Userspace<void*> arg)
ws.ws_xpixel = 0;
ws.ws_ypixel = 0;
if (!copy_to_user(user_winsize, &ws))
return -EFAULT;
return 0;
return EFAULT;
return KSuccess;
case TIOCSWINSZ: {
user_winsize = static_ptr_cast<winsize*>(arg);
winsize ws;
if (!copy_from_user(&ws, user_winsize))
return -EFAULT;
return EFAULT;
if (ws.ws_col == m_columns && ws.ws_row == m_rows)
return 0;
return KSuccess;
m_rows = ws.ws_row;
m_columns = ws.ws_col;
generate_signal(SIGWINCH);
return 0;
return KSuccess;
}
case TIOCSCTTY:
current_process.set_tty(this);
return 0;
return KSuccess;
case TIOCSTI:
return -EIO;
return EIO;
case TIOCNOTTY:
current_process.set_tty(nullptr);
return 0;
return KSuccess;
}
return -EINVAL;
return EINVAL;
}
void TTY::set_size(unsigned short columns, unsigned short rows)

4
Kernel/TTY/TTY.h
View file

@ -25,7 +25,7 @@ public:
virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const FileDescription&, size_t) const override;
virtual bool can_write(const FileDescription&, size_t) const override;
virtual int ioctl(FileDescription&, unsigned request, Userspace<void*> arg) override final;
virtual KResult ioctl(FileDescription&, unsigned request, Userspace<void*> arg) override final;
virtual String absolute_path(const FileDescription&) const override { return tty_name(); }
virtual String const& tty_name() const = 0;
@ -40,7 +40,7 @@ public:
return 0;
}
int set_termios(const termios&);
KResult set_termios(const termios&);
bool should_generate_signals() const { return m_termios.c_lflag & ISIG; }
bool should_flush_on_signal() const { return !(m_termios.c_lflag & NOFLSH); }
bool should_echo_input() const { return m_termios.c_lflag & ECHO; }