mirror of
				https://github.com/linuxkit/linuxkit.git
				synced 2025-11-04 08:07:48 +00:00 
			
		
		
		
	Merge pull request #3701 from fredericdalleau/disable-bpfilter
Disable CONFIG_BPFILTER and CONFIG_BPFILTER_UMH
This commit is contained in:
		@@ -213,7 +213,6 @@ CONFIG_BPF_SYSCALL=y
 | 
				
			|||||||
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
					CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
				
			||||||
CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
					CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
				
			||||||
CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
					CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
				
			||||||
CONFIG_USERMODE_DRIVER=y
 | 
					 | 
				
			||||||
# CONFIG_BPF_PRELOAD is not set
 | 
					# CONFIG_BPF_PRELOAD is not set
 | 
				
			||||||
# CONFIG_USERFAULTFD is not set
 | 
					# CONFIG_USERFAULTFD is not set
 | 
				
			||||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
					CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
				
			||||||
@@ -1341,8 +1340,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 | 
				
			|||||||
CONFIG_BRIDGE_EBT_SNAT=y
 | 
					CONFIG_BRIDGE_EBT_SNAT=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=y
 | 
					CONFIG_BRIDGE_EBT_LOG=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=y
 | 
					CONFIG_BRIDGE_EBT_NFLOG=y
 | 
				
			||||||
CONFIG_BPFILTER=y
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_BPFILTER_UMH=m
 | 
					 | 
				
			||||||
# CONFIG_IP_DCCP is not set
 | 
					# CONFIG_IP_DCCP is not set
 | 
				
			||||||
CONFIG_IP_SCTP=m
 | 
					CONFIG_IP_SCTP=m
 | 
				
			||||||
# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
					# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -203,7 +203,6 @@ CONFIG_KALLSYMS=y
 | 
				
			|||||||
CONFIG_KALLSYMS_BASE_RELATIVE=y
 | 
					CONFIG_KALLSYMS_BASE_RELATIVE=y
 | 
				
			||||||
CONFIG_BPF_SYSCALL=y
 | 
					CONFIG_BPF_SYSCALL=y
 | 
				
			||||||
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
					CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
				
			||||||
CONFIG_USERMODE_DRIVER=y
 | 
					 | 
				
			||||||
# CONFIG_BPF_PRELOAD is not set
 | 
					# CONFIG_BPF_PRELOAD is not set
 | 
				
			||||||
# CONFIG_USERFAULTFD is not set
 | 
					# CONFIG_USERFAULTFD is not set
 | 
				
			||||||
CONFIG_KCMP=y
 | 
					CONFIG_KCMP=y
 | 
				
			||||||
@@ -1102,8 +1101,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 | 
				
			|||||||
CONFIG_BRIDGE_EBT_SNAT=y
 | 
					CONFIG_BRIDGE_EBT_SNAT=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=y
 | 
					CONFIG_BRIDGE_EBT_LOG=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=y
 | 
					CONFIG_BRIDGE_EBT_NFLOG=y
 | 
				
			||||||
CONFIG_BPFILTER=y
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_BPFILTER_UMH=m
 | 
					 | 
				
			||||||
# CONFIG_IP_DCCP is not set
 | 
					# CONFIG_IP_DCCP is not set
 | 
				
			||||||
CONFIG_IP_SCTP=m
 | 
					CONFIG_IP_SCTP=m
 | 
				
			||||||
# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
					# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -233,7 +233,6 @@ CONFIG_BPF_SYSCALL=y
 | 
				
			|||||||
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
					CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
				
			||||||
CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
					CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
				
			||||||
CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
					CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
				
			||||||
CONFIG_USERMODE_DRIVER=y
 | 
					 | 
				
			||||||
# CONFIG_BPF_PRELOAD is not set
 | 
					# CONFIG_BPF_PRELOAD is not set
 | 
				
			||||||
# CONFIG_USERFAULTFD is not set
 | 
					# CONFIG_USERFAULTFD is not set
 | 
				
			||||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
					CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
				
			||||||
@@ -1393,8 +1392,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 | 
				
			|||||||
CONFIG_BRIDGE_EBT_SNAT=y
 | 
					CONFIG_BRIDGE_EBT_SNAT=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=y
 | 
					CONFIG_BRIDGE_EBT_LOG=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=y
 | 
					CONFIG_BRIDGE_EBT_NFLOG=y
 | 
				
			||||||
CONFIG_BPFILTER=y
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_BPFILTER_UMH=m
 | 
					 | 
				
			||||||
# CONFIG_IP_DCCP is not set
 | 
					# CONFIG_IP_DCCP is not set
 | 
				
			||||||
CONFIG_IP_SCTP=m
 | 
					CONFIG_IP_SCTP=m
 | 
				
			||||||
# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
					# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -213,7 +213,6 @@ CONFIG_BPF_SYSCALL=y
 | 
				
			|||||||
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
					CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
				
			||||||
CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
					CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
				
			||||||
CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
					CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
				
			||||||
CONFIG_USERMODE_DRIVER=y
 | 
					 | 
				
			||||||
# CONFIG_BPF_PRELOAD is not set
 | 
					# CONFIG_BPF_PRELOAD is not set
 | 
				
			||||||
# CONFIG_USERFAULTFD is not set
 | 
					# CONFIG_USERFAULTFD is not set
 | 
				
			||||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
					CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
				
			||||||
@@ -1345,8 +1344,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 | 
				
			|||||||
CONFIG_BRIDGE_EBT_SNAT=y
 | 
					CONFIG_BRIDGE_EBT_SNAT=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=y
 | 
					CONFIG_BRIDGE_EBT_LOG=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=y
 | 
					CONFIG_BRIDGE_EBT_NFLOG=y
 | 
				
			||||||
CONFIG_BPFILTER=y
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_BPFILTER_UMH=m
 | 
					 | 
				
			||||||
# CONFIG_IP_DCCP is not set
 | 
					# CONFIG_IP_DCCP is not set
 | 
				
			||||||
CONFIG_IP_SCTP=m
 | 
					CONFIG_IP_SCTP=m
 | 
				
			||||||
# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
					# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -203,7 +203,6 @@ CONFIG_KALLSYMS=y
 | 
				
			|||||||
CONFIG_KALLSYMS_BASE_RELATIVE=y
 | 
					CONFIG_KALLSYMS_BASE_RELATIVE=y
 | 
				
			||||||
CONFIG_BPF_SYSCALL=y
 | 
					CONFIG_BPF_SYSCALL=y
 | 
				
			||||||
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
					CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
				
			||||||
CONFIG_USERMODE_DRIVER=y
 | 
					 | 
				
			||||||
# CONFIG_BPF_PRELOAD is not set
 | 
					# CONFIG_BPF_PRELOAD is not set
 | 
				
			||||||
# CONFIG_USERFAULTFD is not set
 | 
					# CONFIG_USERFAULTFD is not set
 | 
				
			||||||
CONFIG_KCMP=y
 | 
					CONFIG_KCMP=y
 | 
				
			||||||
@@ -1105,8 +1104,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 | 
				
			|||||||
CONFIG_BRIDGE_EBT_SNAT=y
 | 
					CONFIG_BRIDGE_EBT_SNAT=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=y
 | 
					CONFIG_BRIDGE_EBT_LOG=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=y
 | 
					CONFIG_BRIDGE_EBT_NFLOG=y
 | 
				
			||||||
CONFIG_BPFILTER=y
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_BPFILTER_UMH=m
 | 
					 | 
				
			||||||
# CONFIG_IP_DCCP is not set
 | 
					# CONFIG_IP_DCCP is not set
 | 
				
			||||||
CONFIG_IP_SCTP=m
 | 
					CONFIG_IP_SCTP=m
 | 
				
			||||||
# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
					# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -233,7 +233,6 @@ CONFIG_BPF_SYSCALL=y
 | 
				
			|||||||
CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
					CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
 | 
				
			||||||
CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
					CONFIG_BPF_JIT_ALWAYS_ON=y
 | 
				
			||||||
CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
					CONFIG_BPF_JIT_DEFAULT_ON=y
 | 
				
			||||||
CONFIG_USERMODE_DRIVER=y
 | 
					 | 
				
			||||||
# CONFIG_BPF_PRELOAD is not set
 | 
					# CONFIG_BPF_PRELOAD is not set
 | 
				
			||||||
# CONFIG_USERFAULTFD is not set
 | 
					# CONFIG_USERFAULTFD is not set
 | 
				
			||||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
					CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 | 
				
			||||||
@@ -1399,8 +1398,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 | 
				
			|||||||
CONFIG_BRIDGE_EBT_SNAT=y
 | 
					CONFIG_BRIDGE_EBT_SNAT=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_LOG=y
 | 
					CONFIG_BRIDGE_EBT_LOG=y
 | 
				
			||||||
CONFIG_BRIDGE_EBT_NFLOG=y
 | 
					CONFIG_BRIDGE_EBT_NFLOG=y
 | 
				
			||||||
CONFIG_BPFILTER=y
 | 
					# CONFIG_BPFILTER is not set
 | 
				
			||||||
CONFIG_BPFILTER_UMH=m
 | 
					 | 
				
			||||||
# CONFIG_IP_DCCP is not set
 | 
					# CONFIG_IP_DCCP is not set
 | 
				
			||||||
CONFIG_IP_SCTP=m
 | 
					CONFIG_IP_SCTP=m
 | 
				
			||||||
# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
					# CONFIG_SCTP_DBG_OBJCNT is not set
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user