summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-12-06 13:01:29 +0800
committerAlex Shi <alex.shi@linaro.org>2016-12-06 13:01:29 +0800
commitbdcf7d8df4cfa7f99423da161019b964f7ce2520 (patch)
tree7496c94119c57f9987703bb0a4f13997f911ddc1 /lib
parenta8575ee86e3ec89dde405193d61a6c0a958308cf (diff)
parent3ba1692e7239293d7bc5a596ca9b0707f5bc07d5 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts: keep low scan freq in android in net/wireless/scan.c
Diffstat (limited to 'lib')
-rw-r--r--lib/mpi/mpi-pow.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c
index 5464c8744ea9..e24388a863a7 100644
--- a/lib/mpi/mpi-pow.c
+++ b/lib/mpi/mpi-pow.c
@@ -64,8 +64,13 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod)
if (!esize) {
/* Exponent is zero, result is 1 mod MOD, i.e., 1 or 0
* depending on if MOD equals 1. */
- rp[0] = 1;
res->nlimbs = (msize == 1 && mod->d[0] == 1) ? 0 : 1;
+ if (res->nlimbs) {
+ if (mpi_resize(res, 1) < 0)
+ goto enomem;
+ rp = res->d;
+ rp[0] = 1;
+ }
res->sign = 0;
goto leave;
}