Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / kernel / module-verify.c
index 9dacc53..85a23bc 100644 (file)
@@ -1,7 +1,6 @@
-/* module-verify.c: description
+/* module-verify.c: module verifier
  *
  * Written by David Howells (dhowells@redhat.com)
- * - Derived from GregKH's RSA module signer
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
 #include <linux/elf.h>
 #include <linux/crypto.h>
 #include <linux/crypto/ksign.h>
-#include <asm/scatterlist.h>
 #include "module-verify.h"
 
 #if 0
-#define _debug(FMT, ...) printk(KERN_DEBUG FMT, ##__VA_ARGS__)
+#define _debug(FMT, ...) printk(FMT, ##__VA_ARGS__)
 #else
-#define _debug(FMT, ...) do { ; } while (0)
+#define _debug(FMT, ...) do {} while (0)
 #endif
 
-static int signedonly;
+static int module_verify_elf(struct module_verify_data *mvdata);
 
 /*****************************************************************************/
 /*
- * verify the signature attached to a module
+ * verify a module's integrity
+ * - check the ELF is viable
+ * - check the module's signature if it has one
  */
-int module_verify_sig(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, const char *secstrings, struct module *mod)
+int module_verify(const Elf_Ehdr *hdr, size_t size)
 {
-       struct crypto_tfm *sha1_tfm;
-       unsigned sig_index, sig_size;
-       char *sig;
-       int i;
-
-       /* pull the signature out of the file */
-       sig_index = 0;
-       for (i = 1; i < hdr->e_shnum; i++) {
-               if (strcmp(secstrings + sechdrs[i].sh_name,
-                          "module_sig") == 0) {
-                       sig_index = i;
+       struct module_verify_data mvdata;
+       int ret;
+
+       memset(&mvdata, 0, sizeof(mvdata));
+       mvdata.buffer   = hdr;
+       mvdata.hdr      = hdr;
+       mvdata.size     = size;
+
+       ret = module_verify_elf(&mvdata);
+       if (ret < 0) {
+               if (ret == -ELIBBAD)
+                       printk("Module failed ELF checks\n");
+               goto error;
+       }
+
+#ifdef CONFIG_MODULE_SIG
+       ret = module_verify_signature(&mvdata);
+#endif
+
+ error:
+       kfree(mvdata.secsizes);
+       kfree(mvdata.canonlist);
+       return ret;
+
+} /* end module_verify() */
+
+/*****************************************************************************/
+/*
+ * verify the ELF structure of a module
+ */
+static int module_verify_elf(struct module_verify_data *mvdata)
+{
+       const Elf_Ehdr *hdr = mvdata->hdr;
+       const Elf_Shdr *section, *section2, *secstop;
+       const Elf_Rela *relas, *rela, *relastop;
+       const Elf_Rel *rels, *rel, *relstop;
+       const Elf_Sym *symbol, *symstop;
+       size_t size, sssize, *secsize, tmp, tmp2;
+       long last;
+       int line;
+
+       size = mvdata->size;
+       mvdata->nsects = hdr->e_shnum;
+
+#define elfcheck(X) \
+do { if (unlikely(!(X))) { line = __LINE__; goto elfcheck_error; } } while(0)
+
+#define seccheck(X) \
+do { if (unlikely(!(X))) { line = __LINE__; goto seccheck_error; } } while(0)
+
+#define symcheck(X) \
+do { if (unlikely(!(X))) { line = __LINE__; goto symcheck_error; } } while(0)
+
+#define relcheck(X) \
+do { if (unlikely(!(X))) { line = __LINE__; goto relcheck_error; } } while(0)
+
+#define relacheck(X) \
+do { if (unlikely(!(X))) { line = __LINE__; goto relacheck_error; } } while(0)
+
+       /* validate the ELF header */
+       elfcheck(hdr->e_ehsize < size);
+       elfcheck(hdr->e_entry == 0);
+       elfcheck(hdr->e_phoff == 0);
+       elfcheck(hdr->e_phnum == 0);
+
+       elfcheck(hdr->e_shnum < SHN_LORESERVE);
+       elfcheck(hdr->e_shoff < size);
+       elfcheck(hdr->e_shoff >= hdr->e_ehsize);
+       elfcheck((hdr->e_shoff & (sizeof(long) - 1)) == 0);
+       elfcheck(hdr->e_shstrndx > 0);
+       elfcheck(hdr->e_shstrndx < hdr->e_shnum);
+       elfcheck(hdr->e_shentsize == sizeof(Elf_Shdr));
+
+       tmp = (size_t) hdr->e_shentsize * (size_t) hdr->e_shnum;
+       elfcheck(tmp <= size - hdr->e_shoff);
+
+       /* allocate a table to hold in-file section sizes */
+       mvdata->secsizes = kmalloc(hdr->e_shnum * sizeof(size_t), GFP_KERNEL);
+       if (!mvdata->secsizes)
+               return -ENOMEM;
+
+       memset(mvdata->secsizes, 0, hdr->e_shnum * sizeof(size_t));
+
+       /* validate the ELF section headers */
+       mvdata->sections = mvdata->buffer + hdr->e_shoff;
+       secstop = mvdata->sections + mvdata->nsects;
+
+       sssize = mvdata->sections[hdr->e_shstrndx].sh_size;
+       elfcheck(sssize > 0);
+
+       section = mvdata->sections;
+       seccheck(section->sh_type == SHT_NULL);
+       seccheck(section->sh_size == 0);
+       seccheck(section->sh_offset == 0);
+
+       secsize = mvdata->secsizes + 1;
+       for (section++; section < secstop; secsize++, section++) {
+               seccheck(section->sh_name < sssize);
+               seccheck(section->sh_link < hdr->e_shnum);
+
+               if (section->sh_entsize > 0)
+                       seccheck(section->sh_size % section->sh_entsize == 0);
+
+               seccheck(section->sh_offset >= hdr->e_ehsize);
+               seccheck(section->sh_offset < size);
+
+               /* determine the section's in-file size */
+               tmp = size - section->sh_offset;
+               if (section->sh_offset < hdr->e_shoff)
+                       tmp = hdr->e_shoff - section->sh_offset;
+
+               for (section2 = mvdata->sections + 1; section2 < secstop; section2++) {
+                       if (section->sh_offset < section2->sh_offset) {
+                               tmp2 = section2->sh_offset - section->sh_offset;
+                               if (tmp2 < tmp)
+                                       tmp = tmp2;
+                       }
+               }
+               *secsize = tmp;
+
+               _debug("Section %ld: %zx bytes at %lx\n",
+                      section - mvdata->sections,
+                      *secsize,
+                      section->sh_offset);
+
+               /* perform section type specific checks */
+               switch (section->sh_type) {
+               case SHT_NOBITS:
+                       break;
+
+               case SHT_REL:
+                       seccheck(section->sh_entsize == sizeof(Elf_Rel));
+                       goto more_rel_checks;
+
+               case SHT_RELA:
+                       seccheck(section->sh_entsize == sizeof(Elf_Rela));
+               more_rel_checks:
+                       seccheck(section->sh_info > 0);
+                       seccheck(section->sh_info < hdr->e_shnum);
+                       goto more_sec_checks;
+
+               case SHT_SYMTAB:
+                       seccheck(section->sh_entsize == sizeof(Elf_Sym));
+                       goto more_sec_checks;
+
+               default:
+               more_sec_checks:
+                       /* most types of section must be contained entirely
+                        * within the file */
+                       seccheck(section->sh_size <= *secsize);
                        break;
                }
        }
 
-       if (sig_index <= 0)
-               goto no_signature;
+       /* validate the ELF section names */
+       section = &mvdata->sections[hdr->e_shstrndx];
 
-       _debug("sig in section %d (size %d)\n",
-              sig_index, sechdrs[sig_index].sh_size);
+       seccheck(section->sh_offset != hdr->e_shoff);
 
-       sig = (char *) sechdrs[sig_index].sh_addr;
-       sig_size = sechdrs[sig_index].sh_size;
+       mvdata->secstrings = mvdata->buffer + section->sh_offset;
 
-       _debug("");
+       last = -1;
+       for (section = mvdata->sections + 1; section < secstop; section++) {
+               const char *secname;
+               tmp = sssize - section->sh_name;
+               secname = mvdata->secstrings + section->sh_name;
+               seccheck(secname[0] != 0);
+               if (section->sh_name > last)
+                       last = section->sh_name;
+       }
 
+       if (last > -1) {
+               tmp = sssize - last;
+               elfcheck(memchr(mvdata->secstrings + last, 0, tmp) != NULL);
+       }
 
+       /* look for various sections in the module */
+       for (section = mvdata->sections + 1; section < secstop; section++) {
+               switch (section->sh_type) {
+               case SHT_SYMTAB:
+                       if (strcmp(mvdata->secstrings + section->sh_name,
+                                  ".symtab") == 0
+                           ) {
+                               seccheck(mvdata->symbols == NULL);
+                               mvdata->symbols =
+                                       mvdata->buffer + section->sh_offset;
+                               mvdata->nsyms =
+                                       section->sh_size / sizeof(Elf_Sym);
+                               seccheck(section->sh_size > 0);
+                       }
+                       break;
 
+               case SHT_STRTAB:
+                       if (strcmp(mvdata->secstrings + section->sh_name,
+                                  ".strtab") == 0
+                           ) {
+                               seccheck(mvdata->strings == NULL);
+                               mvdata->strings =
+                                       mvdata->buffer + section->sh_offset;
+                               sssize = mvdata->nstrings = section->sh_size;
+                               seccheck(section->sh_size > 0);
+                       }
+                       break;
+               }
+       }
+
+       if (!mvdata->symbols) {
+               printk("Couldn't locate module symbol table\n");
+               goto format_error;
+       }
 
-       /* grab an SHA1 transformation context
-        * - !!! if this tries to load the sha1.ko module, we will deadlock!!!
-        */
-       sha1_tfm = crypto_alloc_tfm2("sha1", 0, 1);
-       if (!sha1_tfm) {
-               printk("Couldn't load module - SHA1 transform unavailable\n");
-               return -EPERM;
+       if (!mvdata->strings) {
+               printk("Couldn't locate module strings table\n");
+               goto format_error;
        }
 
-       crypto_digest_init(sha1_tfm);
+       /* validate the symbol table */
+       symstop = mvdata->symbols + mvdata->nsyms;
 
-       for (i = 1; i < hdr->e_shnum; i++) {
-               uint8_t *data;
-               int size;
-               const char *name = secstrings + sechdrs[i].sh_name;
+       symbol = mvdata->symbols;
+       symcheck(ELF_ST_TYPE(symbol[0].st_info) == STT_NOTYPE);
+       symcheck(symbol[0].st_shndx == SHN_UNDEF);
+       symcheck(symbol[0].st_value == 0);
+       symcheck(symbol[0].st_size == 0);
 
-               /* We only care about sections with "text" or "data" in their names */
-               if ((strstr(name, "text") == NULL) &&
-                   (strstr(name, "data") == NULL))
-                       continue;
+       last = -1;
+       for (symbol++; symbol < symstop; symbol++) {
+               symcheck(symbol->st_name < sssize);
+               if (symbol->st_name > last)
+                       last = symbol->st_name;
+               symcheck(symbol->st_shndx < mvdata->nsects ||
+                        symbol->st_shndx >= SHN_LORESERVE);
+       }
 
-               /* avoid the ".rel.*" sections too. */
-               if (strstr(name, ".rel.") != NULL)
-                       continue;
+       if (last > -1) {
+               tmp = sssize - last;
+               elfcheck(memchr(mvdata->strings + last, 0, tmp) != NULL);
+       }
 
-               /* avoid the ".rel.*" sections too. */
-               if (strstr(name, ".rela.") != NULL)
-                       continue;
+       /* validate each relocation table as best we can */
+       for (section = mvdata->sections + 1; section < secstop; section++) {
+               section2 = mvdata->sections + section->sh_info;
 
-               data = (uint8_t *) sechdrs[i].sh_addr;
-               size = sechdrs[i].sh_size;
+               switch (section->sh_type) {
+               case SHT_REL:
+                       rels = mvdata->buffer + section->sh_offset;
+                       relstop = mvdata->buffer + section->sh_offset + section->sh_size;
 
-               _debug("SHA1ing the %s section, size %d\n", name, size);
-               _debug("idata [ %02x%02x%02x%02x ]\n",
-                      data[0], data[1], data[2], data[3]);
+                       for (rel = rels; rel < relstop; rel++) {
+                               relcheck(rel->r_offset < section2->sh_size);
+                               relcheck(ELF_R_SYM(rel->r_info) < mvdata->nsyms);
+                       }
 
-               crypto_digest_update_kernel(sha1_tfm, data, size);
+                       break;
+
+               case SHT_RELA:
+                       relas = mvdata->buffer + section->sh_offset;
+                       relastop = mvdata->buffer + section->sh_offset + section->sh_size;
+
+                       for (rela = relas; rela < relastop; rela++) {
+                               relacheck(rela->r_offset < section2->sh_size);
+                               relacheck(ELF_R_SYM(rela->r_info) < mvdata->nsyms);
+                       }
+
+                       break;
+
+               default:
+                       break;
+               }
        }
 
-       /* do the actual signature verification */
-       i = ksign_verify_signature(sig, sig_size, sha1_tfm);
-       if (!i)
-                mod->gpgsig_ok = 1;
-       
-       return i;
-
-       /* deal with the case of an unsigned module */
- no_signature:
-       if (!signedonly)
-               return 0;
-       printk("An attempt to load unsigned module was rejected\n");
-       return -EPERM;
-} /* end module_verify_sig() */
-
-static int __init sign_setup(char *str)
-{
-       signedonly = 1;
+
+       _debug("ELF okay\n");
        return 0;
-}
-__setup("enforcemodulesig", sign_setup);
-                        
+
+ elfcheck_error:
+       printk("Verify ELF error (assertion %d)\n", line);
+       goto format_error;
+
+ seccheck_error:
+       printk("Verify ELF error [sec %ld] (assertion %d)\n",
+              (long)(section - mvdata->sections), line);
+       goto format_error;
+
+ symcheck_error:
+       printk("Verify ELF error [sym %ld] (assertion %d)\n",
+              (long)(symbol - mvdata->symbols), line);
+       goto format_error;
+
+ relcheck_error:
+       printk("Verify ELF error [sec %ld rel %ld] (assertion %d)\n",
+              (long)(section - mvdata->sections),
+              (long)(rel - rels), line);
+       goto format_error;
+
+ relacheck_error:
+       printk("Verify ELF error [sec %ld rela %ld] (assertion %d)\n",
+              (long)(section - mvdata->sections),
+              (long)(rela - relas), line);
+       goto format_error;
+
+ format_error:
+       return -ELIBBAD;
+
+} /* end module_verify_elf() */