Skip to content

Commit

Permalink
linux5.5: re-enable KASLR, PAGE_POISONING.
Browse files Browse the repository at this point in the history 
Sync i686 with x86_64, reduce diff.
  • Loading branch information
Juan RP committed Feb 6, 2020
1 parent 070731d commit d501529
Show file tree
Hide file tree
Showing 2 changed files with 848 additions and 725 deletions.

10 comments on commit d501529

@q66
Copy link
Contributor

@q66 q66 commented on d501529 Feb 6, 2020

Choose a reason for hiding this comment

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

enable CONFIG_HARDENED_USERCOPY, CONFIG_FORTIFY_SOURCE back to where it was too

also switch CONFIG_NR_CPUS back to 256

also set CONFIG_DEFAULT_MMAP_MIN_ADDR back to 65536

i'd probably also set CONFIG_UNICODE=y

we'll also need to reenable a bunch of drivers; particularly these will need reverting:

-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_PROTO_BCDC=y
-CONFIG_BRCMFMAC_PROTO_MSGBUF=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCMFMAC is not set

-CONFIG_SND_SOC_SOF_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_PCI=m
-CONFIG_SND_SOC_SOF_ACPI=m
-CONFIG_SND_SOC_SOF_OPTIONS=m
-# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
-# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
-# CONFIG_SND_SOC_SOF_DEBUG is not set
-CONFIG_SND_SOC_SOF=m
-CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
-CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
-CONFIG_SND_SOC_SOF_INTEL_ACPI=m
-CONFIG_SND_SOC_SOF_INTEL_PCI=m
-CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
-CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
-CONFIG_SND_SOC_SOF_INTEL_COMMON=m
-CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
-CONFIG_SND_SOC_SOF_BAYTRAIL=m
-CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
-CONFIG_SND_SOC_SOF_MERRIFIELD=m
-CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_APOLLOLAKE=m
-CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_GEMINILAKE=m
-CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_CANNONLAKE=m
-CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_COFFEELAKE=m
-CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_ICELAKE=m
-# CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT is not set
-# CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT is not set
-CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_TIGERLAKE=m
-CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y
-CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
-CONFIG_SND_SOC_SOF_HDA_COMMON=m
-CONFIG_SND_SOC_SOF_HDA_LINK=y
-CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
-# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
-CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
-CONFIG_SND_SOC_SOF_HDA=m
-CONFIG_SND_SOC_SOF_XTENSA=m
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set

@leahneukirchen
Copy link
Member

Choose a reason for hiding this comment

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

This config is completely botched, please start over from a 5.4 one.

@q66
Copy link
Contributor

@q66 q66 commented on d501529 Feb 6, 2020

Choose a reason for hiding this comment

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

Some more that I found:

CONFIG_VALIDATE_FS_PARSER=y, CONFIG_ENERGY_MODEL=y... there might be others

@q66
Copy link
Contributor

@q66 q66 commented on d501529 Feb 6, 2020

Choose a reason for hiding this comment

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

Anyway, I'll do the ppc ones later, someone will have to do ARM, as for x86_64, I'd probably start from 5.4 yeah but I don't have systems running to test that now, so somebody else will have to do it

@leahneukirchen
Copy link
Member

Choose a reason for hiding this comment

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

I can point out at least 10 changes that should not be in there, that were correct in 5.4.

@leahneukirchen
Copy link
Member

Choose a reason for hiding this comment

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

At it, I'll make a PR.

@leahneukirchen
Copy link
Member

Choose a reason for hiding this comment

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

I just ran make configure myself and got this diffconfig;

