net: sockmap: Don't call bpf_prog_put() on NULL pointer

[kernel-patches-bot]

Pull request for series with
subject: net: sockmap: Don't call bpf_prog_put() on NULL pointer
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=363425

[kernel-patches-bot]

Master branch: 28802e7
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=363425
version: 1

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: net: sockmap: Don't call bpf_prog_put() on NULL pointer
Using index info to reconstruct a base tree...
M	net/core/sock_map.c
Falling back to patching base and 3-way merge...
Auto-merging net/core/sock_map.c
CONFLICT (content): Merge conflict in net/core/sock_map.c
Patch failed at 0001 net: sockmap: Don't call bpf_prog_put() on NULL pointer
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch'

conflict:

diff --cc net/core/sock_map.c
index 119f52a99dc1,a73ccce54423..000000000000
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@@ -235,16 -238,18 +235,27 @@@ static int sock_map_link(struct bpf_ma
  	int ret;
  
  	skb_verdict = READ_ONCE(progs->skb_verdict);
++<<<<<<< HEAD
 +	skb_parser = READ_ONCE(progs->skb_parser);
 +	skb_progs = skb_parser && skb_verdict;
 +	if (skb_progs) {
 +		skb_verdict = bpf_prog_inc_not_zero(skb_verdict);
 +		if (IS_ERR(skb_verdict))
 +			return PTR_ERR(skb_verdict);
++=======
+ 	if (skb_verdict) {
+ 		skb_verdict = bpf_prog_inc_not_zero(skb_verdict);
+ 		if (IS_ERR(skb_verdict))
+ 			return PTR_ERR(skb_verdict);
+ 	}
+ 
+ 	skb_parser = READ_ONCE(progs->skb_parser);
+ 	if (skb_parser) {
++>>>>>>> net: sockmap: Don't call bpf_prog_put() on NULL pointer
  		skb_parser = bpf_prog_inc_not_zero(skb_parser);
  		if (IS_ERR(skb_parser)) {
- 			bpf_prog_put(skb_verdict);
- 			return PTR_ERR(skb_parser);
+ 			ret = PTR_ERR(skb_parser);
+ 			goto out_put_skb_verdict;
  		}
  	}
  
@@@ -303,11 -312,12 +314,20 @@@ out_drop
  out_progs:
  	if (msg_parser)
  		bpf_prog_put(msg_parser);
++<<<<<<< HEAD
 +out:
 +	if (skb_progs) {
 +		bpf_prog_put(skb_verdict);
 +		bpf_prog_put(skb_parser);
 +	}
++=======
+ out_put_skb_parser:
+ 	if (skb_parser)
+ 		bpf_prog_put(skb_parser);
+ out_put_skb_verdict:
+ 	if (skb_verdict)
+ 		bpf_prog_put(skb_verdict);
++>>>>>>> net: sockmap: Don't call bpf_prog_put() on NULL pointer
  	return ret;
  }
  

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=363425 irrelevant now. Closing PR.