Received: by 10.213.65.68 with SMTP id h4csp1731467imn; Mon, 19 Mar 2018 11:42:07 -0700 (PDT) X-Google-Smtp-Source: AG47ELsSFf49wSIR0Q/ZaVpT9oDOskq4jfzoc8NHTVIl2Int4T/wH+fSs/dLapyFT7nuknLuJA3O X-Received: by 10.98.172.13 with SMTP id v13mr7668990pfe.175.1521484927874; Mon, 19 Mar 2018 11:42:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521484927; cv=none; d=google.com; s=arc-20160816; b=k4vZiEIYJQXaDWtaON+GEhJVkVIxDsnJfKUJEf+NN8FmnaQJBPbf695cqUjfAcM5K8 WXRYw84o7U6CPTQRx0RPehJwG3NBopiK+K2b+AB9smKy2gYihwpapgHFfqc3eexcIgAs E5Dl7fvN0QBIrQkECy6178t1LHpBY9mYW2EoOpTXeqIRNMc7H1J+U3Z3CV2zzEqcwzyo 1sF6KyCrfQ476Tq5be177en/smbbpB75/KLale9r3ge6A0k2hf/rl85/cQbbUEmkMPHU yEX4VFcRKqB2a8aMB9mhZgf6fxuNVWrydREhMJdD857pJI198VjywyNUjm7AvcJZY79M JeLw== 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=3C06AHJosH/kuJ0N+pqaSZQeFxgOTV5niGwSAFrwUvs=; b=F+BN7Raauvq+pWfT117Vs3ngOiUZSK9bq9Xlrkg0e2rOmAVrCb6rf/R0iUNzjP9E8P OuSUaB4PZo5rsalbgjzaGJsqHCTp+U6cfsc88OwZ2X10e+EZjMIRincaNvzFJzURt6pw BxFhGys4p367isxyXPvZQ1HTuYNrnm2sx8KTYYOWbtz9A8R03uQbV/lXeGcygrnxvfpb GuXMJZrVhoSDCox5WWLcMQQuz/+J+n/3vG5UrmSYDeZ+qTV4xmN0QAH74hkVXlqeJyIG Fyz7eECVC+HuByDBAbq6t2RsRhlCVVoxL6jR3oXukdOI90G5//s1h2yfw0wU4Y5SW52z 6nXQ== 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 f125si277151pgc.736.2018.03.19.11.41.53; Mon, 19 Mar 2018 11:42:07 -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 S1032215AbeCSSjK (ORCPT + 99 others); Mon, 19 Mar 2018 14:39:10 -0400 Received: from mx-rz-2.rrze.uni-erlangen.de ([131.188.11.21]:47783 "EHLO mx-rz-2.rrze.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032085AbeCSSiH (ORCPT ); Mon, 19 Mar 2018 14:38:07 -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 404lDs0nyvzPk7s; Mon, 19 Mar 2018 19:38:05 +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: X-Virus-Scanned: amavisd-new at boeck2.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:3db:1800:60b5:55d8:d757:229 Received: from fau.de (p200300D503DB180060B555D8D7570229.dip0.t-ipconnect.de [IPv6:2003:d5:3db:1800:60b5:55d8:d757:229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: U2FsdGVkX18n7YefjdqUgQ+cZbxIaUGsPvrglLeL384=) by smtp-auth.uni-erlangen.de (Postfix) with ESMTPSA id 404lDn5QyLzPkHV; Mon, 19 Mar 2018 19:38:01 +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, Christoph Hellwig Subject: [PATCH v2 08/11] block: sed-opal: ioctl for writing to shadow mbr Date: Mon, 19 Mar 2018 19:36:50 +0100 Message-Id: <9f94be9c32887aacdcba75bd6a3902d0350eb987.1521482296.git.jonas.rabenstein@studium.uni-erlangen.de> 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 diff --git a/block/sed-opal.c b/block/sed-opal.c index 2c8baff8bf67..4549fa164e98 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -1492,6 +1492,54 @@ 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; + u64 len; + int err = 0; + + /* FIXME: this is the maximum we can use for IO_BUFFER_LENGTH=2048. + * Instead of having a constant value, it would be nice to + * compute the actual value depending on IO_BUFFER_LENGTH + */ + len = 1950; + + /* do the actual transmission(s) */ + src = (u8 *) shadow->data; + 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); + dst = add_bytestring_header(&err, dev, len); + if (!dst) + break; + if (copy_from_user(dst, src + 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) { @@ -2037,6 +2085,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; @@ -2369,6 +2442,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..8e84307f66d4 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 __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) @@ -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