Skip to contentSkip to conversation

tools: bpftool: update prog names list and fix segfault

PATCH Applied Quentin Monnet 3 participants 6 messages Jul 24, 2020 – Jul 28, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover tools: bpftool: update prog names list and fix segfault

Although probing features with bpftool works fine if bpftool's array of program and map type names lack the latest kernel additions, it can crash if there are some types missing _in the middle_ of the arrays. The case recently occurred with the addition of the "sk_lookup" name, which skipped the "lsm" in the list.

Let's update the list, and let's make sure it does not crash bpftool again if we omit other types again in the future.

Quentin Monnet (2):
tools: bpftool: skip type probe if name is not found
tools: bpftool: add LSM type to array of prog names

 tools/bpf/bpftool/feature.c | 8 ++++++++
 tools/bpf/bpftool/prog.c    | 1 +
 2 files changed, 9 insertions(+)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/2 tools: bpftool: skip type probe if name is not found

For probing program and map types, bpftool loops on type values and uses the relevant type name in prog_type_name[] or map_type_name[]. To ensure the name exists, we exit from the loop if we go over the size of the array.

However, this is not enough in the case where the arrays have "holes" in them, program or map types for which they have no name, but not at the end of the list. This is currently the case for BPF_PROG_TYPE_LSM, not known to bpftool and which name is a null string. When probing for features, bpftool attempts to strlen() that name and segfaults.

Let's fix it by skipping probes for "unknown" program and map types, with an informational message giving the numeral value in that case.

Fixes 93a3545d812a ("tools/bpftool: Add name mappings for SK_LOOKUP prog and attach type")
---
 tools/bpf/bpftool/feature.c | 8 ++++++++
 1 file changed, 8 insertions(+)
tools/bpf/bpftool/feature.c +8 -0
index 1cd75807673e..a43a6f10b564 100644
@@ -504,6 +504,10 @@ probe_prog_type(enum bpf_prog_type prog_type, bool *supported_types,
 
 	supported_types[prog_type] |= res;
 
+	if (!prog_type_name[prog_type]) {
+		p_info("program type name not found (type %d)", prog_type);
+		return;
+	}
 	maxlen = sizeof(plain_desc) - strlen(plain_comment) - 1;
 	if (strlen(prog_type_name[prog_type]) > maxlen) {
 		p_info("program type name too long");
@@ -533,6 +537,10 @@ probe_map_type(enum bpf_map_type map_type, const char *define_prefix,
 	 * check required for unprivileged users
 	 */
 
+	if (!map_type_name[map_type]) {
+		p_info("map type name not found (type %d)", map_type);
+		return;
+	}
 	maxlen = sizeof(plain_desc) - strlen(plain_comment) - 1;
 	if (strlen(map_type_name[map_type]) > maxlen) {
 		p_info("map type name too long");
Signature · 1 line
2.20.1
reviewer Acked-by on v1 1/2
#2 lore raw

Re: [PATCH bpf-next 1/2] tools: bpftool: skip type probe if name is not found

Quoted 12 lines · Quentin Monnet

For probing program and map types, bpftool loops on type values and uses the relevant type name in prog_type_name[] or map_type_name[]. To ensure the name exists, we exit from the loop if we go over the size of the array.

However, this is not enough in the case where the arrays have "holes" in them, program or map types for which they have no name, but not at the end of the list. This is currently the case for BPF_PROG_TYPE_LSM, not known to bpftool and which name is a null string. When probing for features, bpftool attempts to strlen() that name and segfaults.

Quoted 6 lines

Let's fix it by skipping probes for "unknown" program and map types, with an informational message giving the numeral value in that case.

Fixes 93a3545d812a ("tools/bpftool: Add name mappings for SK_LOOKUP prog and attach type")
#3 lore raw

PATCH 2/2 tools: bpftool: add LSM type to array of prog names

In reply to Quentin Monnet

Assign "lsm" as a printed name for BPF_PROG_TYPE_LSM in bpftool, so that it can use it when listing programs loaded on the system or when probing features.

---
 tools/bpf/bpftool/prog.c | 1 +
 1 file changed, 1 insertion(+)
tools/bpf/bpftool/prog.c +1 -0
index 3e6ecc6332e2..158995d853b0 100644
@@ -59,6 +59,7 @@ const char * const prog_type_name[] = {
 	[BPF_PROG_TYPE_TRACING]			= "tracing",
 	[BPF_PROG_TYPE_STRUCT_OPS]		= "struct_ops",
 	[BPF_PROG_TYPE_EXT]			= "ext",
+	[BPF_PROG_TYPE_LSM]			= "lsm",
 	[BPF_PROG_TYPE_SK_LOOKUP]		= "sk_lookup",
 };
 
Signature · 1 line
2.20.1
reviewer Acked-by on v1 2/2
#4 lore raw

Re: [PATCH bpf-next 2/2] tools: bpftool: add LSM type to array of prog names

Quoted 6 lines · Quentin Monnet

Assign "lsm" as a printed name for BPF_PROG_TYPE_LSM in bpftool, so that it can use it when listing programs loaded on the system or when probing features.

maintainer Applied
#5 lore raw
In reply to Quentin Monnet
Quoted 9 lines · Quentin Monnet

Although probing features with bpftool works fine if bpftool's array of program and map type names lack the latest kernel additions, it can crash if there are some types missing _in the middle_ of the arrays. The case recently occurred with the addition of the "sk_lookup" name, which skipped the "lsm" in the list.

Let's update the list, and let's make sure it does not crash bpftool again if we omit other types again in the future.

Quoted 8 lines

Quentin Monnet (2):
tools: bpftool: skip type probe if name is not found
tools: bpftool: add LSM type to array of prog names

  tools/bpf/bpftool/feature.c | 8 ++++++++
  tools/bpf/bpftool/prog.c    | 1 +
  2 files changed, 9 insertions(+)

Applied, thanks!