libblkid: check if device is OPAL locked on I/O error

author Luca Boccassi <bluca@debian.org>

Wed, 22 Feb 2023 01:33:36 +0000 (01:33 +0000)

committer Luca Boccassi <bluca@debian.org>

Wed, 22 Feb 2023 02:02:03 +0000 (02:02 +0000)
author Luca Boccassi <bluca@debian.org>
Wed, 22 Feb 2023 01:33:36 +0000 (01:33 +0000)
committer Luca Boccassi <bluca@debian.org>
Wed, 22 Feb 2023 02:02:03 +0000 (02:02 +0000)
diff --git a/configure.ac b/configure.ac

index 89ba867dfb352fa6d0401da468c9e0e44315b2e5..d631b062d280ee31cc05a69464d979641972480c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -751,6 +751,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([extern char *__progname;],
            AC_MSG_RESULT([yes]),
            AC_MSG_RESULT([no]))
  
+AC_CHECK_DECL([IOC_OPAL_GET_STATUS],
+       [AC_DEFINE([HAVE_OPAL_GET_STATUS], [1],
+               [Define to 1 if OPAL status ioctl is defined])],,
+             [#include <linux/sed-opal.h>])
+
  dnl Static compilation
  m4_define([UL_STATIC_PROGRAMS], [blkid, fdisk, losetup, mount, nsenter, sfdisk, umount, unshare])
  
diff --git a/libblkid/src/blkidP.h b/libblkid/src/blkidP.h

index a9308068e66296af0284123931e8237d227d953b..5d2a02055dc812fa0c94204eb5cce183708df6c4 100644 (file)
--- a/libblkid/src/blkidP.h
+++ b/libblkid/src/blkidP.h
@@ -237,6 +237,7 @@ struct blkid_struct_probe
  #define BLKID_FL_CDROM_DEV     (1 << 3)        /* is a CD/DVD drive */
  #define BLKID_FL_NOSCAN_DEV    (1 << 4)        /* do not scan this device */
  #define BLKID_FL_MODIF_BUFF    (1 << 5)        /* cached buffers has been modified */
+#define BLKID_FL_OPAL_LOCKED   (1 << 6)        /* OPAL device is locked (I/O errors) */
  
  /* private per-probing flags */
  #define BLKID_PROBE_FL_IGNORE_PT (1 << 1)      /* ignore partition table */
@@ -407,6 +408,9 @@ extern int blkid_probe_is_tiny(blkid_probe pr)
  extern int blkid_probe_is_cdrom(blkid_probe pr)
                         __attribute__((nonnull))
                         __attribute__((warn_unused_result));
+extern int blkdid_probe_is_opal_locked(blkid_probe pr)
+                       __attribute__((nonnull))
+                       __attribute__((warn_unused_result));
  
  extern unsigned char *blkid_probe_get_buffer(blkid_probe pr,
                                  uint64_t off, uint64_t len)
diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c

index 61c7a446802f62b66a4f7268e65d0d03e672f7ed..35de30334697c712a8b068d342d96f88a44321e1 100644 (file)
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -110,6 +110,9 @@
  #include <stdint.h>
  #include <stdarg.h>
  #include <limits.h>
+#ifdef HAVE_OPAL_GET_STATUS
+#include <linux/sed-opal.h>
+#endif
  
  #include "blkidP.h"
  #include "all-io.h"
@@ -578,8 +581,23 @@ static struct blkid_bufinfo *read_buffer(blkid_probe pr, uint64_t real_off, uint
  
                 /* I/O errors on CDROMs are non-fatal to work with hybrid
                  * audio+data disks */
-               if (ret >= 0 || blkid_probe_is_cdrom(pr))
+               if (ret >= 0 || blkid_probe_is_cdrom(pr) || blkdid_probe_is_opal_locked(pr))
                         errno = 0;
+#ifdef HAVE_OPAL_GET_STATUS
+               else {
+                       struct opal_status st = { };
+
+                       /* If the device is locked with OPAL, we'll fail to read with I/O
+                        * errors when probing deep into the block device. Do not return
+                        * an error, so that we can move on to different types of checks.*/
+                       ret = ioctl(pr->fd, IOC_OPAL_GET_STATUS, &st);
+                       if (ret == 0 && (st.flags & OPAL_FL_LOCKED)) {
+                               pr->flags |= BLKID_FL_OPAL_LOCKED;
+                               errno = 0;
+                       }
+               }
+#endif
+
                 return NULL;
         }
  
@@ -815,6 +833,11 @@ int blkid_probe_is_cdrom(blkid_probe pr)
         return (pr->flags & BLKID_FL_CDROM_DEV);
  }
  
+int blkdid_probe_is_opal_locked(blkid_probe pr)
+{
+       return (pr->flags & BLKID_FL_OPAL_LOCKED);
+}
+
  #ifdef CDROM_GET_CAPABILITY
  
  static int is_sector_readable(int fd, uint64_t sector)
diff --git a/meson.build b/meson.build

index 5139a3fd0593f82e05b4cca7d72262adf30c3e62..f0ebe074144e96624aa0e519ce2ac0d287a59593 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -692,6 +692,9 @@ int main(void) {
  have = cc.compiles(code, name : 'using __progname')
  conf.set('HAVE___PROGNAME', have ? 1 : false)
  
+have_opal_get_status= cc.has_header_symbol('linux/sed-opal.h', 'IOC_OPAL_GET_STATUS')
+conf.set('HAVE_OPAL_GET_STATUS', have_opal_get_status ? 1 : false)
+
  build_plymouth_support = get_option('build-plymouth-support')
  have_tiocglcktrmios = cc.has_header_symbol(
    'sys/ioctl.h', 'TIOCGLCKTRMIOS',
author	Luca Boccassi <bluca@debian.org>
	Wed, 22 Feb 2023 01:33:36 +0000 (01:33 +0000)
committer	Luca Boccassi <bluca@debian.org>
	Wed, 22 Feb 2023 02:02:03 +0000 (02:02 +0000)
configure.ac		patch \| blob \| blame \| history
libblkid/src/blkidP.h		patch \| blob \| blame \| history
libblkid/src/probe.c		patch \| blob \| blame \| history
meson.build		patch \| blob \| blame \| history