sed-opal: if key is available from IOC_OPAL_SAVE use it when locking
Subsystems (2)
PATCH 1/1 sed-opal: if key is available from IOC_OPAL_SAVE use it when locking
From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the 'IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.
If the caller provides a key on the other hand it will still be used as before, no changes in that case.
--- block/sed-opal.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
block/sed-opal.c +29 -0
@@ -2470,6 +2470,35 @@ static int opal_lock_unlock(struct opal_dev *dev,return -EINVAL ;mutex_lock (&dev->dev_lock); + +/* +* Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key +* is not required, as it requires root privileges anyway, and root can deny +* access to a disk in many ways regardless. Requiring the volume key to lock +* the device is a peculiarity of the OPAL specification. +* Given we might already have saved the key if the user requested it via the +* 'IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was +* provided here and the locking range matches. This allows integrating OPAL +* with tools and libraries that are used to the common behaviour and do not +* ask for the volume key when closing a device. +*/ +if (lk_unlk->l_state ==OPAL_LK && lk_unlk->session.opal_key.key_len ==0 ) { +struct opal_suspend_data *iter; + +setup_opal_dev (dev); +list_for_each_entry (iter, &dev->unlk_lst, node) { +if (iter->lr == lk_unlk->session.opal_key.lr && + iter->unlk.session.opal_key.key_len >0 ) { + lk_unlk->session.opal_key.key_len = + iter->unlk.session.opal_key.key_len; +memcpy (lk_unlk->session.opal_key.key, + iter->unlk.session.opal_key.key, + iter->unlk.session.opal_key.key_len); +break ; + } + } + } + ret =__opal_lock_unlock (dev, lk_unlk);mutex_unlock (&dev->dev_lock);
Signature · 1 line
2.35.1
Quoted 14 lines · On Fri, Dec 02, 2022 at 12:36:10AM +0000, [email protected] wrote:
From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the '
IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.
Quoted 6 lines
If the caller provides a key on the other hand it will still be used as before, no changes in that case.
Suggested-by Štěpán Horáček <[email protected]>Signed-off-by Luca Boccassi <[email protected]>---
But it would be quite the change in behavior for existing users, no?
It might be better to add an ioctl that would allow to set an option on the opal device after it was opened which marks it as closable without providing the key?
Quoted 3 lines · Christian Brauner
It might be better to add an ioctl that would allow to set an option on the opal device after it was opened which marks it as closable without providing the key?
Yes.
And while we're at it: please fix the overly long lines in the block comment that make it completely unreadable.
Quoted 23 lines · Christian Brauner
Quoted 14 lines · On Fri, Dec 02, 2022 at 12:36:10AM +0000, [email protected] wrote:
From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the '
IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.Quoted 6 lines
If the caller provides a key on the other hand it will still be used as before, no changes in that case.
Suggested-by Štěpán Horáček <[email protected]>Signed-off-by Luca Boccassi <[email protected]>---
Quoted 5 lines
But it would be quite the change in behavior for existing users, no?
It might be better to add an ioctl that would allow to set an option on the opal device after it was opened which marks it as closable without providing the key?
Closing with a zero-length key could not work before and would fail with eperm, so I can't imagine anyone using it as such, so I didn't bother.
But I don't mind either way, so I will add a new ioctl for v2.
Kind regards,
Luca Boccassi
Quoted 26 lines · Luca Boccassi
Quoted 25 lines · Christian Brauner
Quoted 14 lines · On Fri, Dec 02, 2022 at 12:36:10AM +0000, [email protected] wrote:
From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the '
IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.Quoted 6 lines
If the caller provides a key on the other hand it will still be used as before, no changes in that case.
Suggested-by Štěpán Horáček <[email protected]>Signed-off-by Luca Boccassi <[email protected]>---
But it would be quite the change in behavior for existing users, no?
Quoted 7 lines
Quoted 3 lines
It might be better to add an ioctl that would allow to set an option on the opal device after it was opened which marks it as closable without providing the key?
Closing with a zero-length key could not work before and would fail with eperm, so I can't imagine anyone using it as such, so I didn't bother.
That's not the point though. Afaict, with your change users that rely on the device only being closable by users that have access to the key couldn't rely on his anymore. At least that's what the change description seems to imply.
PATCH v2 1/1 sed-opal: allow using IOC_OPAL_SAVE for locking too
In reply to [email protected]From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the 'IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches, and the user sets the appropriate flag with 'IOC_OPAL_SAVE'. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.
Callers can always pass a non-zero key and it will be used regardless, as before.
---
v2: break on 80chr for optimal rendering on 1970s green monochrome monitors
make the new functionality dependent on a new flag that has to be passed to IOC_OPAL_SAVE, using reserved bits in its ioctl struct
block/sed-opal.c | 32 ++++++++++++++++++++++++++++++++ include/uapi/linux/sed-opal.h | 3 ++- 2 files changed, 34 insertions(+), 1 deletion(-)
block/sed-opal.c +32 -0
@@ -2470,6 +2470,38 @@ static int opal_lock_unlock(struct opal_dev *dev,return -EINVAL ;mutex_lock (&dev->dev_lock); + +/* +* Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume +* key is not required, as it requires root privileges anyway, and root can +* deny access to a disk in many ways regardless. Requiring the volume key +* to lock the device is a peculiarity of the OPAL specification. +* Given we might already have saved the key if the user requested it via +* the 'IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no +* key was provided here, the locking range matches and the appropriate +* flag was passed with 'IOC_OPAL_SAVE'. This allows integrating OPAL with +* tools and libraries that are used to the common behaviour and do not ask +* for the volume key when closing a device. +*/ +if (lk_unlk->l_state ==OPAL_LK && + lk_unlk->session.opal_key.key_len ==0 ) { +struct opal_suspend_data *iter; + +setup_opal_dev (dev); +list_for_each_entry (iter, &dev->unlk_lst, node) { +if (iter->unlk.save_for_lock && + iter->lr == lk_unlk->session.opal_key.lr && + iter->unlk.session.opal_key.key_len >0 ) { + lk_unlk->session.opal_key.key_len = + iter->unlk.session.opal_key.key_len; +memcpy (lk_unlk->session.opal_key.key, + iter->unlk.session.opal_key.key, + iter->unlk.session.opal_key.key_len); +break ; + } + } + } + ret =__opal_lock_unlock (dev, lk_unlk);mutex_unlock (&dev->dev_lock);
include/uapi/linux/sed-opal.h +2 -1
@@ -76,7 +76,8 @@ struct opal_user_lr_setup {struct opal_lock_unlock {struct opal_session_info session;__u32 l_state; -__u8 __align[4 ]; +__u8 save_for_lock:1 ;/* if in IOC_OPAL_SAVE will also use key to lock */ +__u8 __align[3 ]; };struct opal_new_pw {
Signature · 1 line
2.35.1
Re: [PATCH v2] sed-opal: allow using IOC_OPAL_SAVE for locking too
block/sed-opal.c static int opal_lock_unlock(struct opal_dev *dev, · line 2475
Quoted 1 line · On Sat, Dec 03, 2022 at 12:12:43AM +0000, [email protected] wrote:
block/sed-opal.c +1
-0+* Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume
As said last time, please correctly format your block comments so that they don't spill out of 80 characters for every single line and become completely unreadable.
Quoted 7 lines
block/sed-opal.c +7
-0+if (lk_unlk->l_state ==OPAL_LK && + lk_unlk->session.opal_key.key_len ==0 ) { +struct opal_suspend_data *iter; + +setup_opal_dev (dev); +list_for_each_entry (iter, &dev->unlk_lst, node) { + if (iter->unlk.save_for_lock &&
block/sed-opal.c static int opal_lock_unlock(struct opal_dev *dev, · line 2502
Quoted 10 lines
block/sed-opal.c +10
-0+ iter->lr == lk_unlk->session.opal_key.lr && + iter->unlk.session.opal_key.key_len > 0) { + lk_unlk->session.opal_key.key_len = + iter->unlk.session.opal_key.key_len; +memcpy (lk_unlk->session.opal_key.key, + iter->unlk.session.opal_key.key, + iter->unlk.session.opal_key.key_len); +break ; + } + }
And please split this logic into a helper.
include/uapi/linux/sed-opal.h struct opal_user_lr_setup { · line 79
Quoted 3 lines
include/uapi/linux/sed-opal.h +1
-1__u32 l_state; -__u8 __align[4 ]; + __u8 save_for_lock:1; /* if in IOC_OPAL_SAVE will also use key to lock */
Please never use bitfields in ABIs, the psABI rules for them are just a mess to start with, and not filling all of them leads to leaks of stack contents as well. Just turn the entire 4 bytes into a flags field and then just bitmasks.
PATCH v3 1/1 sed-opal: allow using IOC_OPAL_SAVE for locking too
In reply to [email protected]From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the 'IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches, and the user sets the appropriate flag with 'IOC_OPAL_SAVE'. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.
Callers can always pass a non-zero key and it will be used regardless, as before.
---
v3: split out static helper, switch from bitfield to flags field (leaving
two bytes for future use, u16 should be enough for flags for this ioctl)
block/sed-opal.c | 39 +++++++++++++++++++++++++++++++++++ include/uapi/linux/sed-opal.h | 8 ++++++- 2 files changed, 46 insertions(+), 1 deletion(-)
block/sed-opal.c +39 -0
@@ -2461,6 +2461,44 @@ static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)return execute_steps (dev, mbrdone_step,ARRAY_SIZE (mbrdone_step)); } +static void opal_lock_check_for_saved_key (struct opal_dev *dev, +struct opal_lock_unlock *lk_unlk) +{ +struct opal_suspend_data *iter; + +if (lk_unlk->l_state !=OPAL_LK || + lk_unlk->session.opal_key.key_len >0 ) +return ; + +/* +* Usually when closing a crypto device (eg: dm-crypt with LUKS) the +* volume key is not required, as it requires root privileges anyway, +* and root can deny access to a disk in many ways regardless. +* Requiring the volume key to lock the device is a peculiarity of the +* OPAL specification. Given we might already have saved the key if +* the user requested it via the 'IOC_OPAL_SAVE' ioctl, we can use +* that key to lock the device if no key was provided here, the +* locking range matches and the appropriate flag was passed with +* 'IOC_OPAL_SAVE'. +* This allows integrating OPAL with tools and libraries that are used +* to the common behaviour and do not ask for the volume key when +* closing a device. +*/ +setup_opal_dev (dev); +list_for_each_entry (iter, &dev->unlk_lst, node) { +if ((iter->unlk.flags &OPAL_SAVE_FOR_LOCK ) && + iter->lr == lk_unlk->session.opal_key.lr && + iter->unlk.session.opal_key.key_len >0 ) { + lk_unlk->session.opal_key.key_len = + iter->unlk.session.opal_key.key_len; +memcpy (lk_unlk->session.opal_key.key, + iter->unlk.session.opal_key.key, + iter->unlk.session.opal_key.key_len); +break ; + } + } +} +static int opal_lock_unlock (struct opal_dev *dev,struct opal_lock_unlock *lk_unlk) {
@@ -2470,6 +2508,7 @@ static int opal_lock_unlock(struct opal_dev *dev,return -EINVAL ;mutex_lock (&dev->dev_lock); +opal_lock_check_for_saved_key (dev, lk_unlk); ret =__opal_lock_unlock (dev, lk_unlk);mutex_unlock (&dev->dev_lock);
include/uapi/linux/sed-opal.h +7 -1
@@ -44,6 +44,11 @@ enum opal_lock_state { OPAL_LK = 0x04, /* 0100 */ }; +enum opal_lock_flags { +/* IOC_OPAL_SAVE will also store the provided key for locking */ +OPAL_SAVE_FOR_LOCK =0x01 , +}; +struct opal_key {__u8 lr;__u8 key_len;
@@ -76,7 +81,8 @@ struct opal_user_lr_setup {struct opal_lock_unlock {struct opal_session_info session;__u32 l_state; -__u8 __align[4 ]; +__u16 flags; +__u8 __align[2 ]; };struct opal_new_pw {
Signature · 1 line
2.35.1
Re: [PATCH v3] sed-opal: allow using IOC_OPAL_SAVE for locking too
Looks good:
Re: [PATCH v3] sed-opal: allow using IOC_OPAL_SAVE for locking too
In reply to [email protected]Quoted 15 lines · On Tue, Dec 06, 2022 at 12:03:46AM +0000, [email protected] wrote:
From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the '
IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches, and the user sets the appropriate flag with 'IOC_OPAL_SAVE'. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.
Quoted 6 lines
Callers can always pass a non-zero key and it will be used regardless, as before.
Suggested-by Štěpán Horáček <[email protected]>Signed-off-by Luca Boccassi <[email protected]>---
Looks good to me,
PATCH v4 1/1 sed-opal: allow using IOC_OPAL_SAVE for locking too
In reply to [email protected]From: Luca Boccassi <[email protected]>
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Given we might already have saved the key if the user requested it via the 'IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches, and the user sets the appropriate flag with 'IOC_OPAL_SAVE'. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.
Callers can always pass a non-zero key and it will be used regardless, as before.
---
v4: add reviewed-by tags, no other changes
block/sed-opal.c | 39 +++++++++++++++++++++++++++++++++++ include/uapi/linux/sed-opal.h | 8 ++++++- 2 files changed, 46 insertions(+), 1 deletion(-)
block/sed-opal.c +39 -0
@@ -2461,6 +2461,44 @@ static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)return execute_steps (dev, mbrdone_step,ARRAY_SIZE (mbrdone_step)); } +static void opal_lock_check_for_saved_key (struct opal_dev *dev, +struct opal_lock_unlock *lk_unlk) +{ +struct opal_suspend_data *iter; + +if (lk_unlk->l_state !=OPAL_LK || + lk_unlk->session.opal_key.key_len >0 ) +return ; + +/* +* Usually when closing a crypto device (eg: dm-crypt with LUKS) the +* volume key is not required, as it requires root privileges anyway, +* and root can deny access to a disk in many ways regardless. +* Requiring the volume key to lock the device is a peculiarity of the +* OPAL specification. Given we might already have saved the key if +* the user requested it via the 'IOC_OPAL_SAVE' ioctl, we can use +* that key to lock the device if no key was provided here, the +* locking range matches and the appropriate flag was passed with +* 'IOC_OPAL_SAVE'. +* This allows integrating OPAL with tools and libraries that are used +* to the common behaviour and do not ask for the volume key when +* closing a device. +*/ +setup_opal_dev (dev); +list_for_each_entry (iter, &dev->unlk_lst, node) { +if ((iter->unlk.flags &OPAL_SAVE_FOR_LOCK ) && + iter->lr == lk_unlk->session.opal_key.lr && + iter->unlk.session.opal_key.key_len >0 ) { + lk_unlk->session.opal_key.key_len = + iter->unlk.session.opal_key.key_len; +memcpy (lk_unlk->session.opal_key.key, + iter->unlk.session.opal_key.key, + iter->unlk.session.opal_key.key_len); +break ; + } + } +} +static int opal_lock_unlock (struct opal_dev *dev,struct opal_lock_unlock *lk_unlk) {
@@ -2470,6 +2508,7 @@ static int opal_lock_unlock(struct opal_dev *dev,return -EINVAL ;mutex_lock (&dev->dev_lock); +opal_lock_check_for_saved_key (dev, lk_unlk); ret =__opal_lock_unlock (dev, lk_unlk);mutex_unlock (&dev->dev_lock);
include/uapi/linux/sed-opal.h +7 -1
@@ -44,6 +44,11 @@ enum opal_lock_state { OPAL_LK = 0x04, /* 0100 */ }; +enum opal_lock_flags { +/* IOC_OPAL_SAVE will also store the provided key for locking */ +OPAL_SAVE_FOR_LOCK =0x01 , +}; +struct opal_key {__u8 lr;__u8 key_len;
@@ -76,7 +81,8 @@ struct opal_user_lr_setup {struct opal_lock_unlock {struct opal_session_info session;__u32 l_state; -__u8 __align[4 ]; +__u16 flags; +__u8 __align[2 ]; };struct opal_new_pw {
Signature · 1 line
2.35.1
Jens Axboe
maintainerRe: [PATCH v4] sed-opal: allow using IOC_OPAL_SAVE for locking too
Quoted 1 line · On 12/6/22 2:29 AM, [email protected] wrote:
v4: add reviewed-by tags, no other changes
Never resend just for that, normal patch tooling picks that up automatically hence it's just pointless noise.
Signature · 1 line
Jens Axboe
Re: [PATCH v4] sed-opal: allow using IOC_OPAL_SAVE for locking too
Quoted 6 lines · Jens Axboe
Quoted 1 line · On 12/6/22 2:29 AM, [email protected] wrote:
v4: add reviewed-by tags, no other changes
Never resend just for that, normal patch tooling picks that up automatically hence it's just pointless noise.
Sorry, didn't know about that.
Kind Regards,
Luca Boccassi
Re: [PATCH v4] sed-opal: allow using IOC_OPAL_SAVE for locking too
In reply to [email protected]Quoted 6 lines · On Tue, 06 Dec 2022 09:29:13 +0000, [email protected] wrote:
Usually when closing a crypto device (eg: dm-crypt with LUKS) the volume key is not required, as it requires root privileges anyway, and root can deny access to a disk in many ways regardless. Requiring the volume key to lock the device is a peculiarity of the OPAL specification.
Quoted 8 lines
Given we might already have saved the key if the user requested it via the '
IOC_OPAL_SAVE' ioctl, we can use that key to lock the device if no key was provided here and the locking range matches, and the user sets the appropriate flag with 'IOC_OPAL_SAVE'. This allows integrating OPAL with tools and libraries that are used to the common behaviour and do not ask for the volume key when closing a device.[...]
Applied, thanks!
[1/1] sed-opal: allow using IOC_OPAL_SAVE for locking too
commit: c1f480b2d092960ecf8bb0bd1f27982c33ada42a
Best regards,
Signature · 1 line
Jens Axboe