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

Kernel: Make KCOVDevice::ioctl() return KResult

Browse source 
Recent ioctl() changes broke this, this commit fixes that
and the build.
This commit is contained in:
Ali Mohammad Pur 2021-07-27 01:38:06 +04:30
parent 713b18b7a6
commit e76af0fe16
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Kernel/Devices/KCOVDevice.cpp
View file

@ -75,9 +75,9 @@ KResultOr<NonnullRefPtr<FileDescription>> KCOVDevice::open(int options)
return File::open(options); return File::open(options);
} }
int KCOVDevice::ioctl(FileDescription&, unsigned request, FlatPtr arg) KResult KCOVDevice::ioctl(FileDescription&, unsigned request, Userspace<void*> arg)
{ {
int error = 0; KResult return_value = KSuccess;
auto thread = Thread::current(); auto thread = Thread::current();
auto tid = thread->tid(); auto tid = thread->tid();
auto pid = thread->pid(); auto pid = thread->pid();
@ -90,19 +90,19 @@ int KCOVDevice::ioctl(FileDescription&, unsigned request, FlatPtr arg)
switch (request) { switch (request) {
case KCOV_SETBUFSIZE: { case KCOV_SETBUFSIZE: {
if (kcov_instance->state >= KCOVInstance::TRACING) { if (kcov_instance->state >= KCOVInstance::TRACING) {
error = EBUSY; return_value = EBUSY;
break; break;
} }
error = kcov_instance->buffer_allocate(arg); return_value = kcov_instance->buffer_allocate((FlatPtr)arg.unsafe_userspace_ptr());
break; break;
} }
case KCOV_ENABLE: { case KCOV_ENABLE: {
if (kcov_instance->state >= KCOVInstance::TRACING) { if (kcov_instance->state >= KCOVInstance::TRACING) {
error = EBUSY; return_value = EBUSY;
break; break;
} }
if (!kcov_instance->has_buffer()) { if (!kcov_instance->has_buffer()) {
error = ENOBUFS; return_value = ENOBUFS;
break; break;
} }
VERIFY(kcov_instance->state == KCOVInstance::OPENED); VERIFY(kcov_instance->state == KCOVInstance::OPENED);
@ -113,7 +113,7 @@ int KCOVDevice::ioctl(FileDescription&, unsigned request, FlatPtr arg)
case KCOV_DISABLE: { case KCOV_DISABLE: {
auto maybe_kcov_instance = thread_instance->get(tid); auto maybe_kcov_instance = thread_instance->get(tid);
if (!maybe_kcov_instance.has_value()) { if (!maybe_kcov_instance.has_value()) {
error = ENOENT; return_value = ENOENT;
break; break;
} }
VERIFY(kcov_instance->state == KCOVInstance::TRACING); VERIFY(kcov_instance->state == KCOVInstance::TRACING);
@ -122,11 +122,11 @@ int KCOVDevice::ioctl(FileDescription&, unsigned request, FlatPtr arg)
break; break;
} }
default: { default: {
error = EINVAL; return_value = EINVAL;
} }
}; };
return error; return return_value;
} }
KResultOr<Region*> KCOVDevice::mmap(Process& process, FileDescription&, const Range& range, u64 offset, int prot, bool shared) KResultOr<Region*> KCOVDevice::mmap(Process& process, FileDescription&, const Range& range, u64 offset, int prot, bool shared)

2
Kernel/Devices/KCOVDevice.h
View file

@ -37,7 +37,7 @@ protected:
virtual void start_request(AsyncBlockDeviceRequest& request) override final { request.complete(AsyncDeviceRequest::Failure); } virtual void start_request(AsyncBlockDeviceRequest& request) override final { request.complete(AsyncDeviceRequest::Failure); }
virtual KResultOr<size_t> read(FileDescription&, u64, UserOrKernelBuffer&, size_t) override { return -EINVAL; } virtual KResultOr<size_t> read(FileDescription&, u64, UserOrKernelBuffer&, size_t) override { return -EINVAL; }
virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return -EINVAL; } virtual KResultOr<size_t> write(FileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return -EINVAL; }
virtual int ioctl(FileDescription&, unsigned request, FlatPtr arg) override; virtual KResult ioctl(FileDescription&, unsigned request, Userspace<void*> arg) override;
private: private:
KCOVDevice(); KCOVDevice();

4
Kernel/Devices/KCOVInstance.cpp
View file

@ -15,7 +15,7 @@ KCOVInstance::KCOVInstance(ProcessID pid)
state = UNUSED; state = UNUSED;
} }
int KCOVInstance::buffer_allocate(size_t buffer_size_in_entries) KResult KCOVInstance::buffer_allocate(size_t buffer_size_in_entries)
{ {
// first entry contains index of last PC // first entry contains index of last PC
this->m_buffer_size_in_entries = buffer_size_in_entries - 1; this->m_buffer_size_in_entries = buffer_size_in_entries - 1;
@ -40,7 +40,7 @@ int KCOVInstance::buffer_allocate(size_t buffer_size_in_entries)
if (!this->has_buffer()) if (!this->has_buffer())
return ENOMEM; return ENOMEM;
return 0; return KSuccess;
} }
void KCOVInstance::buffer_add_pc(u64 pc) void KCOVInstance::buffer_add_pc(u64 pc)

2
Kernel/Devices/KCOVInstance.h
View file

@ -30,7 +30,7 @@ class KCOVInstance final {
public: public:
explicit KCOVInstance(ProcessID pid); explicit KCOVInstance(ProcessID pid);
int buffer_allocate(size_t buffer_size_in_entries); KResult buffer_allocate(size_t buffer_size_in_entries);
bool has_buffer() const { return m_buffer != nullptr; } bool has_buffer() const { return m_buffer != nullptr; }
void buffer_add_pc(u64 pc); void buffer_add_pc(u64 pc);