mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
fd72f265bb
The DCCP socket family has now been removed from this tree, see:
8bb3212be4 ("Merge branch 'net-retire-dccp-socket'")
Remove connection tracking and NAT support for this protocol, this
should not pose a problem because no DCCP traffic is expected to be seen
on the wire.
As for the code for matching on dccp header for iptables and nftables,
mark it as deprecated and keep it in place. Ruleset restoration is an
atomic operation. Without dccp matching support, an astray match on dccp
could break this operation leaving your computer with no policy in
place, so let's follow a more conservative approach for matches.
Add CONFIG_NFT_EXTHDR_DCCP which is set to 'n' by default to deprecate
dccp extension support. Similarly, label CONFIG_NETFILTER_XT_MATCH_DCCP
as deprecated too and also set it to 'n' by default.
Code to match on DCCP protocol from ebtables also remains in place, this
is just a few checks on IPPROTO_DCCP from _check() path which is
exercised when ruleset is loaded. There is another use of IPPROTO_DCCP
from the _check() path in the iptables multiport match. Another check
for IPPROTO_DCCP from the packet in the reject target is also removed.
So let's schedule removal of the dccp matching for a second stage, this
should not interfer with the dccp retirement since this is only matching
on the dccp header.
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
349 lines
8.6 KiB
Plaintext
349 lines
8.6 KiB
Plaintext
# CONFIG_LOCALVERSION_AUTO is not set
|
|
CONFIG_KERNEL_LZMA=y
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_POSIX_MQUEUE=y
|
|
CONFIG_AUDIT=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_PREEMPT=y
|
|
CONFIG_BSD_PROCESS_ACCT=y
|
|
CONFIG_BSD_PROCESS_ACCT_V3=y
|
|
CONFIG_TASKSTATS=y
|
|
CONFIG_TASK_DELAY_ACCT=y
|
|
CONFIG_TASK_XACCT=y
|
|
CONFIG_TASK_IO_ACCOUNTING=y
|
|
CONFIG_MEMCG=y
|
|
CONFIG_BLK_CGROUP=y
|
|
CONFIG_SCHED_AUTOGROUP=y
|
|
CONFIG_SYSFS_DEPRECATED=y
|
|
CONFIG_RELAY=y
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
CONFIG_EXPERT=y
|
|
CONFIG_MACH_LOONGSON64=y
|
|
# CONFIG_CPU_LOONGSON3_CPUCFG_EMULATION is not set
|
|
CONFIG_HZ_256=y
|
|
CONFIG_MIPS32_O32=y
|
|
CONFIG_MIPS32_N32=y
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_FORCE_LOAD=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
CONFIG_MODVERSIONS=y
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
CONFIG_MQ_IOSCHED_DEADLINE=m
|
|
CONFIG_IOSCHED_BFQ=y
|
|
CONFIG_BFQ_GROUP_IOSCHED=y
|
|
CONFIG_BINFMT_MISC=m
|
|
CONFIG_KSM=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_XFRM_USER=y
|
|
CONFIG_NET_KEY=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_MULTICAST=y
|
|
CONFIG_IP_ADVANCED_ROUTER=y
|
|
CONFIG_IP_MULTIPLE_TABLES=y
|
|
CONFIG_IP_ROUTE_MULTIPATH=y
|
|
CONFIG_IP_ROUTE_VERBOSE=y
|
|
CONFIG_NETFILTER=y
|
|
CONFIG_NETFILTER_NETLINK_LOG=m
|
|
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
|
|
CONFIG_NETFILTER_XT_TARGET_MARK=m
|
|
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
|
|
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
|
|
CONFIG_NETFILTER_XT_MATCH_ESP=m
|
|
CONFIG_NETFILTER_XT_MATCH_LENGTH=m
|
|
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
|
|
CONFIG_NETFILTER_XT_MATCH_MAC=m
|
|
CONFIG_NETFILTER_XT_MATCH_MARK=m
|
|
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
|
|
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
|
|
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
|
|
CONFIG_NETFILTER_XT_MATCH_REALM=m
|
|
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
|
|
CONFIG_NETFILTER_XT_MATCH_STRING=m
|
|
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
|
|
CONFIG_IP_VS=m
|
|
CONFIG_IP_NF_IPTABLES=m
|
|
CONFIG_IP_NF_MATCH_AH=m
|
|
CONFIG_IP_NF_MATCH_ECN=m
|
|
CONFIG_IP_NF_MATCH_TTL=m
|
|
CONFIG_IP_NF_FILTER=m
|
|
CONFIG_IP_NF_TARGET_REJECT=m
|
|
CONFIG_IP_NF_MANGLE=m
|
|
CONFIG_IP_NF_TARGET_ECN=m
|
|
CONFIG_IP_NF_TARGET_TTL=m
|
|
CONFIG_IP_NF_RAW=m
|
|
CONFIG_IP_NF_ARPTABLES=m
|
|
CONFIG_IP_NF_ARPFILTER=m
|
|
CONFIG_IP_NF_ARP_MANGLE=m
|
|
CONFIG_IP_SCTP=m
|
|
CONFIG_L2TP=m
|
|
CONFIG_BRIDGE=m
|
|
CONFIG_CFG80211=m
|
|
CONFIG_CFG80211_WEXT=y
|
|
CONFIG_MAC80211=m
|
|
CONFIG_RFKILL=m
|
|
CONFIG_RFKILL_INPUT=y
|
|
CONFIG_PCIEPORTBUS=y
|
|
CONFIG_HOTPLUG_PCI_PCIE=y
|
|
CONFIG_PCIEASPM_PERFORMANCE=y
|
|
CONFIG_HOTPLUG_PCI=y
|
|
CONFIG_DEVTMPFS=y
|
|
CONFIG_DEVTMPFS_MOUNT=y
|
|
CONFIG_MTD=m
|
|
CONFIG_BLK_DEV_LOOP=y
|
|
CONFIG_BLK_DEV_RAM=y
|
|
CONFIG_BLK_DEV_RAM_SIZE=8192
|
|
CONFIG_RAID_ATTRS=m
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_BLK_DEV_SR=y
|
|
CONFIG_CHR_DEV_SG=y
|
|
CONFIG_CHR_DEV_SCH=m
|
|
CONFIG_SCSI_CONSTANTS=y
|
|
CONFIG_SCSI_LOGGING=y
|
|
CONFIG_SCSI_SPI_ATTRS=m
|
|
CONFIG_SCSI_FC_ATTRS=m
|
|
CONFIG_ISCSI_TCP=m
|
|
CONFIG_MEGARAID_NEWGEN=y
|
|
CONFIG_MEGARAID_MM=y
|
|
CONFIG_MEGARAID_MAILBOX=y
|
|
CONFIG_MEGARAID_LEGACY=y
|
|
CONFIG_MEGARAID_SAS=y
|
|
CONFIG_ATA=y
|
|
CONFIG_SATA_AHCI=y
|
|
CONFIG_PATA_ATIIXP=y
|
|
CONFIG_MD=y
|
|
CONFIG_BLK_DEV_MD=m
|
|
CONFIG_MD_LINEAR=m
|
|
CONFIG_MD_RAID0=m
|
|
CONFIG_MD_RAID1=m
|
|
CONFIG_MD_RAID10=m
|
|
CONFIG_MD_RAID456=m
|
|
CONFIG_MD_MULTIPATH=m
|
|
CONFIG_BLK_DEV_DM=m
|
|
CONFIG_DM_CRYPT=m
|
|
CONFIG_DM_SNAPSHOT=m
|
|
CONFIG_DM_MIRROR=m
|
|
CONFIG_DM_ZERO=m
|
|
CONFIG_TARGET_CORE=m
|
|
CONFIG_TCM_IBLOCK=m
|
|
CONFIG_TCM_FILEIO=m
|
|
CONFIG_TCM_PSCSI=m
|
|
CONFIG_LOOPBACK_TARGET=m
|
|
CONFIG_ISCSI_TARGET=m
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_TUN=m
|
|
# CONFIG_NET_VENDOR_3COM is not set
|
|
# CONFIG_NET_VENDOR_ADAPTEC is not set
|
|
# CONFIG_NET_VENDOR_ALTEON is not set
|
|
# CONFIG_NET_VENDOR_AMD is not set
|
|
# CONFIG_NET_VENDOR_ARC is not set
|
|
# CONFIG_NET_VENDOR_ATHEROS is not set
|
|
# CONFIG_NET_VENDOR_BROADCOM is not set
|
|
# CONFIG_NET_VENDOR_BROCADE is not set
|
|
# CONFIG_NET_VENDOR_CHELSIO is not set
|
|
# CONFIG_NET_VENDOR_CIRRUS is not set
|
|
# CONFIG_NET_VENDOR_CISCO is not set
|
|
# CONFIG_NET_VENDOR_DEC is not set
|
|
# CONFIG_NET_VENDOR_DLINK is not set
|
|
# CONFIG_NET_VENDOR_EMULEX is not set
|
|
# CONFIG_NET_VENDOR_I825XX is not set
|
|
CONFIG_E1000=y
|
|
CONFIG_E1000E=y
|
|
CONFIG_IGB=y
|
|
CONFIG_IXGBE=y
|
|
# CONFIG_NET_VENDOR_MARVELL is not set
|
|
# CONFIG_NET_VENDOR_MELLANOX is not set
|
|
# CONFIG_NET_VENDOR_MICREL is not set
|
|
# CONFIG_NET_VENDOR_MICROCHIP is not set
|
|
# CONFIG_NET_VENDOR_MICROSEMI is not set
|
|
# CONFIG_NET_VENDOR_MYRI is not set
|
|
# CONFIG_NET_VENDOR_NATSEMI is not set
|
|
# CONFIG_NET_VENDOR_NETERION is not set
|
|
# CONFIG_NET_VENDOR_NETRONOME is not set
|
|
# CONFIG_NET_VENDOR_NI is not set
|
|
# CONFIG_NET_VENDOR_NVIDIA is not set
|
|
# CONFIG_NET_VENDOR_OKI is not set
|
|
# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
|
|
# CONFIG_NET_VENDOR_PENSANDO is not set
|
|
# CONFIG_NET_VENDOR_QLOGIC is not set
|
|
# CONFIG_NET_VENDOR_QUALCOMM is not set
|
|
# CONFIG_NET_VENDOR_RDC is not set
|
|
CONFIG_8139CP=y
|
|
CONFIG_8139TOO=y
|
|
# CONFIG_8139TOO_PIO is not set
|
|
CONFIG_R8169=y
|
|
# CONFIG_NET_VENDOR_RENESAS is not set
|
|
# CONFIG_NET_VENDOR_ROCKER is not set
|
|
# CONFIG_NET_VENDOR_SAMSUNG is not set
|
|
# CONFIG_NET_VENDOR_SEEQ is not set
|
|
# CONFIG_NET_VENDOR_SOLARFLARE is not set
|
|
# CONFIG_NET_VENDOR_SILAN is not set
|
|
# CONFIG_NET_VENDOR_SIS is not set
|
|
# CONFIG_NET_VENDOR_SMSC is not set
|
|
CONFIG_STMMAC_ETH=y
|
|
# CONFIG_NET_VENDOR_SUN is not set
|
|
# CONFIG_NET_VENDOR_TEHUTI is not set
|
|
# CONFIG_NET_VENDOR_TI is not set
|
|
# CONFIG_NET_VENDOR_TOSHIBA is not set
|
|
# CONFIG_NET_VENDOR_VIA is not set
|
|
# CONFIG_NET_VENDOR_WIZNET is not set
|
|
CONFIG_PPP=m
|
|
CONFIG_PPP_BSDCOMP=m
|
|
CONFIG_PPP_DEFLATE=m
|
|
CONFIG_PPP_FILTER=y
|
|
CONFIG_PPP_MPPE=m
|
|
CONFIG_PPP_MULTILINK=y
|
|
CONFIG_PPPOE=m
|
|
CONFIG_PPPOL2TP=m
|
|
CONFIG_PPP_ASYNC=m
|
|
CONFIG_PPP_SYNC_TTY=m
|
|
CONFIG_ATH9K=m
|
|
CONFIG_HOSTAP=m
|
|
CONFIG_INPUT_LEDS=m
|
|
CONFIG_INPUT_SPARSEKMAP=y
|
|
CONFIG_INPUT_EVDEV=y
|
|
# CONFIG_KEYBOARD_ATKBD is not set
|
|
CONFIG_KEYBOARD_XTKBD=m
|
|
# CONFIG_MOUSE_PS2 is not set
|
|
CONFIG_INPUT_MISC=y
|
|
CONFIG_INPUT_UINPUT=m
|
|
# CONFIG_SERIO_I8042 is not set
|
|
CONFIG_SERIO_SERPORT=m
|
|
CONFIG_SERIO_LIBPS2=y
|
|
CONFIG_SERIO_RAW=m
|
|
CONFIG_LEGACY_PTY_COUNT=16
|
|
CONFIG_SERIAL_8250=y
|
|
# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
|
|
CONFIG_SERIAL_8250_CONSOLE=y
|
|
CONFIG_SERIAL_8250_NR_UARTS=16
|
|
CONFIG_SERIAL_8250_EXTENDED=y
|
|
CONFIG_SERIAL_8250_MANY_PORTS=y
|
|
CONFIG_SERIAL_8250_SHARE_IRQ=y
|
|
CONFIG_SERIAL_8250_RSA=y
|
|
CONFIG_SERIAL_OF_PLATFORM=y
|
|
CONFIG_SERIAL_NONSTANDARD=y
|
|
CONFIG_HW_RANDOM=y
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_PIIX4=y
|
|
CONFIG_GPIO_LOONGSON=y
|
|
CONFIG_SENSORS_LM75=m
|
|
CONFIG_SENSORS_LM93=m
|
|
CONFIG_SENSORS_W83627HF=m
|
|
# CONFIG_MEDIA_CEC_SUPPORT is not set
|
|
CONFIG_MEDIA_SUPPORT=m
|
|
# CONFIG_MEDIA_CONTROLLER is not set
|
|
CONFIG_MEDIA_USB_SUPPORT=y
|
|
CONFIG_USB_VIDEO_CLASS=m
|
|
CONFIG_DRM=y
|
|
CONFIG_DRM_RADEON=y
|
|
CONFIG_FB_RADEON=y
|
|
CONFIG_LCD_CLASS_DEVICE=y
|
|
CONFIG_LCD_PLATFORM=m
|
|
# CONFIG_VGA_CONSOLE is not set
|
|
CONFIG_FRAMEBUFFER_CONSOLE=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
|
|
CONFIG_LOGO=y
|
|
CONFIG_SOUND=y
|
|
CONFIG_SND=y
|
|
CONFIG_SND_VERBOSE_PRINTK=y
|
|
CONFIG_SND_SEQUENCER=y
|
|
CONFIG_SND_SEQ_DUMMY=m
|
|
# CONFIG_SND_ISA is not set
|
|
CONFIG_SND_HDA_INTEL=y
|
|
CONFIG_SND_HDA_HWDEP=y
|
|
CONFIG_SND_HDA_PATCH_LOADER=y
|
|
CONFIG_SND_HDA_CODEC_REALTEK=y
|
|
CONFIG_SND_HDA_CODEC_ANALOG=y
|
|
CONFIG_SND_HDA_CODEC_SIGMATEL=y
|
|
CONFIG_SND_HDA_CODEC_VIA=y
|
|
CONFIG_SND_HDA_CODEC_CONEXANT=y
|
|
# CONFIG_SND_USB is not set
|
|
CONFIG_SND_SOC=y
|
|
CONFIG_HID_A4TECH=m
|
|
CONFIG_HID_SUNPLUS=m
|
|
CONFIG_USB=y
|
|
CONFIG_USB_MON=y
|
|
CONFIG_USB_XHCI_HCD=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_ROOT_HUB_TT=y
|
|
CONFIG_USB_OHCI_HCD=y
|
|
CONFIG_USB_UHCI_HCD=m
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_USB_SERIAL=m
|
|
CONFIG_USB_SERIAL_OPTION=m
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_DRV_CMOS=y
|
|
CONFIG_DMADEVICES=y
|
|
# CONFIG_CPU_HWMON is not set
|
|
CONFIG_PM_DEVFREQ=y
|
|
CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
|
|
CONFIG_DEVFREQ_GOV_PERFORMANCE=y
|
|
CONFIG_DEVFREQ_GOV_POWERSAVE=y
|
|
CONFIG_DEVFREQ_GOV_USERSPACE=y
|
|
CONFIG_EXT2_FS=y
|
|
CONFIG_EXT2_FS_XATTR=y
|
|
CONFIG_EXT2_FS_POSIX_ACL=y
|
|
CONFIG_EXT2_FS_SECURITY=y
|
|
CONFIG_EXT3_FS=y
|
|
CONFIG_EXT3_FS_POSIX_ACL=y
|
|
CONFIG_EXT3_FS_SECURITY=y
|
|
CONFIG_XFS_FS=y
|
|
CONFIG_XFS_QUOTA=y
|
|
CONFIG_XFS_POSIX_ACL=y
|
|
CONFIG_QUOTA=y
|
|
# CONFIG_PRINT_QUOTA_WARNING is not set
|
|
CONFIG_AUTOFS_FS=y
|
|
CONFIG_FUSE_FS=m
|
|
CONFIG_ISO9660_FS=m
|
|
CONFIG_JOLIET=y
|
|
CONFIG_MSDOS_FS=y
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_FAT_DEFAULT_CODEPAGE=936
|
|
CONFIG_FAT_DEFAULT_IOCHARSET="gb2312"
|
|
CONFIG_PROC_KCORE=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_TMPFS_POSIX_ACL=y
|
|
CONFIG_CONFIGFS_FS=y
|
|
CONFIG_CRAMFS=m
|
|
CONFIG_SQUASHFS=y
|
|
CONFIG_SQUASHFS_XATTR=y
|
|
CONFIG_NFS_FS=m
|
|
CONFIG_NFS_V3_ACL=y
|
|
CONFIG_NFS_V4=m
|
|
CONFIG_NFSD=m
|
|
CONFIG_NFSD_V3_ACL=y
|
|
CONFIG_NFSD_V4=y
|
|
CONFIG_CIFS=m
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_CODEPAGE_936=y
|
|
CONFIG_NLS_ASCII=y
|
|
CONFIG_NLS_UTF8=y
|
|
CONFIG_SECURITY=y
|
|
CONFIG_SECURITYFS=y
|
|
CONFIG_SECURITY_NETWORK=y
|
|
CONFIG_SECURITY_PATH=y
|
|
CONFIG_SECURITY_SELINUX=y
|
|
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
|
|
CONFIG_SECURITY_SELINUX_DISABLE=y
|
|
CONFIG_DEFAULT_SECURITY_DAC=y
|
|
CONFIG_CRYPTO_SEQIV=m
|
|
CONFIG_CRYPTO_HMAC=y
|
|
CONFIG_CRYPTO_MD5=y
|
|
CONFIG_CRYPTO_WP512=m
|
|
CONFIG_CRYPTO_BLOWFISH=m
|
|
CONFIG_CRYPTO_CAST5=m
|
|
CONFIG_CRYPTO_CAST6=m
|
|
CONFIG_CRYPTO_SERPENT=m
|
|
CONFIG_CRYPTO_TWOFISH=m
|
|
CONFIG_CRYPTO_DEFLATE=m
|
|
CONFIG_PRINTK_TIME=y
|
|
CONFIG_FRAME_WARN=1024
|
|
CONFIG_STRIP_ASM_SYMS=y
|
|
CONFIG_MAGIC_SYSRQ=y
|
|
# CONFIG_SCHED_DEBUG is not set
|
|
# CONFIG_DEBUG_PREEMPT is not set
|
|
# CONFIG_FTRACE is not set
|