Commit 3f5238f5 authored by Roberto Sassu's avatar Roberto Sassu Committed by zgzxx
Browse files

mpi: introduce mpi_key_length() 

euleros inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I91FSN


CVE: NA

-------------------------------------------------

Introduce the new function to get the number of bits and bytes from an MPI.

v4:
 - path change lib/mpi/mpicoder.c->lib/crypto/mpi/mpicoder.c for 6.6 kernel

Signed-off-by: default avatarRoberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: default avatarTianxing Zhang <zhangtianxing3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarzhoushuiqing <zhoushuiqing2@huawei.com>
Signed-off-by: default avatarzhangguangzhi <zhangguangzhi3@huawei.com>
parent 337a0ed1

include/linux/mpi.h

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ enum gcry_mpi_format { 
};



MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes);

#ifdef CONFIG_PGP_LIBRARY

int mpi_key_length(const void *xbuffer, unsigned int ret_nread,

		   unsigned int *nbits_arg, unsigned int *nbytes_arg);

#endif

MPI mpi_read_from_buffer(const void *buffer, unsigned *ret_nread);

int mpi_fromstr(MPI val, const char *str);

MPI mpi_scanval(const char *string);

lib/crypto/mpi/mpicoder.c

+44 −0
Original line number Diff line number Diff line
@@ -79,6 +79,49 @@ MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes) 
}

EXPORT_SYMBOL_GPL(mpi_read_raw_data);



#ifdef CONFIG_PGP_LIBRARY

int mpi_key_length(const void *xbuffer, unsigned int ret_nread,

		   unsigned int *nbits_arg, unsigned int *nbytes_arg)

{

	const uint8_t *buffer = xbuffer;

	unsigned int nbits, nbytes;



	if (ret_nread < 2)

		return -EINVAL;

	nbits = buffer[0] << 8 | buffer[1];



	if (nbits > MAX_EXTERN_MPI_BITS) {

		pr_info("MPI: mpi too large (%u bits)\n", nbits);

		return -EINVAL;

	}



	nbytes = DIV_ROUND_UP(nbits, 8);

	if (nbytes + 2 > ret_nread) {

		pr_info("MPI: mpi larger than buffer nbytes=%u ret_nread=%u\n",

			nbytes, ret_nread);

		return -EINVAL;

	}



	if (nbits_arg)

		*nbits_arg = nbits;

	if (nbytes_arg)

		*nbytes_arg = nbytes;



	return 0;

}

EXPORT_SYMBOL_GPL(mpi_key_length);



MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)

{

	const uint8_t *buffer = xbuffer;

	unsigned int nbytes;

	MPI val;

	int ret;



	ret = mpi_key_length(xbuffer, *ret_nread, NULL, &nbytes);

	if (ret < 0)

		return ERR_PTR(ret);

#else

MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)

{

	const uint8_t *buffer = xbuffer;
@@ -101,6 +144,7 @@ MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread) 
		return ERR_PTR(-EINVAL);

	}



#endif /* CONFIG_PGP_LIBRARY */

	val = mpi_read_raw_data(buffer + 2, nbytes);

	if (!val)

		return ERR_PTR(-ENOMEM);