Message ID | 20181018143718.26298-39-richard@nod.at |
---|---|
State | Accepted |
Delegated to: | David Oberhollenzer |
Headers | show
Return-Path: <linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nod.at Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ea5GfDU9"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="fqEhN4JS"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bX7K0Wp5z9sC2 for <incoming@patchwork.ozlabs.org>; Fri, 19 Oct 2018 01:51:40 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LhahjZdeG/INFYDdEivR5OwzQP73kv2uW5afXjVh3sk=; b=Ea5GfDU9vT560N lIRK5BwZ2llz5kIB0IdBGPqvzu5l7o5dco0Ez4a53p8vmBGEuC7D/e3COalbuQo5VOzH2tLZDTBS1 pfm6pYaVnNf1tk1IlWsqIQNz1XdvZGwPsKCvEeGg7ueTQ1CJGuJBDVkm30NPLDX090IjbC8DKLmTF 6S9XuZ1zYWsEumoFi0ERjb65Ngw6vt9cKy9wXGNAwMMd7brauGL3g3PeG3SKyFO7ck34+QgdBNGBM N1BzJHjeIFGaMeTUeRPFna3D6mXE26hh2uU1H+B2/kTEaWRTiRv4pFRVssf3XxLxiPvkk7dSnt1RJ qqFtzm+tyCMvxXpvCdIQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gD9e3-0004vQ-BH; Thu, 18 Oct 2018 14:51:27 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gD9TC-00053K-1n for linux-mtd@bombadil.infradead.org; Thu, 18 Oct 2018 14:40:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=4RdDgbrPXwcSFzENT0r02Kcgyp/j87H1XTcIzS2eI9g=; b=fqEhN4JSb3PEeOCHUfMY6BWxCz z/a+DSGye1Y4LgVwpgy0eZNGq8EDxhEo5hONt5ajNPA6EzfHEiEjfgtpGBRK7rESHw1xRPBcZ15s4 4da2AwDhnSUyGGHbnOqz5nMH3oWam+nDjiC6fOCmTH/iIC2nHmgMHHBUcfZ/+wFMytDLVd53m/LQT fRIHh1D+0JgthBDqou1h6dRTBj/t3tg6etAUlaNqC5sRzQlo6PGY9HLLO06BPuEzhRfSP98qCRcGy lsmqvBLg0gjXf+aWcmBi3jUHWXmpuO5fmKJ2mT7CPc7Mcq7qUTeZj/7iOUQ9tOpniyEH8+fcWq+J8 +zwUIKlA==; Received: from lilium.sigma-star.at ([109.75.188.150]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gD9SC-0002TQ-Pl for linux-mtd@lists.infradead.org; Thu, 18 Oct 2018 14:39:14 +0000 Received: from localhost (localhost [127.0.0.1]) by lilium.sigma-star.at (Postfix) with ESMTP id 88F4218011B65; Thu, 18 Oct 2018 16:39:06 +0200 (CEST) From: Richard Weinberger <richard@nod.at> To: linux-mtd@lists.infradead.org Subject: [PATCH 38/42] mkfs.ubifs: More fscryptctl compatibility Date: Thu, 18 Oct 2018 16:37:14 +0200 Message-Id: <20181018143718.26298-39-richard@nod.at> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181018143718.26298-1-richard@nod.at> References: <20181018143718.26298-1-richard@nod.at> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181018_153912_984874_AF2688D0 X-CRM114-Status: GOOD ( 10.72 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on casper.infradead.org summary: Content analysis details: (0.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list <linux-mtd.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-mtd/> List-Post: <mailto:linux-mtd@lists.infradead.org> List-Help: <mailto:linux-mtd-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-mtd>, <mailto:linux-mtd-request@lists.infradead.org?subject=subscribe> Cc: Richard Weinberger <richard@nod.at>, david.oberhollenzer@sigma-star.at Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" <linux-mtd-bounces@lists.infradead.org> Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
mtd-utils: Add fscrypt support to mkfs.ubifs
|
expand
|
diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.c b/ubifs-utils/mkfs.ubifs/fscrypt.c index 29dad1b039e7..3d4bff618050 100644 --- a/ubifs-utils/mkfs.ubifs/fscrypt.c +++ b/ubifs-utils/mkfs.ubifs/fscrypt.c @@ -202,7 +202,7 @@ static int load_master_key(const char *key_file, struct cipher *fsc) return -1; } - keysize = read(kf, fscrypt_masterkey, fsc->key_length); + keysize = read(kf, fscrypt_masterkey, FS_MAX_KEY_SIZE); if (keysize < 0) { sys_errmsg("read '%s'", key_file); goto fail;
fscryptctl reads up to FS_MAX_KEY_SIZE bytes from the source key to compute the descriptor. Signed-off-by: Richard Weinberger <richard@nod.at> --- ubifs-utils/mkfs.ubifs/fscrypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)