bpf: verifier: initialize imm in kfunc_tab in add_kfunc_call()

[kernel-patches-daemon-bpf-rc]

Pull request for series with
subject: bpf: verifier: initialize imm in kfunc_tab in add_kfunc_call()
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898

[kernel-patches-daemon-bpf-rc]

Upstream branch: 3249e8a
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: 3249e8a
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: f1d8c65
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: 93ce3be
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: 93ce3be
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: c1da3df
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: fea3f5e
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: 63066b7
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: c133390
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: ef2c0b2
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: a4d31f4
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

[kernel-patches-daemon-bpf-rc]

Upstream branch: 4f7bc83
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
version: 2

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=1022898
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: bpf: verifier: initialize imm in kfunc_tab in add_kfunc_call()
Using index info to reconstruct a base tree...
M	kernel/bpf/verifier.c
Falling back to patching base and 3-way merge...
Auto-merging kernel/bpf/verifier.c
CONFLICT (content): Merge conflict in kernel/bpf/verifier.c
Patch failed at 0001 bpf: verifier: initialize imm in kfunc_tab in add_kfunc_call()'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"'

conflict:

diff --cc kernel/bpf/verifier.c
index 098dd7f21c89,31136f9c418b..000000000000
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -22381,6 -22363,17 +22393,20 @@@ static int specialize_kfunc(struct bpf_
  		if (!env->insn_aux_data[insn_idx].non_sleepable)
  			addr = (unsigned long)bpf_dynptr_from_file_sleepable;
  	}
++<<<<<<< HEAD
++=======
+ 
+ set_imm:
+ 	if (!bpf_jit_supports_far_kfunc_call()) {
+ 		call_imm = BPF_CALL_IMM(addr);
+ 		/* Check whether the relative offset overflows desc->imm */
+ 		if ((unsigned long)(s32)call_imm != call_imm) {
+ 			verbose(env, "address of kernel func_id %u is out of range\n", func_id);
+ 			return -EINVAL;
+ 		}
+ 		desc->imm = call_imm;
+ 	}
++>>>>>>> bpf: verifier: initialize imm in kfunc_tab in add_kfunc_call()
  	desc->addr = addr;
  	return 0;
  }