Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git] / security / keys / keyring.c
index f81372f53dd706ba966d89c1dffb9ab1fe1b63e7..e14f09e3a4b027376bcf6f78f1464a4374cb4550 100644 (file)
@@ -246,6 +246,7 @@ static unsigned long keyring_get_key_chunk(const void *data, int level)
                                    (ASSOC_ARRAY_KEY_CHUNK_SIZE - 8));
                n--;
                offset = 1;
+               /* fall through */
        default:
                offset += sizeof(chunk) - 1;
                offset += (level - 3) * sizeof(chunk);