From 63ea2b4d1f7e9fe70d2c3655f569d7debc5ddd12 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 16 Sep 2022 15:15:12 +0200 Subject: [PATCH] * Fri Sep 16 2022 Tomas Bzatek - 2.9.4-4 - Restrict ATA Secure Erase Format() options (#2120329) Resolves: #2120329 --- ...2.10.0-block_format_ata_secure_erase.patch | 60 +++++++++++++++++++ udisks2.spec | 7 ++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 udisks-2.10.0-block_format_ata_secure_erase.patch diff --git a/udisks-2.10.0-block_format_ata_secure_erase.patch b/udisks-2.10.0-block_format_ata_secure_erase.patch new file mode 100644 index 0000000..3ad878d --- /dev/null +++ b/udisks-2.10.0-block_format_ata_secure_erase.patch @@ -0,0 +1,60 @@ +From eb917d346bc8592924c5f6566b01841176c53c8c Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek +Date: Mon, 22 Aug 2022 16:27:11 +0200 +Subject: [PATCH] udiskslinuxblock: Only permit ATA Secure Erase during + Format() on a whole block device + +ATA Secure Erase requested as an option to the Format() method call used +to perform the actual erase on a whole drive object it looked up. When +Format() was called on a partition, this led to data loss on a whole drive. +This commit adds a safeguard to check that the Format() is requested +on a whole block device. + +Severity of this issue was slightly lowered by a failure to submit +the ATA Secure erase command in case some filesystem was mounted +at that point. +--- + src/udiskslinuxblock.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c +index d1da94edf..db0ed2bf6 100644 +--- a/src/udiskslinuxblock.c ++++ b/src/udiskslinuxblock.c +@@ -2354,6 +2354,7 @@ erase_ata_device (UDisksBlock *block, + { + gboolean ret = FALSE; + UDisksObject *drive_object = NULL; ++ UDisksLinuxBlockObject *block_object = NULL; + UDisksDriveAta *ata = NULL; + + drive_object = udisks_daemon_find_object (daemon, udisks_block_get_drive (block)); +@@ -2369,6 +2370,20 @@ erase_ata_device (UDisksBlock *block, + goto out; + } + ++ /* Reverse check to ensure we're erasing whole block device and not a partition */ ++ block_object = udisks_linux_drive_object_get_block (UDISKS_LINUX_DRIVE_OBJECT (drive_object), FALSE /* get_hw */); ++ if (block_object == NULL) ++ { ++ g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED, "Couldn't find a block device for the drive to erase"); ++ goto out; ++ } ++ if (g_strcmp0 (g_dbus_object_get_object_path (G_DBUS_OBJECT (object)), ++ g_dbus_object_get_object_path (G_DBUS_OBJECT (block_object))) != 0) ++ { ++ g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED, "ATA secure erase needs to be performed on a whole block device"); ++ goto out; ++ } ++ + /* sleep a tiny bit here to avoid the secure erase code racing with + * programs spawned by udev + */ +@@ -2382,6 +2397,7 @@ erase_ata_device (UDisksBlock *block, + out: + g_clear_object (&ata); + g_clear_object (&drive_object); ++ g_clear_object (&block_object); + return ret; + } + diff --git a/udisks2.spec b/udisks2.spec index d1cfc29..c721c90 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -48,7 +48,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.9.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://github.com/storaged-project/udisks Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2 @@ -59,6 +59,8 @@ Patch1: udisks-2.10.0-static_daemon_resources_free.patch Patch2: udisks-2.10.0-lvm2_teardown_tests.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2030916 Patch3: udisks-2.10.0-vdo_test_writeAmplificationRatio.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2120329 +Patch4: udisks-2.10.0-block_format_ata_secure_erase.patch BuildRequires: make BuildRequires: glib2-devel >= %{glib2_version} @@ -434,6 +436,9 @@ fi %endif %changelog +* Fri Sep 16 2022 Tomas Bzatek - 2.9.4-4 +- Restrict ATA Secure Erase Format() options (#2120329) + * Tue Feb 01 2022 Tomas Bzatek - 2.9.4-3 - Fix LVM-VDO statistics tests (#2030916)