Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer

Conflicts:
	arch/arm/mach-omap2/timer.c

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/digsig.c b/lib/digsig.c
index 286d558033e2..8c0e62975c88 100644
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -163,9 +163,11 @@ static int digsig_verify_rsa(struct key *key,
         memcpy(out1 + head, p, l);
 
         err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len);
+        if (err)
+                goto err;
 
-        if (!err && len == hlen)
-                err = memcmp(out2, h, hlen);
+        if (len != hlen || memcmp(out2, h, hlen))
+                err = -EINVAL;
 
 err:
         mpi_free(in);