diff --git a/device/community/linux-postmarketos-omap/0007-libbpf-Fix-UAF-in-strset__add_str.patch b/device/community/linux-postmarketos-omap/0007-libbpf-Fix-UAF-in-strset__add_str.patch deleted file mode 100644 index 1fc18c672..000000000 --- a/device/community/linux-postmarketos-omap/0007-libbpf-Fix-UAF-in-strset__add_str.patch +++ /dev/null @@ -1,161 +0,0 @@ -From b23705e6afb6ac4ae6d220dcb35975698667dd76 Mon Sep 17 00:00:00 2001 -From: Carlos Llamas -Date: Sat, 23 May 2026 16:27:21 +0000 -Subject: [PATCH] libbpf: Fix UAF in strset__add_str() - -strset_add_str_mem() might reallocate the strset data buffer in order to -accommodate the provided string 's'. However, if 's' points to a string -already present in the buffer, it becomes dangling after the realloc. -This leads to a use-after-free when attempting to memcpy() the string -into the new buffer. - -One scenario that triggers this problematic path is when resolve_btfids -attempts to patch kfunc prototypes using existing BTF parameter names: - - | resolve_btfids: function bpf_list_push_back_impl already exists in BTF - | Segmentation fault (core dumped) - -Compiling resolve_btfids with fsanitize=address generates a detailed -report of the UAF: - - | ================================================================= - | ERROR: AddressSanitizer: heap-use-after-free on address 0x7f4c4a500bd4 - | ==1507892==ERROR: AddressSanitizer: heap-use-after-free on address 0x7f4c4a500bd4 at pc 0x55d25155a2a8 bp 0x7ffcef879060 sp 0x7ffcef878818 - | READ of size 5 at 0x7f4c4a500bd4 thread T0 - | #0 0x55d25155a2a7 in memcpy (tools/bpf/resolve_btfids/resolve_btfids+0xcf2a7) - | #1 0x55d2515d708e in strset__add_str tools/lib/bpf/strset.c:162:2 - | #2 0x55d2515c730b in btf__add_str tools/lib/bpf/btf.c:2109:8 - | #3 0x55d2515c9020 in btf__add_func_param tools/lib/bpf/btf.c:3108:14 - | #4 0x55d25159f0b5 in process_kfunc_with_implicit_args tools/bpf/resolve_btfids/main.c:1196:9 - | #5 0x55d25159e004 in btf2btf tools/bpf/resolve_btfids/main.c:1229:9 - | #6 0x55d25159cee7 in main tools/bpf/resolve_btfids/main.c:1535:6 - | #7 0x7f4c78e29f76 in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16 - | #8 0x7f4c78e2a026 in __libc_start_main csu/../csu/libc-start.c:360:3 - | #9 0x55d2514bb860 in _start (tools/bpf/resolve_btfids/resolve_btfids+0x30860) - | - | 0x7f4c4a500bd4 is located 13268 bytes inside of 2829000-byte region [0x7f4c4a4fd800,0x7f4c4a7b02c8) - | freed by thread T0 here: - | #0 0x55d25155b700 in realloc (tools/bpf/resolve_btfids/resolve_btfids+0xd0700) - | #1 0x55d2515c426c in libbpf_reallocarray tools/lib/bpf/./libbpf_internal.h:220:9 - | #2 0x55d2515c426c in libbpf_add_mem tools/lib/bpf/btf.c:224:13 - | - | previously allocated by thread T0 here: - | #0 0x55d25155b2e3 in malloc (tools/bpf/resolve_btfids/resolve_btfids+0xd02e3) - | #1 0x55d2515d6e7d in strset__new tools/lib/bpf/strset.c:58:20 - -While resolve_btfids could be refactored to avoid this call path, let's -instead fix this issue at the source in strset__add_str() and avoid -similar scenarios. - -Let's check if set->strs_data was reallocated and whether 's' points to -an internal string within the old strset buffer. In such case, 's' is -reconstructed to point to the new buffer. - -While already here, also fix strset__find_str() which suffers from the -same problem by factoring out the common operations into a new helper -function strset_str_append(). - -Fixes: 90d76d3ececc ("libbpf: Extract internal set-of-strings datastructure APIs") -Suggested-by: Andrii Nakryiko -Suggested-by: Mykyta Yatsenko -Signed-off-by: Carlos Llamas -Signed-off-by: Andrii Nakryiko -Link: https://lore.kernel.org/bpf/20260523162722.2718940-1-cmllamas@google.com ---- - tools/lib/bpf/strset.c | 62 ++++++++++++++++++++++++++++-------------- - 1 file changed, 41 insertions(+), 21 deletions(-) - -diff --git a/tools/lib/bpf/strset.c b/tools/lib/bpf/strset.c -index 2464bcbd04e037..ace73c6b3d62b4 100644 ---- a/tools/lib/bpf/strset.c -+++ b/tools/lib/bpf/strset.c -@@ -107,6 +107,41 @@ static void *strset_add_str_mem(struct strset *set, size_t add_sz) - set->strs_data_len, set->strs_data_max_len, add_sz); - } - -+static long strset_str_append(struct strset *set, const char *s) -+{ -+ uintptr_t old_data = (uintptr_t)set->strs_data; -+ size_t old_data_len = set->strs_data_len; -+ uintptr_t old_s = (uintptr_t)s; -+ long len = strlen(s) + 1; -+ void *p; -+ -+ /* -+ * Hashmap keys are always offsets within set->strs_data, so to even -+ * look up some string from the "outside", we need to first append it -+ * at the end, so that it can be addressed with an offset. Luckily, -+ * until set->strs_data_len is incremented, that string is just a piece -+ * of garbage for the rest of the code, so no harm, no foul. On the -+ * other hand, if the string is unique, it's already appended and -+ * ready to be used, only a simple set->strs_data_len increment away. -+ */ -+ p = strset_add_str_mem(set, len); -+ if (!p) -+ return -ENOMEM; -+ -+ /* -+ * The set->strs_data might have reallocated and if 's' pointed -+ * to an internal string within the old buffer, then it became -+ * dangling and needs to be reconstructed before the copy. -+ */ -+ if (old_data && old_data != (uintptr_t)set->strs_data && -+ old_s >= old_data && old_s < old_data + old_data_len) -+ s = set->strs_data + (old_s - old_data); -+ -+ memcpy(p, s, len); -+ -+ return len; -+} -+ - /* Find string offset that corresponds to a given string *s*. - * Returns: - * - >0 offset into string data, if string is found; -@@ -116,16 +151,12 @@ static void *strset_add_str_mem(struct strset *set, size_t add_sz) - int strset__find_str(struct strset *set, const char *s) - { - long old_off, new_off, len; -- void *p; - -- /* see strset__add_str() for why we do this */ -- len = strlen(s) + 1; -- p = strset_add_str_mem(set, len); -- if (!p) -- return -ENOMEM; -+ len = strset_str_append(set, s); -+ if (len < 0) -+ return len; - - new_off = set->strs_data_len; -- memcpy(p, s, len); - - if (hashmap__find(set->strs_hash, new_off, &old_off)) - return old_off; -@@ -142,24 +173,13 @@ int strset__find_str(struct strset *set, const char *s) - int strset__add_str(struct strset *set, const char *s) - { - long old_off, new_off, len; -- void *p; - int err; - -- /* Hashmap keys are always offsets within set->strs_data, so to even -- * look up some string from the "outside", we need to first append it -- * at the end, so that it can be addressed with an offset. Luckily, -- * until set->strs_data_len is incremented, that string is just a piece -- * of garbage for the rest of the code, so no harm, no foul. On the -- * other hand, if the string is unique, it's already appended and -- * ready to be used, only a simple set->strs_data_len increment away. -- */ -- len = strlen(s) + 1; -- p = strset_add_str_mem(set, len); -- if (!p) -- return -ENOMEM; -+ len = strset_str_append(set, s); -+ if (len < 0) -+ return len; - - new_off = set->strs_data_len; -- memcpy(p, s, len); - - /* Now attempt to add the string, but only if the string with the same - * contents doesn't exist already (HASHMAP_ADD strategy). If such diff --git a/device/community/linux-postmarketos-omap/APKBUILD b/device/community/linux-postmarketos-omap/APKBUILD index 11c47ddfa..42a86dd95 100644 --- a/device/community/linux-postmarketos-omap/APKBUILD +++ b/device/community/linux-postmarketos-omap/APKBUILD @@ -1,8 +1,8 @@ # Kernel config based on: arch/arm/configs/omap2plus_defconfig maintainer="Mithil Bavishi " pkgname=linux-postmarketos-omap -pkgver=7.1.3 -pkgrel=1 +pkgver=7.1.5 +pkgrel=0 pkgdesc="Mainline kernel fork for OMAP devices" arch="armv7" url="https://kernel.org/" @@ -53,7 +53,6 @@ source=" 0004-arm-dts-Add-barnesnoble-encore-support.patch 0005-panel-Add-lg-ld070ws1-for-barnesnoble-encore.patch 0006-omap4-cfi.patch - 0007-libbpf-Fix-UAF-in-strset__add_str.patch " builddir="$srcdir/linux-$_kernver" replaces="linux-samsung-espresso3g linux-nokia-n900" @@ -84,13 +83,12 @@ package() { } sha512sums=" -1c5e7e16c73f4942dcdc1783987e65351259d1f2d4ff39c91182529e2f9e689b62b3df3ec89b61514c473eb13ecb004a3825716b9c583fc41e25fc01fe569b30 linux-7.1.3.tar.xz -54a4f85c87a743a5ad81226c18d4fba5faf8d0286ddfd3fd8d02364b040f8e35cfaa35b7576dd086a72ca54506753391acc89de758aa5ff1c71b3c4fceafe72e config-postmarketos-omap.armv7 +17f95307b6e86a0794df146d97256ba4783b7a494f5eb43aafc14d64367541874cec7f6e8c2ea724eca149db18e4bd5880bf28a8c5e47ae8a769776bbd955af8 linux-7.1.5.tar.xz +e1e549db4eac7360a65121d705af3c880cc840736b5b0a87842828acf5bfd802c2e80807fb61cc10c343164f3162248308bb6acc7f3ee13520ad0d216128d65f config-postmarketos-omap.armv7 1a68e3a32ae1e56d325c0f759ee66d64d14f46a5d52e75ae008dfddac335beb3aa7acaf62abb95b6d5ce1557f0cf9b4c31ab78e110af178db1ac963bb377dbf0 0001-iio-rescale-revert-logic.patch 11bcc2bdcd8862e56f23a763d393b1d5f62af82cfd6dd347b5786b9f299144950d5941579091fea144371bad1188f366d8cd5a26453fc852fd3e769df2bd21bc 0002-hsi-dma-fix.patch a17ddc7a41ce2a6be04a8ee0ffcfb8dbb0381d1ce7fac8336befd79bc388ce5d16b6ba3a4732a540a43add55c43b015a3b77205a007a058d4d6e3291234b5cc0 0003-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch 2626cdd833bfbee5e714e224953533f02a7d1faba0d7c9b968ab728a28d70ebfb3a9ed46aab30e3784165c6eeeff3f26b482e188af5bc5c15de5c970d262c188 0004-arm-dts-Add-barnesnoble-encore-support.patch f03770e3c2f4c2876b31750f194646bbbe43b60fc7489ee9c54d1f6b36d72da4d2894b86dc47c1c9bf7676ef0c5d1788fa4f8c4d0f8eff1dd4e75d1ce4b9dfc8 0005-panel-Add-lg-ld070ws1-for-barnesnoble-encore.patch 25df8fb362e6f4e3612fd2e7ac02978674daabb7bf246928f94f4c8e408e196c5831f6eace3e2838c2e8f835cf1517f6a5e96160fcaec4ff4020c8859e25712c 0006-omap4-cfi.patch -e2555390d48cbbdc32a7d3f0c27599ff88f2fe3e786d1d0086caaa5b092cc3edcb6e95e2fb07034edb3793f6dc954da0662c723202eb7e2c4956c99b50919b12 0007-libbpf-Fix-UAF-in-strset__add_str.patch " diff --git a/device/community/linux-postmarketos-omap/config-postmarketos-omap.armv7 b/device/community/linux-postmarketos-omap/config-postmarketos-omap.armv7 index 49d4ab468..cb136a2dd 100644 --- a/device/community/linux-postmarketos-omap/config-postmarketos-omap.armv7 +++ b/device/community/linux-postmarketos-omap/config-postmarketos-omap.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 7.1.3 Kernel Configuration +# Linux/arm 7.1.5 Kernel Configuration # CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.8" CONFIG_GCC_VERSION=0 @@ -1615,7 +1615,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # Firmware loader # CONFIG_FW_LOADER=y -CONFIG_FW_LOADER_DEBUG=y +# CONFIG_FW_LOADER_DEBUG is not set CONFIG_EXTRA_FIRMWARE="" # CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER_COMPRESS=y @@ -1883,14 +1883,14 @@ CONFIG_ZRAM_BACKEND_ZSTD=y CONFIG_ZRAM_BACKEND_DEFLATE=y CONFIG_ZRAM_BACKEND_842=y CONFIG_ZRAM_BACKEND_LZO=y -# CONFIG_ZRAM_DEF_COMP_LZORLE is not set -CONFIG_ZRAM_DEF_COMP_LZO=y +CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_LZO is not set # CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZ4HC is not set # CONFIG_ZRAM_DEF_COMP_ZSTD is not set # CONFIG_ZRAM_DEF_COMP_DEFLATE is not set # CONFIG_ZRAM_DEF_COMP_842 is not set -CONFIG_ZRAM_DEF_COMP="lzo" +CONFIG_ZRAM_DEF_COMP="lzo-rle" CONFIG_ZRAM_WRITEBACK=y CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y CONFIG_ZRAM_MEMORY_TRACKING=y @@ -2291,14 +2291,13 @@ CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set # CONFIG_USB_NET_MCS7830 is not set CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET_ENABLE=m CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +# CONFIG_USB_BELKIN is not set +# CONFIG_USB_ARMLINUX is not set +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_NET_KALMIA is not set @@ -2542,7 +2541,6 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_GPIO_BEEPER is not set # CONFIG_INPUT_GPIO_DECODER is not set CONFIG_INPUT_GPIO_VIBRA=m -CONFIG_INPUT_CPCAP_PWRBUTTON=m # CONFIG_INPUT_ATI_REMOTE2 is not set # CONFIG_INPUT_KEYSPAN_REMOTE is not set # CONFIG_INPUT_KXTJ9 is not set @@ -2550,12 +2548,10 @@ CONFIG_INPUT_CPCAP_PWRBUTTON=m # CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set -CONFIG_INPUT_TPS65218_PWRBUTTON=m CONFIG_INPUT_TWL4030_PWRBUTTON=y CONFIG_INPUT_TWL4030_VIBRA=m # CONFIG_INPUT_TWL6040_VIBRA is not set CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_PALMAS_PWRBUTTON=m # CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PWM_BEEPER is not set CONFIG_INPUT_PWM_VIBRA=m @@ -2863,7 +2859,6 @@ CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_OCELOT is not set -# CONFIG_PINCTRL_PALMAS is not set CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_STMFX is not set # CONFIG_PINCTRL_SX150X is not set @@ -2917,10 +2912,9 @@ CONFIG_GPIO_OMAP=y # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set -CONFIG_GPIO_PCA953X=m -# CONFIG_GPIO_PCA953X_IRQ is not set +# CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCA9570 is not set -CONFIG_GPIO_PCF857X=y +# CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_TPIC2810 is not set # end of I2C GPIO expanders @@ -2928,10 +2922,6 @@ CONFIG_GPIO_PCF857X=y # MFD GPIO expanders # # CONFIG_HTC_EGPIO is not set -# CONFIG_GPIO_LP873X is not set -CONFIG_GPIO_LP87565=y -CONFIG_GPIO_PALMAS=y -# CONFIG_GPIO_TPS65218 is not set # CONFIG_GPIO_TPS65910 is not set CONFIG_GPIO_TWL4030=y # CONFIG_GPIO_TWL6040 is not set @@ -3030,7 +3020,6 @@ CONFIG_POWER_SUPPLY=y # CONFIG_TEST_POWER is not set # CONFIG_CHARGER_ADP5061 is not set # CONFIG_BATTERY_CHAGALL is not set -# CONFIG_BATTERY_CPCAP is not set # CONFIG_BATTERY_CW2015 is not set # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2780 is not set @@ -3051,7 +3040,6 @@ CONFIG_BATTERY_MAX17042=y # CONFIG_BATTERY_MAX1721X is not set # CONFIG_BATTERY_TWL4030_MADC is not set CONFIG_BATTERY_RX51=m -# CONFIG_CHARGER_CPCAP is not set CONFIG_CHARGER_ISP1704=m CONFIG_CHARGER_MAX8903=m # CONFIG_CHARGER_TWL4030 is not set @@ -3073,7 +3061,6 @@ CONFIG_CHARGER_BQ24735=m # CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ256XX is not set CONFIG_CHARGER_SMB347=m -# CONFIG_CHARGER_TPS65217 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_RT5033 is not set @@ -3392,7 +3379,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_NCT6694 is not set # CONFIG_MFD_OCELOT is not set # CONFIG_EZX_PCAP is not set -CONFIG_MFD_CPCAP=y +# CONFIG_MFD_CPCAP is not set # CONFIG_MFD_VIPERBOARD is not set # CONFIG_MFD_NTXEC is not set # CONFIG_MFD_RETU is not set @@ -3414,19 +3401,19 @@ CONFIG_MFD_SYSCON=y CONFIG_MFD_TI_AM335X_TSCADC=m # CONFIG_MFD_LP3943 is not set # CONFIG_MFD_LP8788 is not set -CONFIG_MFD_TI_LMU=m +# CONFIG_MFD_TI_LMU is not set # CONFIG_MFD_BQ257XX is not set CONFIG_MFD_OMAP_USB_HOST=y -CONFIG_MFD_PALMAS=y +# CONFIG_MFD_PALMAS is not set # CONFIG_TPS6105X is not set # CONFIG_TPS65010 is not set # CONFIG_TPS6507X is not set # CONFIG_MFD_TPS65086 is not set # CONFIG_MFD_TPS65090 is not set -CONFIG_MFD_TPS65217=y -CONFIG_MFD_TI_LP873X=y -CONFIG_MFD_TI_LP87565=y -CONFIG_MFD_TPS65218=y +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TI_LP87565 is not set +# CONFIG_MFD_TPS65218 is not set # CONFIG_MFD_TPS65219 is not set # CONFIG_MFD_TPS6586X is not set CONFIG_MFD_TPS65910=y @@ -3475,7 +3462,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_AD5398 is not set # CONFIG_REGULATOR_ADP5055 is not set # CONFIG_REGULATOR_AW37503 is not set -# CONFIG_REGULATOR_CPCAP is not set # CONFIG_REGULATOR_DA9121 is not set # CONFIG_REGULATOR_DA9210 is not set # CONFIG_REGULATOR_DA9211 is not set @@ -3485,13 +3471,10 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_ISL9305 is not set # CONFIG_REGULATOR_ISL6271A is not set # CONFIG_REGULATOR_FP9931 is not set -CONFIG_REGULATOR_LM363X=m # CONFIG_REGULATOR_LP3971 is not set # CONFIG_REGULATOR_LP3972 is not set -CONFIG_REGULATOR_LP872X=y -CONFIG_REGULATOR_LP873X=y +# CONFIG_REGULATOR_LP872X is not set # CONFIG_REGULATOR_LP8755 is not set -CONFIG_REGULATOR_LP87565=y # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set @@ -3513,7 +3496,6 @@ CONFIG_REGULATOR_LP87565=y # CONFIG_REGULATOR_MP886X is not set # CONFIG_REGULATOR_MPQ7920 is not set # CONFIG_REGULATOR_MT6311 is not set -CONFIG_REGULATOR_PALMAS=y CONFIG_REGULATOR_PBIAS=y # CONFIG_REGULATOR_PCA9450 is not set # CONFIG_REGULATOR_PF9453 is not set @@ -3548,15 +3530,13 @@ CONFIG_REGULATOR_TI_ABB=y # CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_SY8827N is not set # CONFIG_REGULATOR_TPS51632 is not set -CONFIG_REGULATOR_TPS62360=m +# CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS6286X is not set # CONFIG_REGULATOR_TPS6287X is not set -CONFIG_REGULATOR_TPS65023=y -CONFIG_REGULATOR_TPS6507X=y +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set # CONFIG_REGULATOR_TPS65132 is not set # CONFIG_REGULATOR_TPS65185 is not set -CONFIG_REGULATOR_TPS65217=y -CONFIG_REGULATOR_TPS65218=y # CONFIG_REGULATOR_TPS6524X is not set CONFIG_REGULATOR_TPS65910=y CONFIG_REGULATOR_TWL4030=y @@ -4432,7 +4412,6 @@ CONFIG_BACKLIGHT_PWM=y # CONFIG_BACKLIGHT_LP855X is not set # CONFIG_BACKLIGHT_MP3309C is not set CONFIG_BACKLIGHT_PANDORA=m -# CONFIG_BACKLIGHT_TPS65217 is not set CONFIG_BACKLIGHT_GPIO=m # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set @@ -4457,20 +4436,12 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set # end of Console display driver support -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_MONO_FILE="drivers/video/logo/logo_linux_mono.pbm" -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_VGA16_FILE="drivers/video/logo/logo_linux_vga16.ppm" -CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_LOGO_LINUX_CLUT224_FILE="drivers/video/logo/logo_linux_clut224.ppm" +# CONFIG_LOGO is not set # CONFIG_TRACE_GPU_MEM is not set # end of Graphics support # CONFIG_DRM_ACCEL is not set CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m @@ -4483,10 +4454,7 @@ CONFIG_SND_UMP=m # CONFIG_SND_UMP_LEGACY_RAWMIDI is not set CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_OSSEMUL is not set CONFIG_SND_PCM_TIMER=y # CONFIG_SND_HRTIMER is not set # CONFIG_SND_DYNAMIC_MINORS is not set @@ -4746,7 +4714,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CHV3_CODEC is not set -CONFIG_SND_SOC_CPCAP=m # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set # CONFIG_SND_SOC_CS35L34 is not set @@ -5485,7 +5452,6 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m # CONFIG_LEDS_AW2013 is not set # CONFIG_LEDS_BCM6328 is not set # CONFIG_LEDS_BCM6358 is not set -CONFIG_LEDS_CPCAP=m # CONFIG_LEDS_CR0014114 is not set # CONFIG_LEDS_EL15203000 is not set # CONFIG_LEDS_LM3530 is not set @@ -5528,7 +5494,6 @@ CONFIG_LEDS_PWM=m # CONFIG_LEDS_USER is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_LM3697 is not set -# CONFIG_LEDS_LM36274 is not set # CONFIG_LEDS_ST1202 is not set # @@ -5650,7 +5615,6 @@ CONFIG_RTC_DRV_M41T80=m # CONFIG_RTC_DRV_M41T80_WDT is not set # CONFIG_RTC_DRV_BQ32K is not set CONFIG_RTC_DRV_TWL4030=y -CONFIG_RTC_DRV_PALMAS=m # CONFIG_RTC_DRV_TPS65910 is not set # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set @@ -5719,7 +5683,6 @@ CONFIG_RTC_DRV_OMAP=y # CONFIG_RTC_DRV_CADENCE is not set # CONFIG_RTC_DRV_FTRTC010 is not set # CONFIG_RTC_DRV_R7301 is not set -CONFIG_RTC_DRV_CPCAP=m # CONFIG_RTC_DRV_GOLDFISH is not set # @@ -5825,7 +5788,6 @@ CONFIG_COMMON_CLK=y CONFIG_CLK_TWL=y CONFIG_CLK_TWL6040=y # CONFIG_COMMON_CLK_AXI_CLKGEN is not set -CONFIG_COMMON_CLK_PALMAS=m # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI521XX is not set @@ -5833,7 +5795,7 @@ CONFIG_COMMON_CLK_PALMAS=m # CONFIG_COMMON_CLK_VC5 is not set # CONFIG_COMMON_CLK_VC7 is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set -CONFIG_COMMON_CLK_TI_ADPLL=y +# CONFIG_COMMON_CLK_TI_ADPLL is not set # CONFIG_XILINX_VCU is not set # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set # CONFIG_HWSPINLOCK is not set @@ -5987,7 +5949,6 @@ CONFIG_EXTCON=y # CONFIG_EXTCON_LC824206XA is not set # CONFIG_EXTCON_MAX3355 is not set # CONFIG_EXTCON_MAX14526 is not set -CONFIG_EXTCON_PALMAS=m # CONFIG_EXTCON_PTN5150 is not set # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set @@ -6108,7 +6069,6 @@ CONFIG_KXCJK1013=m # CONFIG_AD9467 is not set # CONFIG_ADE9000 is not set # CONFIG_CC10001_ADC is not set -CONFIG_CPCAP_ADC=m # CONFIG_ENVELOPE_DETECTOR is not set # CONFIG_GEHC_PMC_ADC is not set # CONFIG_HI8435 is not set @@ -6137,7 +6097,6 @@ CONFIG_INA2XX_ADC=m # CONFIG_NCT7201 is not set # CONFIG_PAC1921 is not set # CONFIG_PAC1934 is not set -# CONFIG_PALMAS_GPADC is not set # CONFIG_ROHM_BD79112 is not set # CONFIG_ROHM_BD79124 is not set # CONFIG_RICHTEK_RTQ6056 is not set @@ -6700,13 +6659,13 @@ CONFIG_GENERIC_PHY=y # CONFIG_PHY_CADENCE_SALVO is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set -CONFIG_PHY_CPCAP_USB=m -CONFIG_PHY_MAPPHONE_MDM6600=m +# CONFIG_PHY_CPCAP_USB is not set +# CONFIG_PHY_MAPPHONE_MDM6600 is not set # CONFIG_PHY_OCELOT_SERDES is not set -CONFIG_PHY_DM816X_USB=m +# CONFIG_PHY_DM816X_USB is not set CONFIG_OMAP_CONTROL_PHY=y CONFIG_OMAP_USB2=y -CONFIG_TI_PIPE3=y +# CONFIG_TI_PIPE3 is not set CONFIG_TWL4030_USB=y # end of PHY Subsystem @@ -7416,7 +7375,7 @@ CONFIG_BINARY_PRINTF=y # Library routines # CONFIG_RAID6_PQ=m -CONFIG_RAID6_PQ_BENCHMARK=y +# CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_LINEAR_RANGES=y # CONFIG_PACKING is not set CONFIG_BITREVERSE=y @@ -7442,7 +7401,7 @@ CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_LIB_AES_ARCH=y -CONFIG_CRYPTO_LIB_AES_CBC_MACS=m +CONFIG_CRYPTO_LIB_AES_CBC_MACS=y CONFIG_CRYPTO_LIB_ARC4=m CONFIG_CRYPTO_LIB_BLAKE2B=m CONFIG_CRYPTO_LIB_BLAKE2B_ARCH=y @@ -7486,13 +7445,13 @@ CONFIG_ZSTD_COMMON=y CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y -CONFIG_XZ_DEC_X86=y -CONFIG_XZ_DEC_POWERPC=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_ARMTHUMB=y # CONFIG_XZ_DEC_ARM64 is not set -CONFIG_XZ_DEC_SPARC=y -CONFIG_XZ_DEC_RISCV=y +# CONFIG_XZ_DEC_SPARC is not set +# CONFIG_XZ_DEC_RISCV is not set CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set @@ -7597,8 +7556,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_SYMBOLIC_ERRNAME=y -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_BUGVERBOSE_DETAILED is not set +# CONFIG_DEBUG_BUGVERBOSE is not set # end of printk and dmesg options CONFIG_DEBUG_KERNEL=y