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_read 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:17:49 +02:00
parent 0c630d5687
commit 9ce537d703
47 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/TTY/MasterPTY.cpp
View file

@ -72,7 +72,7 @@ ErrorOr<size_t> MasterPTY::write(OpenFileDescription&, u64, const UserOrKernelBu
return size;
}
bool MasterPTY::can_read(const OpenFileDescription&, size_t) const
bool MasterPTY::can_read(const OpenFileDescription&, u64) const
{
if (!m_slave)
return true;

2
Kernel/TTY/MasterPTY.h
View file

@ -33,7 +33,7 @@ private:
// ^CharacterDevice
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&, size_t) const override;
virtual bool can_read(const OpenFileDescription&, u64) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual ErrorOr<void> close() override;
virtual bool is_master_pty() const override { return true; }

2
Kernel/TTY/PTYMultiplexer.h
View file

@ -26,7 +26,7 @@ public:
virtual ErrorOr<NonnullRefPtr<OpenFileDescription>> open(int options) override;
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&, size_t) const override { return true; }
virtual bool can_read(const OpenFileDescription&, u64) const override { return true; }
virtual bool can_write(const OpenFileDescription&, size_t) const override { return true; }
void notify_master_destroyed(Badge<MasterPTY>, unsigned index);

2
Kernel/TTY/SlavePTY.cpp
View file

@ -90,7 +90,7 @@ bool SlavePTY::can_write(const OpenFileDescription&, size_t) const
return m_master->can_write_from_slave();
}
bool SlavePTY::can_read(const OpenFileDescription& description, size_t offset) const
bool SlavePTY::can_read(const OpenFileDescription& description, u64 offset) const
{
if (m_master->is_closed())
return true;

2
Kernel/TTY/SlavePTY.h
View file

@ -32,7 +32,7 @@ private:
virtual void echo(u8) override;
// ^CharacterDevice
virtual bool can_read(const OpenFileDescription&, size_t) const override;
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 StringView class_name() const override { return "SlavePTY"sv; }

2
Kernel/TTY/TTY.cpp
View file

@ -139,7 +139,7 @@ void TTY::process_output(u8 ch, Functor put_char)
}
}
bool TTY::can_read(const OpenFileDescription&, size_t) const
bool TTY::can_read(const OpenFileDescription&, u64) const
{
if (in_canonical_mode()) {
return m_available_lines > 0;

2
Kernel/TTY/TTY.h
View file

@ -23,7 +23,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&, size_t) const override;
virtual bool can_read(const OpenFileDescription&, u64) const override;
virtual bool can_write(const OpenFileDescription&, size_t) const override;
virtual ErrorOr<void> ioctl(OpenFileDescription&, unsigned request, Userspace<void*> arg) override final;
virtual ErrorOr<NonnullOwnPtr<KString>> pseudo_path(const OpenFileDescription&) const override;