View | Details | Raw Unified | Return to bug 46911
Collapse All | Expand All

(-)a/udisks/src/udiskslinuxnvmecontroller.c (+6 lines)
Lines 398-407 udisks_linux_nvme_controller_refresh_smart_sync (UDisksLinuxNVMeController *ctr Link Here
398
  smart_log = bd_nvme_get_smart_log (dev_file, error);
398
  smart_log = bd_nvme_get_smart_log (dev_file, error);
399
  if ((device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SELFTEST) == BD_NVME_CTRL_FEAT_SELFTEST)
399
  if ((device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SELFTEST) == BD_NVME_CTRL_FEAT_SELFTEST)
400
    selftest_log = bd_nvme_get_self_test_log (dev_file, NULL);
400
    selftest_log = bd_nvme_get_self_test_log (dev_file, NULL);
401
// sanitize-log is known to smash stack on certain conditions
402
#if 0
401
  if ((device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SANITIZE_CRYPTO) == BD_NVME_CTRL_FEAT_SANITIZE_CRYPTO ||
403
  if ((device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SANITIZE_CRYPTO) == BD_NVME_CTRL_FEAT_SANITIZE_CRYPTO ||
402
      (device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SANITIZE_BLOCK) == BD_NVME_CTRL_FEAT_SANITIZE_BLOCK ||
404
      (device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SANITIZE_BLOCK) == BD_NVME_CTRL_FEAT_SANITIZE_BLOCK ||
403
      (device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SANITIZE_OVERWRITE) == BD_NVME_CTRL_FEAT_SANITIZE_OVERWRITE)
405
      (device->nvme_ctrl_info->features & BD_NVME_CTRL_FEAT_SANITIZE_OVERWRITE) == BD_NVME_CTRL_FEAT_SANITIZE_OVERWRITE)
404
    sanitize_log = bd_nvme_get_sanitize_log (dev_file, NULL);
406
    sanitize_log = bd_nvme_get_sanitize_log (dev_file, NULL);
407
#endif
405
  if (smart_log || selftest_log || sanitize_log)
408
  if (smart_log || selftest_log || sanitize_log)
406
    {
409
    {
407
      g_mutex_lock (&ctrl->smart_lock);
410
      g_mutex_lock (&ctrl->smart_lock);
Lines 1121-1126 handle_sanitize_start (UDisksNVMeController *_object, Link Here
1121
  gint64 time_est = 0;
1124
  gint64 time_est = 0;
1122
  GError *error = NULL;
1125
  GError *error = NULL;
1123
1126
1127
  // this uses sanitize-log which is known to smash stack on certain conditions
1128
  goto out;
1129
1124
  object = udisks_daemon_util_dup_object (ctrl, &error);
1130
  object = udisks_daemon_util_dup_object (ctrl, &error);
1125
  if (object == NULL)
1131
  if (object == NULL)
1126
    {
1132
    {

Return to bug 46911