Received: by 10.213.65.68 with SMTP id h4csp340925imn; Tue, 13 Mar 2018 06:12:07 -0700 (PDT) X-Google-Smtp-Source: AG47ELvwhVFIW2RO17N/kz4X43j2FV6Bbb5omE9JBMFKqYqhIO+ogvuLzgL9+TZ6usfB5ZfYBl6b X-Received: by 2002:a17:902:5852:: with SMTP id f18-v6mr513584plj.289.1520946726984; Tue, 13 Mar 2018 06:12:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520946726; cv=none; d=google.com; s=arc-20160816; b=A4CpAf1Pi2X6xGPXZihvh9b0dhhxYQ4LQ3V541Xv959ZOfdkwyoTdPBLZTAirSAgRD 3nSJMUKhuQl/NbAAdoQVxcCf8kYwQrfMPZRlrVZo+WTyu9Fhj4wGSrdkBD2GDqcUyPO0 GlBMlmlgQOQ0GGYRu061Ws14E9kXhxWg5IDrk2aOcnSK2Fp55qORBN9ps+UUsN0UV6F4 Zr3e09m4yFH62dIqd0KIGi01ETf8KjuygaC2vw4DBiDoWWatWQgxVgZzwXIBqYcndEOM HgdfFcd2nezE8PeclEEJc8qM1anGXWMxKzdbjYwAk50PqkXGSe5pNDpcxebB/yhcot6e PuLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=SFDhFg6Z8gs6m2p2wprsxjdi0Ke83Pe7ov15qGTDIXw=; b=r2lYgRfhE9H4IvD3WqTH0J1jIoqqhWRwNISZU4owrXDc4c9TxeNCUw3jw6lDHB11nc /oBL6o0cvvWdusSimFZ+L76WvwE7URKzYpeSeTQ32bP4X+7B0k9bCIzSYliHrqivzkX7 +py3Kx6tJ9/s7dqZ9WROAr0TDyn/zgs3XxsYKmPDu39d8FutSVOjuB4GuR2VLdLm5IAL rFz5oguQA32SkOyhE487Po0mpIrTuQpS46U3BR/mVqqhQ5ptgy2R7S97oxkuB33Cx5Zr EsM/ncKcw8aByz2mQyKbciZu8GZ8pdbhx+9FTVpIxoz40ZKmDNr3ANfvGMPoJx/6tfAP bONw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r26si121007pfi.378.2018.03.13.06.11.52; Tue, 13 Mar 2018 06:12:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932641AbeCMNKJ (ORCPT + 99 others); Tue, 13 Mar 2018 09:10:09 -0400 Received: from mx-rz-2.rrze.uni-erlangen.de ([131.188.11.21]:48496 "EHLO mx-rz-2.rrze.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932553AbeCMNKF (ORCPT ); Tue, 13 Mar 2018 09:10:05 -0400 Received: from mx-rz-2.rrze.uni-erlangen.de (mx-rz-2.rrze.uni-erlangen.de [IPv6:2001:638:a000:1025::15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx-rz-2.rrze.uni-erlangen.de (Postfix) with ESMTPS id 400wF807xVzPkN9; Tue, 13 Mar 2018 14:10:04 +0100 (CET) Authentication-Results: mx-rz-2.rrze.uni-erlangen.de; dkim=none reason="no signature"; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Quarantine-ID: <5uvBVUCH5tc7> X-Virus-Scanned: amavisd-new at boeck4.rrze.uni-erlangen.de (RRZE) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-RRZE-Flag: Not-Spam X-RRZE-Submit-IP: 2003:d5:3c2:e00:dbd1:5c46:f440:b630 Received: from fau.de (p200300D503C20E00DBD15C46F440B630.dip0.t-ipconnect.de [IPv6:2003:d5:3c2:e00:dbd1:5c46:f440:b630]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: U2FsdGVkX1/MGxeHa15J+TV1f8xBySZivA//KYAW0Tc=) by smtp-auth.uni-erlangen.de (Postfix) with ESMTPSA id 400wF44vqjzPlQ9; Tue, 13 Mar 2018 14:10:00 +0100 (CET) From: Jonas Rabenstein To: Jonas Rabenstein , Scott Bauer , Jonathan Derrick , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] block: sed-opal: ioctl for writing to shadow mbr Date: Tue, 13 Mar 2018 14:09:01 +0100 Message-Id: X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow modification of the shadow mbr. If the shadow mbr is not marked as done, this data will be presented read only as the device content. Only after marking the shadow mbr as done and unlocking a locking range the actual content is accessible. Signed-off-by: Jonas Rabenstein --- block/sed-opal.c | 74 +++++++++++++++++++++++++++++++++++++++++++ include/linux/sed-opal.h | 1 + include/uapi/linux/sed-opal.h | 8 +++++ 3 files changed, 83 insertions(+) diff --git a/block/sed-opal.c b/block/sed-opal.c index b201c96d23a3..1ec3734af656 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -1491,6 +1491,52 @@ static int set_mbr_enable_disable(struct opal_dev *dev, void *data) return finalize_and_send(dev, parse_and_check_status); } +static int write_shadow_mbr(struct opal_dev *dev, void *data) +{ + struct opal_shadow_mbr *shadow = data; + size_t off; + u64 len; + int err = 0; + u8 *payload; + + /* FIXME: this is the maximum we can use for IO_BUFFER_LENGTH=2048. + * Instead of having constant, it would be nice to compute the + * actual value depending on IO_BUFFER_LENGTH + */ + len = 1950; + + /* do the actual transmission(s) */ + for (off = 0 ; off < shadow->size; off += len) { + len = min(len, shadow->size - off); + + pr_debug("MBR: write bytes %zu+%llu/%llu\n", + off, len, shadow->size); + err = start_opal_cmd(dev, opaluid[OPAL_MBR], + opalmethod[OPAL_SET]); + add_token_u8(&err, dev, OPAL_STARTNAME); + add_token_u8(&err, dev, OPAL_WHERE); + add_token_u64(&err, dev, shadow->offset + off); + add_token_u8(&err, dev, OPAL_ENDNAME); + + add_token_u8(&err, dev, OPAL_STARTNAME); + add_token_u8(&err, dev, OPAL_VALUES); + payload = add_bytestring_header(&err, dev, len); + if (!payload) + break; + if (copy_from_user(payload, shadow->data + off, len)) + err = -EFAULT; + + add_token_u8(&err, dev, OPAL_ENDNAME); + if (err) + break; + + err = finalize_and_send(dev, parse_and_check_status); + if (err) + break; + } + return err; +} + static int generic_pw_cmd(u8 *key, size_t key_len, u8 *cpin_uid, struct opal_dev *dev) { @@ -2036,6 +2082,31 @@ static int opal_mbr_status(struct opal_dev *dev, struct opal_mbr_data *opal_mbr) return ret; } +static int opal_write_shadow_mbr(struct opal_dev *dev, + struct opal_shadow_mbr *info) +{ + const struct opal_step mbr_steps[] = { + { opal_discovery0, }, + { start_admin1LSP_opal_session, &info->key }, + { write_shadow_mbr, info }, + { end_opal_session, }, + { NULL, } + }; + int ret; + + if (info->size == 0) + return 0; + + if (!access_ok(VERIFY_READ, info->data, info->size)) + return -EINVAL; + + mutex_lock(&dev->dev_lock); + setup_opal_dev(dev, mbr_steps); + ret = next(dev); + mutex_unlock(&dev->dev_lock); + return ret; +} + static int opal_save(struct opal_dev *dev, struct opal_lock_unlock *lk_unlk) { struct opal_suspend_data *suspend; @@ -2368,6 +2439,9 @@ int sed_ioctl(struct opal_dev *dev, unsigned int cmd, void __user *arg) case IOC_OPAL_MBR_STATUS: ret = opal_mbr_status(dev, p); break; + case IOC_OPAL_WRITE_SHADOW_MBR: + ret = opal_write_shadow_mbr(dev, p); + break; case IOC_OPAL_ERASE_LR: ret = opal_erase_locking_range(dev, p); break; diff --git a/include/linux/sed-opal.h b/include/linux/sed-opal.h index b38dc602cae3..cf08cdc13cbd 100644 --- a/include/linux/sed-opal.h +++ b/include/linux/sed-opal.h @@ -47,6 +47,7 @@ static inline bool is_sed_ioctl(unsigned int cmd) case IOC_OPAL_ENABLE_DISABLE_MBR: case IOC_OPAL_ERASE_LR: case IOC_OPAL_SECURE_ERASE_LR: + case IOC_OPAL_WRITE_SHADOW_MBR: case IOC_OPAL_MBR_STATUS: return true; } diff --git a/include/uapi/linux/sed-opal.h b/include/uapi/linux/sed-opal.h index 0cb9890cdc04..c2669ebff681 100644 --- a/include/uapi/linux/sed-opal.h +++ b/include/uapi/linux/sed-opal.h @@ -104,6 +104,13 @@ struct opal_mbr_data { __u8 __align[7]; }; +struct opal_shadow_mbr { + struct opal_key key; + const __u8 *data; + __u64 offset; + __u64 size; +}; + #define IOC_OPAL_SAVE _IOW('p', 220, struct opal_lock_unlock) #define IOC_OPAL_LOCK_UNLOCK _IOW('p', 221, struct opal_lock_unlock) #define IOC_OPAL_TAKE_OWNERSHIP _IOW('p', 222, struct opal_key) @@ -117,5 +124,6 @@ struct opal_mbr_data { #define IOC_OPAL_ERASE_LR _IOW('p', 230, struct opal_session_info) #define IOC_OPAL_SECURE_ERASE_LR _IOW('p', 231, struct opal_session_info) #define IOC_OPAL_MBR_STATUS _IOW('p', 232, struct opal_mbr_data) +#define IOC_OPAL_WRITE_SHADOW_MBR _IOW('p', 233, struct opal_shadow_mbr) #endif /* _UAPI_SED_OPAL_H */ -- 2.16.1