Attachment 38904 Details for Bug 30332 – updated patch

[patch] updated patch

lp484429-use-luks-holder-property-in-removal.patch (text/plain), 2.71 KB, created by Mathieu Trudel-Lapierre on 2010-09-23 08:27:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Trudel-Lapierre

Created: 2010-09-23 08:27:31 UTC

Size: 2.71 KB

patch

obsolete

>From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
>Subject: Teardown LUKS cleartext device on slave forced removal
>Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/cryptsetup/+bug/484429
>Last-Update: 2010-09-22
>
>In the event of the "forced" removal of a crypto device (e.g. simply pulled),
>use the luks_holder property since it is still available to figure out which
>underlying cleartext LUKS device to teardown, instead of scanning through
>all available devices (because the cleartext device already has had its
>properties cleaned up).
>
>Index: udisks-1.0.1+git20100614/src/device.c
>===================================================================
>--- udisks-1.0.1+git20100614.orig/src/device.c	2010-09-23 11:01:40.885444001 -0400
>+++ udisks-1.0.1+git20100614/src/device.c	2010-09-23 11:03:12.575444002 -0400
>@@ -11790,32 +11790,25 @@
>         }
>     }
> 
>-  if (device->priv->id_usage != NULL && strcmp (device->priv->id_usage, "crypto") == 0)
>+  if (device->priv->id_usage != NULL && device->priv->luks_holder != NULL && strcmp (device->priv->id_usage, "crypto") == 0)
>     {
>-      GList *devices;
>-      GList *l;
>+      Device *d;
> 
>       /* look for cleartext device  */
>-      devices = daemon_local_get_all_devices (device->priv->daemon);
>-      for (l = devices; l != NULL; l = l->next)
>+      d = daemon_local_find_by_object_path (device->priv->daemon, device->priv->luks_holder);
>+      if (strcmp (d->priv->object_path, device->priv->luks_holder) == 0)
>         {
>-          Device *d = DEVICE (l->data);
>-          if (d->priv->device_is_luks_cleartext && d->priv->luks_cleartext_slave != NULL
>-              && strcmp (d->priv->luks_cleartext_slave, device->priv->object_path) == 0)
>+          /* Check whether it is set up by us */
>+          if (d->priv->dm_name != NULL && g_str_has_prefix (d->priv->dm_name, "udisks-luks-uuid-"))
>             {
> 
>-              /* Check whether it is set up by us */
>-              if (d->priv->dm_name != NULL && g_str_has_prefix (d->priv->dm_name, "udisks-luks-uuid-"))
>-                {
>+              g_print ("**** NOTE: Force luks teardown device %s (cleartext %s)\n",
>+                       device->priv->device_file,
>+                       d->priv->device_file);
> 
>-                  g_print ("**** NOTE: Force luks teardown device %s (cleartext %s)\n",
>-                           device->priv->device_file,
>-                           d->priv->device_file);
>-
>-                  /* Gotcha */
>-                  force_luks_teardown (device, d, callback, user_data);
>-                  goto pending;
>-                }
>+              /* Gotcha */
>+              force_luks_teardown (device, d, callback, user_data);
>+              goto pending;
>             }
>         }
>     }

Actions: View | Splinter Review

Attachments on bug 30332: 38888 | 38904

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.