Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5514822yba; Tue, 30 Apr 2019 16:32:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqxjKTmDz+TaQYpabv9YVUMzXx5Lqe6hwUcbfgWfagZSgy+/jt6Dq+NMKrZS9y/X+1Y6gwKp X-Received: by 2002:a17:902:9048:: with SMTP id w8mr72547328plz.195.1556667131789; Tue, 30 Apr 2019 16:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556667131; cv=none; d=google.com; s=arc-20160816; b=twcYWCkhCsyrkiQ38dA1/1JEfNhVS7/vw7jJXXNLAd3kBc2GNKuu1mZKlF7dsWrJ9Y 8YeDBV+D//pqhqYj/0F1ISxLnX/fPuYdqiv2SpZft5wym6Ni/B5KlR7XBu8yNjX2TXpj Tg1Nm7YqgmgzLGBUiPtkVkz7IwS849IsjHhxJetcPMZ58Cw2T+UOqezJf9qJWw+2UnWB CLvgdZyKgaR4wz5Ns1N7e1WrqD/gX/fWDrLSPOpATOP6S5IV0ki/lJrJo2fJAY5QFg5+ des3mQksprt0PeTTJFJUtBBuhZeVDZc7mmqlRy6A9C3wICYi9NyZsEZkQ2raDvx/XIi5 kLOQ== 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=z950GQ09xqDj1VQ8RNlQ970vQnKiBdyxx8mQuvYI/WE=; b=Y6tb5KIlFaILyQopOCu6MUw1TMu3U8FsPH3CqGirchi4EAXZxIwkEq+vZL6p1JrJXj 62DBfAAtQENleLOVXFjIw6qyWXLb5Htl3qZmUnne/QcV9UYJqR4Blgo388BJqkHU1KUq rXPbsAOf2uOtlPkcoTNn9f+UGHBOnfXuRXKCxCnRzYIBkUObLXLnYwpIGdw/s3PaSM4E UUztqYuK8COaNsfZ2gS3LgL3/TTpcUtsgyqFNNZ8nJspyJ9/KmLsMy6wNJuuZzTyZmwd 1mnXZgpu48jS8VSZAUxfQmjwjzCnO/ZVA05NbdQ3/8M0FOXJ3uvtDYBlGvn3OqhHn11G Kb9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fjfi.cvut.cz header.s=20151024 header.b=XeYbulpF; 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 k136si14380172pgc.184.2019.04.30.16.31.55; Tue, 30 Apr 2019 16:32:11 -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=XeYbulpF; 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 S1727390AbfD3XbB (ORCPT + 99 others); Tue, 30 Apr 2019 19:31:01 -0400 Received: from mailgw2.fjfi.cvut.cz ([147.32.9.131]:59486 "EHLO mailgw2.fjfi.cvut.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726559AbfD3Xa7 (ORCPT ); Tue, 30 Apr 2019 19:30:59 -0400 Received: from localhost (localhost [127.0.0.1]) by mailgw2.fjfi.cvut.cz (Postfix) with ESMTP id 01D7AA02AE; Wed, 1 May 2019 01:21:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fjfi.cvut.cz; s=20151024; t=1556666467; i=@fjfi.cvut.cz; bh=z950GQ09xqDj1VQ8RNlQ970vQnKiBdyxx8mQuvYI/WE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XeYbulpF02/B+BotL1jrRAAWR2oWx9UOG1q6wYhoGQ435DWqxyd+7GDvgNj/C4aLd lLSHAenFeR7nMVm8kJol6dMCDq5pb07QSB/6jh7+wW6LdZNr0RIGUsyX0KCWve/WBq s2SXQ62BEyH7MQClFUS3uYl9wNpI++sIDqOkZ/aI= 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 M9myyxcmA_3j; 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 E5AABA02B8; Wed, 1 May 2019 01:20:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailgw2.fjfi.cvut.cz E5AABA02B8 Received: by linux.fjfi.cvut.cz (Postfix, from userid 1001) id A66A360050; 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 3/3] block: sed-opal: check size of shadow mbr Date: Wed, 1 May 2019 01:20:59 +0200 Message-Id: <1556666459-17948-4-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 Check whether the shadow mbr does fit in the provided space on the target. Also a proper firmware should handle this case and return an error we may prevent problems or even damage with crappy firmwares. Signed-off-by: Jonas Rabenstein Signed-off-by: David Kozub Reviewed-by: Scott Bauer Reviewed-by: Jon Derrick --- block/opal_proto.h | 16 ++++++++++++++++ block/sed-opal.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/block/opal_proto.h b/block/opal_proto.h index b6e352cfe982..5e8df3245eb0 100644 --- a/block/opal_proto.h +++ b/block/opal_proto.h @@ -106,6 +106,7 @@ enum opal_uid { OPAL_ENTERPRISE_BANDMASTER0_UID, OPAL_ENTERPRISE_ERASEMASTER_UID, /* tables */ + OPAL_TABLE_TABLE, OPAL_LOCKINGRANGE_GLOBAL, OPAL_LOCKINGRANGE_ACE_RDLOCKED, OPAL_LOCKINGRANGE_ACE_WRLOCKED, @@ -160,6 +161,21 @@ enum opal_token { OPAL_STARTCOLUMN = 0x03, OPAL_ENDCOLUMN = 0x04, OPAL_VALUES = 0x01, + /* table table */ + OPAL_TABLE_UID = 0x00, + OPAL_TABLE_NAME = 0x01, + OPAL_TABLE_COMMON = 0x02, + OPAL_TABLE_TEMPLATE = 0x03, + OPAL_TABLE_KIND = 0x04, + OPAL_TABLE_COLUMN = 0x05, + OPAL_TABLE_COLUMNS = 0x06, + OPAL_TABLE_ROWS = 0x07, + OPAL_TABLE_ROWS_FREE = 0x08, + OPAL_TABLE_ROW_BYTES = 0x09, + OPAL_TABLE_LASTID = 0x0A, + OPAL_TABLE_MIN = 0x0B, + OPAL_TABLE_MAX = 0x0C, + /* authority table */ OPAL_PIN = 0x03, /* locking tokens */ diff --git a/block/sed-opal.c b/block/sed-opal.c index 5acb873e9037..39e3eecca58d 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -138,6 +138,8 @@ static const u8 opaluid[][OPAL_UID_LENGTH] = { /* tables */ + [OPAL_TABLE_TABLE] + { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01 }, [OPAL_LOCKINGRANGE_GLOBAL] = { 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x01 }, [OPAL_LOCKINGRANGE_ACE_RDLOCKED] = @@ -1139,6 +1141,29 @@ static int generic_get_column(struct opal_dev *dev, const u8 *table, return finalize_and_send(dev, parse_and_check_status); } +/* + * see TCG SAS 5.3.2.3 for a description of the available columns + * + * the result is provided in dev->resp->tok[4] + */ +static int generic_get_table_info(struct opal_dev *dev, enum opal_uid table, + u64 column) +{ + u8 uid[OPAL_UID_LENGTH]; + const unsigned int half = OPAL_UID_LENGTH/2; + + /* sed-opal UIDs can be split in two halves: + * first: actual table index + * second: relative index in the table + * so we have to get the first half of the OPAL_TABLE_TABLE and use the + * first part of the target table as relative index into that table + */ + memcpy(uid, opaluid[OPAL_TABLE_TABLE], half); + memcpy(uid+half, opaluid[table], half); + + return generic_get_column(dev, uid, column); +} + static int gen_key(struct opal_dev *dev, void *data) { u8 uid[OPAL_UID_LENGTH]; @@ -1554,6 +1579,20 @@ static int write_shadow_mbr(struct opal_dev *dev, void *data) u64 len; int err = 0; + /* do we fit in the available shadow mbr space? */ + err = generic_get_table_info(dev, OPAL_MBR, OPAL_TABLE_ROWS); + if (err) { + pr_debug("MBR: could not get shadow size\n"); + return err; + } + + len = response_get_u64(&dev->parsed, 4); + if (shadow->size > len || shadow->offset > len - shadow->size) { + pr_debug("MBR: does not fit in shadow (%llu vs. %llu)\n", + shadow->offset + shadow->size, len); + return -ENOSPC; + } + /* do the actual transmission(s) */ src = (u8 __user *)(uintptr_t)shadow->data; while (off < shadow->size) { -- 2.20.1