/* * Key-agreement Protocol Primitives (KPP) * * Copyright (c) 2016, Intel Corporation * Authors: Salvatore Benedetto * * 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. * */ #ifndef _CRYPTO_KPP_INT_H #define _CRYPTO_KPP_INT_H #include #include /* * Transform internal helpers. */ static inline void *kpp_request_ctx(struct kpp_request *req) { return req->__ctx; } static inline void *kpp_tfm_ctx(struct crypto_kpp *tfm) { return tfm->base.__crt_ctx; } static inline void kpp_request_complete(struct kpp_request *req, int err) { req->base.complete(&req->base, err); } static inline const char *kpp_alg_name(struct crypto_kpp *tfm) { return crypto_kpp_tfm(tfm)->__crt_alg->cra_name; } /** * crypto_register_kpp() -- Register key-agreement protocol primitives algorithm * * Function registers an implementation of a key-agreement protocol primitive * algorithm * * @alg: algorithm definition * * Return: zero on success; error code in case of error */ int crypto_register_kpp(struct kpp_alg *alg); /** * crypto_unregister_kpp() -- Unregister key-agreement protocol primitive * algorithm * * Function unregisters an implementation of a key-agreement protocol primitive * algorithm * * @alg: algorithm definition */ void crypto_unregister_kpp(struct kpp_alg *alg); #endif -remove'>summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-01-23 18:21:58 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-02 14:31:55 +0100
commit303223092081963513494b4377fa1ac9e362ed4b (patch)
treee312cf241ada3f96d5844613770ebbeeb152585c
parentc74454fadd5ea6fc866ffe2c417a0dba56b2bf1c (diff)
netfilter: guarantee 8 byte minalign for template addresses
The next change will merge skb->nfct pointer and skb->nfctinfo status bits into single skb->_nfct (unsigned long) area. For this to work nf_conn addresses must always be aligned at least on an 8 byte boundary since we will need the lower 3bits to store nfctinfo. Conntrack templates are allocated via kmalloc. kbuild test robot reported BUILD_BUG_ON failed: NFCT_INFOMASK >= ARCH_KMALLOC_MINALIGN on v1 of this patchset, so not all platforms meet this requirement. Do manual alignment if needed, the alignment offset is stored in the nf_conn entry protocol area. This works because templates are not handed off to L4 protocol trackers. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat
-rw-r--r--include/net/netfilter/nf_conntrack.h2
-rw-r--r--net/netfilter/nf_conntrack_core.c29
2 files changed, 26 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h