Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5515839yba; Tue, 30 Apr 2019 16:33:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqwe16sPgxvfeFj68e3s0Ad2Zqez/Ad+iW0ZHkOo/ge2J7hupnAhW7pxHvHf33uz+IzIb8P3 X-Received: by 2002:a17:902:e683:: with SMTP id cn3mr1121479plb.115.1556667198605; Tue, 30 Apr 2019 16:33:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556667198; cv=none; d=google.com; s=arc-20160816; b=lrKnUHfX9o1IIO1SHYMyrE09WhBFPDyn16QwXafaHdInj7MTis8GxcYXns9B4tI8wu Av12GQQIxbi9TjtFAx+8tp6dXOYzQHQZDNdcRpJBXKwh858PcafwaplQQwVh6KhdO7dS quUoGRPJQnNkONS6nxBFVj+2CTNyVbg6XAexZA1ztfJe+i3ZYw1bAL0vmIkF96qZmqmR +gQXmFWwtcIZFwBeKmDO8YU8OCYyPMn/hhH6jbEdTiKHIYjmOuH0eCMpo7lBu1DHz1lO y3Q5Mcdlwzuhr2G9vLfJN5zRzUSsomTRJZXlpez0dg3K9vPp55BKbMrzztzcwftYhQnU GiJA== 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:message-id:date :subject:cc:to:from:dkim-filter:dkim-signature; bh=jpNFd3cEl9rt88T8uD0VgyCxWvsA+VMlhWgH2FK84n0=; b=SY/2/KmW0WZjpxiEIXs8Eyl5vlGivkirXO+s2fZ8J9LISkpZFT/ijy3WuJH0AYCNvx NOEzX18eQorWGNrK+eGA01voBVDR4/bXoGPQzDP+aMtBn72L6wvLVsrzyhzTlW6St3IM wt71fVLdTZQdRWw9Qyuk3iM/6KXe/1WuR/VmCBZC7/4Sed1Orss1S300qCmn8uIzYcw3 30uWp1cYSruuMmxWrebeX3Z9cNeFmIPZQe0EXnS6LGJjlR4aIhHjLyptMp2wmWNFnRG9 deVAa18yFTzDjKqkcnAApTvTwFmvAV4sw7pu7CPO3+Ks1mxVmuZiOkZklcKYQJMVbZt2 aQRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fjfi.cvut.cz header.s=20151024 header.b=DxOHSarE; 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 l10si30255389pgg.536.2019.04.30.16.33.02; Tue, 30 Apr 2019 16:33:18 -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; dkim=pass header.i=@fjfi.cvut.cz header.s=20151024 header.b=DxOHSarE; 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 S1727310AbfD3Xa7 (ORCPT + 99 others); Tue, 30 Apr 2019 19:30:59 -0400 Received: from mailgw2.fjfi.cvut.cz ([147.32.9.131]:59488 "EHLO mailgw2.fjfi.cvut.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726412AbfD3Xa6 (ORCPT ); Tue, 30 Apr 2019 19:30:58 -0400 Received: from localhost (localhost [127.0.0.1]) by mailgw2.fjfi.cvut.cz (Postfix) with ESMTP id 059E8A022D; Wed, 1 May 2019 01:21:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fjfi.cvut.cz; s=20151024; t=1556666471; i=@fjfi.cvut.cz; bh=jpNFd3cEl9rt88T8uD0VgyCxWvsA+VMlhWgH2FK84n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DxOHSarED2aSd6G7DXLOetKundFejVe23sOot7aUTTfUcDlWZr4GaRN4LPu/FVIXk o58OXxC677Uy+TMxVGYNViQJ4YJKfwCs7l+/5zHIaZXHPCJY3ZEcJHSqwOFk4DhY+J Nc0xtgpzgtS4IWErZdhdSQEtgP8S8DPlo6obBYOw= X-CTU-FNSPE-Virus-Scanned: amavisd-new at fjfi.cvut.cz Received: from mailgw2.fjfi.cvut.cz ([127.0.0.1]) by localhost (mailgw2.fjfi.cvut.cz [127.0.0.1]) (amavisd-new, port 10022) with ESMTP id CEJRMcjzKhjy; Wed, 1 May 2019 01:21:00 +0200 (CEST) Received: from linux.fjfi.cvut.cz (linux.fjfi.cvut.cz [147.32.5.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailgw2.fjfi.cvut.cz (Postfix) with ESMTPS id BB2FCA02B0; Wed, 1 May 2019 01:20:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailgw2.fjfi.cvut.cz BB2FCA02B0 Received: by linux.fjfi.cvut.cz (Postfix, from userid 1001) id 7541A6004E; Wed, 1 May 2019 01:20:59 +0200 (CEST) From: David Kozub To: Jens Axboe , Jonathan Derrick , Scott Bauer , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jonas Rabenstein Subject: [PATCH 2/3] block: sed-opal: ioctl for writing to shadow mbr Date: Wed, 1 May 2019 01:20:58 +0200 Message-Id: <1556666459-17948-3-git-send-email-zub@linux.fjfi.cvut.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1556666459-17948-1-git-send-email-zub@linux.fjfi.cvut.cz> References: <1556666459-17948-1-git-send-email-zub@linux.fjfi.cvut.cz> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonas Rabenstein 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. Co-authored-by: David Kozub Signed-off-by: Jonas Rabenstein Signed-off-by: David Kozub Reviewed-by: Scott Bauer Reviewed-by: Jon Derrick --- block/sed-opal.c | 94 ++++++++++++++++++++++++++++++++++- include/linux/sed-opal.h | 1 + include/uapi/linux/sed-opal.h | 8 +++ 3 files changed, 101 insertions(+), 2 deletions(-) diff --git a/block/sed-opal.c b/block/sed-opal.c index f1eb9c18e335..5acb873e9037 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -34,6 +34,9 @@ #define IO_BUFFER_LENGTH 2048 #define MAX_TOKS 64 +/* Number of bytes needed by cmd_finalize. */ +#define CMD_FINALIZE_BYTES_NEEDED 7 + struct opal_step { int (*fn)(struct opal_dev *dev, void *data); void *data; @@ -531,12 +534,17 @@ static int opal_discovery0_step(struct opal_dev *dev) return execute_step(dev, &discovery0_step, 0); } +static size_t remaining_size(struct opal_dev *cmd) +{ + return IO_BUFFER_LENGTH - cmd->pos; +} + static bool can_add(int *err, struct opal_dev *cmd, size_t len) { if (*err) return false; - if (len > IO_BUFFER_LENGTH || cmd->pos > IO_BUFFER_LENGTH - len) { + if (remaining_size(cmd) < len) { pr_debug("Error adding %zu bytes: end of buffer.\n", len); *err = -ERANGE; return false; @@ -682,7 +690,11 @@ static int cmd_finalize(struct opal_dev *cmd, u32 hsn, u32 tsn) struct opal_header *hdr; int err = 0; - /* close the parameter list opened from cmd_start */ + /* + * Close the parameter list opened from cmd_start. + * The number of bytes added must be equal to + * CMD_FINALIZE_BYTES_NEEDED. + */ add_token_u8(&err, cmd, OPAL_ENDLIST); add_token_u8(&err, cmd, OPAL_ENDOFDATA); @@ -1533,6 +1545,58 @@ 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; + const u8 __user *src; + u8 *dst; + size_t off = 0; + u64 len; + int err = 0; + + /* do the actual transmission(s) */ + src = (u8 __user *)(uintptr_t)shadow->data; + while (off < shadow->size) { + err = cmd_start(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); + + /* + * The bytestring header is either 1 or 2 bytes, so assume 2. + * There also needs to be enough space to accommodate the + * trailing OPAL_ENDNAME (1 byte) and tokens added by + * cmd_finalize. + */ + len = min(remaining_size(dev) - (2+1+CMD_FINALIZE_BYTES_NEEDED), + (size_t)(shadow->size - off)); + pr_debug("MBR: write bytes %zu+%llu/%llu\n", + off, len, shadow->size); + + dst = add_bytestring_header(&err, dev, len); + if (!dst) + break; + if (copy_from_user(dst, src + off, len)) + err = -EFAULT; + dev->pos += len; + + add_token_u8(&err, dev, OPAL_ENDNAME); + if (err) + break; + + err = finalize_and_send(dev, parse_and_check_status); + if (err) + break; + + off += len; + } + return err; +} + static int generic_pw_cmd(u8 *key, size_t key_len, u8 *cpin_uid, struct opal_dev *dev) { @@ -2010,6 +2074,29 @@ static int opal_set_mbr_done(struct opal_dev *dev, return ret; } +static int opal_write_shadow_mbr(struct opal_dev *dev, + struct opal_shadow_mbr *info) +{ + const struct opal_step mbr_steps[] = { + { start_admin1LSP_opal_session, &info->key }, + { write_shadow_mbr, info }, + { end_opal_session, } + }; + int ret; + + if (info->size == 0) + return 0; + + if (!access_ok((void __user *)(uintptr_t)info->data, info->size)) + return -EFAULT; + + mutex_lock(&dev->dev_lock); + setup_opal_dev(dev); + ret = execute_steps(dev, mbr_steps, ARRAY_SIZE(mbr_steps)); + 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; @@ -2326,6 +2413,9 @@ int sed_ioctl(struct opal_dev *dev, unsigned int cmd, void __user *arg) case IOC_OPAL_MBR_DONE: ret = opal_set_mbr_done(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 42b2ce5da7b3..fb5bf6138a98 100644 --- a/include/linux/sed-opal.h +++ b/include/linux/sed-opal.h @@ -48,6 +48,7 @@ static inline bool is_sed_ioctl(unsigned int cmd) case IOC_OPAL_ERASE_LR: case IOC_OPAL_SECURE_ERASE_LR: case IOC_OPAL_MBR_DONE: + case IOC_OPAL_WRITE_SHADOW_MBR: return true; } return false; diff --git a/include/uapi/linux/sed-opal.h b/include/uapi/linux/sed-opal.h index 81dd0e8886a1..9c83785f0a2a 100644 --- a/include/uapi/linux/sed-opal.h +++ b/include/uapi/linux/sed-opal.h @@ -115,6 +115,13 @@ struct opal_mbr_done { __u8 __align[7]; }; +struct opal_shadow_mbr { + struct opal_key key; + const __u64 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) @@ -128,5 +135,6 @@ struct opal_mbr_done { #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_DONE _IOW('p', 232, struct opal_mbr_done) +#define IOC_OPAL_WRITE_SHADOW_MBR _IOW('p', 233, struct opal_shadow_mbr) #endif /* _UAPI_SED_OPAL_H */ -- 2.20.1