lkml.org 
[lkml]   [2022]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] kernel/bpf: change "char *" string form to "char []"
Date
The string form of "char []" declares a single variable. It is better
than "char *" which creates two variables.

Signed-off-by: liqiong <liqiong@nfschina.com>
---
kernel/bpf/btf.c | 4 ++--
kernel/bpf/verifier.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 0918a39279f6..218a8ac73644 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -894,10 +894,10 @@ static const struct btf_type *btf_type_skip_qualifiers(const struct btf *btf,
static const char *btf_show_name(struct btf_show *show)
{
/* BTF_MAX_ITER array suffixes "[]" */
- const char *array_suffixes = "[][][][][][][][][][]";
+ static const char array_suffixes[] = "[][][][][][][][][][]";
const char *array_suffix = &array_suffixes[strlen(array_suffixes)];
/* BTF_MAX_ITER pointer suffixes "*" */
- const char *ptr_suffixes = "**********";
+ static const char ptr_suffixes[] = "**********";
const char *ptr_suffix = &ptr_suffixes[strlen(ptr_suffixes)];
const char *name = NULL, *prefix = "", *parens = "";
const struct btf_member *m = show->state.member;
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index d175b70067b3..78a090fcbc72 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -7346,7 +7346,7 @@ static int sanitize_err(struct bpf_verifier_env *env,
const struct bpf_reg_state *off_reg,
const struct bpf_reg_state *dst_reg)
{
- static const char *err = "pointer arithmetic with it prohibited for !root";
+ static const char err[] = "pointer arithmetic with it prohibited for !root";
const char *op = BPF_OP(insn->code) == BPF_ADD ? "add" : "sub";
u32 dst = insn->dst_reg, src = insn->src_reg;

--
2.25.1
\
 
 \ /
  Last update: 2022-05-12 16:31    [W:0.090 / U:0.084 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site