crypto: lib/mpi - Add error checks
Subsystems (3)
Herbert Xu
maintainerv2 cover crypto: lib/mpi - Add error checks
This patch series reverts MPI library extensions which are buggy as they carried assumptions from user-space that memory allocations always succeed. They were used by SM2 which itself has now been removed.
Ironically most of these library functions were previously in the kernel in a non-buggy form but were removed because they were unused.
About half of the extensions remain because they have found uses beyond SM2. For those error checks have been added.
Herbert Xu (4):
Revert "lib/mpi: Extend the MPI library"
crypto: lib/mpi - Add error checks to extension
crypto: dh - Check mpi_rshift errors
crypto: rsa - Check MPI allocation errors
crypto/dh.c | 4 +- crypto/rsa.c | 19 +- include/linux/mpi.h | 87 ++------- lib/crypto/mpi/Makefile | 1 - lib/crypto/mpi/mpi-add.c | 89 +++------ lib/crypto/mpi/mpi-bit.c | 168 ++--------------- lib/crypto/mpi/mpi-cmp.c | 46 +---- lib/crypto/mpi/mpi-div.c | 82 ++++----- lib/crypto/mpi/mpi-internal.h | 21 +-- lib/crypto/mpi/mpi-inv.c | 143 --------------- lib/crypto/mpi/mpi-mod.c | 148 +-------------- lib/crypto/mpi/mpi-mul.c | 29 ++- lib/crypto/mpi/mpicoder.c | 336 ---------------------------------- lib/crypto/mpi/mpih-mul.c | 25 --- lib/crypto/mpi/mpiutil.c | 184 +------------------ 15 files changed, 151 insertions(+), 1231 deletions(-) delete mode 100644 lib/crypto/mpi/mpi-inv.c
Signature · 1 line
2.39.2
Herbert Xu
maintainerPATCH v2 1/4 Revert "lib/mpi: Extend the MPI library"
This partially reverts commit a8ea8bdd9df92a0e5db5b43900abb7a288b8a53e.
Most of it is no longer needed since sm2 has been removed. However, the following functions have been kept as they have developed other uses:
mpi_copy
mpi_mod
mpi_test_bitmpi_set_bitmpi_rshift
mpi_addmpi_submpi_addmmpi_subm
mpi_mulmpi_mulm
mpi_tdiv_rmpi_fdiv_r
--- include/linux/mpi.h | 65 ------- lib/crypto/mpi/Makefile | 1 - lib/crypto/mpi/mpi-add.c | 51 ------ lib/crypto/mpi/mpi-bit.c | 143 --------------- lib/crypto/mpi/mpi-cmp.c | 46 +---- lib/crypto/mpi/mpi-div.c | 29 --- lib/crypto/mpi/mpi-internal.h | 10 - lib/crypto/mpi/mpi-inv.c | 143 --------------- lib/crypto/mpi/mpi-mod.c | 144 --------------- lib/crypto/mpi/mpicoder.c | 336 ---------------------------------- lib/crypto/mpi/mpih-mul.c | 25 --- lib/crypto/mpi/mpiutil.c | 182 ------------------ 12 files changed, 10 insertions(+), 1165 deletions(-) delete mode 100644 lib/crypto/mpi/mpi-inv.c
include/linux/mpi.h +0 -65
@@ -40,87 +40,33 @@ struct gcry_mpi {typedef struct gcry_mpi *MPI ;#define mpi_get_nlimbs (a) ((a)->nlimbs) -#define mpi_has_sign (a) ((a)->sign)/*-- mpiutil.c --*/ MPI mpi_alloc (unsigned nlimbs); -void mpi_clear (MPI a);void mpi_free (MPI a);int mpi_resize (MPI a,unsigned nlimbs); -static inline MPI mpi_new (unsigned int nbits) -{ -return mpi_alloc ((nbits +BITS_PER_MPI_LIMB -1 ) /BITS_PER_MPI_LIMB ); -} -MPI mpi_copy (MPI a); -MPI mpi_alloc_like (MPI a); -void mpi_snatch (MPI w,MPI u); -MPI mpi_set (MPI w,MPI u); -MPI mpi_set_ui (MPI w,unsigned long u); -MPI mpi_alloc_set_ui (unsigned long u); -void mpi_swap_cond (MPI a,MPI b,unsigned long swap); - -/* Constants used to return constant MPIs. See mpi_init if you -* want to add more constants. -*/ -#define MPI_NUMBER_OF_CONSTANTS 6 -enum gcry_mpi_constants { -MPI_C_ZERO , -MPI_C_ONE , -MPI_C_TWO , -MPI_C_THREE , -MPI_C_FOUR , -MPI_C_EIGHT -}; - -MPI mpi_const (enum gcry_mpi_constants no);/*-- mpicoder.c --*/ - -/* Different formats of external big integer representation. */ -enum gcry_mpi_format { -GCRYMPI_FMT_NONE =0 , -GCRYMPI_FMT_STD =1 ,/* Twos complement stored without length. */ -GCRYMPI_FMT_PGP =2 ,/* As used by OpenPGP (unsigned only). */ -GCRYMPI_FMT_SSH =3 ,/* As used by SSH (like STD but with length). */ -GCRYMPI_FMT_HEX =4 ,/* Hex format. */ -GCRYMPI_FMT_USG =5 ,/* Like STD but unsigned. */ -GCRYMPI_FMT_OPAQUE =8 /* Opaque format (some functions only). */ -}; -MPI mpi_read_raw_data (const void *xbuffer,size_t nbytes);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);MPI mpi_read_raw_from_sgl (struct scatterlist *sgl,unsigned int len);void *mpi_get_buffer (MPI a,unsigned *nbytes,int *sign);int mpi_read_buffer (MPI a,uint8_t *buf,unsigned buf_len,unsigned *nbytes,int *sign);int mpi_write_to_sgl (MPI a,struct scatterlist *sg,unsigned nbytes,int *sign); -int mpi_print (enum gcry_mpi_format format,unsigned char *buffer, -size_t buflen,size_t *nwritten,MPI a);/*-- mpi-mod.c --*/ void mpi_mod (MPI rem,MPI dividend,MPI divisor); -/* Context used with Barrett reduction. */ -struct barrett_ctx_s ; -typedef struct barrett_ctx_s *mpi_barrett_t ; - -mpi_barrett_t mpi_barrett_init (MPI m,int copy); -void mpi_barrett_free (mpi_barrett_t ctx); -void mpi_mod_barrett (MPI r,MPI x,mpi_barrett_t ctx); -void mpi_mul_barrett (MPI w,MPI u,MPI v,mpi_barrett_t ctx); -/*-- mpi-pow.c --*/ int mpi_powm (MPI res,MPI base,MPI exp,MPI mod);/*-- mpi-cmp.c --*/ int mpi_cmp_ui (MPI u,ulong v);int mpi_cmp (MPI u,MPI v); -int mpi_cmpabs (MPI u,MPI v);/*-- mpi-sub-ui.c --*/ int mpi_sub_ui (MPI w,MPI u,unsigned long vval);
@@ -130,16 +76,9 @@ void mpi_normalize(MPI a);unsigned mpi_get_nbits (MPI a);int mpi_test_bit (MPI a,unsigned int n);void mpi_set_bit (MPI a,unsigned int n); -void mpi_set_highbit (MPI a,unsigned int n); -void mpi_clear_highbit (MPI a,unsigned int n); -void mpi_clear_bit (MPI a,unsigned int n); -void mpi_rshift_limbs (MPI a,unsigned int count);void mpi_rshift (MPI x,MPI a,unsigned int n); -void mpi_lshift_limbs (MPI a,unsigned int count); -void mpi_lshift (MPI x,MPI a,unsigned int n);/*-- mpi-add.c --*/ -void mpi_add_ui (MPI w,MPI u,unsigned long v);void mpi_add (MPI w,MPI u,MPI v);void mpi_sub (MPI w,MPI u,MPI v);void mpi_addm (MPI w,MPI u,MPI v,MPI m);
@@ -152,10 +91,6 @@ void mpi_mulm(MPI w, MPI u, MPI v, MPI m);/*-- mpi-div.c --*/ void mpi_tdiv_r (MPI rem,MPI num,MPI den);void mpi_fdiv_r (MPI rem,MPI dividend,MPI divisor); -void mpi_fdiv_q (MPI quot,MPI dividend,MPI divisor); - -/*-- mpi-inv.c --*/ -int mpi_invm (MPI x,MPI a,MPI n);/* inline functions */
lib/crypto/mpi/Makefile +0 -1
@@ -19,7 +19,6 @@ mpi-y = \ mpi-cmp.o \ mpi-sub-ui.o \ mpi-div.o \ - mpi-inv.o \ mpi-mod.o \ mpi-mul.o \ mpih-cmp.o \
lib/crypto/mpi/mpi-add.c +0 -51
57 lines not on this page · raw message
lib/crypto/mpi/mpi-bit.c +0 -143
158 lines not on this page · raw message
lib/crypto/mpi/mpi-cmp.c +10 -36
64 lines not on this page · raw message
lib/crypto/mpi/mpi-div.c +0 -29
@@ -15,7 +15,6 @@#include "longlong.h" void mpi_tdiv_qr (MPI quot,MPI rem,MPI num,MPI den); -void mpi_fdiv_qr (MPI quot,MPI rem,MPI dividend,MPI divisor);void mpi_fdiv_r (MPI rem,MPI dividend,MPI divisor) {
@@ -40,34 +39,6 @@ void mpi_fdiv_r(MPI rem, MPI dividend, MPI divisor)mpi_free (temp_divisor); } -void mpi_fdiv_q (MPI quot,MPI dividend,MPI divisor) -{ -MPI tmp =mpi_alloc (mpi_get_nlimbs (quot)); -mpi_fdiv_qr (quot, tmp, dividend, divisor); -mpi_free (tmp); -} - -void mpi_fdiv_qr (MPI quot,MPI rem,MPI dividend,MPI divisor) -{ -int divisor_sign = divisor->sign; -MPI temp_divisor =NULL ; - -if (quot == divisor || rem == divisor) { - temp_divisor =mpi_copy (divisor); - divisor = temp_divisor; - } - -mpi_tdiv_qr (quot, rem, dividend, divisor); - -if ((divisor_sign ^ dividend->sign) && rem->nlimbs) { -mpi_sub_ui (quot, quot,1 ); -mpi_add (rem, rem, divisor); - } - -if (temp_divisor) -mpi_free (temp_divisor); -} -/* If den == quot, den needs temporary storage. * If den == rem, den needs temporary storage. * If num == quot, num needs temporary storage.
lib/crypto/mpi/mpi-internal.h +0 -10
@@ -66,14 +66,6 @@ typedef int mpi_size_t; /* (must be a signed type) */ (d)[_i] = (s)[_i]; \ } while (0) -#define MPN_COPY_INCR (d, s, n) \ - do { \ - mpi_size_t _i; \ - for (_i = 0; _i < (n); _i++) \ - (d)[_i] = (s)[_i]; \ - } while (0) - -#define MPN_COPY_DECR (d, s, n) \ do { \ mpi_size_t _i; \
@@ -181,8 +173,6 @@ int mpihelp_mul(mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,void mpih_sqr_n_basecase (mpi_ptr_t prodp,mpi_ptr_t up,mpi_size_t size);void mpih_sqr_n (mpi_ptr_t prodp,mpi_ptr_t up,mpi_size_t size,mpi_ptr_t tspace); -void mpihelp_mul_n (mpi_ptr_t prodp, -mpi_ptr_t up,mpi_ptr_t vp,mpi_size_t size); int mpihelp_mul_karatsuba_case(mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
lib/crypto/mpi/mpi-inv.c deleted +0 -143
143 lines not on this page · raw message
lib/crypto/mpi/mpi-mod.c +0 -144
153 lines not on this page · raw message
lib/crypto/mpi/mpicoder.c +0 -336
351 lines not on this page · raw message
lib/crypto/mpi/mpih-mul.c +0 -25
@@ -317,31 +317,6 @@ mpih_sqr_n(mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t size, mpi_ptr_t tspace) } } - -void mpihelp_mul_n (mpi_ptr_t prodp, -mpi_ptr_t up,mpi_ptr_t vp,mpi_size_t size) -{ -if (up == vp) { -if (size <KARATSUBA_THRESHOLD ) -mpih_sqr_n_basecase (prodp, up, size); -else { -mpi_ptr_t tspace; - tspace =mpi_alloc_limb_space (2 * size); -mpih_sqr_n (prodp, up, size, tspace); -mpi_free_limb_space (tspace); - } - }else { -if (size <KARATSUBA_THRESHOLD ) -mul_n_basecase (prodp, up, vp, size); -else { -mpi_ptr_t tspace; - tspace =mpi_alloc_limb_space (2 * size); -mul_n (prodp, up, vp, size, tspace); -mpi_free_limb_space (tspace); - } - } -} - int mpihelp_mul_karatsuba_case(mpi_ptr_t prodp, mpi_ptr_t up, mpi_size_t usize,
lib/crypto/mpi/mpiutil.c +0 -182
199 lines not on this page · raw message
Signature · 1 line
2.39.2
Herbert Xu
maintainerPATCH v2 2/4 crypto: lib/mpi - Add error checks to extension
In reply to Herbert XuThe remaining functions added by commit a8ea8bdd9df92a0e5db5b43900abb7a288b8a53e did not check for memory allocation errors. Add the checks and change the API to allow errors to be returned.
--- include/linux/mpi.h | 22 +++++++------- lib/crypto/mpi/mpi-add.c | 38 ++++++++++++++++-------- lib/crypto/mpi/mpi-bit.c | 25 +++++++++++----- lib/crypto/mpi/mpi-div.c | 55 +++++++++++++++++++++++++---------- lib/crypto/mpi/mpi-internal.h | 11 +++---- lib/crypto/mpi/mpi-mod.c | 4 +-- lib/crypto/mpi/mpi-mul.c | 29 ++++++++++++++---- lib/crypto/mpi/mpiutil.c | 2 ++ 8 files changed, 128 insertions(+), 58 deletions(-)
include/linux/mpi.h +11 -11
@@ -59,7 +59,7 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sg, unsigned nbytes, int *sign);/*-- mpi-mod.c --*/ -void mpi_mod (MPI rem,MPI dividend,MPI divisor); +int mpi_mod (MPI rem,MPI dividend,MPI divisor);/*-- mpi-pow.c --*/ int mpi_powm (MPI res,MPI base,MPI exp,MPI mod);
@@ -75,22 +75,22 @@ int mpi_sub_ui(MPI w, MPI u, unsigned long vval);void mpi_normalize (MPI a);unsigned mpi_get_nbits (MPI a);int mpi_test_bit (MPI a,unsigned int n); -void mpi_set_bit (MPI a,unsigned int n); -void mpi_rshift (MPI x,MPI a,unsigned int n); +int mpi_set_bit (MPI a,unsigned int n); +int mpi_rshift (MPI x,MPI a,unsigned int n);/*-- mpi-add.c --*/ -void mpi_add (MPI w,MPI u,MPI v); -void mpi_sub (MPI w,MPI u,MPI v); -void mpi_addm (MPI w,MPI u,MPI v,MPI m); -void mpi_subm (MPI w,MPI u,MPI v,MPI m); +int mpi_add (MPI w,MPI u,MPI v); +int mpi_sub (MPI w,MPI u,MPI v); +int mpi_addm (MPI w,MPI u,MPI v,MPI m); +int mpi_subm (MPI w,MPI u,MPI v,MPI m);/*-- mpi-mul.c --*/ -void mpi_mul (MPI w,MPI u,MPI v); -void mpi_mulm (MPI w,MPI u,MPI v,MPI m); +int mpi_mul (MPI w,MPI u,MPI v); +int mpi_mulm (MPI w,MPI u,MPI v,MPI m);/*-- mpi-div.c --*/ -void mpi_tdiv_r (MPI rem,MPI num,MPI den); -void mpi_fdiv_r (MPI rem,MPI dividend,MPI divisor); +int mpi_tdiv_r (MPI rem,MPI num,MPI den); +int mpi_fdiv_r (MPI rem,MPI dividend,MPI divisor);/* inline functions */
lib/crypto/mpi/mpi-add.c +26 -12
@@ -13,11 +13,12 @@#include "mpi-internal.h" -void mpi_add (MPI w,MPI u,MPI v) +int mpi_add (MPI w,MPI u,MPI v) {mpi_ptr_t wp, up, vp;mpi_size_t usize, vsize, wsize;int usign, vsign, wsign; +int err;if (u->nlimbs < v->nlimbs) {/* Swap U and V. */ usize = v->nlimbs;
@@ -25,7 +26,9 @@ void mpi_add(MPI w, MPI u, MPI v) vsize = u->nlimbs; vsign = u->sign; wsize = usize +1 ; -RESIZE_IF_NEEDED (w, wsize); + err =RESIZE_IF_NEEDED (w, wsize); +if (err) +return err;/* These must be after realloc (u or v may be the same as w). */ up = v->d; vp = u->d;
@@ -35,7 +38,9 @@ void mpi_add(MPI w, MPI u, MPI v) vsize = v->nlimbs; vsign = v->sign; wsize = usize +1 ; -RESIZE_IF_NEEDED (w, wsize); + err =RESIZE_IF_NEEDED (w, wsize); +if (err) +return err;/* These must be after realloc (u or v may be the same as w). */ up = u->d; vp = v->d;
@@ -77,28 +82,37 @@ void mpi_add(MPI w, MPI u, MPI v) w->nlimbs = wsize; w->sign = wsign; +return 0 ; }EXPORT_SYMBOL_GPL (mpi_add); -void mpi_sub (MPI w,MPI u,MPI v) +int mpi_sub (MPI w,MPI u,MPI v) { -MPI vv =mpi_copy (v); +int err; +MPI vv; + + vv =mpi_copy (v); +if (!vv) +return -ENOMEM ; + vv->sign = !vv->sign; -mpi_add (w, u, vv); + err =mpi_add (w, u, vv);mpi_free (vv); + +return err; }EXPORT_SYMBOL_GPL (mpi_sub); -void mpi_addm (MPI w,MPI u,MPI v,MPI m) +int mpi_addm (MPI w,MPI u,MPI v,MPI m) { -mpi_add (w, u, v); -mpi_mod (w, w, m); +return mpi_add (w, u, v) ?: +mpi_mod (w, w, m); }EXPORT_SYMBOL_GPL (mpi_addm); -void mpi_subm (MPI w,MPI u,MPI v,MPI m) +int mpi_subm (MPI w,MPI u,MPI v,MPI m) { -mpi_sub (w, u, v); -mpi_mod (w, w, m); +return mpi_sub (w, u, v) ?: +mpi_mod (w, w, m); }EXPORT_SYMBOL_GPL (mpi_subm);
lib/crypto/mpi/mpi-bit.c +18 -7
@@ -76,9 +76,10 @@ EXPORT_SYMBOL_GPL(mpi_test_bit);/**************** * Set bit N of A. */ -void mpi_set_bit (MPI a,unsigned int n) +int mpi_set_bit (MPI a,unsigned int n) {unsigned int i, limbno, bitno; +int err; limbno = n /BITS_PER_MPI_LIMB ; bitno = n %BITS_PER_MPI_LIMB ;
@@ -86,27 +87,31 @@ void mpi_set_bit(MPI a, unsigned int n)if (limbno >= a->nlimbs) {for (i = a->nlimbs; i < a->alloced; i++) a->d[i] =0 ; -mpi_resize (a, limbno+1 ); + err =mpi_resize (a, limbno+1 ); +if (err) +return err; a->nlimbs = limbno+1 ; } a->d[limbno] |= (A_LIMB_1 <<bitno); +return 0 ; }/* * Shift A by N bits to the right. */ -void mpi_rshift (MPI x,MPI a,unsigned int n) +int mpi_rshift (MPI x,MPI a,unsigned int n) {mpi_size_t xsize;unsigned int i;unsigned int nlimbs = (n/BITS_PER_MPI_LIMB );unsigned int nbits = (n%BITS_PER_MPI_LIMB ); +int err;if (x == a) {/* In-place operation. */ if (nlimbs >= x->nlimbs) { x->nlimbs =0 ; -return ; +return 0 ; }if (nlimbs) {
@@ -121,7 +126,9 @@ void mpi_rshift(MPI x, MPI a, unsigned int n)/* Copy and shift by more or equal bits than in a limb. */ xsize = a->nlimbs; x->sign = a->sign; -RESIZE_IF_NEEDED (x, xsize); + err =RESIZE_IF_NEEDED (x, xsize); +if (err) +return err; x->nlimbs = xsize;for (i =0 ; i < a->nlimbs; i++) x->d[i] = a->d[i];
@@ -129,7 +136,7 @@ void mpi_rshift(MPI x, MPI a, unsigned int n)if (nlimbs >= x->nlimbs) { x->nlimbs =0 ; -return ; +return 0 ; }for (i =0 ; i < x->nlimbs - nlimbs; i++)
@@ -143,7 +150,9 @@ void mpi_rshift(MPI x, MPI a, unsigned int n)/* Copy and shift by less than bits in a limb. */ xsize = a->nlimbs; x->sign = a->sign; -RESIZE_IF_NEEDED (x, xsize); + err =RESIZE_IF_NEEDED (x, xsize); +if (err) +return err; x->nlimbs = xsize;if (xsize) {
@@ -159,5 +168,7 @@ void mpi_rshift(MPI x, MPI a, unsigned int n) } }MPN_NORMALIZE (x->d, x->nlimbs); + +return 0 ; }EXPORT_SYMBOL_GPL (mpi_rshift);
lib/crypto/mpi/mpi-div.c +40 -15
140 lines not on this page · raw message
lib/crypto/mpi/mpi-internal.h +6 -5
@@ -52,11 +52,12 @@typedef mpi_limb_t *mpi_ptr_t ;/* pointer to a limb */ typedef int mpi_size_t ;/* (must be a signed type) */ -#define RESIZE_IF_NEEDED (a, b) \ - do { \ - if ((a)->alloced < (b)) \ - mpi_resize((a), (b)); \ - } while (0) +static inline int RESIZE_IF_NEEDED (MPI a,unsigned b) +{ +if (a->alloced < b) +return mpi_resize (a, b); +return 0 ; +}/* Copy N limbs from S to D. */ #define MPN_COPY (d, s, n) \
lib/crypto/mpi/mpi-mod.c +2 -2
@@ -7,7 +7,7 @@#include "mpi-internal.h" -void mpi_mod (MPI rem,MPI dividend,MPI divisor) +int mpi_mod (MPI rem,MPI dividend,MPI divisor) { -mpi_fdiv_r (rem, dividend, divisor); +return mpi_fdiv_r (rem, dividend, divisor); }
lib/crypto/mpi/mpi-mul.c +23 -6
@@ -13,7 +13,7 @@#include "mpi-internal.h" -void mpi_mul (MPI w,MPI u,MPI v) +int mpi_mul (MPI w,MPI u,MPI v) {mpi_size_t usize, vsize, wsize;mpi_ptr_t up, vp, wp;
@@ -21,6 +21,7 @@ void mpi_mul(MPI w, MPI u, MPI v)int usign, vsign, sign_product;int assign_wp =0 ;mpi_ptr_t tmp_limb =NULL ; +int err;if (u->nlimbs < v->nlimbs) {/* Swap U and V. */
@@ -46,15 +47,21 @@ void mpi_mul(MPI w, MPI u, MPI v)if (w->alloced < wsize) {if (wp == up || wp == vp) { wp =mpi_alloc_limb_space (wsize); +if (!wp) +return -ENOMEM ; assign_wp =1 ; }else { -mpi_resize (w, wsize); + err =mpi_resize (w, wsize); +if (err) +return err; wp = w->d; } }else {/* Make U and V not overlap with W. */ if (wp == up) {/* W and U are identical. Allocate temporary space for U. */ up = tmp_limb =mpi_alloc_limb_space (usize); +if (!up) +return -ENOMEM ;/* Is V identical too? Keep it identical with U. */ if (wp == vp) vp = up;
@@ -63,6 +70,8 @@ void mpi_mul(MPI w, MPI u, MPI v) }else if (wp == vp) {/* W and V are identical. Allocate temporary space for V. */ vp = tmp_limb =mpi_alloc_limb_space (vsize); +if (!vp) +return -ENOMEM ;/* Copy to the temporary space. */ MPN_COPY (vp, wp, vsize); }
@@ -71,7 +80,12 @@ void mpi_mul(MPI w, MPI u, MPI v)if (!vsize) wsize =0 ;else { -mpihelp_mul (wp, up, usize, vp, vsize, &cy); + err =mpihelp_mul (wp, up, usize, vp, vsize, &cy); +if (err) { +if (assign_wp) +mpi_free_limb_space (wp); + goto free_tmp_limb; + } wsize -= cy ?0 :1 ; }
@@ -79,14 +93,17 @@ void mpi_mul(MPI w, MPI u, MPI v)mpi_assign_limb_space (w, wp, wsize); w->nlimbs = wsize; w->sign = sign_product; + +free_tmp_limb:if (tmp_limb)mpi_free_limb_space (tmp_limb); +return err; }EXPORT_SYMBOL_GPL (mpi_mul); -void mpi_mulm (MPI w,MPI u,MPI v,MPI m) +int mpi_mulm (MPI w,MPI u,MPI v,MPI m) { -mpi_mul (w, u, v); -mpi_tdiv_r (w, w, m); +return mpi_mul (w, u, v) ?: +mpi_tdiv_r (w, w, m); }EXPORT_SYMBOL_GPL (mpi_mulm);
lib/crypto/mpi/mpiutil.c +2 -0
@@ -133,6 +133,8 @@ MPI mpi_copy(MPI a)if (a) { b =mpi_alloc (a->nlimbs); +if (!b) +return NULL ; b->nlimbs = a->nlimbs; b->sign = a->sign; b->flags = a->flags;
Signature · 1 line
2.39.2
Herbert Xu
maintainerPATCH v2 3/4 crypto: dh - Check mpi_rshift errors
In reply to Herbert XuNow that mpi_rshift can return errors, check them.
--- crypto/dh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
crypto/dh.c +2 -2
@@ -145,9 +145,9 @@ static int dh_is_pubkey_valid(struct dh_ctx *ctx, MPI y)* ->p is odd, so no need to explicitly subtract one * from it before shifting to the right. */ -mpi_rshift (q, ctx->p,1 ); + ret =mpi_rshift (q, ctx->p,1 ) ?: +mpi_powm (val, y, q, ctx->p); - ret =mpi_powm (val, y, q, ctx->p);mpi_free (q);if (ret) {mpi_free (val);
Signature · 1 line
2.39.2
Herbert Xu
maintainerPATCH v2 4/4 crypto: rsa - Check MPI allocation errors
In reply to Herbert Xu--- crypto/rsa.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
crypto/rsa.c +12 -7
@@ -98,14 +98,13 @@ static int _rsa_dec_crt(const struct rsa_mpi_key *key, MPI m_or_m1_or_h, MPI c) goto err_free_mpi;/* (2iii) h = (m_1 - m_2) * qInv mod p */ -mpi_sub (m12_or_qh, m_or_m1_or_h, m2); -mpi_mulm (m_or_m1_or_h, m12_or_qh, key->qinv, key->p); + ret =mpi_sub (m12_or_qh, m_or_m1_or_h, m2) ?: +mpi_mulm (m_or_m1_or_h, m12_or_qh, key->qinv, key->p);/* (2iv) m = m_2 + q * h */ -mpi_mul (m12_or_qh, key->q, m_or_m1_or_h); -mpi_addm (m_or_m1_or_h, m2, m12_or_qh, key->n); - - ret =0 ; + ret = ret ?: +mpi_mul (m12_or_qh, key->q, m_or_m1_or_h) ?: +mpi_addm (m_or_m1_or_h, m2, m12_or_qh, key->n); err_free_mpi:mpi_free (m12_or_qh);
@@ -236,6 +235,7 @@ static int rsa_check_key_length(unsigned int len)static int rsa_check_exponent_fips (MPI e) {MPI e_max =NULL ; +int err;/* check if odd */ if (!mpi_test_bit (e,0 )) {
@@ -250,7 +250,12 @@ static int rsa_check_exponent_fips(MPI e) e_max =mpi_alloc (0 );if (!e_max)return -ENOMEM ; -mpi_set_bit (e_max,256 ); + + err =mpi_set_bit (e_max,256 ); +if (err) { +mpi_free (e_max); +return err; + }if (mpi_cmp (e, e_max) >=0 ) {mpi_free (e_max);
Signature · 1 line
2.39.2