Updated crypto and lz4 (bc3468a2) · Commits · e / devices / samsung / android_kernel_samsung_exynos7580-common

crypto/Kconfig

+14 −1

Original line number	Diff line number	Diff line
		@@ -86,6 +86,14 @@ config CRYPTO_PCOMP2
		tristate
		select CRYPTO_ALGAPI2

		config CRYPTO_ACOMP2
		tristate
		select CRYPTO_ALGAPI2

		config CRYPTO_ACOMP
		tristate
		select CRYPTO_ALGAPI
		select CRYPTO_ACOMP2
		config CRYPTO_MANAGER
		tristate "Cryptographic algorithm manager"
		select CRYPTO_MANAGER2
		@@ -99,6 +107,7 @@ config CRYPTO_MANAGER2
		select CRYPTO_HASH2
		select CRYPTO_BLKCIPHER2
		select CRYPTO_PCOMP2
		select CRYPTO_ACOMP2

		config CRYPTO_USER
		tristate "Userspace cryptographic algorithm configuration"
		@@ -1331,6 +1340,7 @@ comment "Compression"
		config CRYPTO_DEFLATE
		tristate "Deflate compression algorithm"
		select CRYPTO_ALGAPI
		select CRYPTO_ACOMP2
		select ZLIB_INFLATE
		select ZLIB_DEFLATE
		help
		@@ -1351,6 +1361,7 @@ config CRYPTO_ZLIB
		config CRYPTO_LZO
		tristate "LZO compression algorithm"
		select CRYPTO_ALGAPI
		select CRYPTO_ACOMP2
		select LZO_COMPRESS
		select LZO_DECOMPRESS
		help
		@@ -1359,14 +1370,16 @@ config CRYPTO_LZO
		config CRYPTO_LZ4
		tristate "LZ4 compression algorithm"
		select CRYPTO_ALGAPI
		select CRYPTO_ACOMP2
		select LZ4_COMPRESS
		select LZ4_DECOMPRESS
		help
		This is the LZ4 algorithm.

		config CRYPTO_LZ4HC
		+config CRYPTO_LZ4HC
		tristate "LZ4HC compression algorithm"
		select CRYPTO_ALGAPI
		select CRYPTO_ACOMP2
		select LZ4HC_COMPRESS
		select LZ4_DECOMPRESS
		help

crypto/Makefile

+10 −1

Original line number	Diff line number	Diff line
		@@ -2,8 +2,13 @@
		# Cryptographic API
		#

		# memneq MUST be built with -Os or -O0 to prevent early-return optimizations
		# that will defeat memneq's actual purpose to prevent timing attacks.
		CFLAGS_REMOVE_memneq.o := -O1 -O2 -O3
		CFLAGS_memneq.o := -Os

		obj-$(CONFIG_CRYPTO) += crypto.o
		crypto-y := api.o cipher.o compress.o
		crypto-y := api.o cipher.o compress.o memneq.o

		obj-$(CONFIG_CRYPTO_WORKQUEUE) += crypto_wq.o

		@@ -26,6 +31,10 @@ crypto_hash-y += ahash.o
		crypto_hash-y += shash.o
		obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o

		crypto_acompress-y := acompress.o
		crypto_acompress-y += scompress.o
		obj-$(CONFIG_CRYPTO_ACOMP2) += crypto_acompress.o

		obj-$(CONFIG_CRYPTO_PCOMP2) += pcompress.o

		cryptomgr-y := algboss.o testmgr.o

crypto/acompress.c

0 → 100644

+199 −0

