Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp95912imu; Tue, 22 Jan 2019 14:35:01 -0800 (PST) X-Google-Smtp-Source: ALg8bN4GxOXFXdSxxWpO0n/T29nKvY/TBCqY70TdxYrfeCej76hZXY9Z+kfmD9OtrioOWDSbvVFL X-Received: by 2002:a62:68c5:: with SMTP id d188mr36230631pfc.194.1548196501447; Tue, 22 Jan 2019 14:35:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548196501; cv=none; d=google.com; s=arc-20160816; b=GDiqI1R+auM6VpuT1cpt76vX9gxxp08JEuZ+uPHkEgiNCA+853WuYBRmnWUGt8E/rB /iXDFqXM4Y0GN6kkkYdcrif0QkkAfWMEQnK7owgWfS9yA3gewNKIapGmlpnLpDVTbOYL fvUYDteL5neAm5/BgMMxDo8+tdD1u1gUvAiSrehN8xKyCftAH8mRkJYp59qIPYU2wE+r 19ZgPymqr+d6LsJ/wgA3yOBwtoVHCG4ym7Ssm3euvVbeLKljG7hr8XVbIul4le+EhDTa DrQeEK32IZ49fTFOx8l8eXVC2Ywj+AaB2Lx6l32evUHkrPuek90TkkFGWUFU8FejXnWs 2KFw== 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=3m1osabHxvnQjgOHh2T+FDREipOOLFO8fpNe37d736s=; b=eG3PaTKIhj+LnECKJxbLg5p+zQS5vEpJG+c0fSi9bl6zl+cCar+hQ7fl/zZ4exoJk4 gPNboFfgPL2CMoH9pkSYKMzzi4F5nnu3/EQcibr8SNCIp8SLg0nWiY0idvU/3B9HO9x1 CxuwL9GMDyyQSk7lRPp9D1rc/Q76JPDiJ1gOQgLFpxyTccMn/EVwmqVt34yxHyg8JkuU F1JtND03ARr+V/ti0S3qKrLFB9hZV14KJF5+BTHNNUFvag21kMcar43rgqAncUVLbhQV EytIix7mLcvJTV2creP5qpMockeKNOSHYtHwGSJaZEbjeLkr9NCcj3ZDYpu3sRBqYkT+ xPGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fjfi.cvut.cz header.s=20151024 header.b="NfcPAuv/"; 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 j26si15983146pgl.537.2019.01.22.14.34.45; Tue, 22 Jan 2019 14:35:01 -0800 (PST) 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="NfcPAuv/"; 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 S1727347AbfAVWdA (ORCPT + 99 others); Tue, 22 Jan 2019 17:33:00 -0500 Received: from mailgw1.fjfi.cvut.cz ([147.32.9.3]:45834 "EHLO mailgw1.fjfi.cvut.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727237AbfAVWct (ORCPT ); Tue, 22 Jan 2019 17:32:49 -0500 Received: from localhost (localhost [127.0.0.1]) by mailgw1.fjfi.cvut.cz (Postfix) with ESMTP id 61CE7B066F; Tue, 22 Jan 2019 23:32:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fjfi.cvut.cz; s=20151024; t=1548196366; i=@fjfi.cvut.cz; bh=3m1osabHxvnQjgOHh2T+FDREipOOLFO8fpNe37d736s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NfcPAuv/oR97E3pGXISI4wh642dau7f3POzZwS4ZMhpqpuDZNDygTFlVHw6hbaVEJ 53o2smxoebi2QubY9CrudFQNWand7/bgW+xGATtfbyuFPY3oNZafFYkQe3l5V2Dnbi fzMwuCijkimHCi0N0uJ/8WP8LNxOF3ycTyUzgOXM= X-CTU-FNSPE-Virus-Scanned: amavisd-new at fjfi.cvut.cz Received: from mailgw1.fjfi.cvut.cz ([127.0.0.1]) by localhost (mailgw1.fjfi.cvut.cz [127.0.0.1]) (amavisd-new, port 10022) with ESMTP id pwwQx9C4MTpe; Tue, 22 Jan 2019 23:32:41 +0100 (CET) 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 mailgw1.fjfi.cvut.cz (Postfix) with ESMTPS id 31D2BB0664; Tue, 22 Jan 2019 23:32:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailgw1.fjfi.cvut.cz 31D2BB0664 Received: by linux.fjfi.cvut.cz (Postfix, from userid 1001) id 1638F6004E; Tue, 22 Jan 2019 23:32:35 +0100 (CET) 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 v3 13/16] block: sed-opal: check size of shadow mbr Date: Tue, 22 Jan 2019 23:31:44 +0100 Message-Id: <1548196307-12987-14-git-send-email-zub@linux.fjfi.cvut.cz> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548196307-12987-1-git-send-email-zub@linux.fjfi.cvut.cz> References: <1548196307-12987-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 --- 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 2459ac4d523b..3493bb979978 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c @@ -139,6 +139,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] = @@ -1120,6 +1122,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]; @@ -1535,6 +1560,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 *) shadow->data; while (off < shadow->size) { -- 2.20.1