Commit 66cf99b5 authored by Haiyue Wang's avatar Haiyue Wang Committed by Daniel Borkmann
Browse files

bpf: Remove the unnecessary insn buffer comparison 



The variable 'insn' is initialized to 'insn_buf' without being changed, only
some helper macros are defined, so the insn buffer comparison is unnecessary.
Just remove it. This missed removal back in 2377b81d ("bpf: split shared
bpf_tcp_sock and bpf_sock_ops implementation").

Signed-off-by: default avatarHaiyue Wang <haiyue.wang@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarStanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/bpf/20230108151258.96570-1-haiyue.wang@intel.com
parent 6d0c4b11

net/core/filter.c

+0 −6
Original line number Diff line number Diff line
@@ -6847,9 +6847,6 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, 
					FIELD));			\

	} while (0)



	if (insn > insn_buf)

		return insn - insn_buf;



	switch (si->off) {

	case offsetof(struct bpf_tcp_sock, rtt_min):

		BUILD_BUG_ON(sizeof_field(struct tcp_sock, rtt_min) !=
@@ -10147,9 +10144,6 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, 
			SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ);	      \

	} while (0)



	if (insn > insn_buf)

		return insn - insn_buf;



	switch (si->off) {

	case offsetof(struct bpf_sock_ops, op):

		*insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF(struct bpf_sock_ops_kern,