[PATCH] kprobes: be more permissive when user specifies both symbol name and address

[Jianyu Zhan <nasa4836@gmail.com>]

Currently, if user specifies both symbol name and address, we just
bail out.

This might be too rude. This patch makes it give more tolerance.
If both are specified, let symbol name take precedence; upon failure,
try address. And print a warning message if user specify an address
to inform him that using symbol is more preferred.

Signed-off-by: Jianyu Zhan <nasa4836@gmail.com>
---
 Documentation/kprobes.txt |  4 +++-
 kernel/kprobes.c          | 33 +++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index 0cfb00f..ecf901b 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -344,7 +344,9 @@ to install a probepoint is known. This field is used to calculate the
 probepoint.
 
 3. Specify either the kprobe "symbol_name" OR the "addr". If both are
-specified, kprobe registration will fail with -EINVAL.
+specified, searching for "symbol_name" takes precedence; upon failure,
+then try "addr". If neither is specified, kprobe registration will fail
+with -EINVAL.
 
 4. With CISC architectures (such as i386 and x86_64), the kprobes code
 does not validate if the kprobe.addr is at an instruction boundary.
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index ceeadfc..2444a7a 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1354,17 +1354,42 @@ static int __kprobes in_kprobes_functions(unsigned long addr)
 static kprobe_opcode_t __kprobes *kprobe_addr(struct kprobe *p)
 {
 	kprobe_opcode_t *addr = p->addr;
+	char namebuf[KSYM_NAME_LEN];
+	const char *sym_name = NULL;
 
-	if ((p->symbol_name && p->addr) ||
-	    (!p->symbol_name && !p->addr))
+	if (!p->symbol_name && !p->addr)
 		goto invalid;
 
 	if (p->symbol_name) {
 		kprobe_lookup_name(p->symbol_name, addr);
-		if (!addr)
-			return ERR_PTR(-ENOENT);
+		if (addr) {
+			if (p->addr && p->addr != addr)
+				printk(KERN_WARNING "Warning: kprobe adrress for %s "
+					"mismatch, should be %p, not %p.\n",
+					p->symbol_name, addr, p->addr);
+			goto found;
+		}
+	}
+	if (p->addr) {
+		printk(KERN_WARNING "Warning: kprobes symbol name is now supported."
+			"Please use it instead.\n");
+		sym_name = kallsyms_lookup((unsigned long)(p->addr),
+				NULL, NULL, NULL, namebuf);
+		if (sym_name) {
+			if (p->symbol_name && strncmp(sym_name, p->symbol_name,
+						KSYM_NAME_LEN))
+				printk(KERN_WARNING "Warning: found %s at addres "
+				"%p, but not %s.\n",
+				p->symbol_name, addr, sym_name);
+
+			addr = p->addr;
+			goto found;
+		}
+
 	}
+	return ERR_PTR(-ENOENT);
 
+found:
 	addr = (kprobe_opcode_t *)(((char *)addr) + p->offset);
 	if (addr)
 		return addr;
-- 
1.9.0.GIT