From: Mimi Zohar <zohar@linux.vnet.ibm.com> To: linux-security-module@vger.kernel.org Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>, "Luis R. Rodriguez" <mcgrof@suse.com>, kexec@lists.infradead.org, linux-modules@vger.kernel.org, fsdevel@vger.kernel.org, David Howells <dhowells@redhat.com>, David Woodhouse <dwmw2@infradead.org>, Kees Cook <keescook@chromium.org>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Dmitry Kasatkin <dmitry.kasatkin@gmail.com> Subject: [RFC PATCH v2 04/11] ima: calculate the hash of a buffer using aynchronous hash(ahash) Date: Mon, 18 Jan 2016 10:11:19 -0500 [thread overview] Message-ID: <1453129886-20192-5-git-send-email-zohar@linux.vnet.ibm.com> (raw) In-Reply-To: <1453129886-20192-1-git-send-email-zohar@linux.vnet.ibm.com> Setting up ahash has some overhead. Only use ahash to calculate the hash of a buffer, if the buffer is larger than ima_ahash_minsize. Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> --- security/integrity/ima/ima_crypto.c | 75 ++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 8d86281..82c4d3c 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -519,6 +519,63 @@ int ima_calc_field_array_hash(struct ima_field_data *field_data, return rc; } +static int calc_buffer_ahash_atfm(const void *buf, loff_t len, + struct ima_digest_data *hash, + struct crypto_ahash *tfm) +{ + struct ahash_request *req; + struct scatterlist sg; + struct ahash_completion res; + int rc, ahash_rc = 0; + + hash->length = crypto_ahash_digestsize(tfm); + + req = ahash_request_alloc(tfm, GFP_KERNEL); + if (!req) + return -ENOMEM; + + init_completion(&res.completion); + ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG | + CRYPTO_TFM_REQ_MAY_SLEEP, + ahash_complete, &res); + + rc = ahash_wait(crypto_ahash_init(req), &res); + if (rc) + goto out; + + sg_init_one(&sg, buf, len); + ahash_request_set_crypt(req, &sg, NULL, len); + + ahash_rc = crypto_ahash_update(req); + + /* wait for the update request to complete */ + rc = ahash_wait(ahash_rc, &res); + if (!rc) { + ahash_request_set_crypt(req, NULL, hash->digest, 0); + rc = ahash_wait(crypto_ahash_final(req), &res); + } +out: + ahash_request_free(req); + return rc; +} + +static int calc_buffer_ahash(const void *buf, loff_t len, + struct ima_digest_data *hash) +{ + struct crypto_ahash *tfm; + int rc; + + tfm = ima_alloc_atfm(hash->algo); + if (IS_ERR(tfm)) + return PTR_ERR(tfm); + + rc = calc_buffer_ahash_atfm(buf, len, hash, tfm); + + ima_free_atfm(tfm); + + return rc; +} + static int calc_buffer_shash_tfm(const void *buf, loff_t size, struct ima_digest_data *hash, struct crypto_shash *tfm) @@ -550,8 +607,8 @@ static int calc_buffer_shash_tfm(const void *buf, loff_t size, return rc; } -int ima_calc_buffer_hash(const void *buf, loff_t len, - struct ima_digest_data *hash) +static int calc_buffer_shash(const void *buf, loff_t len, + struct ima_digest_data *hash) { struct crypto_shash *tfm; int rc; @@ -566,6 +623,20 @@ int ima_calc_buffer_hash(const void *buf, loff_t len, return rc; } +int ima_calc_buffer_hash(const void *buf, loff_t len, + struct ima_digest_data *hash) +{ + int rc; + + if (ima_ahash_minsize && len >= ima_ahash_minsize) { + rc = calc_buffer_ahash(buf, len, hash); + if (!rc) + return 0; + } + + return calc_buffer_shash(buf, len, hash); +} + static void __init ima_pcrread(int idx, u8 *pcr) { if (!ima_used_chip) -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: Mimi Zohar <zohar@linux.vnet.ibm.com> To: linux-security-module@vger.kernel.org Cc: Kees Cook <keescook@chromium.org>, fsdevel@vger.kernel.org, David Woodhouse <dwmw2@infradead.org>, "Luis R. Rodriguez" <mcgrof@suse.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, kexec@lists.infradead.org, David Howells <dhowells@redhat.com>, Dmitry Kasatkin <dmitry.kasatkin@gmail.com>, Mimi Zohar <zohar@linux.vnet.ibm.com>, linux-modules@vger.kernel.org Subject: [RFC PATCH v2 04/11] ima: calculate the hash of a buffer using aynchronous hash(ahash) Date: Mon, 18 Jan 2016 10:11:19 -0500 [thread overview] Message-ID: <1453129886-20192-5-git-send-email-zohar@linux.vnet.ibm.com> (raw) In-Reply-To: <1453129886-20192-1-git-send-email-zohar@linux.vnet.ibm.com> Setting up ahash has some overhead. Only use ahash to calculate the hash of a buffer, if the buffer is larger than ima_ahash_minsize. Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> --- security/integrity/ima/ima_crypto.c | 75 ++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 8d86281..82c4d3c 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -519,6 +519,63 @@ int ima_calc_field_array_hash(struct ima_field_data *field_data, return rc; } +static int calc_buffer_ahash_atfm(const void *buf, loff_t len, + struct ima_digest_data *hash, + struct crypto_ahash *tfm) +{ + struct ahash_request *req; + struct scatterlist sg; + struct ahash_completion res; + int rc, ahash_rc = 0; + + hash->length = crypto_ahash_digestsize(tfm); + + req = ahash_request_alloc(tfm, GFP_KERNEL); + if (!req) + return -ENOMEM; + + init_completion(&res.completion); + ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG | + CRYPTO_TFM_REQ_MAY_SLEEP, + ahash_complete, &res); + + rc = ahash_wait(crypto_ahash_init(req), &res); + if (rc) + goto out; + + sg_init_one(&sg, buf, len); + ahash_request_set_crypt(req, &sg, NULL, len); + + ahash_rc = crypto_ahash_update(req); + + /* wait for the update request to complete */ + rc = ahash_wait(ahash_rc, &res); + if (!rc) { + ahash_request_set_crypt(req, NULL, hash->digest, 0); + rc = ahash_wait(crypto_ahash_final(req), &res); + } +out: + ahash_request_free(req); + return rc; +} + +static int calc_buffer_ahash(const void *buf, loff_t len, + struct ima_digest_data *hash) +{ + struct crypto_ahash *tfm; + int rc; + + tfm = ima_alloc_atfm(hash->algo); + if (IS_ERR(tfm)) + return PTR_ERR(tfm); + + rc = calc_buffer_ahash_atfm(buf, len, hash, tfm); + + ima_free_atfm(tfm); + + return rc; +} + static int calc_buffer_shash_tfm(const void *buf, loff_t size, struct ima_digest_data *hash, struct crypto_shash *tfm) @@ -550,8 +607,8 @@ static int calc_buffer_shash_tfm(const void *buf, loff_t size, return rc; } -int ima_calc_buffer_hash(const void *buf, loff_t len, - struct ima_digest_data *hash) +static int calc_buffer_shash(const void *buf, loff_t len, + struct ima_digest_data *hash) { struct crypto_shash *tfm; int rc; @@ -566,6 +623,20 @@ int ima_calc_buffer_hash(const void *buf, loff_t len, return rc; } +int ima_calc_buffer_hash(const void *buf, loff_t len, + struct ima_digest_data *hash) +{ + int rc; + + if (ima_ahash_minsize && len >= ima_ahash_minsize) { + rc = calc_buffer_ahash(buf, len, hash); + if (!rc) + return 0; + } + + return calc_buffer_shash(buf, len, hash); +} + static void __init ima_pcrread(int idx, u8 *pcr) { if (!ima_used_chip) -- 2.1.0 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2016-01-18 15:28 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-18 15:11 [RFC PATCH v2 00/11] vfss: support for a common kernel file loader Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-18 15:11 ` [RFC PATCH v2 01/11] ima: separate 'security.ima' reading functionality from collect Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-19 20:00 ` Dmitry Kasatkin 2016-01-19 20:00 ` Dmitry Kasatkin 2016-01-21 13:19 ` Mimi Zohar 2016-01-21 13:19 ` Mimi Zohar 2016-01-21 18:18 ` Dmitry Kasatkin 2016-01-21 18:18 ` Dmitry Kasatkin 2016-01-18 15:11 ` [RFC PATCH v2 02/11] vfs: define a generic function to read a file from the kernel Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-20 1:09 ` Luis R. Rodriguez 2016-01-20 1:09 ` Luis R. Rodriguez 2016-01-21 13:24 ` Mimi Zohar 2016-01-21 13:24 ` Mimi Zohar 2016-01-18 15:11 ` [RFC PATCH v2 03/11] ima: provide buffer hash calculation function Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-19 19:26 ` Dmitry Kasatkin 2016-01-19 19:26 ` Dmitry Kasatkin 2016-01-21 13:18 ` Mimi Zohar 2016-01-21 13:18 ` Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar [this message] 2016-01-18 15:11 ` [RFC PATCH v2 04/11] ima: calculate the hash of a buffer using aynchronous hash(ahash) Mimi Zohar 2016-01-18 15:11 ` [RFC PATCH v2 05/11] ima: define a new hook to measure and appraise a file already in memory Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-18 15:11 ` [RFC PATCH v2 06/11] kexec: replace call to copy_file_from_fd() with kernel version Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-20 3:22 ` Minfei Huang 2016-01-20 3:22 ` Minfei Huang 2016-01-20 23:12 ` Luis R. Rodriguez 2016-01-20 23:12 ` Luis R. Rodriguez 2016-01-21 0:27 ` Dmitry Torokhov 2016-01-21 0:27 ` Dmitry Torokhov 2016-01-25 6:37 ` Dave Young 2016-01-25 6:37 ` Dave Young 2016-01-25 7:02 ` Dave Young 2016-01-25 7:02 ` Dave Young 2016-01-25 15:04 ` Mimi Zohar 2016-01-25 15:04 ` Mimi Zohar 2016-01-25 20:34 ` Luis R. Rodriguez 2016-01-25 20:34 ` Luis R. Rodriguez 2016-01-25 23:48 ` Mimi Zohar 2016-01-25 23:48 ` Mimi Zohar 2016-01-26 20:48 ` Luis R. Rodriguez 2016-01-26 20:48 ` Luis R. Rodriguez 2016-01-26 1:20 ` Dave Young 2016-01-26 1:20 ` Dave Young 2016-01-26 16:40 ` Mimi Zohar 2016-01-26 16:40 ` Mimi Zohar 2016-01-27 1:50 ` Dave Young 2016-01-27 1:50 ` Dave Young 2016-01-18 15:11 ` [RFC PATCH v2 07/11] firmware: replace call to fw_read_file_contents() " Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-20 0:10 ` Kees Cook 2016-01-20 0:10 ` Kees Cook 2016-01-21 12:04 ` Mimi Zohar 2016-01-21 12:04 ` Mimi Zohar 2016-01-20 23:39 ` Luis R. Rodriguez 2016-01-20 23:39 ` Luis R. Rodriguez 2016-01-20 23:56 ` Luis R. Rodriguez 2016-01-20 23:56 ` Luis R. Rodriguez 2016-01-21 12:05 ` Mimi Zohar 2016-01-21 12:05 ` Mimi Zohar 2016-01-21 16:49 ` Luis R. Rodriguez 2016-01-21 16:49 ` Luis R. Rodriguez 2016-01-18 15:11 ` [RFC PATCH v2 08/11] module: replace copy_module_from_fd " Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-21 0:03 ` Luis R. Rodriguez 2016-01-21 0:03 ` Luis R. Rodriguez 2016-01-21 13:12 ` Mimi Zohar 2016-01-21 13:12 ` Mimi Zohar 2016-01-21 15:45 ` Paul Moore 2016-01-21 15:45 ` Paul Moore 2016-01-21 21:15 ` Mimi Zohar 2016-01-21 21:15 ` Mimi Zohar 2016-01-21 21:26 ` Paul Moore 2016-01-21 21:26 ` Paul Moore 2016-01-21 21:58 ` Kees Cook 2016-01-21 21:58 ` Kees Cook 2016-01-21 16:56 ` Luis R. Rodriguez 2016-01-21 16:56 ` Luis R. Rodriguez 2016-01-21 20:37 ` Mimi Zohar 2016-01-21 20:37 ` Mimi Zohar 2016-01-18 15:11 ` [RFC PATCH v2 09/11] ima: load policy using path Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-21 0:05 ` Luis R. Rodriguez 2016-01-21 0:05 ` Luis R. Rodriguez 2016-01-21 13:15 ` Mimi Zohar 2016-01-21 13:15 ` Mimi Zohar 2016-01-23 2:59 ` Luis R. Rodriguez 2016-01-23 2:59 ` Luis R. Rodriguez 2016-01-18 15:11 ` [RFC PATCH v2 10/11] ima: measure and appraise the IMA policy itself Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-18 15:11 ` [RFC PATCH v2 11/11] ima: require signed IMA policy Mimi Zohar 2016-01-18 15:11 ` Mimi Zohar 2016-01-21 20:16 ` [RFC PATCH v2 00/11] vfss: support for a common kernel file loader Luis R. Rodriguez 2016-01-21 20:16 ` Luis R. Rodriguez 2016-01-21 20:18 ` Mimi Zohar 2016-01-21 20:18 ` Mimi Zohar
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1453129886-20192-5-git-send-email-zohar@linux.vnet.ibm.com \ --to=zohar@linux.vnet.ibm.com \ --cc=dhowells@redhat.com \ --cc=dmitry.kasatkin@gmail.com \ --cc=dmitry.torokhov@gmail.com \ --cc=dwmw2@infradead.org \ --cc=fsdevel@vger.kernel.org \ --cc=keescook@chromium.org \ --cc=kexec@lists.infradead.org \ --cc=linux-modules@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=mcgrof@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.