Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752467AbaKLHKj (ORCPT ); Wed, 12 Nov 2014 02:10:39 -0500 Received: from mail.eperm.de ([89.247.134.16]:54502 "EHLO mail.eperm.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187AbaKLHJl (ORCPT ); Wed, 12 Nov 2014 02:09:41 -0500 X-AuthUser: sm@eperm.de From: Stephan Mueller To: Herbert Xu Cc: ABI/API , linux-crypto@vger.kernel.org, LKML Subject: [PATCH 2/8] crypto: AF_ALG: user space interface for cipher info Date: Wed, 12 Nov 2014 08:01:04 +0100 Message-ID: <3969167.9oqJUVzqHv@tachyon.chronox.de> User-Agent: KMail/4.14.2 (Linux/3.17.2-300.fc21.x86_64; KDE/4.14.2; x86_64; ; ) In-Reply-To: <4738444.A2vZX1nNCo@tachyon.chronox.de> References: <4738444.A2vZX1nNCo@tachyon.chronox.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The AF_ALG interface allows normal cipher (hash, encrypt, decrypt). However, it does not allow user space to obtain the following generic information about the currently active cipher: * block size of the cipher * IV size of the cipher * for AEAD, the maximum authentication tag size The patch adds a getsockopt interface for the symmetric ciphers to answer such information requests from user space. The kernel crypto API function calls are used to obtain the real data. As all data are simple integer values, the getsockopt handler function uses put_user() to return the integer value to user space in the *optval parameter of getsockopt. Signed-off-by: Stephan Mueller --- crypto/algif_skcipher.c | 46 ++++++++++++++++++++++++++++++++++++++++++++- include/uapi/linux/if_alg.h | 3 +++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 83187f4..7a1656b 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -522,6 +522,50 @@ static unsigned int skcipher_poll(struct file *file, struct socket *sock, return mask; } +static int skcipher_getsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user *optlen) +{ + struct sock *sk = sock->sk; + struct alg_sock *ask = alg_sk(sk); + struct skcipher_ctx *ctx = ask->private; + const struct af_alg_type *type; + int len = 0; + int err = -EOPNOTSUPP; + + lock_sock(sk); + type = ask->type; + + if (level != SOL_ALG || !type) + goto unlock; + + switch (optname) { + case ALG_GET_BLOCKSIZE: + len = skcipher_crypto_blocksize(ctx); + err = 0; + break; + case ALG_GET_IVSIZE: + len = skcipher_crypto_ivsize_ctx(ctx); + err = 0; + break; + case ALG_GET_AEAD_AUTHSIZE: + if (ctx->aead) { + len = crypto_aead_authsize(crypto_aead_reqtfm( + &ctx->u.aead_req)); + err = 0; + } + break; + default: + break; + } + +unlock: + release_sock(sk); + if (err >= 0) + err = put_user(len, optlen); + + return err; +} + static struct proto_ops algif_skcipher_ops = { .family = PF_ALG, @@ -531,7 +575,6 @@ static struct proto_ops algif_skcipher_ops = { .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown, - .getsockopt = sock_no_getsockopt, .mmap = sock_no_mmap, .bind = sock_no_bind, .accept = sock_no_accept, @@ -542,6 +585,7 @@ static struct proto_ops algif_skcipher_ops = { .sendpage = skcipher_sendpage, .recvmsg = skcipher_recvmsg, .poll = skcipher_poll, + .getsockopt = skcipher_getsockopt, }; static void *skcipher_bind(const char *name, u32 type, u32 mask) diff --git a/include/uapi/linux/if_alg.h b/include/uapi/linux/if_alg.h index 64e7008..267fd73 100644 --- a/include/uapi/linux/if_alg.h +++ b/include/uapi/linux/if_alg.h @@ -39,6 +39,9 @@ struct af_alg_aead_assoc { #define ALG_SET_OP 3 #define ALG_SET_AEAD_ASSOC 4 #define ALG_SET_AEAD_AUTHSIZE 5 +#define ALG_GET_BLOCKSIZE 6 +#define ALG_GET_IVSIZE 7 +#define ALG_GET_AEAD_AUTHSIZE 8 /* Operations */ #define ALG_OP_DECRYPT 0 -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/