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

Kernel: Use u64 instead of size_t for File::can_write offset

Browse source 
This ensures offsets will not be truncated on large files on i686.
This commit is contained in:
Idan Horowitz 2022-01-25 20:19:35 +02:00
parent 9ce537d703
commit 664ca58746
40 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/TTY/MasterPTY.cpp
View file

@ -79,7 +79,7 @@ bool MasterPTY::can_read(const OpenFileDescription&, u64) const
return !m_buffer->is_empty();
}
bool MasterPTY::can_write(const OpenFileDescription&, size_t) const
bool MasterPTY::can_write(const OpenFileDescription&, u64) const
{
return true;
}

2
Kernel/TTY/MasterPTY.h
View file

@ -34,7 +34,7 @@ private:
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const OpenFileDescription&, u64) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, u64) const override;
virtual ErrorOr<void> close() override;
virtual bool is_master_pty() const override { return true; }
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override;

2
Kernel/TTY/PTYMultiplexer.h
View file

@ -27,7 +27,7 @@ public:
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override { return 0; }
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override { return 0; }
virtual bool can_read(const OpenFileDescription&, u64) const override { return true; }
virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; }
virtual bool can_write(const OpenFileDescription&, u64) const override { return true; }
void notify_master_destroyed(Badge<MasterPTY>, unsigned index);

2
Kernel/TTY/SlavePTY.cpp
View file

@ -85,7 +85,7 @@ ErrorOr<size_t> SlavePTY::on_tty_write(const UserOrKernelBuffer& data, size_t si
return m_master->on_slave_write(data, size);
}
bool SlavePTY::can_write(const OpenFileDescription&, size_t) const
bool SlavePTY::can_write(const OpenFileDescription&, u64) const
{
return m_master->can_write_from_slave();
}

2
Kernel/TTY/SlavePTY.h
View file

@ -34,7 +34,7 @@ private:
// ^CharacterDevice
virtual bool can_read(const OpenFileDescription&, u64) const override;
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, u64) const override;
virtual StringView class_name() const override { return "SlavePTY"sv; }
virtual ErrorOr<void> close() override;

2
Kernel/TTY/TTY.cpp
View file

@ -147,7 +147,7 @@ bool TTY::can_read(const OpenFileDescription&, u64) const
return !m_input_buffer.is_empty();
}
bool TTY::can_write(const OpenFileDescription&, size_t) const
bool TTY::can_write(const OpenFileDescription&, u64) const
{
return true;
}

2
Kernel/TTY/TTY.h
View file

@ -24,7 +24,7 @@ public:
virtual ErrorOr<size_t> read(OpenFileDescription&, u64, UserOrKernelBuffer&, size_t) override;
virtual ErrorOr<size_t> write(OpenFileDescription&, u64, const UserOrKernelBuffer&, size_t) override;
virtual bool can_read(const OpenFileDescription&, u64) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual bool can_write(const OpenFileDescription&, u64) const override;
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override final;
virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_path(const OpenFileDescription&) const override;