@@ -1914,19 +1914,19 @@ static char *format_callchain(struct bpf_verifier_env *env, struct bpf_scc_callc
1914
1914
*/
1915
1915
static int maybe_enter_scc(struct bpf_verifier_env *env, struct bpf_verifier_state *st)
1916
1916
{
1917
- struct bpf_scc_callchain callchain;
1917
+ struct bpf_scc_callchain * callchain = &env->callchain_buf ;
1918
1918
struct bpf_scc_visit *visit;
1919
1919
1920
- if (!compute_scc_callchain(env, st, & callchain))
1920
+ if (!compute_scc_callchain(env, st, callchain))
1921
1921
return 0;
1922
- visit = scc_visit_lookup(env, & callchain);
1923
- visit = visit ?: scc_visit_alloc(env, & callchain);
1922
+ visit = scc_visit_lookup(env, callchain);
1923
+ visit = visit ?: scc_visit_alloc(env, callchain);
1924
1924
if (!visit)
1925
1925
return -ENOMEM;
1926
1926
if (!visit->entry_state) {
1927
1927
visit->entry_state = st;
1928
1928
if (env->log.level & BPF_LOG_LEVEL2)
1929
- verbose(env, "SCC enter %s\n", format_callchain(env, & callchain));
1929
+ verbose(env, "SCC enter %s\n", format_callchain(env, callchain));
1930
1930
}
1931
1931
return 0;
1932
1932
}
@@ -1939,21 +1939,21 @@ static int propagate_backedges(struct bpf_verifier_env *env, struct bpf_scc_visi
1939
1939
*/
1940
1940
static int maybe_exit_scc(struct bpf_verifier_env *env, struct bpf_verifier_state *st)
1941
1941
{
1942
- struct bpf_scc_callchain callchain;
1942
+ struct bpf_scc_callchain * callchain = &env->callchain_buf ;
1943
1943
struct bpf_scc_visit *visit;
1944
1944
1945
- if (!compute_scc_callchain(env, st, & callchain))
1945
+ if (!compute_scc_callchain(env, st, callchain))
1946
1946
return 0;
1947
- visit = scc_visit_lookup(env, & callchain);
1947
+ visit = scc_visit_lookup(env, callchain);
1948
1948
if (!visit) {
1949
1949
verifier_bug(env, "scc exit: no visit info for call chain %s",
1950
- format_callchain(env, & callchain));
1950
+ format_callchain(env, callchain));
1951
1951
return -EFAULT;
1952
1952
}
1953
1953
if (visit->entry_state != st)
1954
1954
return 0;
1955
1955
if (env->log.level & BPF_LOG_LEVEL2)
1956
- verbose(env, "SCC exit %s\n", format_callchain(env, & callchain));
1956
+ verbose(env, "SCC exit %s\n", format_callchain(env, callchain));
1957
1957
visit->entry_state = NULL;
1958
1958
env->num_backedges -= visit->num_backedges;
1959
1959
visit->num_backedges = 0;
@@ -1968,22 +1968,22 @@ static int add_scc_backedge(struct bpf_verifier_env *env,
1968
1968
struct bpf_verifier_state *st,
1969
1969
struct bpf_scc_backedge *backedge)
1970
1970
{
1971
- struct bpf_scc_callchain callchain;
1971
+ struct bpf_scc_callchain * callchain = &env->callchain_buf ;
1972
1972
struct bpf_scc_visit *visit;
1973
1973
1974
- if (!compute_scc_callchain(env, st, & callchain)) {
1974
+ if (!compute_scc_callchain(env, st, callchain)) {
1975
1975
verifier_bug(env, "add backedge: no SCC in verification path, insn_idx %d",
1976
1976
st->insn_idx);
1977
1977
return -EFAULT;
1978
1978
}
1979
- visit = scc_visit_lookup(env, & callchain);
1979
+ visit = scc_visit_lookup(env, callchain);
1980
1980
if (!visit) {
1981
1981
verifier_bug(env, "add backedge: no visit info for call chain %s",
1982
- format_callchain(env, & callchain));
1982
+ format_callchain(env, callchain));
1983
1983
return -EFAULT;
1984
1984
}
1985
1985
if (env->log.level & BPF_LOG_LEVEL2)
1986
- verbose(env, "SCC backedge %s\n", format_callchain(env, & callchain));
1986
+ verbose(env, "SCC backedge %s\n", format_callchain(env, callchain));
1987
1987
backedge->next = visit->backedges;
1988
1988
visit->backedges = backedge;
1989
1989
visit->num_backedges++;
@@ -1999,12 +1999,12 @@ static int add_scc_backedge(struct bpf_verifier_env *env,
1999
1999
static bool incomplete_read_marks(struct bpf_verifier_env *env,
2000
2000
struct bpf_verifier_state *st)
2001
2001
{
2002
- struct bpf_scc_callchain callchain;
2002
+ struct bpf_scc_callchain * callchain = &env->callchain_buf ;
2003
2003
struct bpf_scc_visit *visit;
2004
2004
2005
- if (!compute_scc_callchain(env, st, & callchain))
2005
+ if (!compute_scc_callchain(env, st, callchain))
2006
2006
return false;
2007
- visit = scc_visit_lookup(env, & callchain);
2007
+ visit = scc_visit_lookup(env, callchain);
2008
2008
if (!visit)
2009
2009
return false;
2010
2010
return !!visit->backedges;
0 commit comments