[PATCH 2/2] kallsyms: Revert back to 128 max symbol length

From: Michal Marek
Date: Mon Nov 11 2013 - 08:41:26 EST


This reverts commits
f3462aa (Kbuild: Handle longer symbols in kallsyms.c) and
eea0e9c (kbuild: Increase kallsyms max symbol length)
except for the added overflow check. The reason is a regression caused
by increasing the buffer:
http://marc.info/?l=linux-kernel&m=138387700415675.

Reported-by: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Joe Mario <jmario@xxxxxxxxxx>
Signed-off-by: Michal Marek <mmarek@xxxxxxx>
---
include/linux/kallsyms.h | 2 +-
scripts/kallsyms.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 5648870..6883e19 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -9,7 +9,7 @@
#include <linux/kernel.h>
#include <linux/stddef.h>

-#define KSYM_NAME_LEN 255
+#define KSYM_NAME_LEN 128
#define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \
2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1)

diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 48afa20..518da86c 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -27,7 +27,7 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
#endif

-#define KSYM_NAME_LEN 255
+#define KSYM_NAME_LEN 128

struct sym_entry {
unsigned long long addr;
--
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/