2011-08-31 15:05:16 +04:00
|
|
|
/* mpicoder.c - Coder for the external representation of MPIs
|
|
|
|
* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
|
|
|
|
*
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
*
|
|
|
|
* GnuPG 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.
|
|
|
|
*
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
|
|
*/
|
|
|
|
|
2012-09-24 20:11:27 +04:00
|
|
|
#include <linux/bitops.h>
|
2015-08-28 10:27:15 +03:00
|
|
|
#include <linux/count_zeros.h>
|
2016-03-22 15:12:39 +03:00
|
|
|
#include <linux/byteorder/generic.h>
|
2016-06-29 14:32:22 +03:00
|
|
|
#include <linux/scatterlist.h>
|
2016-03-22 15:12:41 +03:00
|
|
|
#include <linux/string.h>
|
2011-08-31 15:05:16 +04:00
|
|
|
#include "mpi-internal.h"
|
|
|
|
|
|
|
|
#define MAX_EXTERN_MPI_BITS 16384
|
|
|
|
|
2012-09-24 20:11:27 +04:00
|
|
|
/**
|
|
|
|
* mpi_read_raw_data - Read a raw byte stream as a positive integer
|
|
|
|
* @xbuffer: The data to read
|
|
|
|
* @nbytes: The amount of data to read
|
|
|
|
*/
|
|
|
|
MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes)
|
|
|
|
{
|
|
|
|
const uint8_t *buffer = xbuffer;
|
|
|
|
int i, j;
|
|
|
|
unsigned nbits, nlimbs;
|
|
|
|
mpi_limb_t a;
|
|
|
|
MPI val = NULL;
|
|
|
|
|
2013-06-13 01:04:40 +04:00
|
|
|
while (nbytes > 0 && buffer[0] == 0) {
|
2012-09-24 20:11:27 +04:00
|
|
|
buffer++;
|
|
|
|
nbytes--;
|
|
|
|
}
|
|
|
|
|
|
|
|
nbits = nbytes * 8;
|
|
|
|
if (nbits > MAX_EXTERN_MPI_BITS) {
|
|
|
|
pr_info("MPI: mpi too large (%u bits)\n", nbits);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (nbytes > 0)
|
2016-05-26 14:05:32 +03:00
|
|
|
nbits -= count_leading_zeros(buffer[0]) - (BITS_PER_LONG - 8);
|
2012-09-24 20:11:27 +04:00
|
|
|
|
2013-01-30 13:30:06 +04:00
|
|
|
nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);
|
2012-09-24 20:11:27 +04:00
|
|
|
val = mpi_alloc(nlimbs);
|
|
|
|
if (!val)
|
|
|
|
return NULL;
|
|
|
|
val->nbits = nbits;
|
|
|
|
val->sign = 0;
|
|
|
|
val->nlimbs = nlimbs;
|
|
|
|
|
|
|
|
if (nbytes > 0) {
|
|
|
|
i = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
|
|
|
|
i %= BYTES_PER_MPI_LIMB;
|
|
|
|
for (j = nlimbs; j > 0; j--) {
|
|
|
|
a = 0;
|
|
|
|
for (; i < BYTES_PER_MPI_LIMB; i++) {
|
|
|
|
a <<= 8;
|
|
|
|
a |= *buffer++;
|
|
|
|
}
|
|
|
|
i = 0;
|
|
|
|
val->d[j - 1] = a;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(mpi_read_raw_data);
|
|
|
|
|
2011-08-31 15:05:16 +04:00
|
|
|
MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
|
|
|
|
{
|
|
|
|
const uint8_t *buffer = xbuffer;
|
2016-05-27 00:19:55 +03:00
|
|
|
unsigned int nbits, nbytes;
|
|
|
|
MPI val;
|
2011-08-31 15:05:16 +04:00
|
|
|
|
|
|
|
if (*ret_nread < 2)
|
lib/mpi: mpi_read_from_buffer(): return error code
mpi_read_from_buffer() reads a MPI from a buffer into a newly allocated
MPI instance. It expects the buffer's leading two bytes to contain the
number of bits, followed by the actual payload.
On failure, it returns NULL and updates the in/out argument ret_nread
somewhat inconsistently:
- If the given buffer is too short to contain the leading two bytes
encoding the number of bits or their value is unsupported, then
ret_nread will be cleared.
- If the allocation of the resulting MPI instance fails, ret_nread is left
as is.
The only user of mpi_read_from_buffer(), digsig_verify_rsa(), simply checks
for a return value of NULL and returns -ENOMEM if that happens.
While this is all of cosmetic nature only, there is another error condition
which currently isn't detectable by the caller of mpi_read_from_buffer():
if the given buffer is too small to hold the number of bits as encoded in
its first two bytes, the return value will be non-NULL and *ret_nread > 0.
In preparation of communicating this condition to the caller, let
mpi_read_from_buffer() return error values by means of the ERR_PTR()
mechanism.
Make the sole caller of mpi_read_from_buffer(), digsig_verify_rsa(),
check the return value for IS_ERR() rather than == NULL. If IS_ERR() is
true, return the associated error value rather than the fixed -ENOMEM.
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2016-05-27 00:19:51 +03:00
|
|
|
return ERR_PTR(-EINVAL);
|
2011-08-31 15:05:16 +04:00
|
|
|
nbits = buffer[0] << 8 | buffer[1];
|
|
|
|
|
|
|
|
if (nbits > MAX_EXTERN_MPI_BITS) {
|
|
|
|
pr_info("MPI: mpi too large (%u bits)\n", nbits);
|
lib/mpi: mpi_read_from_buffer(): return error code
mpi_read_from_buffer() reads a MPI from a buffer into a newly allocated
MPI instance. It expects the buffer's leading two bytes to contain the
number of bits, followed by the actual payload.
On failure, it returns NULL and updates the in/out argument ret_nread
somewhat inconsistently:
- If the given buffer is too short to contain the leading two bytes
encoding the number of bits or their value is unsupported, then
ret_nread will be cleared.
- If the allocation of the resulting MPI instance fails, ret_nread is left
as is.
The only user of mpi_read_from_buffer(), digsig_verify_rsa(), simply checks
for a return value of NULL and returns -ENOMEM if that happens.
While this is all of cosmetic nature only, there is another error condition
which currently isn't detectable by the caller of mpi_read_from_buffer():
if the given buffer is too small to hold the number of bits as encoded in
its first two bytes, the return value will be non-NULL and *ret_nread > 0.
In preparation of communicating this condition to the caller, let
mpi_read_from_buffer() return error values by means of the ERR_PTR()
mechanism.
Make the sole caller of mpi_read_from_buffer(), digsig_verify_rsa(),
check the return value for IS_ERR() rather than == NULL. If IS_ERR() is
true, return the associated error value rather than the fixed -ENOMEM.
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2016-05-27 00:19:51 +03:00
|
|
|
return ERR_PTR(-EINVAL);
|
2011-08-31 15:05:16 +04:00
|
|
|
}
|
|
|
|
|
2013-01-30 13:30:06 +04:00
|
|
|
nbytes = DIV_ROUND_UP(nbits, 8);
|
2016-05-27 00:19:53 +03:00
|
|
|
if (nbytes + 2 > *ret_nread) {
|
2016-05-27 00:19:54 +03:00
|
|
|
pr_info("MPI: mpi larger than buffer nbytes=%u ret_nread=%u\n",
|
|
|
|
nbytes, *ret_nread);
|
2016-05-27 00:19:53 +03:00
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
}
|
|
|
|
|
2016-05-27 00:19:55 +03:00
|
|
|
val = mpi_read_raw_data(buffer + 2, nbytes);
|
2011-08-31 15:05:16 +04:00
|
|
|
if (!val)
|
lib/mpi: mpi_read_from_buffer(): return error code
mpi_read_from_buffer() reads a MPI from a buffer into a newly allocated
MPI instance. It expects the buffer's leading two bytes to contain the
number of bits, followed by the actual payload.
On failure, it returns NULL and updates the in/out argument ret_nread
somewhat inconsistently:
- If the given buffer is too short to contain the leading two bytes
encoding the number of bits or their value is unsupported, then
ret_nread will be cleared.
- If the allocation of the resulting MPI instance fails, ret_nread is left
as is.
The only user of mpi_read_from_buffer(), digsig_verify_rsa(), simply checks
for a return value of NULL and returns -ENOMEM if that happens.
While this is all of cosmetic nature only, there is another error condition
which currently isn't detectable by the caller of mpi_read_from_buffer():
if the given buffer is too small to hold the number of bits as encoded in
its first two bytes, the return value will be non-NULL and *ret_nread > 0.
In preparation of communicating this condition to the caller, let
mpi_read_from_buffer() return error values by means of the ERR_PTR()
mechanism.
Make the sole caller of mpi_read_from_buffer(), digsig_verify_rsa(),
check the return value for IS_ERR() rather than == NULL. If IS_ERR() is
true, return the associated error value rather than the fixed -ENOMEM.
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2016-05-27 00:19:51 +03:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2011-08-31 15:05:16 +04:00
|
|
|
|
2016-05-27 00:19:53 +03:00
|
|
|
*ret_nread = nbytes + 2;
|
2011-08-31 15:05:16 +04:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(mpi_read_from_buffer);
|
|
|
|
|
2016-02-17 16:46:59 +03:00
|
|
|
static int count_lzeros(MPI a)
|
|
|
|
{
|
|
|
|
mpi_limb_t alimb;
|
|
|
|
int i, lzeros = 0;
|
|
|
|
|
|
|
|
for (i = a->nlimbs - 1; i >= 0; i--) {
|
|
|
|
alimb = a->d[i];
|
|
|
|
if (alimb == 0) {
|
|
|
|
lzeros += sizeof(mpi_limb_t);
|
|
|
|
} else {
|
|
|
|
lzeros += count_leading_zeros(alimb) / 8;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return lzeros;
|
|
|
|
}
|
|
|
|
|
2015-06-15 23:18:36 +03:00
|
|
|
/**
|
|
|
|
* mpi_read_buffer() - read MPI to a bufer provided by user (msb first)
|
|
|
|
*
|
|
|
|
* @a: a multi precision integer
|
|
|
|
* @buf: bufer to which the output will be written to. Needs to be at
|
|
|
|
* leaset mpi_get_size(a) long.
|
|
|
|
* @buf_len: size of the buf.
|
2015-11-13 14:01:32 +03:00
|
|
|
* @nbytes: receives the actual length of the data written on success and
|
|
|
|
* the data to-be-written on -EOVERFLOW in case buf_len was too
|
|
|
|
* small.
|
2015-06-15 23:18:36 +03:00
|
|
|
* @sign: if not NULL, it will be set to the sign of a.
|
|
|
|
*
|
|
|
|
* Return: 0 on success or error code in case of error
|
2011-08-31 15:05:16 +04:00
|
|
|
*/
|
2015-06-15 23:18:36 +03:00
|
|
|
int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,
|
|
|
|
int *sign)
|
2011-08-31 15:05:16 +04:00
|
|
|
{
|
2015-06-15 23:18:36 +03:00
|
|
|
uint8_t *p;
|
2016-03-22 15:12:41 +03:00
|
|
|
#if BYTES_PER_MPI_LIMB == 4
|
|
|
|
__be32 alimb;
|
|
|
|
#elif BYTES_PER_MPI_LIMB == 8
|
|
|
|
__be64 alimb;
|
|
|
|
#else
|
|
|
|
#error please implement for this limb size.
|
|
|
|
#endif
|
2015-06-15 23:18:36 +03:00
|
|
|
unsigned int n = mpi_get_size(a);
|
2016-02-17 16:46:59 +03:00
|
|
|
int i, lzeros;
|
2015-06-15 23:18:36 +03:00
|
|
|
|
2015-11-13 14:01:32 +03:00
|
|
|
if (!buf || !nbytes)
|
2015-06-15 23:18:36 +03:00
|
|
|
return -EINVAL;
|
2011-08-31 15:05:16 +04:00
|
|
|
|
|
|
|
if (sign)
|
|
|
|
*sign = a->sign;
|
2015-06-15 23:18:36 +03:00
|
|
|
|
2016-02-17 16:46:59 +03:00
|
|
|
lzeros = count_lzeros(a);
|
2015-06-15 23:18:36 +03:00
|
|
|
|
2015-11-13 14:01:32 +03:00
|
|
|
if (buf_len < n - lzeros) {
|
|
|
|
*nbytes = n - lzeros;
|
|
|
|
return -EOVERFLOW;
|
|
|
|
}
|
|
|
|
|
2015-06-15 23:18:36 +03:00
|
|
|
p = buf;
|
2015-08-24 17:52:14 +03:00
|
|
|
*nbytes = n - lzeros;
|
2011-08-31 15:05:16 +04:00
|
|
|
|
2016-03-22 15:12:40 +03:00
|
|
|
for (i = a->nlimbs - 1 - lzeros / BYTES_PER_MPI_LIMB,
|
|
|
|
lzeros %= BYTES_PER_MPI_LIMB;
|
|
|
|
i >= 0; i--) {
|
2011-08-31 15:05:16 +04:00
|
|
|
#if BYTES_PER_MPI_LIMB == 4
|
2016-03-22 15:12:41 +03:00
|
|
|
alimb = cpu_to_be32(a->d[i]);
|
2011-08-31 15:05:16 +04:00
|
|
|
#elif BYTES_PER_MPI_LIMB == 8
|
2016-03-22 15:12:41 +03:00
|
|
|
alimb = cpu_to_be64(a->d[i]);
|
2011-08-31 15:05:16 +04:00
|
|
|
#else
|
|
|
|
#error please implement for this limb size.
|
|
|
|
#endif
|
2016-03-22 15:12:42 +03:00
|
|
|
memcpy(p, (u8 *)&alimb + lzeros, BYTES_PER_MPI_LIMB - lzeros);
|
|
|
|
p += BYTES_PER_MPI_LIMB - lzeros;
|
|
|
|
lzeros = 0;
|
2011-08-31 15:05:16 +04:00
|
|
|
}
|
2015-06-15 23:18:36 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(mpi_read_buffer);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* mpi_get_buffer() - Returns an allocated buffer with the MPI (msb first).
|
|
|
|
* Caller must free the return string.
|
|
|
|
* This function does return a 0 byte buffer with nbytes set to zero if the
|
|
|
|
* value of A is zero.
|
|
|
|
*
|
|
|
|
* @a: a multi precision integer.
|
|
|
|
* @nbytes: receives the length of this buffer.
|
|
|
|
* @sign: if not NULL, it will be set to the sign of the a.
|
|
|
|
*
|
|
|
|
* Return: Pointer to MPI buffer or NULL on error
|
|
|
|
*/
|
|
|
|
void *mpi_get_buffer(MPI a, unsigned *nbytes, int *sign)
|
|
|
|
{
|
2015-08-24 17:52:14 +03:00
|
|
|
uint8_t *buf;
|
2015-06-15 23:18:36 +03:00
|
|
|
unsigned int n;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!nbytes)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
n = mpi_get_size(a);
|
|
|
|
|
|
|
|
if (!n)
|
|
|
|
n++;
|
|
|
|
|
|
|
|
buf = kmalloc(n, GFP_KERNEL);
|
|
|
|
|
|
|
|
if (!buf)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
ret = mpi_read_buffer(a, buf, n, nbytes, sign);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
kfree(buf);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return buf;
|
2011-08-31 15:05:16 +04:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(mpi_get_buffer);
|
|
|
|
|
2015-10-08 19:26:50 +03:00
|
|
|
/**
|
|
|
|
* mpi_write_to_sgl() - Funnction exports MPI to an sgl (msb first)
|
|
|
|
*
|
|
|
|
* This function works in the same way as the mpi_read_buffer, but it
|
|
|
|
* takes an sgl instead of u8 * buf.
|
|
|
|
*
|
|
|
|
* @a: a multi precision integer
|
|
|
|
* @sgl: scatterlist to write to. Needs to be at least
|
|
|
|
* mpi_get_size(a) long.
|
2016-06-29 14:32:21 +03:00
|
|
|
* @nbytes: the number of bytes to write. Leading bytes will be
|
|
|
|
* filled with zero.
|
2015-10-08 19:26:50 +03:00
|
|
|
* @sign: if not NULL, it will be set to the sign of a.
|
|
|
|
*
|
|
|
|
* Return: 0 on success or error code in case of error
|
|
|
|
*/
|
2016-06-29 14:32:21 +03:00
|
|
|
int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned nbytes,
|
2015-10-08 19:26:50 +03:00
|
|
|
int *sign)
|
|
|
|
{
|
|
|
|
u8 *p, *p2;
|
2016-03-22 15:12:39 +03:00
|
|
|
#if BYTES_PER_MPI_LIMB == 4
|
|
|
|
__be32 alimb;
|
|
|
|
#elif BYTES_PER_MPI_LIMB == 8
|
|
|
|
__be64 alimb;
|
|
|
|
#else
|
|
|
|
#error please implement for this limb size.
|
|
|
|
#endif
|
2015-10-08 19:26:50 +03:00
|
|
|
unsigned int n = mpi_get_size(a);
|
2016-06-29 14:32:22 +03:00
|
|
|
struct sg_mapping_iter miter;
|
2016-06-29 14:32:21 +03:00
|
|
|
int i, x, buf_len;
|
2016-06-29 14:32:22 +03:00
|
|
|
int nents;
|
2015-10-08 19:26:50 +03:00
|
|
|
|
|
|
|
if (sign)
|
|
|
|
*sign = a->sign;
|
|
|
|
|
2016-06-29 14:32:21 +03:00
|
|
|
if (nbytes < n)
|
2015-11-13 14:01:32 +03:00
|
|
|
return -EOVERFLOW;
|
|
|
|
|
2016-06-29 14:32:22 +03:00
|
|
|
nents = sg_nents_for_len(sgl, nbytes);
|
|
|
|
if (nents < 0)
|
|
|
|
return -EINVAL;
|
2015-10-08 19:26:50 +03:00
|
|
|
|
2016-06-29 14:32:22 +03:00
|
|
|
sg_miter_start(&miter, sgl, nents, SG_MITER_ATOMIC | SG_MITER_TO_SG);
|
|
|
|
sg_miter_next(&miter);
|
|
|
|
buf_len = miter.length;
|
|
|
|
p2 = miter.addr;
|
2016-06-29 14:32:21 +03:00
|
|
|
|
2016-06-29 14:32:22 +03:00
|
|
|
while (nbytes > n) {
|
2016-06-29 14:32:21 +03:00
|
|
|
i = min_t(unsigned, nbytes - n, buf_len);
|
|
|
|
memset(p2, 0, i);
|
|
|
|
p2 += i;
|
|
|
|
nbytes -= i;
|
2016-06-29 14:32:22 +03:00
|
|
|
|
|
|
|
buf_len -= i;
|
|
|
|
if (!buf_len) {
|
|
|
|
sg_miter_next(&miter);
|
|
|
|
buf_len = miter.length;
|
|
|
|
p2 = miter.addr;
|
|
|
|
}
|
2016-06-29 14:32:21 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = a->nlimbs - 1; i >= 0; i--) {
|
2015-10-08 19:26:50 +03:00
|
|
|
#if BYTES_PER_MPI_LIMB == 4
|
2016-06-29 14:32:21 +03:00
|
|
|
alimb = a->d[i] ? cpu_to_be32(a->d[i]) : 0;
|
2015-10-08 19:26:50 +03:00
|
|
|
#elif BYTES_PER_MPI_LIMB == 8
|
2016-06-29 14:32:21 +03:00
|
|
|
alimb = a->d[i] ? cpu_to_be64(a->d[i]) : 0;
|
2015-10-08 19:26:50 +03:00
|
|
|
#else
|
|
|
|
#error please implement for this limb size.
|
|
|
|
#endif
|
2016-06-29 14:32:21 +03:00
|
|
|
p = (u8 *)&alimb;
|
2015-10-08 19:26:50 +03:00
|
|
|
|
2016-06-29 14:32:21 +03:00
|
|
|
for (x = 0; x < sizeof(alimb); x++) {
|
2015-10-08 19:26:50 +03:00
|
|
|
*p2++ = *p++;
|
2016-06-29 14:32:22 +03:00
|
|
|
if (!--buf_len) {
|
|
|
|
sg_miter_next(&miter);
|
|
|
|
buf_len = miter.length;
|
|
|
|
p2 = miter.addr;
|
|
|
|
}
|
2015-10-08 19:26:50 +03:00
|
|
|
}
|
|
|
|
}
|
2016-06-29 14:32:22 +03:00
|
|
|
|
|
|
|
sg_miter_stop(&miter);
|
2015-10-08 19:26:50 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(mpi_write_to_sgl);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* mpi_read_raw_from_sgl() - Function allocates an MPI and populates it with
|
|
|
|
* data from the sgl
|
|
|
|
*
|
|
|
|
* This function works in the same way as the mpi_read_raw_data, but it
|
|
|
|
* takes an sgl instead of void * buffer. i.e. it allocates
|
|
|
|
* a new MPI and reads the content of the sgl to the MPI.
|
|
|
|
*
|
|
|
|
* @sgl: scatterlist to read from
|
2016-03-22 15:12:43 +03:00
|
|
|
* @nbytes: number of bytes to read
|
2015-10-08 19:26:50 +03:00
|
|
|
*
|
|
|
|
* Return: Pointer to a new MPI or NULL on error
|
|
|
|
*/
|
2016-03-22 15:12:43 +03:00
|
|
|
MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int nbytes)
|
2015-10-08 19:26:50 +03:00
|
|
|
{
|
2016-06-29 14:32:22 +03:00
|
|
|
struct sg_mapping_iter miter;
|
2016-03-22 15:12:43 +03:00
|
|
|
unsigned int nbits, nlimbs;
|
2016-06-29 14:32:22 +03:00
|
|
|
int x, j, z, lzeros, ents;
|
|
|
|
unsigned int len;
|
|
|
|
const u8 *buff;
|
2015-10-08 19:26:50 +03:00
|
|
|
mpi_limb_t a;
|
|
|
|
MPI val = NULL;
|
|
|
|
|
2016-06-29 14:32:22 +03:00
|
|
|
ents = sg_nents_for_len(sgl, nbytes);
|
|
|
|
if (ents < 0)
|
|
|
|
return NULL;
|
2015-10-08 19:26:50 +03:00
|
|
|
|
2016-06-29 14:32:22 +03:00
|
|
|
sg_miter_start(&miter, sgl, ents, SG_MITER_ATOMIC | SG_MITER_FROM_SG);
|
2015-10-08 19:26:50 +03:00
|
|
|
|
2016-06-29 14:32:22 +03:00
|
|
|
lzeros = 0;
|
|
|
|
len = 0;
|
|
|
|
while (nbytes > 0) {
|
2015-10-18 13:45:18 +03:00
|
|
|
while (len && !*buff) {
|
2015-10-08 19:26:50 +03:00
|
|
|
lzeros++;
|
2015-10-18 13:45:18 +03:00
|
|
|
len--;
|
|
|
|
buff++;
|
|
|
|
}
|
2015-10-08 19:26:50 +03:00
|
|
|
|
|
|
|
if (len && *buff)
|
|
|
|
break;
|
|
|
|
|
2016-06-29 14:32:22 +03:00
|
|
|
sg_miter_next(&miter);
|
|
|
|
buff = miter.addr;
|
|
|
|
len = miter.length;
|
|
|
|
|
lib/mpi: mpi_read_raw_from_sgl(): don't include leading zero SGEs in nbytes
At the very beginning of mpi_read_raw_from_sgl(), the leading zeros of
the input scatterlist are counted:
lzeros = 0;
for_each_sg(sgl, sg, ents, i) {
...
if (/* sg contains nonzero bytes */)
break;
/* sg contains nothing but zeros here */
ents--;
lzeros = 0;
}
Later on, the total number of trailing nonzero bytes is calculated by
subtracting the number of leading zero bytes from the total number of input
bytes:
nbytes -= lzeros;
However, since lzeros gets reset to zero for each completely zero leading
sg in the loop above, it doesn't include those.
Besides wasting resources by allocating a too large output buffer,
this mistake propagates into the calculation of x, the number of
leading zeros within the most significant output limb:
x = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
What's more, the low order bytes of the output, equal in number to the
extra bytes in nbytes, are left uninitialized.
Fix this by adjusting nbytes for each completely zero leading scatterlist
entry.
Fixes: 2d4d1eea540b ("lib/mpi: Add mpi sgl helpers")
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2016-03-22 15:12:44 +03:00
|
|
|
nbytes -= lzeros;
|
2015-10-08 19:26:50 +03:00
|
|
|
lzeros = 0;
|
|
|
|
}
|
|
|
|
|
2016-07-28 08:29:17 +03:00
|
|
|
miter.consumed = lzeros;
|
|
|
|
|
lib/mpi: mpi_read_raw_from_sgl(): don't include leading zero SGEs in nbytes
At the very beginning of mpi_read_raw_from_sgl(), the leading zeros of
the input scatterlist are counted:
lzeros = 0;
for_each_sg(sgl, sg, ents, i) {
...
if (/* sg contains nonzero bytes */)
break;
/* sg contains nothing but zeros here */
ents--;
lzeros = 0;
}
Later on, the total number of trailing nonzero bytes is calculated by
subtracting the number of leading zero bytes from the total number of input
bytes:
nbytes -= lzeros;
However, since lzeros gets reset to zero for each completely zero leading
sg in the loop above, it doesn't include those.
Besides wasting resources by allocating a too large output buffer,
this mistake propagates into the calculation of x, the number of
leading zeros within the most significant output limb:
x = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
What's more, the low order bytes of the output, equal in number to the
extra bytes in nbytes, are left uninitialized.
Fix this by adjusting nbytes for each completely zero leading scatterlist
entry.
Fixes: 2d4d1eea540b ("lib/mpi: Add mpi sgl helpers")
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2016-03-22 15:12:44 +03:00
|
|
|
nbytes -= lzeros;
|
2015-10-08 19:26:50 +03:00
|
|
|
nbits = nbytes * 8;
|
|
|
|
if (nbits > MAX_EXTERN_MPI_BITS) {
|
2017-08-10 09:06:18 +03:00
|
|
|
sg_miter_stop(&miter);
|
2015-10-08 19:26:50 +03:00
|
|
|
pr_info("MPI: mpi too large (%u bits)\n", nbits);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nbytes > 0)
|
2016-06-29 14:32:22 +03:00
|
|
|
nbits -= count_leading_zeros(*buff) - (BITS_PER_LONG - 8);
|
2015-10-08 19:26:50 +03:00
|
|
|
|
2017-08-10 09:06:18 +03:00
|
|
|
sg_miter_stop(&miter);
|
|
|
|
|
2015-10-08 19:26:50 +03:00
|
|
|
nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);
|
|
|
|
val = mpi_alloc(nlimbs);
|
|
|
|
if (!val)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
val->nbits = nbits;
|
|
|
|
val->sign = 0;
|
|
|
|
val->nlimbs = nlimbs;
|
|
|
|
|
|
|
|
if (nbytes == 0)
|
|
|
|
return val;
|
|
|
|
|
|
|
|
j = nlimbs - 1;
|
|
|
|
a = 0;
|
lib/mpi: mpi_read_raw_from_sgl(): sanitize meaning of indices
Within the byte reading loop in mpi_read_raw_sgl(), there are two
housekeeping indices used, z and x.
At all times, the index z represents the number of output bytes covered
by the input SGEs for which processing has completed so far. This includes
any leading zero bytes within the most significant limb.
The index x changes its meaning after the first outer loop's iteration
though: while processing the first input SGE, it represents
"number of leading zero bytes in most significant output limb" +
"current position within current SGE"
For the remaining SGEs OTOH, x corresponds just to
"current position within current SGE"
After all, it is only the sum of z and x that has any meaning for the
output buffer and thus, the
"number of leading zero bytes in most significant output limb"
part can be moved away from x into z from the beginning, opening up the
opportunity for cleaner code.
Before the outer loop iterating over the SGEs, don't initialize z with
zero, but with the number of leading zero bytes in the most significant
output limb. For the inner loop iterating over a single SGE's bytes,
get rid of the buf_shift offset to x' bounds and let x run from zero to
sg->length - 1.
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2016-03-22 15:18:07 +03:00
|
|
|
z = BYTES_PER_MPI_LIMB - nbytes % BYTES_PER_MPI_LIMB;
|
|
|
|
z %= BYTES_PER_MPI_LIMB;
|
2015-10-08 19:26:50 +03:00
|
|
|
|
2016-07-28 08:29:17 +03:00
|
|
|
while (sg_miter_next(&miter)) {
|
|
|
|
buff = miter.addr;
|
|
|
|
len = miter.length;
|
|
|
|
|
lib/mpi: mpi_read_raw_from_sgl(): sanitize meaning of indices
Within the byte reading loop in mpi_read_raw_sgl(), there are two
housekeeping indices used, z and x.
At all times, the index z represents the number of output bytes covered
by the input SGEs for which processing has completed so far. This includes
any leading zero bytes within the most significant limb.
The index x changes its meaning after the first outer loop's iteration
though: while processing the first input SGE, it represents
"number of leading zero bytes in most significant output limb" +
"current position within current SGE"
For the remaining SGEs OTOH, x corresponds just to
"current position within current SGE"
After all, it is only the sum of z and x that has any meaning for the
output buffer and thus, the
"number of leading zero bytes in most significant output limb"
part can be moved away from x into z from the beginning, opening up the
opportunity for cleaner code.
Before the outer loop iterating over the SGEs, don't initialize z with
zero, but with the number of leading zero bytes in the most significant
output limb. For the inner loop iterating over a single SGE's bytes,
get rid of the buf_shift offset to x' bounds and let x run from zero to
sg->length - 1.
Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2016-03-22 15:18:07 +03:00
|
|
|
for (x = 0; x < len; x++) {
|
2015-10-08 19:26:50 +03:00
|
|
|
a <<= 8;
|
2016-06-29 14:32:22 +03:00
|
|
|
a |= *buff++;
|
2015-10-08 19:26:50 +03:00
|
|
|
if (((z + x + 1) % BYTES_PER_MPI_LIMB) == 0) {
|
|
|
|
val->d[j--] = a;
|
|
|
|
a = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
z += x;
|
|
|
|
}
|
2016-06-29 14:32:22 +03:00
|
|
|
|
2015-10-08 19:26:50 +03:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(mpi_read_raw_from_sgl);
|