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

Kernel: Require StorageDevice reference for StorageDevicePartition

Browse source 
Allowing creation of StorageDevicePartition objects for any arbitrary
BlockDevice objects means that we could technically create a
StorageDevicePartition for another StorageDevicePartition which is
obviously not the intention for this code. Instead, require to pass a
StorageDevice reference to ensure this cannot happen.
This commit is contained in:
Liav A 2023-06-30 11:27:29 +03:00 • committed by Andrew Kaster
parent f08f339e9a
commit c216e7439f
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Devices/Storage/StorageDevicePartition.cpp
View file

@ -6,12 +6,13 @@
#include <Kernel/Debug.h> #include <Kernel/Debug.h>
#include <Kernel/Devices/DeviceManagement.h> #include <Kernel/Devices/DeviceManagement.h>
#include <Kernel/Devices/Storage/StorageDevice.h>
#include <Kernel/Devices/Storage/StorageDevicePartition.h> #include <Kernel/Devices/Storage/StorageDevicePartition.h>
#include <Kernel/FileSystem/OpenFileDescription.h> #include <Kernel/FileSystem/OpenFileDescription.h>
namespace Kernel { namespace Kernel {
NonnullLockRefPtr<StorageDevicePartition> StorageDevicePartition::create(BlockDevice& device, MinorNumber minor_number, Partition::DiskPartitionMetadata metadata) NonnullLockRefPtr<StorageDevicePartition> StorageDevicePartition::create(StorageDevice& device, MinorNumber minor_number, Partition::DiskPartitionMetadata metadata)
{ {
auto partition_or_error = DeviceManagement::try_create_device<StorageDevicePartition>(device, minor_number, metadata); auto partition_or_error = DeviceManagement::try_create_device<StorageDevicePartition>(device, minor_number, metadata);
// FIXME: Find a way to propagate errors // FIXME: Find a way to propagate errors
@ -19,7 +20,7 @@ NonnullLockRefPtr<StorageDevicePartition> StorageDevicePartition::create(BlockDe
return partition_or_error.release_value(); return partition_or_error.release_value();
} }
StorageDevicePartition::StorageDevicePartition(BlockDevice& device, MinorNumber minor_number, Partition::DiskPartitionMetadata metadata) StorageDevicePartition::StorageDevicePartition(StorageDevice& device, MinorNumber minor_number, Partition::DiskPartitionMetadata metadata)
: BlockDevice(100, minor_number, device.block_size()) : BlockDevice(100, minor_number, device.block_size())
, m_device(device) , m_device(device)
, m_metadata(metadata) , m_metadata(metadata)

7
Kernel/Devices/Storage/StorageDevicePartition.h
View file

@ -13,11 +13,12 @@
namespace Kernel { namespace Kernel {
class StorageDevice;
class StorageDevicePartition final : public BlockDevice { class StorageDevicePartition final : public BlockDevice {
friend class DeviceManagement; friend class DeviceManagement;
public: public:
static NonnullLockRefPtr<StorageDevicePartition> create(BlockDevice&, MinorNumber, Partition::DiskPartitionMetadata); static NonnullLockRefPtr<StorageDevicePartition> create(StorageDevice&, MinorNumber, Partition::DiskPartitionMetadata);
virtual ~StorageDevicePartition(); virtual ~StorageDevicePartition();
virtual void start_request(AsyncBlockDeviceRequest&) override; virtual void start_request(AsyncBlockDeviceRequest&) override;
@ -35,10 +36,10 @@ public:
Partition::DiskPartitionMetadata const& metadata() const; Partition::DiskPartitionMetadata const& metadata() const;
private: private:
StorageDevicePartition(BlockDevice&, MinorNumber, Partition::DiskPartitionMetadata); StorageDevicePartition(StorageDevice&, MinorNumber, Partition::DiskPartitionMetadata);
virtual StringView class_name() const override; virtual StringView class_name() const override;
LockWeakPtr<BlockDevice> m_device; LockWeakPtr<StorageDevice> m_device;
Partition::DiskPartitionMetadata m_metadata; Partition::DiskPartitionMetadata m_metadata;
}; };