From: Yafang Shao <laoar.shao@gmail.com>
Date: Fri, 23 Feb 2018 06:58:41 +0000 (+0800)
Subject: bpf: NULL pointer check is not needed in BPF_CGROUP_RUN_PROG_INET_SOCK
X-Git-Tag: v4.19~1326^2~369^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee07862f7b4594d390b978f6636a6a6191632ab3;p=platform%2Fkernel%2Flinux-rpi3.git

bpf: NULL pointer check is not needed in BPF_CGROUP_RUN_PROG_INET_SOCK

sk is already allocated in inet_create/inet6_create, hence when
BPF_CGROUP_RUN_PROG_INET_SOCK is executed sk will never be NULL.

The logic is as bellow,
	sk = sk_alloc();
	if (!sk)
		goto out;
	BPF_CGROUP_RUN_PROG_INET_SOCK(sk);

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---

diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h
index a7f16e0..8a45666 100644
--- a/include/linux/bpf-cgroup.h
+++ b/include/linux/bpf-cgroup.h
@@ -96,7 +96,7 @@ int __cgroup_bpf_check_dev_permission(short dev_type, u32 major, u32 minor,
 #define BPF_CGROUP_RUN_PROG_INET_SOCK(sk)				       \
 ({									       \
 	int __ret = 0;							       \
-	if (cgroup_bpf_enabled && sk) {					       \
+	if (cgroup_bpf_enabled) {					       \
 		__ret = __cgroup_bpf_run_filter_sk(sk,			       \
 						 BPF_CGROUP_INET_SOCK_CREATE); \
 	}								       \