aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorKees Cook <kees@ubuntu.com>2007-09-16 05:15:46 -0400
committerSam Ravnborg <sam@neptun.(none)>2007-10-12 15:48:11 -0400
commite00498258c215b46bd24f12ab3a2ed1bcb4772fe (patch)
treec8b0835337c841540dfcba1b2402d5ea5d84b604 /scripts
parent295ac051861e0c1aa6908bd0b0aafa7636ef4c7c (diff)
kbuild: make modpost detect unterminated device id lists
Cause modpost to fail if any device id lists are incorrectly terminated, after reporting the offender. Improved reporting by akpm Signed-off-by: Kees Cook <kees@ubuntu.com> Cc: Greg KH <greg@kroah.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: Ben Collins <bcollins@ubuntu.com> Cc: Michael Wu <flamingice@sourmilk.net> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/file2alias.c40
1 files changed, 33 insertions, 7 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 36e3754db53a..7abee0f2d207 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -55,10 +55,14 @@ do { \
55 * Check that sizeof(device_id type) are consistent with size of section 55 * Check that sizeof(device_id type) are consistent with size of section
56 * in .o file. If in-consistent then userspace and kernel does not agree 56 * in .o file. If in-consistent then userspace and kernel does not agree
57 * on actual size which is a bug. 57 * on actual size which is a bug.
58 * Also verify that the final entry in the table is all zeros.
58 **/ 59 **/
59static void device_id_size_check(const char *modname, const char *device_id, 60static void device_id_check(const char *modname, const char *device_id,
60 unsigned long size, unsigned long id_size) 61 unsigned long size, unsigned long id_size,
62 void *symval)
61{ 63{
64 int i;
65
62 if (size % id_size || size < id_size) { 66 if (size % id_size || size < id_size) {
63 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo " 67 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
64 "of the size of section __mod_%s_device_table=%lu.\n" 68 "of the size of section __mod_%s_device_table=%lu.\n"
@@ -66,6 +70,20 @@ static void device_id_size_check(const char *modname, const char *device_id,
66 "in mod_devicetable.h\n", 70 "in mod_devicetable.h\n",
67 modname, device_id, id_size, device_id, size, device_id); 71 modname, device_id, id_size, device_id, size, device_id);
68 } 72 }
73 /* Verify last one is a terminator */
74 for (i = 0; i < id_size; i++ ) {
75 if (*(uint8_t*)(symval+size-id_size+i)) {
76 fprintf(stderr,"%s: struct %s_device_id is %lu bytes. "
77 "The last of %lu is:\n",
78 modname, device_id, id_size, size / id_size);
79 for (i = 0; i < id_size; i++ )
80 fprintf(stderr,"0x%02x ",
81 *(uint8_t*)(symval+size-id_size+i) );
82 fprintf(stderr,"\n");
83 fatal("%s: struct %s_device_id is not terminated "
84 "with a NULL entry!\n", modname, device_id);
85 }
86 }
69} 87}
70 88
71/* USB is special because the bcdDevice can be matched against a numeric range */ 89/* USB is special because the bcdDevice can be matched against a numeric range */
@@ -168,7 +186,7 @@ static void do_usb_table(void *symval, unsigned long size,
168 unsigned int i; 186 unsigned int i;
169 const unsigned long id_size = sizeof(struct usb_device_id); 187 const unsigned long id_size = sizeof(struct usb_device_id);
170 188
171 device_id_size_check(mod->name, "usb", size, id_size); 189 device_id_check(mod->name, "usb", size, id_size, symval);
172 190
173 /* Leave last one: it's the terminator. */ 191 /* Leave last one: it's the terminator. */
174 size -= id_size; 192 size -= id_size;
@@ -535,7 +553,7 @@ static void do_table(void *symval, unsigned long size,
535 char alias[500]; 553 char alias[500];
536 int (*do_entry)(const char *, void *entry, char *alias) = function; 554 int (*do_entry)(const char *, void *entry, char *alias) = function;
537 555
538 device_id_size_check(mod->name, device_id, size, id_size); 556 device_id_check(mod->name, device_id, size, id_size, symval);
539 /* Leave last one: it's the terminator. */ 557 /* Leave last one: it's the terminator. */
540 size -= id_size; 558 size -= id_size;
541 559
@@ -557,14 +575,21 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
557 Elf_Sym *sym, const char *symname) 575 Elf_Sym *sym, const char *symname)
558{ 576{
559 void *symval; 577 void *symval;
578 char *zeros = NULL;
560 579
561 /* We're looking for a section relative symbol */ 580 /* We're looking for a section relative symbol */
562 if (!sym->st_shndx || sym->st_shndx >= info->hdr->e_shnum) 581 if (!sym->st_shndx || sym->st_shndx >= info->hdr->e_shnum)
563 return; 582 return;
564 583
565 symval = (void *)info->hdr 584 /* Handle all-NULL symbols allocated into .bss */
566 + info->sechdrs[sym->st_shndx].sh_offset 585 if (info->sechdrs[sym->st_shndx].sh_type & SHT_NOBITS) {
567 + sym->st_value; 586 zeros = calloc(1, sym->st_size);
587 symval = zeros;
588 } else {
589 symval = (void *)info->hdr
590 + info->sechdrs[sym->st_shndx].sh_offset
591 + sym->st_value;
592 }
568 593
569 if (sym_is(symname, "__mod_pci_device_table")) 594 if (sym_is(symname, "__mod_pci_device_table"))
570 do_table(symval, sym->st_size, 595 do_table(symval, sym->st_size,
@@ -637,6 +662,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
637 do_table(symval, sym->st_size, 662 do_table(symval, sym->st_size,
638 sizeof(struct ssb_device_id), "ssb", 663 sizeof(struct ssb_device_id), "ssb",
639 do_ssb_entry, mod); 664 do_ssb_entry, mod);
665 free(zeros);
640} 666}
641 667
642/* Now add out buffered information to the generated C source */ 668/* Now add out buffered information to the generated C source */