Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 04b1db9fd7eea63c9663072feece616ea41b0a79

Authored by Ian S. Nelson
Committed by Linus Torvalds
1 parent 3b5e0cbb4f
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] /sys/modules: allow full length section names 

I've been using systemtap for some debugging and I noticed that it can't
probe a lot of modules.  Turns out it's kind of silly, the sections section
of /sys/module is limited to 32byte filenames and many of the actual
sections are a a bit longer than that.

[akpm@osdl.org: rewrite to use dymanic allocation]
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 24 additions and 9 deletions Side-by-side Diff

... ... @@ -2478,7 +2478,8 @@
2478 2478 S: United Kingdom
2479 2479  
2480 2480 N: Ian S. Nelson
2481   -E: ian.nelson@echostar.com
  2481 +E: nelsonis@earthlink.net
  2482 +P: 1024D/00D3D983 3EFD 7B86 B888 D7E2 29B6 9E97 576F 1B97 00D3 D983
2482 2483 D: Minor mmap and ide hacks
2483 2484 S: 1370 Atlantis Ave.
2484 2485 S: Lafayette CO, 80026
include/linux/module.h
Diff comments   View file @ 04b1db9
... ... @@ -232,17 +232,17 @@
232 232 };
233 233  
234 234 /* Similar stuff for section attributes. */
235   -#define MODULE_SECT_NAME_LEN 32
236 235 struct module_sect_attr
237 236 {
238 237 struct module_attribute mattr;
239   - char name[MODULE_SECT_NAME_LEN];
  238 + char *name;
240 239 unsigned long address;
241 240 };
242 241  
243 242 struct module_sect_attrs
244 243 {
245 244 struct attribute_group grp;
  245 + int nsections;
246 246 struct module_sect_attr attrs[0];
247 247 };
248 248  
... ... @@ -933,6 +933,15 @@
933 933 return sprintf(buf, "0x%lx\n", sattr->address);
934 934 }
935 935  
  936 +static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
  937 +{
  938 + int section;
  939 +
  940 + for (section = 0; section < sect_attrs->nsections; section++)
  941 + kfree(sect_attrs->attrs[section].name);
  942 + kfree(sect_attrs);
  943 +}
  944 +
936 945 static void add_sect_attrs(struct module *mod, unsigned int nsect,
937 946 char *secstrings, Elf_Shdr *sechdrs)
938 947 {
939 948  
940 949  
... ... @@ -949,21 +958,26 @@
949 958 + nloaded * sizeof(sect_attrs->attrs[0]),
950 959 sizeof(sect_attrs->grp.attrs[0]));
951 960 size[1] = (nloaded + 1) * sizeof(sect_attrs->grp.attrs[0]);
952   - if (! (sect_attrs = kmalloc(size[0] + size[1], GFP_KERNEL)))
  961 + sect_attrs = kzalloc(size[0] + size[1], GFP_KERNEL);
  962 + if (sect_attrs == NULL)
953 963 return;
954 964  
955 965 /* Setup section attributes. */
956 966 sect_attrs->grp.name = "sections";
957 967 sect_attrs->grp.attrs = (void *)sect_attrs + size[0];
958 968  
  969 + sect_attrs->nsections = 0;
959 970 sattr = &sect_attrs->attrs[0];
960 971 gattr = &sect_attrs->grp.attrs[0];
961 972 for (i = 0; i < nsect; i++) {
962 973 if (! (sechdrs[i].sh_flags & SHF_ALLOC))
963 974 continue;
964 975 sattr->address = sechdrs[i].sh_addr;
965   - strlcpy(sattr->name, secstrings + sechdrs[i].sh_name,
966   - MODULE_SECT_NAME_LEN);
  976 + sattr->name = kstrdup(secstrings + sechdrs[i].sh_name,
  977 + GFP_KERNEL);
  978 + if (sattr->name == NULL)
  979 + goto out;
  980 + sect_attrs->nsections++;
967 981 sattr->mattr.show = module_sect_show;
968 982 sattr->mattr.store = NULL;
969 983 sattr->mattr.attr.name = sattr->name;
... ... @@ -979,7 +993,7 @@
979 993 mod->sect_attrs = sect_attrs;
980 994 return;
981 995 out:
982   - kfree(sect_attrs);
  996 + free_sect_attrs(sect_attrs);
983 997 }
984 998  
985 999 static void remove_sect_attrs(struct module *mod)
986 1000  
987 1001  
... ... @@ -989,13 +1003,13 @@
989 1003 &mod->sect_attrs->grp);
990 1004 /* We are positive that no one is using any sect attrs
991 1005 * at this point. Deallocate immediately. */
992   - kfree(mod->sect_attrs);
  1006 + free_sect_attrs(mod->sect_attrs);
993 1007 mod->sect_attrs = NULL;
994 1008 }
995 1009 }
996 1010  
997   -
998 1011 #else
  1012 +
999 1013 static inline void add_sect_attrs(struct module *mod, unsigned int nsect,
1000 1014 char *sectstrings, Elf_Shdr *sechdrs)
1001 1015 {