diff options
| author | Paul Moore <paul@paul-moore.com> | 2023-05-09 13:13:23 -0400 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2023-05-09 13:19:28 -0400 |
| commit | 31583fab12370da984785cd16ceb8f031c94ae76 (patch) | |
| tree | 207daee11fb3db2a333a7b6521f98b473acdad82 | |
| parent | e08c939a3713bd266cbdeb1299ed62310a98f99b (diff) | |
| download | libseccomp-31583fab12370da984785cd16ceb8f031c94ae76.tar.gz | |
gen_bpf: squelch gcc v13.1.1 warnings
Squelch the following warning, first noticed in GCC v13.1.1, but
possibly present earlier:
gen_bpf.c: In function '_gen_bpf_build_bpf':
gen_bpf.c:2083:21: warning: storing the address of local variable
'pseudo_arch' in '*state.arch'
[-Wdangling-pointer=]
Signed-off-by: Paul Moore <paul@paul-moore.com>
| -rw-r--r-- | src/gen_bpf.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/gen_bpf.c b/src/gen_bpf.c index 4ce9081..0672996 100644 --- a/src/gen_bpf.c +++ b/src/gen_bpf.c @@ -2090,15 +2090,19 @@ static int _gen_bpf_build_bpf(struct bpf_state *state, if (i_iter->jt.type == TGT_NXT) { b_jmp = _gen_bpf_find_nxt(b_iter, i_iter->jt.tgt.nxt); - if (b_jmp == NULL) - return -EFAULT; + if (b_jmp == NULL) { + rc = -EFAULT; + goto state_reset; + } i_iter->jt = _BPF_JMP_HSH(b_jmp->hash); } if (i_iter->jf.type == TGT_NXT) { b_jmp = _gen_bpf_find_nxt(b_iter, i_iter->jf.tgt.nxt); - if (b_jmp == NULL) - return -EFAULT; + if (b_jmp == NULL) { + rc = -EFAULT; + goto state_reset; + } i_iter->jf = _BPF_JMP_HSH(b_jmp->hash); } /* we shouldn't need to worry about a TGT_NXT in k */ @@ -2140,8 +2144,10 @@ static int _gen_bpf_build_bpf(struct bpf_state *state, b_jmp = _blk_prepend(state, b_jmp, &instr); - if (b_jmp == NULL) - return -EFAULT; + if (b_jmp == NULL) { + rc = -EFAULT; + goto state_reset; + } } _BPF_INSTR(instr, _BPF_OP(state->arch, @@ -2151,8 +2157,10 @@ static int _gen_bpf_build_bpf(struct bpf_state *state, b_jmp->acc_start.offset)); b_jmp = _blk_prepend(state, b_jmp, &instr); - if (b_jmp == NULL) - return -EFAULT; + if (b_jmp == NULL) { + rc = -EFAULT; + goto state_reset; + } /* not reliant on the accumulator */ b_jmp->acc_start = _ACC_STATE_UNDEF; } @@ -2288,6 +2296,7 @@ static int _gen_bpf_build_bpf(struct bpf_state *state, _blk_free(state, b_iter); } while (b_head != NULL); + state->arch = NULL; return 0; build_bpf_free_blks: @@ -2298,6 +2307,8 @@ build_bpf_free_blks: __blk_free(state, b_iter); b_iter = b_jmp; } +state_reset: + state->arch = NULL; return rc; } |