summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kernel/Bus/VirtIO/ConsolePort.cpp2
-rw-r--r--Kernel/Devices/ConsoleDevice.h2
-rw-r--r--Kernel/Devices/Device.cpp10
-rw-r--r--Kernel/Devices/Device.h2
-rw-r--r--Kernel/Devices/FullDevice.h3
-rw-r--r--Kernel/Devices/KCOVDevice.cpp2
-rw-r--r--Kernel/Devices/NullDevice.h4
-rw-r--r--Kernel/Devices/RandomDevice.h3
-rw-r--r--Kernel/Devices/SelfTTYDevice.h3
-rw-r--r--Kernel/Devices/ZeroDevice.h3
-rw-r--r--Kernel/TTY/MasterPTY.h4
-rw-r--r--Kernel/TTY/SlavePTY.h3
12 files changed, 39 insertions, 2 deletions
diff --git a/Kernel/Bus/VirtIO/ConsolePort.cpp b/Kernel/Bus/VirtIO/ConsolePort.cpp
index 0676a7a8b8..2ff8a18674 100644
--- a/Kernel/Bus/VirtIO/ConsolePort.cpp
+++ b/Kernel/Bus/VirtIO/ConsolePort.cpp
@@ -166,7 +166,7 @@ ErrorOr<NonnullLockRefPtr<OpenFileDescription>> ConsolePort::open(int options)
if (!m_open)
m_console.send_open_control_message(m_port, true);
- return File::open(options);
+ return Device::open(options);
}
}
diff --git a/Kernel/Devices/ConsoleDevice.h b/Kernel/Devices/ConsoleDevice.h
index a3913cf431..3800a58baa 100644
--- a/Kernel/Devices/ConsoleDevice.h
+++ b/Kernel/Devices/ConsoleDevice.h
@@ -28,6 +28,8 @@ public:
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, Kernel::UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, Kernel::UserOrKernelBuffer const&, size_t) override;
virtual StringView class_name() const override { return "Console"sv; }
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
void put_char(char);
diff --git a/Kernel/Devices/Device.cpp b/Kernel/Devices/Device.cpp
index 833a6d9d58..df306c7d92 100644
--- a/Kernel/Devices/Device.cpp
+++ b/Kernel/Devices/Device.cpp
@@ -58,6 +58,16 @@ ErrorOr<NonnullOwnPtr<KString>> Device::pseudo_path(OpenFileDescription const&)
return KString::formatted("device:{},{}", major(), minor());
}
+ErrorOr<NonnullLockRefPtr<OpenFileDescription>> Device::open(int options)
+{
+ TRY(Process::current().jail().with([&](auto& my_jail) -> ErrorOr<void> {
+ if (my_jail && !is_openable_by_jailed_processes())
+ return Error::from_errno(EPERM);
+ return {};
+ }));
+ return File::open(options);
+}
+
void Device::process_next_queued_request(Badge<AsyncDeviceRequest>, AsyncDeviceRequest const& completed_request)
{
SpinlockLocker lock(m_requests_lock);
diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h
index 8c5bfd2ab6..dcfb263fd7 100644
--- a/Kernel/Devices/Device.h
+++ b/Kernel/Devices/Device.h
@@ -43,6 +43,7 @@ public:
MinorNumber minor() const { return m_minor; }
virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_path(OpenFileDescription const&) const override;
+ virtual ErrorOr<NonnullLockRefPtr<OpenFileDescription>> open(int options) override;
UserID uid() const { return m_uid; }
GroupID gid() const { return m_gid; }
@@ -50,6 +51,7 @@ public:
virtual bool is_device() const override { return true; }
virtual void will_be_destroyed() override;
virtual void after_inserting();
+ virtual bool is_openable_by_jailed_processes() const { return false; }
void process_next_queued_request(Badge<AsyncDeviceRequest>, AsyncDeviceRequest const&);
template<typename AsyncRequestType, typename... Args>
diff --git a/Kernel/Devices/FullDevice.h b/Kernel/Devices/FullDevice.h
index 4f8df218f0..443d07721f 100644
--- a/Kernel/Devices/FullDevice.h
+++ b/Kernel/Devices/FullDevice.h
@@ -20,6 +20,9 @@ public:
private:
FullDevice();
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
+
// ^CharacterDevice
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
diff --git a/Kernel/Devices/KCOVDevice.cpp b/Kernel/Devices/KCOVDevice.cpp
index 647a3ab161..634562aea4 100644
--- a/Kernel/Devices/KCOVDevice.cpp
+++ b/Kernel/Devices/KCOVDevice.cpp
@@ -74,7 +74,7 @@ ErrorOr<NonnullLockRefPtr<OpenFileDescription>> KCOVDevice::open(int options)
kcov_instance->set_state(KCOVInstance::OPENED);
proc_instance->set(pid, kcov_instance);
- return File::open(options);
+ return Device::open(options);
}
ErrorOr<void> KCOVDevice::ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg)
diff --git a/Kernel/Devices/NullDevice.h b/Kernel/Devices/NullDevice.h
index 255c67f01c..c7767a1d58 100644
--- a/Kernel/Devices/NullDevice.h
+++ b/Kernel/Devices/NullDevice.h
@@ -20,6 +20,10 @@ public:
private:
NullDevice();
+
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
+
// ^CharacterDevice
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
diff --git a/Kernel/Devices/RandomDevice.h b/Kernel/Devices/RandomDevice.h
index b234792fb9..9983635df7 100644
--- a/Kernel/Devices/RandomDevice.h
+++ b/Kernel/Devices/RandomDevice.h
@@ -20,6 +20,9 @@ public:
private:
RandomDevice();
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
+
// ^CharacterDevice
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
diff --git a/Kernel/Devices/SelfTTYDevice.h b/Kernel/Devices/SelfTTYDevice.h
index 4bf5b7c733..54956aaed8 100644
--- a/Kernel/Devices/SelfTTYDevice.h
+++ b/Kernel/Devices/SelfTTYDevice.h
@@ -20,6 +20,9 @@ public:
private:
SelfTTYDevice();
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
+
// ^CharacterDevice
virtual ErrorOr<NonnullLockRefPtr<OpenFileDescription>> open(int options) override;
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
diff --git a/Kernel/Devices/ZeroDevice.h b/Kernel/Devices/ZeroDevice.h
index 77c9f08e57..c539d4f048 100644
--- a/Kernel/Devices/ZeroDevice.h
+++ b/Kernel/Devices/ZeroDevice.h
@@ -20,6 +20,9 @@ public:
private:
ZeroDevice();
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
+
// ^CharacterDevice
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
diff --git a/Kernel/TTY/MasterPTY.h b/Kernel/TTY/MasterPTY.h
index edb7fb3b34..31653c9a5b 100644
--- a/Kernel/TTY/MasterPTY.h
+++ b/Kernel/TTY/MasterPTY.h
@@ -29,6 +29,10 @@ public:
private:
explicit MasterPTY(unsigned index, NonnullOwnPtr<DoubleBuffer> buffer);
+
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
+
// ^CharacterDevice
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, UserOrKernelBuffer const&, size_t) override;
diff --git a/Kernel/TTY/SlavePTY.h b/Kernel/TTY/SlavePTY.h
index 15c0862674..c576e0a72a 100644
--- a/Kernel/TTY/SlavePTY.h
+++ b/Kernel/TTY/SlavePTY.h
@@ -26,6 +26,9 @@ public:
virtual FileBlockerSet& blocker_set() override;
private:
+ // ^Device
+ virtual bool is_openable_by_jailed_processes() const override { return true; }
+
// ^TTY
virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_name() const override;
virtual ErrorOr<size_t> on_tty_write(UserOrKernelBuffer const&, size_t) override;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 21:56:42 +0000