From patchwork Tue Oct 18 20:54:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 9383021 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D0BDA600CA for ; Tue, 18 Oct 2016 20:55:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0CAD2970C for ; Tue, 18 Oct 2016 20:55:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2BDE2973A; Tue, 18 Oct 2016 20:55:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44D412970C for ; Tue, 18 Oct 2016 20:55:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755278AbcJRUzA (ORCPT ); Tue, 18 Oct 2016 16:55:00 -0400 Received: from mail.sigma-star.at ([95.130.255.111]:45997 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754130AbcJRUy5 (ORCPT ); Tue, 18 Oct 2016 16:54:57 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id B504C24E0004; Tue, 18 Oct 2016 22:54:54 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.sigma-star.at Received: from linux.site (richard.vpn.sigmapriv.at [10.3.0.5]) by mail.sigma-star.at (Postfix) with ESMTPSA id F0BF524E0001; Tue, 18 Oct 2016 22:54:53 +0200 (CEST) From: Richard Weinberger To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, ebiggers@google.com, jaegeuk@kernel.org, tytso@mit.edu, Richard Weinberger Subject: [PATCH 1/2] fscrypto: Fix log string in do_crypto() Date: Tue, 18 Oct 2016 22:54:48 +0200 Message-Id: <1476824089-6841-2-git-send-email-richard@nod.at> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1476824089-6841-1-git-send-email-richard@nod.at> References: <1476824089-6841-1-git-send-email-richard@nod.at> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The operations supports both encryption and decryption. Signed-off-by: Richard Weinberger Reviewed-by: Eric Biggers --- fs/crypto/crypto.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/crypto/crypto.c b/fs/crypto/crypto.c index 61057b7dbddb..1637a0450b9f 100644 --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -194,8 +194,9 @@ static int do_page_crypto(struct inode *inode, skcipher_request_free(req); if (res) { printk_ratelimited(KERN_ERR - "%s: crypto_skcipher_encrypt() returned %d\n", - __func__, res); + "%s: crypto_skcipher_%scrypt() returned %d, flags %#x\n", + __func__, rw == FS_DECRYPT ? "de" : "en", res, + crypto_skcipher_get_flags(tfm)); return res; } return 0;