-AD7292 m
-ADUX1020 m
-BACKLIGHT_QCOM_WLED m
-BLK_CGROUP_RWSTAT y
-CAIF_DRIVERS n
-CC_HAS_INT128 y
-CROS_EC_SENSORHUB m
-CRYPTO_ARCH_HAVE_LIB_BLAKE2S m
-CRYPTO_ARCH_HAVE_LIB_CHACHA m
-CRYPTO_ARCH_HAVE_LIB_CURVE25519 m
-CRYPTO_ARCH_HAVE_LIB_POLY1305 m
-CRYPTO_BLAKE2B m
-CRYPTO_BLAKE2S m
-CRYPTO_BLAKE2S_X86 m
-CRYPTO_CURVE25519 m
-CRYPTO_CURVE25519_X86 m
-CRYPTO_DEV_AMLOGIC_GXL m
-CRYPTO_DEV_AMLOGIC_GXL_DEBUG n
-CRYPTO_LIB_BLAKE2S m
-CRYPTO_LIB_BLAKE2S_GENERIC m
-CRYPTO_LIB_CHACHA m
-CRYPTO_LIB_CHACHA20POLY1305 m
-CRYPTO_LIB_CHACHA_GENERIC m
-CRYPTO_LIB_CURVE25519 m
-CRYPTO_LIB_CURVE25519_GENERIC m
-CRYPTO_LIB_POLY1305 m
-CRYPTO_LIB_POLY1305_GENERIC m
-CRYPTO_LIB_POLY1305_RSIZE 4
-CRYPTO_SKCIPHER y
-CRYPTO_SKCIPHER2 y
-DEV_DAX_HMEM m
-DP83869_PHY m
-DRM_AMD_DC_HDCP n
-DRM_DEBUG_DP_MST_TOPOLOGY_REFS n
-DRM_I915_HEARTBEAT_INTERVAL 2500
-DRM_I915_PREEMPT_TIMEOUT 640
-DRM_I915_STOP_TIMEOUT 100
-DRM_I915_TIMESLICE_DURATION 1
-DRM_TTM_DMA_PAGE_POOL y
-DRM_TTM_HELPER m
-DYNAMIC_FTRACE_WITH_DIRECT_CALLS y
-EFI_SOFT_RESERVE y
-FB_BACKLIGHT m
-FB_TFT m
-FB_TFT_AGM1264K_FL m
-FB_TFT_BD663474 m
-FB_TFT_HX8340BN m
-FB_TFT_HX8347D m
-FB_TFT_HX8353D m
-FB_TFT_HX8357D m
-FB_TFT_ILI9163 m
-FB_TFT_ILI9320 m
-FB_TFT_ILI9325 m
-FB_TFT_ILI9340 m
-FB_TFT_ILI9341 m
-FB_TFT_ILI9481 m
-FB_TFT_ILI9486 m
-FB_TFT_PCD8544 m
-FB_TFT_RA8875 m
-FB_TFT_S6D02A1 m
-FB_TFT_S6D1121 m
-FB_TFT_SEPS525 m
-FB_TFT_SH1106 m
-FB_TFT_SSD1289 m
-FB_TFT_SSD1305 m
-FB_TFT_SSD1306 m
-FB_TFT_SSD1331 m
-FB_TFT_SSD1351 m
-FB_TFT_ST7735R m
-FB_TFT_ST7789V m
-FB_TFT_TINYLCD m
-FB_TFT_TLS8204 m
-FB_TFT_UC1611 m
-FB_TFT_UC1701 m
-FB_TFT_UPD161704 m
-FB_TFT_WATTEROTT m
-FW_CACHE y
-FXOS8700 m
-FXOS8700_I2C m
-FXOS8700_SPI m
-HAVE_ARCH_KASAN_VMALLOC y
-HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS y
-HYPERV_TESTING n
-IOMMU_DMA y
-IO_WQ y
-IRQ_MSI_IOMMU y
-KUNIT n
-LTC2983 m
-MAPPING_DIRTY_HELPERS y
-MEMREGION y
-NET_DSA_MSCC_FELIX n
-NET_DSA_TAG_OCELOT m
-NFC_PN532_UART m
-PINCTRL_TIGERLAKE m
-PTP_1588_CLOCK_IDTCM m
-SENSORS_BEL_PFE m
-SENSORS_LTC2947 m
-SENSORS_LTC2947_I2C m
-SENSORS_LTC2947_SPI m
-SENSORS_TMP513 m
-SF_PDMA n
-SND_INTEL_DSP_CONFIG m
-SND_SOC_ADAU7118 m
-SND_SOC_ADAU7118_HW m
-SND_SOC_ADAU7118_I2C m
-SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON m
-SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH m
-SND_SOC_SOF_DEVELOPER_SUPPORT n
-SND_SOC_SOF_HDA_COMMON_HDMI_CODEC y
-SND_SOC_SOF_JASPERLAKE m
-SND_SOC_SOF_JASPERLAKE_SUPPORT y
-SND_SOC_TAS2562 n
-SND_SOC_TAS2770 n
-SYMBOLIC_ERRNAME y
-SYSTEM76_ACPI m
-TCG_TIS_SPI_CR50 y
-TIPC_CRYPTO y
-TRACE_EVENT_INJECT n
-TYPEC_HD3SS3220 m
-VEML6030 m
-VIDEO_HI556 m
-VIDEO_IMX290 n
-W1_SLAVE_DS2430 m
-WFX m
-X86_IOPL_IOPERM y
-X86_UMIP y
 CRYPTO_XXHASH m -> n
 SND_INTEL_NHLT y -> m
+64BIT_TIME y
+ARCH_HAS_REFCOUNT y
+BACKLIGHT_PM8941_WLED m
+BT_WILINK m
+CAIF_HSI m
+CAIF_SPI_SLAVE m
+CAIF_SPI_SYNC n
+CAIF_TTY m
+CAIF_VIRTIO m
+CALGARY_IOMMU y
+CALGARY_IOMMU_ENABLED_BY_DEFAULT y
+CRYPTO_BLKCIPHER y
+CRYPTO_BLKCIPHER2 y
+EXFAT_DONT_MOUNT_VFAT y
+HEADER_TEST n
+INFINIBAND_CXGB3 m
+INPUT_KXTJ9_POLLED_MODE n
+KEYS_COMPAT y
+NET_DSA_SJA1105_TAS n
+PCIEASPM_DEBUG n
+REFCOUNT_FULL y
+SND_HDA_INTEL_DETECT_DMIC n
+SND_SOC_SOF_BAYTRAIL m
+SND_SOC_SOF_BAYTRAIL_SUPPORT y
+SND_SOC_SOF_DEBUG n
+SND_SOC_SOF_NOCODEC_SUPPORT n
+SND_SOC_SOF_OPTIONS m
+SND_SOC_SOF_STRICT_ABI_CHECKS n
+SYSCTL_SYSCALL n
+X86_INTEL_UMIP y

@leahneukirchen
Copy link
Member

Choose a reason for hiding this comment

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

(reverse diff to 5.4, sorry)

@leahneukirchen
Copy link
Member

Choose a reason for hiding this comment

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

Full diff between 5.4 and my proposed 5.5: https://0x0.st/iibV.diff

@leahneukirchen
Copy link
Member

Choose a reason for hiding this comment

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

#18852

Please sign in to comment.