Original line number	Diff line number	Diff line
		/*
		* Asynchronous Compression operations
		*
		* Copyright (c) 2016, Intel Corporation
		* Authors: Weigang Li <weigang.li@intel.com>
		* Giovanni Cabiddu <giovanni.cabiddu@intel.com>
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the Free
		* Software Foundation; either version 2 of the License, or (at your option)
		* any later version.
		*
		*/
		#include <linux/errno.h>
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/seq_file.h>
		#include <linux/slab.h>
		#include <linux/string.h>
		#include <linux/crypto.h>
		#include <crypto/algapi.h>
		#include <linux/cryptouser.h>
		#include <linux/compiler.h>
		#include <net/netlink.h>
		#include <crypto/internal/acompress.h>
		#include <crypto/internal/scompress.h>
		#include "internal.h"

		static const struct crypto_type crypto_acomp_type;

		#ifdef CONFIG_NET
		static int crypto_acomp_report(struct sk_buff skb, struct crypto_alg alg)
		{
		struct crypto_report_acomp racomp;

		strncpy(racomp.type, "acomp", sizeof(racomp.type));

		if (nla_put(skb, CRYPTOCFGA_REPORT_ACOMP,
		sizeof(struct crypto_report_acomp), &racomp))
		goto nla_put_failure;
		return 0;

		nla_put_failure:
		return -EMSGSIZE;
		}
		#else
		static int crypto_acomp_report(struct sk_buff skb, struct crypto_alg alg)
		{
		return -ENOSYS;
		}
		#endif

		static void crypto_acomp_show(struct seq_file m, struct crypto_alg alg)
		__maybe_unused;

		static void crypto_acomp_show(struct seq_file m, struct crypto_alg alg)
		{
		seq_puts(m, "type : acomp\n");
		}

		static void crypto_acomp_exit_tfm(struct crypto_tfm *tfm)
		{
		struct crypto_acomp *acomp = __crypto_acomp_tfm(tfm);
		struct acomp_alg *alg = crypto_acomp_alg(acomp);

		alg->exit(acomp);
		}

		static int crypto_acomp_init_tfm(struct crypto_tfm *tfm)
		{
		struct crypto_acomp *acomp = __crypto_acomp_tfm(tfm);
		struct acomp_alg *alg = crypto_acomp_alg(acomp);

		if (tfm->__crt_alg->cra_type != &crypto_acomp_type)
		return crypto_init_scomp_ops_async(tfm);

		acomp->compress = alg->compress;
		acomp->decompress = alg->decompress;
		acomp->dst_free = alg->dst_free;
		acomp->reqsize = alg->reqsize;

		if (alg->exit)
		acomp->base.exit = crypto_acomp_exit_tfm;

		if (alg->init)
		return alg->init(acomp);

		return 0;
		}

		static unsigned int crypto_acomp_extsize(struct crypto_alg *alg)
		{
		int extsize = crypto_alg_extsize(alg);

		if (alg->cra_type != &crypto_acomp_type)
		extsize += sizeof(struct crypto_scomp *);

		return extsize;
		}

		static const struct crypto_type crypto_acomp_type = {
		.extsize = crypto_acomp_extsize,
		.init_tfm = crypto_acomp_init_tfm,
		#ifdef CONFIG_PROC_FS
		.show = crypto_acomp_show,
		#endif
		.report = crypto_acomp_report,
		.maskclear = ~CRYPTO_ALG_TYPE_MASK,
		.maskset = CRYPTO_ALG_TYPE_ACOMPRESS_MASK,
		.type = CRYPTO_ALG_TYPE_ACOMPRESS,
		.tfmsize = offsetof(struct crypto_acomp, base),
		};

		struct crypto_acomp crypto_alloc_acomp(const char alg_name, u32 type,
		u32 mask)
		{
		return crypto_alloc_tfm(alg_name, &crypto_acomp_type, type, mask);
		}
		EXPORT_SYMBOL_GPL(crypto_alloc_acomp);

		struct acomp_req acomp_request_alloc(struct crypto_acomp acomp)
		{
		struct crypto_tfm *tfm = crypto_acomp_tfm(acomp);
		struct acomp_req *req;

		req = __acomp_request_alloc(acomp);
		if (req && (tfm->__crt_alg->cra_type != &crypto_acomp_type))
		return crypto_acomp_scomp_alloc_ctx(req);

		return req;
		}
		EXPORT_SYMBOL_GPL(acomp_request_alloc);

		void acomp_request_free(struct acomp_req *req)
		{
		struct crypto_acomp *acomp = crypto_acomp_reqtfm(req);
		struct crypto_tfm *tfm = crypto_acomp_tfm(acomp);

		if (tfm->__crt_alg->cra_type != &crypto_acomp_type)
		crypto_acomp_scomp_free_ctx(req);

		if (req->flags & CRYPTO_ACOMP_ALLOC_OUTPUT) {
		acomp->dst_free(req->dst);
		req->dst = NULL;
		}

		__acomp_request_free(req);
		}
		EXPORT_SYMBOL_GPL(acomp_request_free);

		int crypto_register_acomp(struct acomp_alg *alg)
		{
		struct crypto_alg *base = &alg->base;

		base->cra_type = &crypto_acomp_type;
		base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;
		base->cra_flags \|= CRYPTO_ALG_TYPE_ACOMPRESS;

		return crypto_register_alg(base);
		}
		EXPORT_SYMBOL_GPL(crypto_register_acomp);

		int crypto_unregister_acomp(struct acomp_alg *alg)
		{
		return crypto_unregister_alg(&alg->base);
		}
		EXPORT_SYMBOL_GPL(crypto_unregister_acomp);

		int crypto_register_acomps(struct acomp_alg *algs, int count)
		{
		int i, ret;

		for (i = 0; i < count; i++) {
		ret = crypto_register_acomp(&algs[i]);
		if (ret)
		goto err;
		}

		return 0;

		err:
		for (--i; i >= 0; --i)
		crypto_unregister_acomp(&algs[i]);

		return ret;
		}
		EXPORT_SYMBOL_GPL(crypto_register_acomps);

		void crypto_unregister_acomps(struct acomp_alg *algs, int count)
		{
		int i;

		for (i = count - 1; i >= 0; --i)
		crypto_unregister_acomp(&algs[i]);
		}
		EXPORT_SYMBOL_GPL(crypto_unregister_acomps);

		MODULE_LICENSE("GPL");
		MODULE_DESCRIPTION("Asynchronous compression type");

crypto/algapi.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -954,6 +954,13 @@ void crypto_xor(u8 dst, const u8 src, unsigned int size)
		}
		EXPORT_SYMBOL_GPL(crypto_xor);

		unsigned int crypto_alg_extsize(struct crypto_alg *alg)
		{
		return alg->cra_ctxsize +
		(alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1));
		}
		EXPORT_SYMBOL_GPL(crypto_alg_extsize);

		static int __init crypto_algapi_init(void)
		{
		crypto_init_proc();

crypto/algif_skcipher.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -92,10 +92,8 @@ static int skcipher_alloc_sgl(struct sock *sk)
		sg_init_table(sgl->sg, MAX_SGL_ENTS + 1);
		sgl->cur = 0;

		if (sg) {
		if (sg)
		scatterwalk_sg_chain(sg, MAX_SGL_ENTS + 1, sgl->sg);
		sg_unmark_end(sg + (MAX_SGL_ENTS - 1));
		}

		list_add_tail(&sgl->list, &ctx->tsgl);
		}