RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:48:11 +00:00
Code Issues Activity Actions

Kernel: Pass 'prot' argument to File::mmap() and act on it.

Browse source 
Nothing crazy, this just means that PROT_READ allocates readable regions,
and that PROT_WRITE allocates writable ones.
This commit is contained in:
Andreas Kling 2019-05-30 12:38:35 +02:00
parent 004a630bfe
commit 66c1a9be3b
7 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Devices/BXVGADevice.cpp
View file

@ -84,7 +84,7 @@ dword BXVGADevice::find_framebuffer_address()
return framebuffer_address; return framebuffer_address;
} }
KResultOr<Region*> BXVGADevice::mmap(Process& process, LinearAddress preferred_laddr, size_t offset, size_t size) KResultOr<Region*> BXVGADevice::mmap(Process& process, LinearAddress preferred_laddr, size_t offset, size_t size, int prot)
{ {
ASSERT(offset == 0); ASSERT(offset == 0);
ASSERT(size == framebuffer_size_in_bytes()); ASSERT(size == framebuffer_size_in_bytes());
@ -95,7 +95,9 @@ KResultOr<Region*> BXVGADevice::mmap(Process& process, LinearAddress preferred_l
move(vmo), move(vmo),
0, 0,
"BXVGA Framebuffer", "BXVGA Framebuffer",
true, true); prot & PROT_READ,
prot & PROT_WRITE
);
kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with laddr L%x\n", kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with laddr L%x\n",
process.name().characters(), process.pid(), process.name().characters(), process.pid(),
region, region->size(), framebuffer_address().as_ptr(), region->laddr().get()); region, region->size(), framebuffer_address().as_ptr(), region->laddr().get());

2
Kernel/Devices/BXVGADevice.h
View file

@ -18,7 +18,7 @@ public:
void set_y_offset(int); void set_y_offset(int);
virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg) override; virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg) override;
virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t) override; virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t, int prot) override;
size_t framebuffer_size_in_bytes() const { return m_framebuffer_size.area() * sizeof(dword) * 2; } size_t framebuffer_size_in_bytes() const { return m_framebuffer_size.area() * sizeof(dword) * 2; }
Size framebuffer_size() const { return m_framebuffer_size; } Size framebuffer_size() const { return m_framebuffer_size; }

2
Kernel/File.cpp
View file

@ -24,7 +24,7 @@ int File::ioctl(FileDescriptor&, unsigned, unsigned)
return -ENOTTY; return -ENOTTY;
} }
KResultOr<Region*> File::mmap(Process&, LinearAddress, size_t, size_t) KResultOr<Region*> File::mmap(Process&, LinearAddress, size_t, size_t, int)
{ {
return KResult(-ENODEV); return KResult(-ENODEV);
} }

2
Kernel/File.h
View file

@ -24,7 +24,7 @@ public:
virtual ssize_t read(FileDescriptor&, byte*, ssize_t) = 0; virtual ssize_t read(FileDescriptor&, byte*, ssize_t) = 0;
virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) = 0; virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) = 0;
virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg); virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg);
virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size); virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot);
virtual String absolute_path(FileDescriptor&) const = 0; virtual String absolute_path(FileDescriptor&) const = 0;

2
Kernel/FileSystem/FileDescriptor.cpp
View file

@ -324,7 +324,7 @@ InodeMetadata FileDescriptor::metadata() const
KResultOr<Region*> FileDescriptor::mmap(Process& process, LinearAddress laddr, size_t offset, size_t size, int prot) KResultOr<Region*> FileDescriptor::mmap(Process& process, LinearAddress laddr, size_t offset, size_t size, int prot)
{ {
if (m_file) if (m_file)
return m_file->mmap(process, laddr, offset, size); return m_file->mmap(process, laddr, offset, size, prot);
if (!is_fsfile()) if (!is_fsfile())
return KResult(-ENODEV); return KResult(-ENODEV);

4
Kernel/SharedMemory.cpp
View file

@ -89,9 +89,9 @@ int SharedMemory::write(FileDescriptor&, const byte* data, int data_size)
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
KResultOr<Region*> SharedMemory::mmap(Process& process, LinearAddress laddr, size_t offset, size_t size) KResultOr<Region*> SharedMemory::mmap(Process& process, LinearAddress laddr, size_t offset, size_t size, int prot)
{ {
if (!vmo()) if (!vmo())
return KResult(-ENODEV); return KResult(-ENODEV);
return process.allocate_region_with_vmo(laddr, size, *vmo(), offset, name(), true, true); return process.allocate_region_with_vmo(laddr, size, *vmo(), offset, name(), prot & PROT_READ, prot & PROT_WRITE);
} }

2
Kernel/SharedMemory.h
View file

@ -31,7 +31,7 @@ private:
virtual String absolute_path(FileDescriptor&) const override; virtual String absolute_path(FileDescriptor&) const override;
virtual const char* class_name() const override { return "SharedMemory"; } virtual const char* class_name() const override { return "SharedMemory"; }
virtual bool is_shared_memory() const override { return true; } virtual bool is_shared_memory() const override { return true; }
virtual KResultOr<Region*> mmap(Process&, LinearAddress, size_t offset, size_t size) override; virtual KResultOr<Region*> mmap(Process&, LinearAddress, size_t offset, size_t size, int prot) override;
SharedMemory(const String& name, uid_t, gid_t, mode_t); SharedMemory(const String& name, uid_t, gid_t, mode_t);