Skip to content

wb: Kconfig: add modules for ipsec support - #117

Merged
vdromanov merged 3 commits into
dev/v5.10.yfrom
feature/add_l2tp_support
Dec 19, 2022
Merged

wb: Kconfig: add modules for ipsec support#117
vdromanov merged 3 commits into
dev/v5.10.yfrom
feature/add_l2tp_support

Conversation

@vdromanov

Copy link
Copy Markdown
Contributor

у Гены завёлся l2tp vpn c этим ядром

нам точно такое надо на все wb?

@webconnwebconn left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Думаю, если эта поддержка не требует кучи места, то почему бы и не добавить везде

CONFIG_PREEMPTIRQ_DELAY_TEST=m
CONFIG_STRICT_DEVMEM=y
CONFIG_DEBUG_USER=y
#ipsec support: https://wiki.strongswan.org/projects/strongswan/wiki/KernelModules

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Есть смысл сразу прогнать это через savedefconfig, а то в следующий раз будем редактировать файл и эти опции разбегутся

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make savedefconfig wirenboard7_defconfig ни на что не ругается

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это не так делается, make savedefconfig сохраняет текущий конфиг в файл defconfig, и тебе после этого его надо положить вместо нынешнего.

Примерно так

$ make wirenboard7_defconfig
$ make savedefconfig
$ mv defconfig arch/arm/configs/wirenboard7_defconfig

Comment threaddebian/changelog Outdated
@@ -1,3 +1,9 @@
linux-wb (5.10.35-wb126) stable; urgency=medium

* wb: Kconfig: add modules for ipsec support

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wb7

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

готово

