aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c
index eccb561dd8a3..2d537186191f 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1274,6 +1274,10 @@ static void add_notes_attrs(struct module *mod, unsigned int nsect,
1274 struct module_notes_attrs *notes_attrs; 1274 struct module_notes_attrs *notes_attrs;
1275 struct bin_attribute *nattr; 1275 struct bin_attribute *nattr;
1276 1276
1277 /* failed to create section attributes, so can't create notes */
1278 if (!mod->sect_attrs)
1279 return;
1280
1277 /* Count notes sections and allocate structures. */ 1281 /* Count notes sections and allocate structures. */
1278 notes = 0; 1282 notes = 0;
1279 for (i = 0; i < nsect; i++) 1283 for (i = 0; i < nsect; i++)
@@ -2355,8 +2359,7 @@ static noinline struct module *load_module(void __user *umod,
2355 if (err < 0) 2359 if (err < 0)
2356 goto unlink; 2360 goto unlink;
2357 add_sect_attrs(mod, hdr->e_shnum, secstrings, sechdrs); 2361 add_sect_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
2358 if (mod->sect_attrs) 2362 add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
2359 add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
2360 2363
2361 /* Get rid of temporary copy */ 2364 /* Get rid of temporary copy */
2362 vfree(hdr); 2365 vfree(hdr);