Skip to contentSkip to conversation

kprobes: Allow both @symbol_name and @addr to exist

PATCH In review Bang Li 2 participants 3 messages Mar 13, 2022 – Mar 15, 2022 kprobes

lore
Share & tools
lore

Bang Li

author
#0 lore raw

PATCH 1/1 kprobes: Allow both @symbol_name and @addr to exist

If the address found by the @symbol_name is equal to the @addr, this case should be considered a valid parameter combinations.

Example:

static struct kprobe kp = {
.symbol_name = "kernel_clone",
.addr = (kprobe_opcode_t*)kernel_clone,
};

---
 kernel/kprobes.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
kernel/kprobes.c +10 -5
index 94cab8c9ce56..70d4ed9e7dc7 100644
@@ -1497,13 +1497,19 @@ bool within_kprobe_blacklist(unsigned long addr)
 static kprobe_opcode_t *_kprobe_addr(kprobe_opcode_t *addr,
 			const char *symbol_name, unsigned int offset)
 {
-	if ((symbol_name && addr) || (!symbol_name && !addr))
+	kprobe_opcode_t *symbol_addr;
+
+	if (!symbol_name && !addr)
 		goto invalid;
 
 	if (symbol_name) {
-		addr = kprobe_lookup_name(symbol_name, offset);
-		if (!addr)
+		symbol_addr = kprobe_lookup_name(symbol_name, offset);
+		if (!symbol_addr)
 			return ERR_PTR(-ENOENT);
+
+		if (addr && symbol_addr != addr)
+			goto invalid;
+		addr = symbol_addr;
 	}
 
 	addr = (kprobe_opcode_t *)(((char *)addr) + offset);
@@ -2062,8 +2068,7 @@ bool __weak arch_kprobe_on_func_entry(unsigned long offset)
  * function entry address or not.
  * This returns 0 if it is the function entry, or -EINVAL if it is not.
  * And also it returns -ENOENT if it fails the symbol or address lookup.
- * Caller must pass @addr or @sym (either one must be NULL), or this
- * returns -EINVAL.
+ * Caller must pass @addr or @sym, or this returns -EINVAL.
  */
 int kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset)
 {
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 2 lines · On Sun, 13 Mar 2022 11:21:25 +0800 Bang Li <[email protected]> wrote:

If the address found by the @symbol_name is equal to the @addr, this case should be considered a valid parameter combinations.

Could you tell me the reason why this is needed and use case? I explictly made this case as an error, because I couldn't find any good reason to support this case.

Thank you,

Quoted 53 lines

Example:

static struct kprobe kp = {
.symbol_name = "kernel_clone",
.addr = (kprobe_opcode_t*)kernel_clone,
};

---
 kernel/kprobes.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
kernel/kprobes.c +10 -5
index 94cab8c9ce56..70d4ed9e7dc7 100644
@@ -1497,13 +1497,19 @@ bool within_kprobe_blacklist(unsigned long addr)
 static kprobe_opcode_t *_kprobe_addr(kprobe_opcode_t *addr,
 			const char *symbol_name, unsigned int offset)
 {
-	if ((symbol_name && addr) || (!symbol_name && !addr))
+	kprobe_opcode_t *symbol_addr;
+
+	if (!symbol_name && !addr)
 		goto invalid;
 
 	if (symbol_name) {
-		addr = kprobe_lookup_name(symbol_name, offset);
-		if (!addr)
+		symbol_addr = kprobe_lookup_name(symbol_name, offset);
+		if (!symbol_addr)
 			return ERR_PTR(-ENOENT);
+
+		if (addr && symbol_addr != addr)
+			goto invalid;
+		addr = symbol_addr;
 	}
 
 	addr = (kprobe_opcode_t *)(((char *)addr) + offset);
@@ -2062,8 +2068,7 @@ bool __weak arch_kprobe_on_func_entry(unsigned long offset)
  * function entry address or not.
  * This returns 0 if it is the function entry, or -EINVAL if it is not.
  * And also it returns -ENOENT if it fails the symbol or address lookup.
- * Caller must pass @addr or @sym (either one must be NULL), or this
- * returns -EINVAL.
+ * Caller must pass @addr or @sym, or this returns -EINVAL.
  */
 int kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset)
 {
Signature · 1 line
2.25.1
Signature · 1 line
Masami Hiramatsu <[email protected]>
author
#2 lore raw
Quoted 4 lines · Masami Hiramatsu

On Sun, 13 Mar 2022 11:21:25 +0800
Bang Li <[email protected]> wrote:

Quoted 9 lines
Quoted 2 lines

If the address found by the @symbol_name is equal to the @addr, this case should be considered a valid parameter combinations.

Could you tell me the reason why this is needed and use case? I explictly made this case as an error, because I couldn't find any good reason to support this case.

Thank you,

I'm not sure if I need to change it this way, I just think it's more comprehensive.

Thanks

Quoted 57 lines
Quoted 51 lines

Example:

static struct kprobe kp = {
.symbol_name = "kernel_clone",
.addr = (kprobe_opcode_t*)kernel_clone,
};

---
 kernel/kprobes.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
kernel/kprobes.c +10 -6
index 94cab8c9ce56..70d4ed9e7dc7 100644
@@ -1497,13 +1497,19 @@ bool within_kprobe_blacklist(unsigned long addr)
 static kprobe_opcode_t *_kprobe_addr(kprobe_opcode_t *addr,
                      const char *symbol_name, unsigned int offset)
 {
-     if ((symbol_name && addr) || (!symbol_name && !addr))
+     kprobe_opcode_t *symbol_addr;
+
+     if (!symbol_name && !addr)
              goto invalid;
 
      if (symbol_name) {
-             addr = kprobe_lookup_name(symbol_name, offset);
-             if (!addr)
+             symbol_addr = kprobe_lookup_name(symbol_name, offset);
+             if (!symbol_addr)
                      return ERR_PTR(-ENOENT);
+
+             if (addr && symbol_addr != addr)
+                     goto invalid;
+             addr = symbol_addr;
      }
 
      addr = (kprobe_opcode_t *)(((char *)addr) + offset);
@@ -2062,8 +2068,7 @@ bool __weak arch_kprobe_on_func_entry(unsigned long offset)
  * function entry address or not.
  * This returns 0 if it is the function entry, or -EINVAL if it is not.
  * And also it returns -ENOENT if it fails the symbol or address lookup.
- * Caller must pass @addr or @sym (either one must be NULL), or this
- * returns -EINVAL.
+ * Caller must pass @addr or @sym, or this returns -EINVAL.
  */
 int kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset)
 {
--
Quoted 2 lines

2.25.1

--
Masami Hiramatsu <[email protected]>