Attachment 1479278 Details for Bug 1623127 – tentative ugly patch

[patch] tentative ugly patch

crash-relative-modsym.patch (text/plain), 3.15 KB, created by Dominique Martinet on 2018-08-28 14:17:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominique Martinet

Created: 2018-08-28 14:17:51 UTC

Size: 3.15 KB

patch

obsolete

>diff --git a/symbols.c b/symbols.c
>index 2e6713a..a79b55d 100644
>--- a/symbols.c
>+++ b/symbols.c
>@@ -1597,10 +1597,22 @@ store_module_symbols_v1(ulong total, int mods_installed)
> 
> struct kernel_symbol
> {
>-        unsigned long value;
>-        const char *name;
>+        int value_offset;
>+        int name_offset;
> };
> 
>+static inline ulong
>+modsym_name(ulong syms, struct kernel_symbol *modsym, int i)
>+{
>+	return syms + i * sizeof(struct kernel_symbol) + offsetof(struct kernel_symbol, name_offset) + modsym->name_offset;
>+}
>+
>+static inline ulong
>+modsym_value(ulong syms, struct kernel_symbol *modsym, int i)
>+{
>+	return syms + i * sizeof(struct kernel_symbol) + offsetof(struct kernel_symbol, value_offset) + modsym->value_offset;
>+}
>+
> void
> store_module_symbols_v2(ulong total, int mods_installed)
> {
>@@ -1760,10 +1772,10 @@ store_module_symbols_v2(ulong total, int mods_installed)
> 			modsym = (struct kernel_symbol *)
> 			    (modsymbuf + (i * sizeof(struct kernel_symbol)));
> 			if (!first
>-			    || first > (ulong)modsym->name)
>-				first = (ulong)modsym->name;
>-			if ((ulong)modsym->name > last)
>-				last = (ulong)modsym->name;
>+			    || first > modsym_name(syms, modsym, i))
>+				first = modsym_name(syms, modsym, i);
>+			if (modsym_name(syms, modsym, i) > last)
>+				last = modsym_name(syms, modsym, i);
> 		}
> 
> 		if (last > first) {
>@@ -1794,14 +1806,14 @@ store_module_symbols_v2(ulong total, int mods_installed)
> 
> 			if (strbuf) 
> 				strcpy(buf1,
>-					&strbuf[(ulong)modsym->name - first]);
>+					&strbuf[modsym_name(syms, modsym, i) - first]);
> 			else 
>-				read_string((ulong)modsym->name, buf1,
>+				read_string(modsym_name(syms, modsym, i), buf1,
>                             		BUFSIZE-1);
> 
>                 	if (strlen(buf1)) {
> 				st->ext_module_symtable[mcnt].value = 
>-					modsym->value;
>+					modsym_value(syms, modsym, i);
> 				st->ext_module_symtable[mcnt].type = '?'; 
> 				st->ext_module_symtable[mcnt].flags |= MODULE_SYMBOL;
> 				strip_module_symbol_end(buf1);
>@@ -1834,10 +1846,10 @@ store_module_symbols_v2(ulong total, int mods_installed)
> 			modsym = (struct kernel_symbol *)
> 			    (modsymbuf + (i * sizeof(struct kernel_symbol)));
> 			if (!first
>-			    || first > (ulong)modsym->name)
>-				first = (ulong)modsym->name;
>-			if ((ulong)modsym->name > last)
>-				last = (ulong)modsym->name;
>+			    || first > modsym_name(gpl_syms, modsym, i))
>+				first = modsym_name(gpl_syms, modsym, i);
>+			if (modsym_name(gpl_syms, modsym, i) > last)
>+				last = modsym_name(gpl_syms, modsym, i);
> 		}
> 
> 		if (last > first) {
>@@ -1867,14 +1879,14 @@ store_module_symbols_v2(ulong total, int mods_installed)
> 
> 			if (strbuf) 
> 				strcpy(buf1,
>-					&strbuf[(ulong)modsym->name - first]);
>+					&strbuf[modsym_name(gpl_syms, modsym, i) - first]);
> 			else 
>-				read_string((ulong)modsym->name, buf1,
>+				read_string(modsym_name(gpl_syms, modsym, i), buf1,
>                             		BUFSIZE-1);
> 
>                 	if (strlen(buf1)) {
> 				st->ext_module_symtable[mcnt].value = 
>-					modsym->value;
>+					modsym_value(gpl_syms, modsym, i);
> 				st->ext_module_symtable[mcnt].type = '?'; 
> 				st->ext_module_symtable[mcnt].flags |= MODULE_SYMBOL;
> 				strip_module_symbol_end(buf1);

Actions: View | Diff

Attachments on bug 1623127: 1479278 | 1479344