@vdromanov
vdromanov merged commit afb7828 into dev/v5.10.yDec 19, 2022
@vdromanov
vdromanov deleted the feature/add_l2tp_support branch December 19, 2022 08:22
evgeny-boger pushed a commit that referenced this pull request Mar 26, 2024
…onfig
WB5, WB6 defconfigs: Remove CONFIG_SMP - kernel default is off.
WB6: Add CONFIG_GPIO_MXC, CONFIG_GPIO_GENERIC_PLATFORM.
CONFIG_GPIO_MXC changed from def_bool y to tristate "i.MX GPIO support".
Default value is now false. Change it to 'y' in imx6_wirenboard_defconfig.
Cleanup via savedefconfig.
arch/arm/configs: *defconfig: Enable CONFIG_PINCTRL_MCP23S08=m
arch/arm/configs: *defconfig: Enable CONFIG_MCP4728=m
TODO: Debug. WB5, WB6: Enable AD5064/LTC2637 and MCP4728 in-kernel.
На ядре 5.8.9 не выполняется автоматическая загрузка драйверов i2c, если они
разрешены как модули, причину надо найти.
Временное решение - разрешить их как часть ядра.
Помогает также ручной вызов modprobe, если он идет перед probe контроллера i2c.
CONFIG_AD5064=y
CONFIG_MCP4728=y
arch/arm/configs: WB5, WB6 defconfig: enable CONFIG_LEDS_TRIGGER_DEFAULT_OFF=y
add rtl8xxxu to defconfig file
(cherry picked from commit 192e6ef)
(cherry picked from commit b72550c)
arch/arm/configs: WB5, WB6 defconfig: Add CONFIG_OF_CONFIGFS=y
Enable configfs overlays.
wb6: enable full 1G/3G memory split for 1GB models
arch/arm/configs: WB5, WB6 defconfig: Enable CONFIG_RTL8723BU=m
CONFIG_NVMEM_IMX_OCOTP=y
LIRC and SC16IS7XX are included into wb6 defconfig
wb7: initial defconfig
ARM: config: wb7: disable graphics and unused drivers
wb7: add defconfig for initramfs
wb6, wb7: added rtc-rv8803 driver to defconfig (#84)
* wb6, wb7: added rtc-rv8803 driver to defconfig as a module
wb6: fix bootlet configuration and MMC pinctrl config (#89)
This commit fixes USB bootlet kernel:
- fix kernel panic on g_mass_storage module removing
by making configfs included (not as module);
- fix LEDs by enabling PWM driver for i.MX6
Also it adds missing eMMC lanes pinctrls. Looks like it worked earlier
because Boot ROM initialized these pins (didn't work on USB boot though).
wb7: add missing drivers similar to wb6 (#90)
fec: use ethFECX interface names to reorder them in userspace (#97)
Interface name swapping (eth0<->eth1) is broken in Debian bullseye
because of the missing systemd patch from Debian maintainers
(which was available in stretch).
Ethernet interfaces enumeration is performed in the order they are
defined in the device tree. For imx6ul, FEC2 goes before FEC1.
Instead of changing the order in the device tree (in common file for
many device trees), we decided to change the interface name template in
FEC driver from ethX to ethFECX.
This feature can be disabled in the kernel config.
wb7: enable SYSVIPC config option (#98)
This config option enables System V IPC functions
(like shared memory access, semaphores, message queues and so on).
As it turned out, these functions are used by some of our customers.
wb: add AF_KCM option to enable Docker on Debian 11
add bunch of config options for Docker
as suggested by ./check-config.sh
also enable wireguard and bonding core network drivers
wb: Kconfig: add modules for ipsec support (#117)
* wb: Kconfig: add modules for ipsec support
* Extended netfilter support (#118)
* add nftables to changelog
Co-authored-by: KraPete <86825564+KraPete@users.noreply.github.com>
wb7-initramfs: remove all unused USB gadget features (#123)
wb6_defconfig: add nft nat support (#126)
wb: adddefconfig for SoM testing
defconfig: wb7 mdio bitbang
defconfig: wb7: enable exfat support (module) in defconfig
defconfig: add wb7min defconfig
minimum configuration w/o Wi-Fi and with everything compiled in kernel.
wb6: initramfs: add missing GPIO driver to defconfig + actualize
defconfig: wb7: add wbec drivers
ARM: config: wb7: add wbec and SD3078 drivers, remove AXP pwrkey driver
defconfig: wb7: enable rtl8733bu
fix defconfig: add wb7min defconfig
taraant pushed a commit that referenced this pull request May 16, 2025
* wb: Kconfig: add modules for ipsec support
* Extended netfilter support (#118)
* add nftables to changelog
Co-authored-by: KraPete <86825564+KraPete@users.noreply.github.com>
taraant pushed a commit that referenced this pull request May 19, 2025
* wb: Kconfig: add modules for ipsec support
* Extended netfilter support (#118)
* add nftables to changelog
Co-authored-by: KraPete <86825564+KraPete@users.noreply.github.com>
taraant pushed a commit that referenced this pull request May 19, 2025
Original commits:
arch/arm/configs/imx6_wirenboard_defconfig
7f13aba: CONFIG_NVMEM_IMX_OCOTP=y
6c68cdc: LIRC and SC16IS7XX are included into wb6 defconfig
2a813ac: wb6, wb7: added rtc-rv8803 driver to defconfig (#84)
e8b83b4: fec: use ethFECX interface names to reorder them in userspace (#97)
f6683e6: wb: add AF_KCM option to enable Docker on Debian 11
378cd82: add bunch of config options for Docker
eb0aa5f: wb6_defconfig: add nft nat support (#126)
913bb9d: wb6, wb7: config: add options required for wg-quick
2ce8b34: wb6, wb7 defconfig: add CONFIG_CAN_GS_USB=m
9d6636a: wb6: add docker 28.0.0 support
arch/arm/configs/imx6_wirenboard_initramfs_defconfig
567646d: wb6: fix bootlet configuration and MMC pinctrl config (#89)
5aec967: wb6: initramfs: add missing GPIO driver to defconfig + actualize
arch/arm/configs/mxs_wirenboard_defconfig
f6683e6: wb: add AF_KCM option to enable Docker on Debian 11
arch/arm/configs/wirenboard7_38071cb_defconfig
efbe2be: add wb7min defconfig
e5de9a0: add necessary wbec modules to 38071cb defconfig; add modules to dts
arch/arm/configs/wirenboard7_defconfig
e93ab6f: wb7: initial defconfig
2a813ac: wb6, wb7: added rtc-rv8803 driver to defconfig (#84)
6cba421: wb7: add missing drivers similar to wb6 (#90)
07f3524: wb7: enable SYSVIPC config option (#98)
f6683e6: wb: add AF_KCM option to enable Docker on Debian 11
378cd82: add bunch of config options for Docker
afb7828: wb: Kconfig: add modules for ipsec support (#117)
cc880b8: wb7: enable exfat support (module) in defconfig
efbe2be: add wb7min defconfig
7eea16e: wb7: add wbec drivers
e0e8cf4: iio:adc: add WBEC ADC driver
97b9b0f: wb7: Add rtl8733bu wireless driver as a submodule
2d264d4: build rtc_wbec in kernel
913bb9d: wb6, wb7: config: add options required for wg-quick
e312115: config: add CAN SAE J1939 support built in
2ce8b34: wb6, wb7 defconfig: add CONFIG_CAN_GS_USB=m
1257d54: Add parameters for support docker 28.0.0
arch/arm/configs/wirenboard7_initramfs_defconfig
ffc690f: wb7: add defconfig for initramfs
822c635: wb7-initramfs: remove all unused USB gadget features (#123)
37d87c1: add WBEC support for wb7 bootlet
7b39e7b: wb7_initramfs: add exfat support
arch/arm/configs/wirenboard7_som_test_defconfig
82d206f: wb: add dts and defconfig for SoM testing
taraant pushed a commit that referenced this pull request Jun 9, 2025
* wb: Kconfig: add modules for ipsec support
* Extended netfilter support (#118)
* add nftables to changelog
Co-authored-by: KraPete <86825564+KraPete@users.noreply.github.com>
taraant pushed a commit that referenced this pull request Jul 24, 2025
[ Upstream commit f82727a ]
The reproduction steps:
1. create a tun interface
2. enable l2 bearer
3. TIPC_NL_UDP_GET_REMOTEIP with media name set to tun
tipc: Started in network mode
tipc: Node identity 8af312d38a21, cluster identity 4711
tipc: Enabled bearer <eth:syz_tun>, priority 1
Oops: general protection fault
KASAN: null-ptr-deref in range
CPU: 1 UID: 1000 PID: 559 Comm: poc Not tainted 6.16.0-rc1+ #117 PREEMPT
Hardware name: QEMU Ubuntu 24.04 PC
RIP: 0010:tipc_udp_nl_dump_remoteip+0x4a4/0x8f0
the ub was in fact a struct dev.
when bid != 0 && skip_cnt != 0, bearer_list[bid] may be NULL or
other media when other thread changes it.
fix this by checking media_id.
Fixes: 832629c ("tipc: add UDP remoteip dump to netlink API")
Signed-off-by: Haixia Qu <hxqu@hillstonenet.com>
Reviewed-by: Tung Nguyen <tung.quang.nguyen@est.tech>
Link: https://patch.msgid.link/20250617055624.2680-1-hxqu@hillstonenet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
taraant pushed a commit that referenced this pull request Jul 29, 2025
[ Upstream commit f82727a ]
The reproduction steps:
1. create a tun interface
2. enable l2 bearer
3. TIPC_NL_UDP_GET_REMOTEIP with media name set to tun
tipc: Started in network mode
tipc: Node identity 8af312d38a21, cluster identity 4711
tipc: Enabled bearer <eth:syz_tun>, priority 1
Oops: general protection fault
KASAN: null-ptr-deref in range
CPU: 1 UID: 1000 PID: 559 Comm: poc Not tainted 6.16.0-rc1+ #117 PREEMPT
Hardware name: QEMU Ubuntu 24.04 PC
RIP: 0010:tipc_udp_nl_dump_remoteip+0x4a4/0x8f0
the ub was in fact a struct dev.
when bid != 0 && skip_cnt != 0, bearer_list[bid] may be NULL or
other media when other thread changes it.
fix this by checking media_id.
Fixes: 832629c ("tipc: add UDP remoteip dump to netlink API")
Signed-off-by: Haixia Qu <hxqu@hillstonenet.com>
Reviewed-by: Tung Nguyen <tung.quang.nguyen@est.tech>
Link: https://patch.msgid.link/20250617055624.2680-1-hxqu@hillstonenet.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
taraant pushed a commit that referenced this pull request Jul 29, 2025
* wb: Kconfig: add modules for ipsec support
* Extended netfilter support (#118)
* add nftables to changelog
Co-authored-by: KraPete <86825564+KraPete@users.noreply.github.com>
taraant pushed a commit that referenced this pull request Oct 31, 2025
* wb: Kconfig: add modules for ipsec support
* Extended netfilter support (#118)
* add nftables to changelog
Co-authored-by: KraPete <86825564+KraPete@users.noreply.github.com>
taraant pushed a commit that referenced this pull request Apr 14, 2026
* wb: Kconfig: add modules for ipsec support
* Extended netfilter support (#118)
* add nftables to changelog
Co-authored-by: KraPete <86825564+KraPete@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@vdromanov@webconn@KraPete