From patchwork Sun Apr 3 05:21:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 8733001 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0CF50C0553 for ; Sun, 3 Apr 2016 05:26:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A7AB2022D for ; Sun, 3 Apr 2016 05:26:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59C3120251 for ; Sun, 3 Apr 2016 05:26:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752486AbcDCFXp (ORCPT ); Sun, 3 Apr 2016 01:23:45 -0400 Received: from mail-ig0-f195.google.com ([209.85.213.195]:36589 "EHLO mail-ig0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435AbcDCFXn (ORCPT ); Sun, 3 Apr 2016 01:23:43 -0400 Received: by mail-ig0-f195.google.com with SMTP id sy18so7646713igc.3; Sat, 02 Apr 2016 22:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/WX1/ZSjN/w5HthciWlYrlMXKrbr/3trIxy5R9JFQzA=; b=vcbkkgqzSUC5rStLabEcKtIW6Iwe/XZHwABZlj7rpI2mBTfWwlLUyOOftcc2sjdv1J yE1FXkoTGUrp7k1jlQKJfGkqOkN5S7OuA5u+8WK5WED8L4dSxxTKnAr1ekSo/3SknJs4 q4uWNEqD/xhK0DOGSgSMiwx4mDuCACwmjmef2Txm5GoL5CdtGCPl/OuSlwU9E2Ql2BEa QrufaS9H6utVOgkqaA/zOyN+gvCKxanXvbBlXpt5IObzNUB7paCkPPoZu3iLoN63h1dI Um3nUiiEo0bv8l2ch98VQq/HD3Wvw2ON4YmpQaHkFFWJzpmqr0K4rwPA1skrP7cls8qK qEgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/WX1/ZSjN/w5HthciWlYrlMXKrbr/3trIxy5R9JFQzA=; b=l4lp724gq0htQs9goH9nT7avz3P5rA6Gm7oaSgzDzsDdl2V/SNJFpkPyrQor1xGGTK 224gMs7gNEenp2bZtl1E5H06LfErfj7D3XB2YPKZY6tyWc2vhu/RoJKsqI1z6Qrczp/w tzzkMzvVjUIJpOG8PJKKFszq48aPsRKOKTiuYYX5cXFfxH3/FHapR15ATX9XifOE89Hr EjbgfnuCWyegbW++CWEZ0bDMJ6wdTkp0GdQ5Pu8yxVT5ZGPJg4N6jGaKsbZYSGInJiVz LxXBZYRS+p/SbcsQxik3qSBDOQnG0x28aN5soFVHGkx+jesnehAWzJqrVZ2WDAD4vZZf 7glQ== X-Gm-Message-State: AD7BkJKMv9WUIyGucpxgxVKod948iV9ANATuFBPByNho176vawX+acyGEIrflQEeFOPSxQ== X-Received: by 10.50.41.102 with SMTP id e6mr5572653igl.62.1459661022410; Sat, 02 Apr 2016 22:23:42 -0700 (PDT) Received: from localhost.localdomain (c-24-7-245-123.hsd1.mn.comcast.net. [24.7.245.123]) by smtp.gmail.com with ESMTPSA id je6sm2914954igb.15.2016.04.02.22.23.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Apr 2016 22:23:41 -0700 (PDT) From: Eric Biggers To: linux-fsdevel@vger.kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, jaegeuk@kernel.org, tytso@mit.edu, mhalcrow@google.com, Eric Biggers Subject: [PATCH 07/13] fscrypto: simplify building key descriptor string Date: Sun, 3 Apr 2016 00:21:58 -0500 Message-Id: <1459660924-2960-8-git-send-email-ebiggers3@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459660924-2960-1-git-send-email-ebiggers3@gmail.com> References: <1459660924-2960-1-git-send-email-ebiggers3@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Eric Biggers --- fs/crypto/keyinfo.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/crypto/keyinfo.c b/fs/crypto/keyinfo.c index cb06351..5fcee4d 100644 --- a/fs/crypto/keyinfo.c +++ b/fs/crypto/keyinfo.c @@ -164,13 +164,8 @@ retry: memset(raw_key, 0x42, FS_AES_256_XTS_KEY_SIZE); goto got_key; } - memcpy(full_key_descriptor, FS_KEY_DESC_PREFIX, - FS_KEY_DESC_PREFIX_SIZE); - sprintf(full_key_descriptor + FS_KEY_DESC_PREFIX_SIZE, - "%*phN", FS_KEY_DESCRIPTOR_SIZE, - ctx.master_key_descriptor); - full_key_descriptor[FS_KEY_DESC_PREFIX_SIZE + - (2 * FS_KEY_DESCRIPTOR_SIZE)] = '\0'; + sprintf(full_key_descriptor, FS_KEY_DESC_PREFIX "%*phN", + FS_KEY_DESCRIPTOR_SIZE, ctx.master_key_descriptor); keyring_key = request_key(&key_type_logon, full_key_descriptor, NULL); if (IS_ERR(keyring_key)) { res = PTR_ERR(keyring_key);