summaryrefslogtreecommitdiffstats
path: root/lib/mpi/mpi-div.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-02-27 12:58:59 +0000
committerArnd Bergmann <arnd@arndb.de>2012-02-27 12:59:03 +0000
commitd0cdd82c6e0944df733b28f5d4cbbe97298587e4 (patch)
tree9de205625a4657fedbfae52c65ea017beb7509a8 /lib/mpi/mpi-div.c
parent747303a383d59a4d4667152fb68293dd9ff06438 (diff)
parent9418ba306688c0b77a8548b3281ba3d130036516 (diff)
Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next/fixes-non-critical
* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: (247 commits) ARM: mach-imx: mx3: Fix section mismatch in imx3_init_l2x0() ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS board ARM: mach-pcm038: Fix field name of regulator_consumer_supply struct Also includes an update to v3.3-rc3 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'lib/mpi/mpi-div.c')
-rw-r--r--lib/mpi/mpi-div.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/mpi/mpi-div.c b/lib/mpi/mpi-div.c
index c3087d1390c..f68cbbb4d4a 100644
--- a/lib/mpi/mpi-div.c
+++ b/lib/mpi/mpi-div.c
@@ -149,6 +149,9 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den)
mpi_ptr_t marker[5];
int markidx = 0;
+ if (!dsize)
+ return -EINVAL;
+
memset(marker, 0, sizeof(marker));
/* Ensure space is enough for quotient and remainder.
@@ -207,6 +210,8 @@ int mpi_tdiv_qr(MPI quot, MPI rem, MPI num, MPI den)
* numerator would be gradually overwritten by the quotient limbs. */
if (qp == np) { /* Copy NP object to temporary space. */
np = marker[markidx++] = mpi_alloc_limb_space(nsize);
+ if (!np)
+ goto nomem;
MPN_COPY(np, qp, nsize);
}
} else /* Put quotient at top of remainder. */