Merge tag 'trace-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[mirror_ubuntu-artful-kernel.git] / security / integrity / digsig.c

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index 4304372b323f76ac63c632c71c9b0bef7625490d..106e855e2d9d16933c6a5d6f39a1ead65143c40b 100644 (file)
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -51,7 +51,7 @@ static bool init_keyring __initdata;
 int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
                            const char *digest, int digestlen)
 {
-       if (id >= INTEGRITY_KEYRING_MAX)
+       if (id >= INTEGRITY_KEYRING_MAX || siglen < 2)
                return -EINVAL;
 
        if (!keyring[id]) {