From: Michael Tremer Date: Tue, 10 Dec 2013 12:50:55 +0000 (+0100) Subject: kernel: Update to 3.12.4. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1cbc577da2a2469cda6040884efcde6556804f7;p=ipfire-3.x.git kernel: Update to 3.12.4. --- diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index e46625155..2e337033d 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -157,7 +157,9 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_ARCH_NR_GPIO=0 -CONFIG_HZ=100 +CONFIG_HZ_FIXED=0 +# CONFIG_HZ_200 is not set +# CONFIG_HZ_500 is not set CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set @@ -191,11 +193,10 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set -CONFIG_ATAGS_PROC=y CONFIG_AUTO_ZRELADDR=y # -# CPU Power Management +# CPU Idle # # CONFIG_CPU_IDLE is not set @@ -225,7 +226,18 @@ CONFIG_BPF_JIT=y # Generic Driver Options # # CONFIG_SYS_HYPERVISOR is not set -# CONFIG_CMA is not set +CONFIG_DMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 +CONFIG_CMA_AREAS=7 # # Bus devices @@ -243,7 +255,6 @@ CONFIG_OF_FLATTREE=y CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y -CONFIG_OF_I2C=m CONFIG_OF_NET=y CONFIG_OF_MDIO=y CONFIG_OF_PCI=y @@ -424,6 +435,7 @@ CONFIG_DRM_I2C_SIL164=m # CONFIG_DRM_RADEON is not set # CONFIG_DRM_NOUVEAU is not set CONFIG_DRM_RCAR_DU=m +CONFIG_DRM_RCAR_LVDS=y CONFIG_DRM_SHMOBILE=m # CONFIG_DRM_TILCDC is not set CONFIG_FB_SYS_FILLRECT=y @@ -449,9 +461,13 @@ CONFIG_SND_SOC=m CONFIG_SND_ATMEL_SOC=m CONFIG_SND_DESIGNWARE_I2S=m CONFIG_SND_SOC_I2C_AND_SPI=m -# CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SIMPLE_CARD=m +# +# USB Physical Layer drivers +# +CONFIG_USB_ULPI=y + # # MMC/SD/SDIO Host Controller Drivers # @@ -460,7 +476,6 @@ CONFIG_MMC_DW=m # CONFIG_MMC_DW_IDMAC is not set CONFIG_MMC_DW_PLTFM=m CONFIG_MMC_DW_EXYNOS=m -# CONFIG_MMC_DW_SOCFPGA is not set CONFIG_MMC_DW_PCI=m # @@ -502,7 +517,7 @@ CONFIG_OF_IOMMU=y # CONFIG_EXYNOS_ADC is not set # -# Pressure Sensors +# Temperature sensors # CONFIG_PWM=y CONFIG_PWM_SYSFS=y @@ -530,7 +545,11 @@ CONFIG_ARM_UNWIND=y CONFIG_OLD_MCOUNT=y # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_LL is not set -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +CONFIG_DEBUG_LL_INCLUDE="debug/pl01x.S" +CONFIG_DEBUG_UART_PL01X=y +# CONFIG_DEBUG_UART_8250 is not set +CONFIG_DEBUG_UART_PHYS=0x101f1000 +CONFIG_DEBUG_UART_VIRT=0xf11f1000 CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" # CONFIG_OC_ETM is not set diff --git a/kernel/config-armv5tel-kirkwood b/kernel/config-armv5tel-kirkwood index 6dbb2fa18..1334b0243 100644 --- a/kernel/config-armv5tel-kirkwood +++ b/kernel/config-armv5tel-kirkwood @@ -14,23 +14,16 @@ CONFIG_ARCH_KIRKWOOD=y # # Marvell Kirkwood Implementations # +CONFIG_KIRKWOOD_LEGACY=y CONFIG_MACH_D2NET_V2=y -CONFIG_MACH_DOCKSTAR=y -CONFIG_MACH_ESATA_SHEEVAPLUG=y -CONFIG_MACH_GURUPLUG=y -CONFIG_MACH_INETSPACE_V2=y -CONFIG_MACH_MV88F6281GTW_GE=y CONFIG_MACH_NET2BIG_V2=y CONFIG_MACH_NET5BIG_V2=y -CONFIG_MACH_NETSPACE_MAX_V2=y -CONFIG_MACH_NETSPACE_V2=y CONFIG_MACH_OPENRD=y CONFIG_MACH_OPENRD_BASE=y CONFIG_MACH_OPENRD_CLIENT=y CONFIG_MACH_OPENRD_ULTIMATE=y CONFIG_MACH_RD88F6192_NAS=y CONFIG_MACH_RD88F6281=y -CONFIG_MACH_SHEEVAPLUG=y CONFIG_MACH_T5325=y CONFIG_MACH_TS219=y CONFIG_MACH_TS41X=y @@ -39,33 +32,7 @@ CONFIG_MACH_TS41X=y # Device tree entries # CONFIG_ARCH_KIRKWOOD_DT=y -CONFIG_MACH_CLOUDBOX_DT=y -CONFIG_MACH_DB88F628X_BP_DT=y -CONFIG_MACH_DLINK_KIRKWOOD_DT=y -CONFIG_MACH_DOCKSTAR_DT=y -CONFIG_MACH_DREAMPLUG_DT=y -CONFIG_MACH_GOFLEXNET_DT=y -CONFIG_MACH_GURUPLUG_DT=y -CONFIG_MACH_IB62X0_DT=y -CONFIG_MACH_ICONNECT_DT=y -CONFIG_MACH_INETSPACE_V2_DT=y -CONFIG_MACH_IOMEGA_IX2_200_DT=y -CONFIG_MACH_KM_KIRKWOOD_DT=y -CONFIG_MACH_LSXL_DT=y -CONFIG_MACH_MPLCEC4_DT=y -CONFIG_MACH_NETSPACE_LITE_V2_DT=y -CONFIG_MACH_NETSPACE_MAX_V2_DT=y -CONFIG_MACH_NETSPACE_MINI_V2_DT=y -CONFIG_MACH_NETSPACE_V2_DT=y -CONFIG_MACH_OPENBLOCKS_A6_DT=y -CONFIG_MACH_READYNAS_DT=y -CONFIG_MACH_SHEEVAPLUG_DT=y -CONFIG_MACH_TOPKICK_DT=y -CONFIG_MACH_TS219_DT=y - -# -# ST-Ericsson U300/U335 Feature Selections -# +CONFIG_MACH_MV88F6281GTW_GE_DT=y CONFIG_PLAT_ORION=y CONFIG_PLAT_ORION_LEGACY=y @@ -119,16 +86,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # # ARM CPU frequency scaling drivers # -# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set -# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set -# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set CONFIG_ARM_KIRKWOOD_CPUFREQ=y -# -# Power management options -# -# CONFIG_ARM_CPU_SUSPEND is not set - # # Bluetooth device drivers # @@ -204,18 +163,21 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_GPIO is not set # CONFIG_REGULATOR_AD5398 is not set +CONFIG_REGULATOR_DA9210=m # CONFIG_REGULATOR_FAN53555 is not set +# CONFIG_REGULATOR_GPIO is not set # CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +CONFIG_REGULATOR_LP872X=m +CONFIG_REGULATOR_LP8755=m # CONFIG_REGULATOR_MAX1586 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_MAX8952 is not set # CONFIG_REGULATOR_MAX8973 is not set -# CONFIG_REGULATOR_LP3971 is not set -# CONFIG_REGULATOR_LP3972 is not set -CONFIG_REGULATOR_LP8755=m +CONFIG_REGULATOR_PFUZE100=m # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS65023 is not set @@ -231,7 +193,6 @@ CONFIG_REGULATOR_VEXPRESS=m # Console display driver support # CONFIG_SND_KIRKWOOD_SOC=m -CONFIG_SND_KIRKWOOD_SOC_I2S=m CONFIG_SND_KIRKWOOD_SOC_OPENRD=m CONFIG_SND_KIRKWOOD_SOC_T5325=m CONFIG_SND_SOC_ALC5623=m @@ -278,11 +239,33 @@ CONFIG_COMMON_CLK_SI5351=m CONFIG_MVEBU_CLK_COMMON=y CONFIG_KIRKWOOD_CLK=y +# +# Hardware Spinlock drivers +# +CONFIG_ORION_TIMER=y + # # Rpmsg drivers # CONFIG_MVEBU_DEVBUS=y +# +# Temperature sensors +# +CONFIG_ORION_IRQCHIP=y + +# +# Runtime Testing +# +CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" +# CONFIG_DEBUG_UART_PL01X is not set +CONFIG_DEBUG_UART_8250=y +CONFIG_DEBUG_UART_PHYS=0xf1012000 +CONFIG_DEBUG_UART_VIRT=0xfed12000 +CONFIG_DEBUG_UART_8250_SHIFT=2 +# CONFIG_DEBUG_UART_8250_WORD is not set +# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set + # # Random Number Generation # diff --git a/kernel/config-armv7hl-default b/kernel/config-armv7hl-default index 6658fdea4..7c0e3685e 100644 --- a/kernel/config-armv7hl-default +++ b/kernel/config-armv7hl-default @@ -32,6 +32,7 @@ CONFIG_RCU_NOCB_CPU_ALL=y # # Kernel Performance Events And Counters # +CONFIG_SLUB_CPU_PARTIAL=y CONFIG_USE_GENERIC_SMP_HELPERS=y # @@ -178,6 +179,7 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_ARCH_OMAP2PLUS_TYPICAL=y CONFIG_SOC_HAS_OMAP2_SDRC=y CONFIG_SOC_HAS_REALTIME_COUNTER=y +CONFIG_SOC_DRA7XX=y CONFIG_SOC_OMAP3430=y CONFIG_SOC_TI81XX=y CONFIG_OMAP_PACKAGE_CBB=y @@ -216,51 +218,29 @@ CONFIG_OMAP3_EMU=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set CONFIG_ARCH_PICOXCELL=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_PLAT_SAMSUNG=y -CONFIG_SAMSUNG_PM=y - -# -# Boot options -# -# CONFIG_S3C_BOOT_ERROR_RESET is not set -CONFIG_S3C_BOOT_UART_FORCE_FIFO=y -CONFIG_S3C_LOWLEVEL_UART_PORT=0 -CONFIG_S5P_DEV_MFC=y - -# -# Power management -# -# CONFIG_SAMSUNG_PM_CHECK is not set -CONFIG_S5P_PM=y -CONFIG_S5P_SLEEP=y CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_STI=y CONFIG_SOC_STIH415=y CONFIG_SOC_STIH416=y -CONFIG_ARCH_EXYNOS_MULTI=y +CONFIG_ARCH_SHMOBILE_MULTI=y # -# SAMSUNG EXYNOS SoCs Support +# SH-Mobile System Type # -CONFIG_ARCH_EXYNOS4=y -CONFIG_ARCH_EXYNOS5=y -CONFIG_ARCH_EXYNOS_COMMON=y +CONFIG_ARCH_EMEV2=y # -# EXYNOS SoCs +# SH-Mobile Board Type # -CONFIG_CPU_EXYNOS4210=y -CONFIG_SOC_EXYNOS4212=y -CONFIG_SOC_EXYNOS4412=y -CONFIG_SOC_EXYNOS5250=y -CONFIG_SOC_EXYNOS5420=y -CONFIG_SOC_EXYNOS5440=y +CONFIG_MACH_KZM9D_REFERENCE=y # -# Flattened Device Tree based board for EXYNOS SoCs +# Timer and clock configuration # -CONFIG_MACH_EXYNOS4_DT=y -CONFIG_MACH_EXYNOS5_DT=y +CONFIG_SHMOBILE_TIMER_HZ=128 +CONFIG_SH_TIMER_CMT=y +CONFIG_SH_TIMER_TMU=y +CONFIG_EM_TIMER_STI=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_SIRF=y @@ -279,13 +259,8 @@ CONFIG_ARCH_TEGRA=y CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y CONFIG_ARCH_TEGRA_114_SOC=y -CONFIG_TEGRA_PCI=y CONFIG_TEGRA_AHB=y # CONFIG_TEGRA_EMC_SCALING_ENABLE is not set - -# -# ST-Ericsson U300/U335 Feature Selections -# CONFIG_ARCH_U8500=y CONFIG_UX500_SOC_COMMON=y CONFIG_UX500_SOC_DB8500=y @@ -365,6 +340,7 @@ CONFIG_ARM_ERRATA_764369=y CONFIG_PL310_ERRATA_769419=y CONFIG_ARM_ERRATA_775420=y CONFIG_ARM_ERRATA_798181=y +# CONFIG_ARM_ERRATA_773022 is not set CONFIG_TI_PRIV_EDMA=y # @@ -376,8 +352,7 @@ CONFIG_PCI_DOMAINS=y # PCI host controller drivers # CONFIG_PCI_MVEBU=y -CONFIG_PCIE_DW=y -CONFIG_PCI_EXYNOS=y +CONFIG_PCI_TEGRA=y # CONFIG_PCCARD is not set # @@ -392,11 +367,8 @@ CONFIG_SCHED_SMT=y CONFIG_NR_CPUS=8 CONFIG_HOTPLUG_CPU=y CONFIG_ARM_PSCI=y -CONFIG_LOCAL_TIMERS=y CONFIG_ARCH_NR_GPIO=1024 -CONFIG_HZ=200 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y -CONFIG_MEMORY_ISOLATION=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ZONE_DMA_FLAG=1 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 @@ -411,6 +383,10 @@ CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttyS # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set + +# +# CPU Idle +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # @@ -418,6 +394,7 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # CONFIG_VFPv3=y CONFIG_NEON=y +CONFIG_KERNEL_MODE_NEON=y # # Power management options @@ -425,9 +402,6 @@ CONFIG_NEON=y CONFIG_PM_SLEEP_SMP=y CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y -CONFIG_PM_GENERIC_DOMAINS=y -CONFIG_PM_GENERIC_DOMAINS_SLEEP=y -CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y # # Classification @@ -449,19 +423,6 @@ CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_SOC_BUS=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set - -# -# Default contiguous memory area size: -# -CONFIG_CMA_SIZE_MBYTES=16 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_AREAS=7 # # Bus devices @@ -545,9 +506,9 @@ CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_DOCG4 is not set # CONFIG_MTD_NAND_CAFE is not set +# CONFIG_MTD_NAND_PXA3xx is not set # CONFIG_MTD_NAND_NANDSIM is not set CONFIG_MTD_NAND_PLATFORM=y -# CONFIG_MTD_ALAUDA is not set CONFIG_MTD_NAND_ORION=m CONFIG_MTD_NAND_MXC=m # CONFIG_MTD_NAND_FSMC is not set @@ -555,7 +516,6 @@ CONFIG_MTD_ONENAND=y # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set # CONFIG_MTD_ONENAND_GENERIC is not set CONFIG_MTD_ONENAND_OMAP2=y -# CONFIG_MTD_ONENAND_SAMSUNG is not set # CONFIG_MTD_ONENAND_OTP is not set CONFIG_MTD_ONENAND_2X_PROGRAM=y @@ -568,7 +528,6 @@ CONFIG_MTD_ONENAND_2X_PROGRAM=y # # Device Tree and Open Firmware support # -CONFIG_OF_I2C=y CONFIG_OF_MTD=y # CONFIG_PARPORT is not set CONFIG_BLK_DEV_RAM_SIZE=65536 @@ -649,10 +608,6 @@ CONFIG_INPUT_SIRFSOC_ONKEY=y # CONFIG_SERIAL_AMBA_PL010=y # CONFIG_SERIAL_AMBA_PL010_CONSOLE is not set -CONFIG_SERIAL_SAMSUNG=y -CONFIG_SERIAL_SAMSUNG_UARTS_4=y -CONFIG_SERIAL_SAMSUNG_UARTS=4 -# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set CONFIG_SERIAL_SIRFSOC=y # CONFIG_SERIAL_SIRFSOC_CONSOLE is not set CONFIG_SERIAL_TEGRA=y @@ -669,6 +624,7 @@ CONFIG_SERIAL_SCCNXP=y CONFIG_SERIAL_ARC=y # CONFIG_SERIAL_ARC_CONSOLE is not set CONFIG_HW_RANDOM_BCM2835=y +CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_MXC_RNGA=m CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y @@ -677,11 +633,11 @@ CONFIG_I2C_ALGOBIT=y # I2C system bus drivers (mostly embedded / system-on-chip) # CONFIG_I2C_BCM2835=y +CONFIG_I2C_DAVINCI=m CONFIG_I2C_IMX=y CONFIG_I2C_MV64XXX=y CONFIG_I2C_NOMADIK=y CONFIG_I2C_OMAP=y -CONFIG_I2C_S3C2410=y CONFIG_I2C_SIRF=y CONFIG_I2C_TEGRA=y CONFIG_I2C_WMT=y @@ -723,9 +679,7 @@ CONFIG_PINCTRL_TEGRA=y CONFIG_PINCTRL_TEGRA20=y CONFIG_PINCTRL_TEGRA30=y CONFIG_PINCTRL_TEGRA114=y -CONFIG_PINCTRL_SAMSUNG=y -CONFIG_PINCTRL_EXYNOS=y -CONFIG_PINCTRL_EXYNOS5440=y +# CONFIG_PINCTRL_PALMAS is not set CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_XP=y @@ -784,8 +738,8 @@ CONFIG_W1_MASTER_MXC=m # CONFIG_BATTERY_88PM860X is not set # CONFIG_BATTERY_DA9030 is not set # CONFIG_BATTERY_DA9052 is not set +# CONFIG_BATTERY_TWL4030_MADC is not set # CONFIG_BATTERY_RX51 is not set -# CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_TWL4030 is not set # CONFIG_CHARGER_MANAGER is not set # CONFIG_CHARGER_MAX8997 is not set @@ -811,6 +765,7 @@ CONFIG_ARMADA_THERMAL=m CONFIG_TI_SOC_THERMAL=m CONFIG_OMAP4_THERMAL=y CONFIG_OMAP5_THERMAL=y +CONFIG_DRA752_THERMAL=y # # Watchdog Device Drivers @@ -820,6 +775,7 @@ CONFIG_OMAP5_THERMAL=y # CONFIG_WM831X_WATCHDOG is not set # CONFIG_WM8350_WATCHDOG is not set CONFIG_OMAP_WATCHDOG=y +CONFIG_SUNXI_WATCHDOG=m # CONFIG_TWL4030_WATCHDOG is not set CONFIG_IMX2_WDT=m CONFIG_UX500_WATCHDOG=y @@ -836,6 +792,7 @@ CONFIG_PMIC_DA903X=y CONFIG_PMIC_DA9052=y CONFIG_MFD_DA9052_I2C=y CONFIG_MFD_DA9055=y +CONFIG_MFD_DA9063=y CONFIG_HTC_I2CPLD=y CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m @@ -890,16 +847,29 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_88PM800=m +CONFIG_REGULATOR_88PM8607=y CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_AAT2870=m +CONFIG_REGULATOR_AB3100=y +CONFIG_REGULATOR_AB8500=y +CONFIG_REGULATOR_AS3711=m CONFIG_REGULATOR_DA903X=m CONFIG_REGULATOR_DA9052=m CONFIG_REGULATOR_DA9055=m +CONFIG_REGULATOR_DA9063=m +CONFIG_REGULATOR_DA9210=m +CONFIG_REGULATOR_DBX500_PRCMU=y +CONFIG_REGULATOR_DB8500_PRCMU=y CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_GPIO=y CONFIG_REGULATOR_ISL6271A=m -CONFIG_REGULATOR_88PM8607=y +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP872X=y +CONFIG_REGULATOR_LP8755=m +CONFIG_REGULATOR_LP8788=y CONFIG_REGULATOR_MAX1586=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m @@ -911,19 +881,12 @@ CONFIG_REGULATOR_MAX8997=m CONFIG_REGULATOR_MAX8998=m CONFIG_REGULATOR_MAX77686=m CONFIG_REGULATOR_MAX77693=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_LP872X=y -CONFIG_REGULATOR_LP8755=m -CONFIG_REGULATOR_LP8788=y +CONFIG_REGULATOR_PALMAS=m +CONFIG_REGULATOR_PFUZE100=m CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m -CONFIG_REGULATOR_AB3100=y -CONFIG_REGULATOR_AB8500=y -CONFIG_REGULATOR_DBX500_PRCMU=y -CONFIG_REGULATOR_DB8500_PRCMU=y -CONFIG_REGULATOR_PALMAS=m +CONFIG_REGULATOR_TI_ABB=y CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS62360=m CONFIG_REGULATOR_TPS65023=m @@ -934,13 +897,11 @@ CONFIG_REGULATOR_TPS65910=m CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_TPS80031=m CONFIG_REGULATOR_TWL4030=y -CONFIG_REGULATOR_TI_ABB=y CONFIG_REGULATOR_VEXPRESS=m CONFIG_REGULATOR_WM831X=m CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_WM8994=m -CONFIG_REGULATOR_AS3711=m # # Multimedia core support @@ -955,7 +916,6 @@ CONFIG_VIDEO_OMAP2_VOUT_VRFB=y CONFIG_VIDEO_OMAP2_VOUT=m CONFIG_VIDEO_MX3=m CONFIG_VIDEO_CODA=m -# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) @@ -1002,15 +962,16 @@ CONFIG_FB_MODE_HELPERS=y # Frame buffer hardware drivers # # CONFIG_FB_IMX is not set -# CONFIG_FB_S3C is not set +# CONFIG_FB_VT8500 is not set +# CONFIG_FB_WM8505 is not set # CONFIG_FB_XILINX is not set +# CONFIG_FB_DA8XX is not set # CONFIG_FB_MX3 is not set CONFIG_OMAP2_VRFB=y CONFIG_OMAP2_DSS=y # CONFIG_OMAP2_DSS_DEBUG is not set # CONFIG_OMAP2_DSS_DEBUGFS is not set CONFIG_OMAP2_DSS_DPI=y -# CONFIG_OMAP2_DSS_RFBI is not set CONFIG_OMAP2_DSS_VENC=y CONFIG_OMAP4_DSS_HDMI=y CONFIG_OMAP4_DSS_HDMI_AUDIO=y @@ -1020,14 +981,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1 CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y # CONFIG_FB_OMAP2 is not set -# -# OMAP2/3 Display Device Drivers (old device model) -# -CONFIG_PANEL_GENERIC_DPI=y -CONFIG_PANEL_TFP410=m -CONFIG_PANEL_SHARP_LS037V7DW01=y -# CONFIG_PANEL_PICODLP is not set - # # OMAP Display Device Drivers (new device model) # @@ -1054,11 +1007,11 @@ CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m # # Console display driver support # +CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_SOC_AC97_BUS=y -CONFIG_SND_SOC_DMAENGINE_PCM=y CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y CONFIG_SND_SOC_FSL_SSI=m -CONFIG_SND_SOC_FSL_UTILS=m +CONFIG_SND_SOC_FSL_SPDIF=m CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_IMX_SSI=m CONFIG_SND_SOC_IMX_PCM_FIQ=m @@ -1068,6 +1021,7 @@ CONFIG_SND_SOC_PHYCORE_AC97=m CONFIG_SND_SOC_EUKREA_TLV320=m CONFIG_SND_SOC_IMX_WM8962=m CONFIG_SND_SOC_IMX_SGTL5000=m +CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_OMAP_SOC=m CONFIG_SND_OMAP_SOC_DMIC=m CONFIG_SND_OMAP_SOC_MCBSP=m @@ -1100,6 +1054,7 @@ CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_SGTL5000=m +CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_TLV320AIC23=m CONFIG_SND_SOC_TLV320AIC3X=m CONFIG_SND_SOC_TWL4030=m @@ -1114,7 +1069,6 @@ CONFIG_SND_SOC_TPA6130A2=m # I2C HID support # CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB_ARCH_HAS_XHCI=y # # USB Host Controller Drivers @@ -1125,29 +1079,23 @@ CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_TEGRA=y # CONFIG_USB_CNS3XXX_EHCI is not set CONFIG_USB_OHCI_HCD_OMAP3=y -CONFIG_USB_OHCI_EXYNOS=y CONFIG_USB_CNS3XXX_OHCI=y CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y CONFIG_USB_UHCI_PLATFORM=y CONFIG_USB_IMX21_HCD=m # -# USB Miscellaneous drivers +# USB Physical Layer drivers # -CONFIG_USB_PHY=y CONFIG_AB8500_USB=m -CONFIG_NOP_USB_XCEIV=m +CONFIG_NOP_USB_XCEIV=y CONFIG_OMAP_CONTROL_USB=m CONFIG_OMAP_USB2=m CONFIG_OMAP_USB3=m CONFIG_SAMSUNG_USBPHY=y CONFIG_SAMSUNG_USB2PHY=y CONFIG_SAMSUNG_USB3PHY=y -CONFIG_USB_GPIO_VBUS=m -CONFIG_USB_ISP1301=m CONFIG_USB_MXS_PHY=m -CONFIG_USB_RCAR_PHY=m -CONFIG_USB_ULPI=y CONFIG_USB_ULPI_VIEWPORT=y CONFIG_MMC=y @@ -1164,7 +1112,6 @@ CONFIG_MMC_SDHCI_IO_ACCESSORS=y CONFIG_MMC_SDHCI_CNS3XXX=m CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_SDHCI_TEGRA=m -# CONFIG_MMC_SDHCI_S3C is not set CONFIG_MMC_SDHCI_SIRF=m CONFIG_MMC_SDHCI_BCM_KONA=m CONFIG_MMC_SDHCI_BCM2835=m @@ -1172,6 +1119,7 @@ CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_MXC=m CONFIG_MMC_MVSDIO=m +# CONFIG_MMC_DW_SOCFPGA is not set CONFIG_MMC_WMT=m # @@ -1231,7 +1179,6 @@ CONFIG_RTC_DRV_AB3100=y # CONFIG_RTC_DRV_IMXDI=m CONFIG_RTC_DRV_OMAP=m -CONFIG_RTC_DRV_S3C=m CONFIG_RTC_DRV_VT8500=m CONFIG_RTC_DRV_MV=m CONFIG_RTC_DRV_TEGRA=m @@ -1247,12 +1194,13 @@ CONFIG_MX3_IPU=y CONFIG_MX3_IPU_IRQS=4 CONFIG_TEGRA20_APB_DMA=y # CONFIG_STE_DMA40 is not set -# CONFIG_SIRF_DMA is not set +CONFIG_SIRF_DMA=y CONFIG_TI_EDMA=y CONFIG_IMX_SDMA=m CONFIG_IMX_DMA=m # CONFIG_MXS_DMA is not set CONFIG_DMA_OMAP=y +CONFIG_TI_CPPI41=m CONFIG_DMA_VIRTUAL_CHANNELS=y # @@ -1274,6 +1222,7 @@ CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_VERSATILE=y # CONFIG_COMMON_CLK_MAX77686 is not set CONFIG_COMMON_CLK_SI5351=m +CONFIG_COMMON_CLK_S2MPS11=m CONFIG_CLK_TWL6040=m CONFIG_COMMON_CLK_AXI_CLKGEN=m CONFIG_MVEBU_CLK_COMMON=y @@ -1299,8 +1248,6 @@ CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_GLOBAL_TIMER=y CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y -CONFIG_CLKSRC_EXYNOS_MCT=y -CONFIG_CLKSRC_SAMSUNG_PWM=y CONFIG_VF_PIT_TIMER=y CONFIG_OMAP_MBOX=m CONFIG_OMAP2PLUS_MBOX=m @@ -1321,13 +1268,13 @@ CONFIG_TEGRA30_MC=y # Analog to digital converters # # CONFIG_LP8788_ADC is not set +# CONFIG_TWL6030_GPADC is not set # -# Pressure Sensors +# Temperature sensors # # CONFIG_PWM is not set CONFIG_ARM_GIC=y -CONFIG_GIC_NON_BANKED=y CONFIG_ARCH_HAS_RESET_CONTROLLER=y # @@ -1355,6 +1302,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # Runtime Testing # CONFIG_DEBUG_IMX_UART_PORT=1 +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_UART_PL01X is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_OC_ETM=y # CONFIG_PID_IN_CONTEXTIDR is not set @@ -1376,6 +1325,11 @@ CONFIG_PAX_MEMORY_UDEREF=y CONFIG_PAX_REFCOUNT=y CONFIG_PAX_CONSTIFY_PLUGIN=y +# +# Memory Protections +# +CONFIG_GRKERNSEC_OLD_ARM_USERLAND=y + # # Kernel Auditing # diff --git a/kernel/config-generic b/kernel/config-generic index c6d6ca535..341447d65 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -9,6 +9,7 @@ CONFIG_GENERIC_BUG=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -43,16 +44,15 @@ CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y CONFIG_AUDIT_LOGINUID_IMMUTABLE=y -CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # -CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -101,8 +101,10 @@ CONFIG_BLK_CGROUP=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y +CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y +CONFIG_UIDGID_STRICT_TYPE_CHECKS=y CONFIG_SCHED_AUTOGROUP=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -149,7 +151,6 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set -CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_PROFILING is not set CONFIG_TRACEPOINTS=y CONFIG_HAVE_OPROFILE=y @@ -190,6 +191,7 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_CMDLINE_PARSER is not set # # Partition Types @@ -214,6 +216,7 @@ CONFIG_LDM_PARTITION=y # CONFIG_KARMA_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set # # IO Schedulers @@ -241,6 +244,7 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set CONFIG_HAVE_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_BALLOON_COMPACTION=y @@ -251,11 +255,17 @@ CONFIG_KSM=y CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CLEANCACHE=y # CONFIG_FRONTSWAP is not set +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set # CONFIG_ZBUD is not set CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y # @@ -283,6 +293,10 @@ CONFIG_PM_CLK=y # # shared options # + +# +# CPU Idle +# # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # @@ -301,6 +315,7 @@ CONFIG_PCIEASPM=y # CONFIG_PCIEASPM_DEBUG is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y +CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y @@ -369,7 +384,6 @@ CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m CONFIG_INET_AH=m @@ -479,7 +493,7 @@ CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m -CONFIG_NETFILTER_TPROXY=m +CONFIG_NETFILTER_SYNPROXY=m CONFIG_NETFILTER_XTABLES=y # @@ -631,6 +645,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m # CONFIG_IP_NF_TARGET_ULOG is not set CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -668,6 +683,7 @@ CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m @@ -764,6 +780,7 @@ CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m @@ -812,6 +829,7 @@ CONFIG_BATMAN_ADV_NC=y # CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=y +CONFIG_OPENVSWITCH_VXLAN=y CONFIG_VSOCKETS=m CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m @@ -1093,6 +1111,7 @@ CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVSAS_TASKLET=y # CONFIG_SCSI_MVUMI is not set CONFIG_SCSI_ARCMSR=m +CONFIG_SCSI_ESAS2R=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m @@ -1442,6 +1461,8 @@ CONFIG_IGBVF=m CONFIG_IXGB=m CONFIG_IXGBE=m CONFIG_IXGBE_HWMON=y +CONFIG_IXGBEVF=m +CONFIG_I40E=m CONFIG_NET_VENDOR_I825XX=y CONFIG_IP1000=m CONFIG_JME=m @@ -1584,6 +1605,7 @@ CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m @@ -1638,6 +1660,7 @@ CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set +CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -1732,6 +1755,7 @@ CONFIG_RT73USB=m CONFIG_RT2800USB=m CONFIG_RT2800USB_RT33XX=y CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y CONFIG_RT2800USB_RT53XX=y CONFIG_RT2800USB_RT55XX=y CONFIG_RT2800USB_UNKNOWN=y @@ -2039,6 +2063,7 @@ CONFIG_SERIAL_ARC_NR_PORTS=1 CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 CONFIG_SERIAL_FSL_LPUART=m +CONFIG_SERIAL_ST_ASC=m # CONFIG_TTY_PRINTK is not set CONFIG_PRINTER=m CONFIG_LP_CONSOLE=y @@ -2159,6 +2184,10 @@ CONFIG_PTP_1588_CLOCK=m # # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # + +# +# Pin controllers +# CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIO_DEVRES=y CONFIG_GPIOLIB=y @@ -2197,6 +2226,11 @@ CONFIG_GPIO_TS5500=m # AC97 GPIO expanders: # +# +# LPC GPIO expanders: +# +# CONFIG_GPIO_KEMPLD is not set + # # MODULbus GPIO expanders: # @@ -2247,12 +2281,13 @@ CONFIG_GENERIC_ADC_BATTERY=m # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GOLDFISH is not set CONFIG_POWER_RESET=y CONFIG_POWER_AVS=y CONFIG_HWMON=y @@ -2290,6 +2325,7 @@ CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m # CONFIG_SENSORS_GPIO_FAN is not set CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_HTU21=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m # CONFIG_SENSORS_IIO_HWMON is not set @@ -2582,6 +2618,7 @@ CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_GSPCA_SQ905C=m CONFIG_USB_GSPCA_SQ930X=m CONFIG_USB_GSPCA_STK014=m +CONFIG_USB_GSPCA_STK1135=m CONFIG_USB_GSPCA_STV0680=m CONFIG_USB_GSPCA_SUNPLUS=m CONFIG_USB_GSPCA_T613=m @@ -2608,7 +2645,9 @@ CONFIG_VIDEO_USBTV=m # CONFIG_VIDEO_HDPVR is not set # CONFIG_VIDEO_TLG2300 is not set # CONFIG_VIDEO_USBVISION is not set -# CONFIG_VIDEO_STK1160 is not set +CONFIG_VIDEO_STK1160_COMMON=m +# CONFIG_VIDEO_STK1160_AC97 is not set +CONFIG_VIDEO_STK1160=m # # Analog/digital TV USB devices @@ -2706,6 +2745,7 @@ CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_CX88_BLACKBIRD=m CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ENABLE_VP3054=y CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m CONFIG_VIDEO_BT848=m @@ -2740,9 +2780,11 @@ CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_TIMBERDALE=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_PLATFORM=m +# CONFIG_VIDEO_RCAR_VIN is not set CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m CONFIG_VIDEO_SH_VEU=m +CONFIG_VIDEO_RENESAS_VSP1=m # CONFIG_V4L_TEST_DRIVERS is not set # @@ -2770,7 +2812,6 @@ CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) @@ -3035,17 +3076,11 @@ CONFIG_HDMI=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y # CONFIG_FB_DDC is not set -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLITym +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_IMAGEBLIT=m # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -<<<<<<< Updated upstream -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y -======= ->>>>>>> Stashed changes # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=m CONFIG_FB_DEFERRED_IO=y @@ -3060,6 +3095,8 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set # CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set @@ -3091,6 +3128,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_AUO_K190X is not set +# CONFIG_FB_SIMPLE is not set # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m @@ -3103,14 +3141,17 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_LM3630 is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_GPIO is not set +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set # # Console display driver support # CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONT_8x16=y -CONFIG_FONT_AUTOSELECT=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set @@ -3163,7 +3204,6 @@ CONFIG_SND_MPU401=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_TEA575X=m CONFIG_SND_PCI=y CONFIG_SND_AD1889=m CONFIG_SND_ALS300=m @@ -3206,9 +3246,7 @@ CONFIG_SND_ENS1371=m CONFIG_SND_ES1938=m CONFIG_SND_ES1968=m CONFIG_SND_ES1968_INPUT=y -CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PREALLOC_SIZE=64 CONFIG_SND_HDA_HWDEP=y @@ -3346,6 +3384,7 @@ CONFIG_HID_THINGM=m # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_WACOM is not set # CONFIG_HID_WIIMOTE is not set +# CONFIG_HID_XINMO is not set # CONFIG_HID_ZEROPLUS is not set CONFIG_HID_ZYDACRON=m CONFIG_HID_SENSOR_HUB=m @@ -3361,6 +3400,7 @@ CONFIG_USB_HIDDEV=y # I2C HID support # CONFIG_I2C_HID=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y CONFIG_USB_ARCH_HAS_HCD=y @@ -3387,7 +3427,6 @@ CONFIG_USB_WUSB_CBAF=m # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PLATFORM=m -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -3398,12 +3437,10 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y # CONFIG_USB_ISP1760_HCD is not set CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m +CONFIG_USB_FOTG210_HCD=m CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_PCI=y CONFIG_USB_OHCI_HCD_PLATFORM=y -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=y # CONFIG_USB_U132_HCD is not set CONFIG_USB_SL811_HCD=m @@ -3412,6 +3449,7 @@ CONFIG_USB_SL811_HCD_ISO=y CONFIG_USB_WHCI_HCD=m CONFIG_USB_HWA_HCD=m CONFIG_USB_HCD_SSB=m +# CONFIG_USB_HCD_TEST_MODE is not set # # USB Device Class drivers @@ -3452,6 +3490,16 @@ CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m CONFIG_USB_DWC3=m CONFIG_USB_DWC3_HOST=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_EXYNOS=m +CONFIG_USB_DWC3_PCI=m + +# +# Debugging features +# # CONFIG_USB_DWC3_DEBUG is not set CONFIG_USB_CHIPIDEA=m # CONFIG_USB_CHIPIDEA_HOST is not set @@ -3463,6 +3511,7 @@ CONFIG_USB_CHIPIDEA=m CONFIG_USB_USS720=m CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=m CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m @@ -3473,7 +3522,6 @@ CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m # CONFIG_USB_SERIAL_EMPEG is not set CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m CONFIG_USB_SERIAL_VISOR=m CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IR=m @@ -3492,16 +3540,13 @@ CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7715_PARPORT=y CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MOTOROLA=m # CONFIG_USB_SERIAL_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m CONFIG_USB_SERIAL_QCAUX=m CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_SPCP8X5=m -# CONFIG_USB_SERIAL_HP4X is not set # CONFIG_USB_SERIAL_SAFE is not set -CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m # CONFIG_USB_SERIAL_SYMBOL is not set # CONFIG_USB_SERIAL_TI is not set @@ -3511,15 +3556,11 @@ CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m # CONFIG_USB_SERIAL_OMNINET is not set # CONFIG_USB_SERIAL_OPTICON is not set -# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set # CONFIG_USB_SERIAL_XSENS_MT is not set -# CONFIG_USB_SERIAL_ZIO is not set # CONFIG_USB_SERIAL_WISHBONE is not set CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m -CONFIG_USB_SERIAL_FLASHLOADER=m -CONFIG_USB_SERIAL_SUUNTO=m # CONFIG_USB_SERIAL_DEBUG is not set # @@ -3544,6 +3585,7 @@ CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_TRANCEVIBRATOR is not set CONFIG_USB_IOWARRIOR=m # CONFIG_USB_TEST is not set +# CONFIG_USB_EHSET_TEST_FIXTURE is not set # CONFIG_USB_ISIGHTFW is not set CONFIG_USB_YUREX=m CONFIG_USB_EZUSB_FX2=m @@ -3553,7 +3595,20 @@ CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_CXACRU=m CONFIG_USB_UEAGLEATM=m CONFIG_USB_XUSBATM=m -# CONFIG_USB_PHY is not set + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=m +CONFIG_AM335X_CONTROL_USB=m +CONFIG_AM335X_PHY_USB=m +CONFIG_SAMSUNG_USBPHY=m +CONFIG_SAMSUNG_USB2PHY=m +CONFIG_SAMSUNG_USB3PHY=m +CONFIG_USB_GPIO_VBUS=m +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=m # CONFIG_USB_GADGET is not set CONFIG_UWB=m CONFIG_UWB_HWA=m @@ -3596,6 +3651,7 @@ CONFIG_MEMSTICK=m # # CONFIG_MEMSTICK_UNSAFE_RESUME is not set CONFIG_MSPRO_BLOCK=m +CONFIG_MS_BLOCK=m # # MemoryStick Host Controller Drivers @@ -3620,11 +3676,11 @@ CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m CONFIG_LEDS_LP5562=m +CONFIG_LEDS_LP8501=m # CONFIG_LEDS_PCA955X is not set -CONFIG_LEDS_PCA9633=m +CONFIG_LEDS_PCA963X=m # CONFIG_LEDS_BD2802 is not set CONFIG_LEDS_LT3593=m -# CONFIG_LEDS_RENESAS_TPU is not set CONFIG_LEDS_TCA6507=m CONFIG_LEDS_LM355x=m CONFIG_LEDS_OT200=m @@ -3716,6 +3772,7 @@ CONFIG_RTC_DRV_DS2404=m # # on-CPU RTC drivers # +CONFIG_RTC_DRV_MOXART=m # # HID Sensor RTC drivers @@ -3741,13 +3798,13 @@ CONFIG_ASYNC_TX_DMA=y # CONFIG_AUXDISPLAY is not set CONFIG_UIO=m # CONFIG_UIO_CIF is not set -# CONFIG_UIO_PDRV is not set # CONFIG_UIO_PDRV_GENIRQ is not set # CONFIG_UIO_DMEM_GENIRQ is not set CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m # CONFIG_UIO_NETX is not set +CONFIG_UIO_MF624=m CONFIG_VIRT_DRIVERS=y CONFIG_VIRTIO=y @@ -3772,7 +3829,6 @@ CONFIG_ET131X=m # CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_COMEDI is not set -# CONFIG_ASUS_OLED is not set # CONFIG_PANEL is not set # CONFIG_R8187SE is not set # CONFIG_RTL8192U is not set @@ -3782,6 +3838,7 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m # CONFIG_RTL8192E is not set # CONFIG_R8712U is not set +# CONFIG_R8188EU is not set # CONFIG_RTS5139 is not set # CONFIG_TRANZPORT is not set # CONFIG_IDE_PHISON is not set @@ -3880,13 +3937,21 @@ CONFIG_RTLLIB_CRYPTO_WEP=m # CONFIG_ANDROID is not set # CONFIG_USB_WPAN_HCD is not set # CONFIG_WIMAX_GDM72XX is not set +# CONFIG_LTE_GDM724X is not set CONFIG_NET_VENDOR_SILICOM=y CONFIG_SBYPASS=m CONFIG_BPCTL=m CONFIG_CED1401=m # CONFIG_DGRP is not set CONFIG_FIREWIRE_SERIAL=m +CONFIG_USB_DWC2=m +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +# CONFIG_LUSTRE_FS is not set CONFIG_USB_BTMTK=m +# CONFIG_XILLYBUS is not set +# CONFIG_DGNC is not set +# CONFIG_DGAP is not set CONFIG_CLKDEV_LOOKUP=y # @@ -3921,6 +3986,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # # Accelerometers # +# CONFIG_BMA180 is not set # CONFIG_HID_SENSOR_ACCEL_3D is not set # CONFIG_IIO_ST_ACCEL_3AXIS is not set @@ -3928,6 +3994,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # Analog to digital converters # # CONFIG_MAX1363 is not set +# CONFIG_NAU7802 is not set # CONFIG_TI_ADC081C is not set # CONFIG_VIPERBOARD_ADC is not set @@ -3981,10 +4048,11 @@ CONFIG_IIO_ST_SENSORS_CORE=m # Light sensors # # CONFIG_ADJD_S311 is not set +# CONFIG_APDS9300 is not set +# CONFIG_HID_SENSOR_ALS is not set # CONFIG_SENSORS_LM3533 is not set # CONFIG_SENSORS_TSL2563 is not set # CONFIG_VCNL4000 is not set -# CONFIG_HID_SENSOR_ALS is not set # # Magnetometer sensors @@ -4000,10 +4068,15 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m # CONFIG_IIO_SYSFS_TRIGGER is not set # -# Pressure Sensors +# Pressure sensors # CONFIG_IIO_ST_PRESS=m CONFIG_IIO_ST_PRESS_I2C=m + +# +# Temperature sensors +# +# CONFIG_TMP006 is not set # CONFIG_VME_BUS is not set # CONFIG_IPACK_BUS is not set # CONFIG_RESET_CONTROLLER is not set @@ -4050,6 +4123,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set # CONFIG_NILFS2_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -4510,6 +4584,7 @@ CONFIG_GRKERNSEC_PROC_IPADDR=y CONFIG_GRKERNSEC_DMESG=y CONFIG_GRKERNSEC_HARDEN_PTRACE=y CONFIG_GRKERNSEC_PTRACE_READEXEC=y +CONFIG_GRKERNSEC_HARDEN_IPC=y # CONFIG_GRKERNSEC_TPE is not set # @@ -4623,6 +4698,7 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y +CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -4707,7 +4783,7 @@ CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_COMPRESS=m @@ -4745,6 +4821,7 @@ CONFIG_CORDIC=m # CONFIG_DDR is not set CONFIG_MPILIB=m CONFIG_OID_REGISTRY=m -CONFIG_FONT_SUPPORT=m +CONFIG_FONT_SUPPORT=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_FONT_AUTOSELECT=y diff --git a/kernel/config-i686-default b/kernel/config-i686-default index 586fcc30f..13c5f2702 100644 --- a/kernel/config-i686-default +++ b/kernel/config-i686-default @@ -112,7 +112,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y CONFIG_HIGHPTE=y # CONFIG_MATH_EMULATION is not set -# CONFIG_KEXEC_JUMP is not set CONFIG_PHYSICAL_START=0x400000 CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x400000 diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy index 7bb09dc98..7e72ab369 100644 --- a/kernel/config-i686-legacy +++ b/kernel/config-i686-legacy @@ -28,7 +28,18 @@ CONFIG_OLPC_XO15_SCI=y # Generic Driver Options # # CONFIG_SYS_HYPERVISOR is not set -# CONFIG_CMA is not set +CONFIG_DMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 +CONFIG_CMA_AREAS=7 # # Bus devices @@ -43,7 +54,6 @@ CONFIG_PROC_DEVICETREE=y CONFIG_OF_PROMTREE=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y -CONFIG_OF_I2C=m CONFIG_OF_NET=y CONFIG_OF_MDIO=y CONFIG_OF_PCI=y @@ -91,8 +101,9 @@ CONFIG_I2C_PXA=m CONFIG_I2C_PXA_PCI=y # -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# Pin controllers # +# CONFIG_PINCTRL_SINGLE is not set CONFIG_OF_GPIO=y # @@ -174,7 +185,7 @@ CONFIG_OF_IOMMU=y # CONFIG_EXYNOS_ADC is not set # -# Pressure Sensors +# Temperature sensors # CONFIG_PWM=y CONFIG_PWM_SYSFS=y diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index 72712fd84..df5064485 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -11,7 +11,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_X86_HT=y @@ -27,7 +26,6 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y # IRQ subsystem # CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_IRQ_FORCED_THREADING=y CONFIG_SPARSE_IRQ=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y @@ -52,6 +50,7 @@ CONFIG_PCSPKR_PLATFORM=y # # Kernel Performance Events And Counters # +CONFIG_SLUB_CPU_PARTIAL=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_USER_RETURN_NOTIFIER=y @@ -86,6 +85,7 @@ CONFIG_XEN_PVHVM=y CONFIG_XEN_SAVE_RESTORE=y CONFIG_XEN_DEBUG_FS=y CONFIG_KVM_GUEST=y +# CONFIG_KVM_DEBUG_FS is not set CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y CONFIG_NO_BOOTMEM=y @@ -134,7 +134,6 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_ARCH_DISCARD_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 @@ -159,11 +158,6 @@ CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_300=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=300 CONFIG_RELOCATABLE=y CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set @@ -183,14 +177,12 @@ CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m -# CONFIG_ACPI_PROC_EVENT is not set CONFIG_ACPI_AC=y CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y CONFIG_ACPI_VIDEO=m CONFIG_ACPI_FAN=y CONFIG_ACPI_DOCK=y -CONFIG_ACPI_I2C=m CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_HOTPLUG_CPU=y @@ -249,6 +241,10 @@ CONFIG_X86_P4_CLOCKMOD=y # shared options # CONFIG_X86_SPEEDSTEP_LIB=y + +# +# CPU Idle +# CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y @@ -266,8 +262,6 @@ CONFIG_PCI_DOMAINS=y CONFIG_HOTPLUG_PCI_PCIE=y # CONFIG_PCIEASPM_DEFAULT is not set CONFIG_PCIEASPM_POWERSAVE=y -CONFIG_ARCH_SUPPORTS_MSI=y -CONFIG_PCI_MSI=y CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_HT_IRQ=y CONFIG_PCI_IOAPIC=y @@ -287,6 +281,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set # CONFIG_RAPIDIO is not set +# CONFIG_X86_SYSFB is not set # # Classification @@ -389,7 +384,6 @@ CONFIG_VHOST=m CONFIG_DE4X5=m CONFIG_IGB_DCA=y CONFIG_IXGBE_DCA=y -CONFIG_IXGBEVF=m CONFIG_MLX4_EN=m CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y @@ -426,6 +420,7 @@ CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_INPUT_IDEAPAD_SLIDEBAR=m # # Hardware I/O ports @@ -482,12 +477,22 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. # CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_PINCTRL=y + +# +# Pin controllers +# +# CONFIG_PINMUX is not set +# CONFIG_PINCONF is not set +# CONFIG_DEBUG_PINCTRL is not set +# CONFIG_PINCTRL_BAYTRAIL is not set CONFIG_GPIO_ACPI=y # # Memory mapped GPIO drivers: # # CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_F7188X is not set CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m # CONFIG_GPIO_LYNXPOINT is not set @@ -615,6 +620,7 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y CONFIG_DRM_I810=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set CONFIG_DRM_SIS=m CONFIG_DRM_GMA500=m CONFIG_DRM_GMA600=y @@ -629,6 +635,8 @@ CONFIG_FB_BACKLIGHT=y # # CONFIG_FB_ARC is not set # CONFIG_FB_VGA16 is not set +# CONFIG_FB_VESA is not set +# CONFIG_FB_EFI is not set # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_LE80578 is not set @@ -739,9 +747,6 @@ CONFIG_XEN_HAVE_PVMMU=y # # Android # -CONFIG_USB_DWC2=m -# CONFIG_USB_DWC2_DEBUG is not set -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m @@ -813,8 +818,9 @@ CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y # -# Pressure Sensors +# Temperature sensors # +# CONFIG_NTB is not set # CONFIG_PWM is not set # diff --git a/kernel/config-x86_64-default b/kernel/config-x86_64-default index b02e6aed4..44109275f 100644 --- a/kernel/config-x86_64-default +++ b/kernel/config-x86_64-default @@ -20,6 +20,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y # CONFIG_NO_HZ_IDLE is not set CONFIG_NO_HZ_FULL=y # CONFIG_NO_HZ_FULL_ALL is not set +# CONFIG_NO_HZ_FULL_SYSIDLE is not set # # CPU/Task time and stats accounting @@ -82,7 +83,6 @@ CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_MOVABLE_NODE is not set # CONFIG_MEMORY_HOTPLUG is not set -CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_USE_PERCPU_NUMA_NODE_ID=y @@ -180,11 +180,6 @@ CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_STATS=y CONFIG_IRQ_REMAP=y -# -# Pressure Sensors -# -# CONFIG_NTB is not set - # # File systems # @@ -218,6 +213,7 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=y # # Digest # +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m CONFIG_CRYPTO_SHA512_SSSE3=m @@ -240,3 +236,9 @@ CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m + +# +# Library routines +# +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_CMPXCHG_LOCKREF=y diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 1694b8cb5..b53ab8e66 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,7 +4,7 @@ ############################################################################### name = kernel -version = 3.11.6 +version = 3.12.4 release = 1 thisapp = linux-%{version} diff --git a/kernel/patches/arm-exynos-mp.patch b/kernel/patches/arm-exynos-mp.patch deleted file mode 100644 index 15667ab26..000000000 --- a/kernel/patches/arm-exynos-mp.patch +++ /dev/null @@ -1,408 +0,0 @@ -commit 8b806e0201b97844d0eff4713eb88f0a6d0f689d -Author: Arnd Bergmann -Date: Fri Jun 14 17:16:30 2013 +0200 - - ARM: exynos multiplatform, next try - - Signed-off-by: Arnd Bergmann - -diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index e401a76..fad9324 100644 ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -422,7 +422,7 @@ choice - - config DEBUG_S3C_UART0 - depends on PLAT_SAMSUNG -- select DEBUG_EXYNOS_UART if ARCH_EXYNOS -+ select DEBUG_EXYNOS_UART if ARCH_EXYNOS_COMMON - bool "Use S3C UART 0 for low-level debug" - help - Say Y here if you want the debug print routines to direct -@@ -434,7 +434,7 @@ choice - - config DEBUG_S3C_UART1 - depends on PLAT_SAMSUNG -- select DEBUG_EXYNOS_UART if ARCH_EXYNOS -+ select DEBUG_EXYNOS_UART if ARCH_EXYNOS_COMMON - bool "Use S3C UART 1 for low-level debug" - help - Say Y here if you want the debug print routines to direct -@@ -446,7 +446,7 @@ choice - - config DEBUG_S3C_UART2 - depends on PLAT_SAMSUNG -- select DEBUG_EXYNOS_UART if ARCH_EXYNOS -+ select DEBUG_EXYNOS_UART if ARCH_EXYNOS_COMMON - bool "Use S3C UART 2 for low-level debug" - help - Say Y here if you want the debug print routines to direct -@@ -457,7 +457,7 @@ choice - by CONFIG_S3C_LOWLEVEL_UART_PORT. - - config DEBUG_S3C_UART3 -- depends on PLAT_SAMSUNG && ARCH_EXYNOS -+ depends on PLAT_SAMSUNG && ARCH_EXYNOS_COMMON - select DEBUG_EXYNOS_UART - bool "Use S3C UART 3 for low-level debug" - help -diff --git a/arch/arm/include/debug/samsung.S b/arch/arm/include/debug/samsung.S -index f3a9cff..8d8d922 100644 ---- a/arch/arm/include/debug/samsung.S -+++ b/arch/arm/include/debug/samsung.S -@@ -9,7 +9,7 @@ - * published by the Free Software Foundation. - */ - --#include -+#include - - /* The S5PV210/S5PC110 implementations are as belows. */ - -diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig -index 855d4a7..8744890 100644 ---- a/arch/arm/mach-exynos/Kconfig -+++ b/arch/arm/mach-exynos/Kconfig -@@ -7,13 +7,24 @@ - - # Configuration options for the EXYNOS4 - --if ARCH_EXYNOS -+config ARCH_EXYNOS_MULTI -+ bool "Samsung EXYNOS" if ARCH_MULTI_V7 -+ select ARCH_HAS_CPUFREQ -+ select CPU_V7 -+ select GENERIC_CLOCKEVENTS -+ select HAVE_CLK -+ select HAVE_S3C2410_I2C if I2C -+ select HAVE_S3C_RTC if RTC_CLASS -+ help -+ Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5) -+ -+if ARCH_EXYNOS || ARCH_EXYNOS_MULTI - - menu "SAMSUNG EXYNOS SoCs Support" - - config ARCH_EXYNOS4 - bool "SAMSUNG EXYNOS4" -- default y -+ default ARCH_EXYNOS - select GIC_NON_BANKED - select HAVE_ARM_SCU if SMP - select HAVE_SMP -@@ -24,12 +35,16 @@ config ARCH_EXYNOS4 - - config ARCH_EXYNOS5 - bool "SAMSUNG EXYNOS5" -+ default ARCH_EXYNOS - select HAVE_ARM_SCU if SMP - select HAVE_SMP - select PINCTRL - help - Samsung EXYNOS5 (Cortex-A15) SoC based systems - -+config ARCH_EXYNOS_COMMON -+ def_bool ARCH_EXYNOS4 || ARCH_EXYNOS5 -+ - comment "EXYNOS SoCs" - - config CPU_EXYNOS4210 -@@ -41,7 +56,7 @@ config CPU_EXYNOS4210 - select PM_GENERIC_DOMAINS if PM - select S5P_PM if PM - select S5P_SLEEP if PM -- select SAMSUNG_DMADEV -+ select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM - help - Enable EXYNOS4210 CPU support - -@@ -49,10 +64,11 @@ config SOC_EXYNOS4212 - bool "SAMSUNG EXYNOS4212" - default y - depends on ARCH_EXYNOS4 -+ select MACH_EXYNOS4_DT - select PINCTRL_EXYNOS - select S5P_PM if PM - select S5P_SLEEP if PM -- select SAMSUNG_DMADEV -+ select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM - help - Enable EXYNOS4212 SoC support - -@@ -60,8 +76,9 @@ config SOC_EXYNOS4412 - bool "SAMSUNG EXYNOS4412" - default y - depends on ARCH_EXYNOS4 -+ select MACH_EXYNOS4_DT - select PINCTRL_EXYNOS -- select SAMSUNG_DMADEV -+ select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM - help - Enable EXYNOS4412 SoC support - -@@ -70,11 +87,12 @@ config SOC_EXYNOS5250 - default y - depends on ARCH_EXYNOS5 - select PINCTRL_EXYNOS -+ select MACH_EXYNOS5_DT - select PM_GENERIC_DOMAINS if PM - select S5P_PM if PM - select S5P_SLEEP if PM - select S5P_DEV_MFC -- select SAMSUNG_DMADEV -+ select SAMSUNG_DMADEV if !ARCH_MULTIPLATFORM - help - Enable EXYNOS5250 SoC support - -@@ -121,9 +139,7 @@ config MACH_EXYNOS4_DT - with this machine file. - - config MACH_EXYNOS5_DT -- bool "SAMSUNG EXYNOS5 Machine using device tree" -- default y -- depends on ARCH_EXYNOS5 -+ bool - select ARM_AMBA - select CLKSRC_OF - select USB_ARCH_HAS_XHCI -diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile -index e970a7a..ae397bb 100644 ---- a/arch/arm/mach-exynos/Makefile -+++ b/arch/arm/mach-exynos/Makefile -diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig -@@ -5,14 +5,11 @@ - # - # Licensed under GPLv2 - --obj-y := --obj-m := --obj-n := --obj- := -+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung - --# Core -+ifdef CONFIG_ARCH_EXYNOS_COMMON - --obj-$(CONFIG_ARCH_EXYNOS) += common.o -+obj-y += pmu.o - - obj-$(CONFIG_S5P_PM) += pm.o - obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o -@@ -24,8 +21,8 @@ - - obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o - --obj-$(CONFIG_ARCH_EXYNOS) += exynos-smc.o --obj-$(CONFIG_ARCH_EXYNOS) += firmware.o -++obj-y += exynos-smc.o -++obj-y += firmware.o - - plus_sec := $(call as-instr,.arch_extension sec,+sec) - AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) -@@ -34,3 +31,5 @@ - - obj-$(CONFIG_MACH_EXYNOS4_DT) += mach-exynos4-dt.o - obj-$(CONFIG_MACH_EXYNOS5_DT) += mach-exynos5-dt.o -+ -+endif -index 3dc5cbe..e61abdc 100644 ---- a/arch/arm/plat-samsung/Kconfig -+++ b/arch/arm/plat-samsung/Kconfig -@@ -6,7 +6,7 @@ - - config PLAT_SAMSUNG - bool -- depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS -+ depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P || ARCH_EXYNOS_COMMON - default y - select GENERIC_IRQ_CHIP - select NO_IOPORT -@@ -176,6 +176,7 @@ config S5P_DEV_UART - - config S3C_ADC - bool "ADC common driver support" -+ depends on !ARCH_MULTIPLATFORM - help - Core support for the ADC block found in the Samsung SoC systems - for drivers such as the touchscreen and hwmon to use to share -@@ -396,6 +397,7 @@ config S5P_DEV_USB_EHCI - - config S3C24XX_PWM - bool "PWM device support" -+ depends on !ARCH_MULTIPLATFORM - select PWM - select PWM_SAMSUNG - help -@@ -453,7 +455,7 @@ comment "Power management" - config SAMSUNG_PM_DEBUG - bool "S3C2410 PM Suspend debug" - depends on PM -- select DEBUG_LL -+ depends on DEBUG_LL && SERIAL_SAMSUNG - help - Say Y here if you want verbose debugging from the PM Suspend and - Resume code. See -diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile -index 98d07d8..b458e7d 100644 ---- a/arch/arm/plat-samsung/Makefile -+++ b/arch/arm/plat-samsung/Makefile -@@ -4,6 +4,9 @@ - # - # Licensed under GPLv2 - -+ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include -+ccflags-$(CONFIG_ARCH_EXYNOS_COMMON) += -I$(srctree)/arch/arm/mach-exynos/include -+ - obj-y := - obj-m := - obj-n := dummy.o -diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c -index 7c1e3b7..dc66bb5 100644 ---- a/arch/arm/plat-samsung/s5p-irq-pm.c -+++ b/arch/arm/plat-samsung/s5p-irq-pm.c -@@ -40,7 +40,7 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state) - unsigned long irqbit; - unsigned int irq_rtc_tic, irq_rtc_alarm; - --#ifdef CONFIG_ARCH_EXYNOS -+#ifdef CONFIG_ARCH_EXYNOS_COMMON - if (soc_is_exynos5250()) { - irq_rtc_tic = EXYNOS5_IRQ_RTC_TIC; - irq_rtc_alarm = EXYNOS5_IRQ_RTC_ALARM; -diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index 81465c2..6bd8b5a 100644 ---- a/drivers/clocksource/Kconfig -+++ b/drivers/clocksource/Kconfig -@@ -75,7 +75,7 @@ config CLKSRC_METAG_GENERIC - This option enables support for the Meta per-thread timers. - - config CLKSRC_EXYNOS_MCT -- def_bool y if ARCH_EXYNOS -+ def_bool y if ARCH_EXYNOS_COMMON - help - Support for Multi Core Timer controller on Exynos SoCs. - -diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 31f3adb..15454ad 100644 ---- a/drivers/devfreq/Kconfig -+++ b/drivers/devfreq/Kconfig -@@ -68,6 +68,7 @@ comment "DEVFREQ Drivers" - config ARM_EXYNOS4_BUS_DEVFREQ - bool "ARM Exynos4210/4212/4412 Memory Bus DEVFREQ Driver" - depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412 -+ depends on !ARCH_MULTIPLATFORM - select ARCH_HAS_OPP - select DEVFREQ_GOV_SIMPLE_ONDEMAND - help -diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig -index 6c6034e..d9ed7c0 100644 ---- a/drivers/iommu/Kconfig -+++ b/drivers/iommu/Kconfig -@@ -168,7 +168,7 @@ config TEGRA_IOMMU_SMMU - - config EXYNOS_IOMMU - bool "Exynos IOMMU Support" -- depends on ARCH_EXYNOS && EXYNOS_DEV_SYSMMU -+ depends on ARCH_EXYNOS_COMMON && EXYNOS_DEV_SYSMMU - select IOMMU_API - help - Support for the IOMMU(System MMU) of Samsung Exynos application -diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index 5a8ad51..03688dd 100644 ---- a/drivers/pinctrl/Kconfig -+++ b/drivers/pinctrl/Kconfig -@@ -252,7 +252,7 @@ config PINCTRL_SAMSUNG - - config PINCTRL_EXYNOS - bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440" -- depends on OF && GPIOLIB && ARCH_EXYNOS -+ depends on OF && GPIOLIB && ARCH_EXYNOS_COMMON - select PINCTRL_SAMSUNG - - config PINCTRL_EXYNOS5440 -diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig -index 75840b5..746a931 100644 ---- a/drivers/pwm/Kconfig -+++ b/drivers/pwm/Kconfig -@@ -140,7 +140,7 @@ config PWM_RENESAS_TPU - - config PWM_SAMSUNG - tristate "Samsung PWM support" -- depends on PLAT_SAMSUNG -+ depends on PLAT_SAMSUNG && !ARCH_MULTIPLATFORM - help - Generic PWM framework driver for Samsung. - -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 89cbbab..830b8e7 100644 ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -365,7 +365,7 @@ config SPI_S3C24XX_FIQ - - config SPI_S3C64XX - tristate "Samsung S3C64XX series type SPI" -- depends on (ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS) -+ depends on (ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS_COMMON) - select S3C64XX_DMA if ARCH_S3C64XX - help - SPI driver for Samsung S3C64XX and newer SoCs. -diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig -index 4263d01..d7ad720 100644 ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -462,7 +462,7 @@ config USB_OHCI_SH - - config USB_OHCI_EXYNOS - boolean "OHCI support for Samsung EXYNOS SoC Series" -- depends on ARCH_EXYNOS -+ depends on ARCH_EXYNOS_COMMON - help - Enable support for the Samsung Exynos SOC's on-chip OHCI controller. - -diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig -index 2c301f8..0ba3e03 100644 ---- a/drivers/video/Kconfig -+++ b/drivers/video/Kconfig -@@ -2039,7 +2039,7 @@ config FB_TMIO_ACCELL - config FB_S3C - tristate "Samsung S3C framebuffer support" - depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || ARCH_S5P64X0 || \ -- ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) -+ ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS_COMMON) - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT -diff --git a/drivers/video/exynos/Kconfig b/drivers/video/exynos/Kconfig -index b8abda5..216af14 100644 ---- a/drivers/video/exynos/Kconfig -+++ b/drivers/video/exynos/Kconfig -@@ -15,7 +15,7 @@ if EXYNOS_VIDEO - - config EXYNOS_MIPI_DSI - bool "EXYNOS MIPI DSI driver support." -- depends on ARCH_S5PV210 || ARCH_EXYNOS -+ depends on ARCH_S5PV210 || ARCH_EXYNOS_COMMON - help - This enables support for MIPI-DSI device. - -@@ -29,7 +29,7 @@ config EXYNOS_LCD_S6E8AX0 - - config EXYNOS_DP - bool "EXYNOS DP driver support" -- depends on ARCH_EXYNOS -+ depends on ARCH_EXYNOS_COMMON - default n - help - This enables support for DP device. -diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig -index 9855dfc..fcb2045 100644 ---- a/sound/soc/samsung/Kconfig -+++ b/sound/soc/samsung/Kconfig -@@ -1,6 +1,6 @@ - config SND_SOC_SAMSUNG - tristate "ASoC support for Samsung" -- depends on PLAT_SAMSUNG -+ depends on PLAT_SAMSUNG && !ARCH_MULTIPLATFORM - select S3C64XX_DMA if ARCH_S3C64XX - select S3C2410_DMA if ARCH_S3C24XX - help diff --git a/kernel/patches/grsecurity-2.9.1-3.11.6-201310191259.patch b/kernel/patches/grsecurity-3.0-3.12.4-201312081754.patch similarity index 85% rename from kernel/patches/grsecurity-2.9.1-3.11.6-201310191259.patch rename to kernel/patches/grsecurity-3.0-3.12.4-201312081754.patch index 46b1e15ce..fa9c2c7fd 100644 --- a/kernel/patches/grsecurity-2.9.1-3.11.6-201310191259.patch +++ b/kernel/patches/grsecurity-3.0-3.12.4-201312081754.patch @@ -229,10 +229,10 @@ index b89a739..79768fb 100644 +zconf.lex.c zoffset.h diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 7f9d4f5..6d1afd6 100644 +index fcbb736..5508d8c 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -976,6 +976,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -1031,6 +1031,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. Format: such that (rxsize & ~0x1fffc0) == 0. Default: 1024 @@ -243,7 +243,7 @@ index 7f9d4f5..6d1afd6 100644 hashdist= [KNL,NUMA] Large hashes allocated during boot are distributed across NUMA nodes. Defaults on for 64-bit NUMA, off otherwise. -@@ -1932,6 +1936,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -1999,6 +2003,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. noexec=on: enable non-executable mappings (default) noexec=off: disable non-executable mappings @@ -254,7 +254,7 @@ index 7f9d4f5..6d1afd6 100644 nosmap [X86] Disable SMAP (Supervisor Mode Access Prevention) even if it is supported by processor. -@@ -2199,6 +2207,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -2266,6 +2274,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted. the specified number of seconds. This is to be used if your oopses keep scrolling off the screen. @@ -281,7 +281,7 @@ index 7f9d4f5..6d1afd6 100644 pcd. [PARIDE] diff --git a/Makefile b/Makefile -index e87ba83..ee3c7b7 100644 +index 3b7165e..9112a63 100644 --- a/Makefile +++ b/Makefile @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -399,8 +399,8 @@ index e87ba83..ee3c7b7 100644 +$(vmlinux-dirs): gcc-plugins prepare scripts $(Q)$(MAKE) $(build)=$@ - # Store (new) KERNELRELEASE string in include/config/kernel.release -@@ -835,6 +897,7 @@ prepare0: archprepare FORCE + define filechk_kernel.release +@@ -838,6 +900,7 @@ prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=. # All the preparing.. @@ -408,7 +408,7 @@ index e87ba83..ee3c7b7 100644 prepare: prepare0 # Generate some files -@@ -942,6 +1005,8 @@ all: modules +@@ -945,6 +1008,8 @@ all: modules # using awk while concatenating to the final file. PHONY += modules @@ -417,7 +417,7 @@ index e87ba83..ee3c7b7 100644 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order @$(kecho) ' Building modules, stage 2.'; -@@ -957,7 +1022,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) +@@ -960,7 +1025,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin) # Target to prepare building external modules PHONY += modules_prepare @@ -426,7 +426,7 @@ index e87ba83..ee3c7b7 100644 # Target to install modules PHONY += modules_install -@@ -1023,7 +1088,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ +@@ -1026,7 +1091,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \ signing_key.priv signing_key.x509 x509.genkey \ extra_certificates signing_key.x509.keyid \ @@ -435,7 +435,7 @@ index e87ba83..ee3c7b7 100644 # clean - Delete most, but leave enough to build external modules # -@@ -1063,6 +1128,7 @@ distclean: mrproper +@@ -1066,6 +1131,7 @@ distclean: mrproper \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \ -o -name '.*.rej' \ @@ -443,7 +443,7 @@ index e87ba83..ee3c7b7 100644 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \ -type f -print | xargs rm -f -@@ -1224,6 +1290,8 @@ PHONY += $(module-dirs) modules +@@ -1227,6 +1293,8 @@ PHONY += $(module-dirs) modules $(module-dirs): crmodverdir $(objtree)/Module.symvers $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@) @@ -452,7 +452,7 @@ index e87ba83..ee3c7b7 100644 modules: $(module-dirs) @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1363,17 +1431,21 @@ else +@@ -1366,17 +1434,21 @@ else target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@)) endif @@ -478,7 +478,7 @@ index e87ba83..ee3c7b7 100644 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) %.symtypes: %.c prepare scripts FORCE $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) -@@ -1383,11 +1455,15 @@ endif +@@ -1386,11 +1458,15 @@ endif $(cmd_crmodverdir) $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ $(build)=$(build-dir) @@ -669,7 +669,7 @@ index 1402fcc..0b1abd2 100644 return addr; } diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c -index 0c4132d..88f0d53 100644 +index 98838a0..b304fb4 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm) @@ -829,10 +829,10 @@ index 0c4132d..88f0d53 100644 /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 43594d5..da71e62 100644 +index 1ad6fb6..9406b3d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1791,7 +1791,7 @@ config ALIGNMENT_TRAP +@@ -1832,7 +1832,7 @@ config ALIGNMENT_TRAP config UACCESS_WITH_MEMCPY bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()" @@ -841,6 +841,14 @@ index 43594d5..da71e62 100644 default y if CPU_FEROCEON help Implement faster copy_to_user and clear_user methods for CPU +@@ -2097,6 +2097,7 @@ config XIP_PHYS_ADDR + config KEXEC + bool "Kexec system call (EXPERIMENTAL)" + depends on (!SMP || PM_SLEEP_SMP) ++ depends on !GRKERNSEC_KMEM + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index da1c77d..2ee6056 100644 --- a/arch/arm/include/asm/atomic.h @@ -1530,7 +1538,7 @@ index 75fe66b..ba3dee4 100644 #endif diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h -index 17d0ae8..014e350 100644 +index 15f2d5b..43ffa53 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -116,7 +116,7 @@ struct cpu_cache_fns { @@ -1642,10 +1650,10 @@ index 6ddbe44..b5e38b1 100644 static inline void set_domain(unsigned val) { } static inline void modify_domain(unsigned dom, unsigned type) { } diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h -index 56211f2..17e8a25 100644 +index f4b46d3..abc9b2b 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h -@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); +@@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -1661,7 +1669,7 @@ index 56211f2..17e8a25 100644 /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); +@@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs); extern void elf_set_personality(const struct elf32_hdr *); #define SET_PERSONALITY(ex) elf_set_personality(&(ex)) @@ -1791,7 +1799,7 @@ index 2fe141f..192dc01 100644 #ifdef CONFIG_MMU extern void iotable_init(struct map_desc *, int); diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h -index 12f71a1..04e063c 100644 +index f94784f..9a09a4a 100644 --- a/arch/arm/include/asm/outercache.h +++ b/arch/arm/include/asm/outercache.h @@ -35,7 +35,7 @@ struct outer_cache_fns { @@ -1801,7 +1809,7 @@ index 12f71a1..04e063c 100644 -}; +} __no_const; - #ifdef CONFIG_OUTER_CACHE + extern struct outer_cache_fns outer_cache; diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index 4355f0e..c229913 100644 @@ -1960,7 +1968,7 @@ index 5689c18..eea12f9 100644 #define L_PTE_DIRTY_HIGH (1 << (55 - 32)) diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h -index 04aeb02..73b70dd 100644 +index be956db..c8f25e2 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -33,6 +33,9 @@ @@ -2091,35 +2099,11 @@ index a8cae71c..65dd797 100644 /* * set platform specific SMP operations -diff --git a/arch/arm/include/asm/syscall.h b/arch/arm/include/asm/syscall.h -index f1d96d4..73ddd72 100644 ---- a/arch/arm/include/asm/syscall.h -+++ b/arch/arm/include/asm/syscall.h -@@ -57,6 +57,9 @@ static inline void syscall_get_arguments(struct task_struct *task, - unsigned int i, unsigned int n, - unsigned long *args) - { -+ if (n == 0) -+ return; -+ - if (i + n > SYSCALL_MAX_ARGS) { - unsigned long *args_bad = args + SYSCALL_MAX_ARGS - i; - unsigned int n_bad = n + i - SYSCALL_MAX_ARGS; -@@ -81,6 +84,9 @@ static inline void syscall_set_arguments(struct task_struct *task, - unsigned int i, unsigned int n, - const unsigned long *args) - { -+ if (n == 0) -+ return; -+ - if (i + n > SYSCALL_MAX_ARGS) { - pr_warning("%s called with max args %d, handling only %d\n", - __func__, i + n, SYSCALL_MAX_ARGS); diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h -index 2b8114f..8fe9bcf 100644 +index df5e13d..97efb82 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h -@@ -77,9 +77,9 @@ struct thread_info { +@@ -88,9 +88,9 @@ struct thread_info { .flags = 0, \ .preempt_count = INIT_PREEMPT_COUNT, \ .addr_limit = KERNEL_DS, \ @@ -2132,7 +2116,7 @@ index 2b8114f..8fe9bcf 100644 .restart_block = { \ .fn = do_no_restart_syscall, \ }, \ -@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, +@@ -163,7 +163,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, #define TIF_SYSCALL_AUDIT 9 #define TIF_SYSCALL_TRACEPOINT 10 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */ @@ -2145,7 +2129,7 @@ index 2b8114f..8fe9bcf 100644 #define TIF_USING_IWMMXT 17 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */ #define TIF_RESTORE_SIGMASK 20 -@@ -165,10 +169,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, +@@ -176,10 +180,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT) @@ -2159,7 +2143,7 @@ index 2b8114f..8fe9bcf 100644 /* * Change these and you break ASM code in entry-common.S diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h -index 7e1f760..de33b13 100644 +index 72abdc5..9eba222 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -18,6 +18,7 @@ @@ -2168,9 +2152,9 @@ index 7e1f760..de33b13 100644 #include +#include - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 -@@ -63,11 +64,38 @@ extern int __put_user_bad(void); + #if __LINUX_ARM_ARCH__ < 6 + #include +@@ -70,11 +71,38 @@ extern int __put_user_bad(void); static inline void set_fs(mm_segment_t fs) { current_thread_info()->addr_limit = fs; @@ -2210,7 +2194,7 @@ index 7e1f760..de33b13 100644 #define __addr_ok(addr) ({ \ unsigned long flag; \ __asm__("cmp %2, %0; movlo %0, #0" \ -@@ -143,8 +171,12 @@ extern int __get_user_4(void *); +@@ -150,8 +178,12 @@ extern int __get_user_4(void *); #define get_user(x,p) \ ({ \ @@ -2224,7 +2208,7 @@ index 7e1f760..de33b13 100644 }) extern int __put_user_1(void *, unsigned int); -@@ -188,8 +220,12 @@ extern int __put_user_8(void *, unsigned long long); +@@ -195,8 +227,12 @@ extern int __put_user_8(void *, unsigned long long); #define put_user(x,p) \ ({ \ @@ -2238,7 +2222,7 @@ index 7e1f760..de33b13 100644 }) #else /* CONFIG_MMU */ -@@ -230,13 +266,17 @@ static inline void set_fs(mm_segment_t fs) +@@ -237,13 +273,17 @@ static inline void set_fs(mm_segment_t fs) #define __get_user(x,ptr) \ ({ \ long __gu_err = 0; \ @@ -2256,7 +2240,7 @@ index 7e1f760..de33b13 100644 (void) 0; \ }) -@@ -312,13 +352,17 @@ do { \ +@@ -319,13 +359,17 @@ do { \ #define __put_user(x,ptr) \ ({ \ long __pu_err = 0; \ @@ -2274,7 +2258,7 @@ index 7e1f760..de33b13 100644 (void) 0; \ }) -@@ -418,11 +462,44 @@ do { \ +@@ -425,11 +469,44 @@ do { \ #ifdef CONFIG_MMU @@ -2322,7 +2306,7 @@ index 7e1f760..de33b13 100644 #else #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0) #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0) -@@ -431,6 +508,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l +@@ -438,6 +515,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { @@ -2332,7 +2316,7 @@ index 7e1f760..de33b13 100644 if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else /* security hole - plug it */ -@@ -440,6 +520,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u +@@ -447,6 +527,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2382,7 +2366,7 @@ index 60d3b73..e5a0f22 100644 EXPORT_SYMBOL(__get_user_1); EXPORT_SYMBOL(__get_user_2); diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S -index 9cbe70c..a7b5e34 100644 +index ec3e5cf..b450ee3 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -47,6 +47,87 @@ @@ -2514,7 +2498,7 @@ index 9cbe70c..a7b5e34 100644 SPFIX( addeq r2, r2, #4 ) str r3, [sp, #-4]! @ save the "real" r0 copied @ from the exception stack -@@ -316,6 +410,9 @@ ENDPROC(__pabt_svc) +@@ -317,6 +411,9 @@ ENDPROC(__pabt_svc) .macro usr_entry UNWIND(.fnstart ) UNWIND(.cantunwind ) @ don't unwind the user space @@ -2524,7 +2508,7 @@ index 9cbe70c..a7b5e34 100644 sub sp, sp, #S_FRAME_SIZE ARM( stmib sp, {r1 - r12} ) THUMB( stmia sp, {r0 - r12} ) -@@ -415,7 +512,9 @@ __und_usr: +@@ -416,7 +513,9 @@ __und_usr: tst r3, #PSR_T_BIT @ Thumb mode? bne __und_usr_thumb sub r4, r2, #4 @ ARM instr at LR - 4 @@ -2534,7 +2518,7 @@ index 9cbe70c..a7b5e34 100644 #ifdef CONFIG_CPU_ENDIAN_BE8 rev r0, r0 @ little endian instruction #endif -@@ -450,10 +549,14 @@ __und_usr_thumb: +@@ -451,10 +550,14 @@ __und_usr_thumb: */ .arch armv6t2 #endif @@ -2549,7 +2533,7 @@ index 9cbe70c..a7b5e34 100644 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update orr r0, r0, r5, lsl #16 -@@ -482,7 +585,8 @@ ENDPROC(__und_usr) +@@ -483,7 +586,8 @@ ENDPROC(__und_usr) */ .pushsection .fixup, "ax" .align 2 @@ -2559,7 +2543,7 @@ index 9cbe70c..a7b5e34 100644 .popsection .pushsection __ex_table,"a" .long 1b, 4b -@@ -692,7 +796,7 @@ ENTRY(__switch_to) +@@ -693,7 +797,7 @@ ENTRY(__switch_to) THUMB( str lr, [ip], #4 ) ldr r4, [r2, #TI_TP_VALUE] ldr r5, [r2, #TI_TP_VALUE + 4] @@ -2568,7 +2552,7 @@ index 9cbe70c..a7b5e34 100644 ldr r6, [r2, #TI_CPU_DOMAIN] #endif switch_tls r1, r4, r5, r3, r7 -@@ -701,7 +805,7 @@ ENTRY(__switch_to) +@@ -702,7 +806,7 @@ ENTRY(__switch_to) ldr r8, =__stack_chk_guard ldr r7, [r7, #TSK_STACK_CANARY] #endif @@ -2578,7 +2562,7 @@ index 9cbe70c..a7b5e34 100644 #endif mov r5, r0 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S -index 94104bf..e425391 100644 +index bc6bd96..bd026cb 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -10,18 +10,46 @@ @@ -2645,7 +2629,7 @@ index 94104bf..e425391 100644 #if defined(CONFIG_OABI_COMPAT) diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S -index de23a9b..94c37c4 100644 +index 39f89fb..d612bd9 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -184,6 +184,60 @@ @@ -2745,7 +2729,7 @@ index 918875d..cd5fa27 100644 flush_icache_range((unsigned long)base + offset, offset + length); diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S -index 2c7cc1e..ab2e911 100644 +index 476de57..4857a76 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -52,7 +52,9 @@ @@ -2769,7 +2753,7 @@ index 2c7cc1e..ab2e911 100644 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer #endif diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c -index 85c3fb6..054c2dc 100644 +index 084dc88..fce4e68 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c @@ -37,12 +37,39 @@ @@ -2971,7 +2955,7 @@ index 0dd3b79..e018f64 100644 if (secure_computing(scno) == -1) return -1; diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index afc2489..6372bc8 100644 +index 0e1e2b3..c0e821d 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -98,21 +98,23 @@ EXPORT_SYMBOL(system_serial_high); @@ -3086,10 +3070,10 @@ index ab33042..11248a8 100644 - return page; -} diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c -index 2dc1934..ecf0e21 100644 +index 72024ea..ae302dd 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c -@@ -71,7 +71,7 @@ enum ipi_msg_type { +@@ -70,7 +70,7 @@ enum ipi_msg_type { static DECLARE_COMPLETION(cpu_running); @@ -3099,7 +3083,7 @@ index 2dc1934..ecf0e21 100644 void __init smp_set_ops(struct smp_operations *ops) { diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c -index ab517fc..9adf2fa 100644 +index 8fcda14..4512b9d 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -55,7 +55,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long); @@ -3130,7 +3114,7 @@ index ab517fc..9adf2fa 100644 if (signr) do_exit(signr); } -@@ -592,7 +597,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) +@@ -628,7 +633,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) * The user helper at 0xffff0fe0 must be used instead. * (see entry-armv.S for details) */ @@ -3140,7 +3124,7 @@ index ab517fc..9adf2fa 100644 } return 0; -@@ -849,7 +856,11 @@ void __init early_trap_init(void *vectors_base) +@@ -885,7 +892,11 @@ void __init early_trap_init(void *vectors_base) kuser_init(vectors_base); flush_icache_range(vectors, vectors + PAGE_SIZE * 2); @@ -3224,7 +3208,7 @@ index 7bcee5c..e2f3249 100644 __data_loc = .; #endif diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c -index 741f66a..8a5615c 100644 +index 9c697db..115237f 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -56,7 +56,7 @@ static unsigned long hyp_default_vectors; @@ -3236,7 +3220,7 @@ index 741f66a..8a5615c 100644 static u8 kvm_next_vmid; static DEFINE_SPINLOCK(kvm_vmid_lock); -@@ -392,7 +392,7 @@ void force_vm_exit(const cpumask_t *mask) +@@ -396,7 +396,7 @@ void force_vm_exit(const cpumask_t *mask) */ static bool need_new_vmid_gen(struct kvm *kvm) { @@ -3245,7 +3229,7 @@ index 741f66a..8a5615c 100644 } /** -@@ -425,7 +425,7 @@ static void update_vttbr(struct kvm *kvm) +@@ -429,7 +429,7 @@ static void update_vttbr(struct kvm *kvm) /* First user of a new VMID generation? */ if (unlikely(kvm_next_vmid == 0)) { @@ -3254,7 +3238,7 @@ index 741f66a..8a5615c 100644 kvm_next_vmid = 1; /* -@@ -442,7 +442,7 @@ static void update_vttbr(struct kvm *kvm) +@@ -446,7 +446,7 @@ static void update_vttbr(struct kvm *kvm) kvm_call_hyp(__kvm_flush_vm_context); } @@ -3410,10 +3394,10 @@ index 025f742..a9e5b3b 100644 /* See rational for this in __copy_to_user() above. */ if (n < 64) diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c -index e9238b5..6ed904a 100644 +index 1767611..d2e7e24 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c -@@ -150,7 +150,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw) +@@ -156,7 +156,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw) clk_gate_ops.disable(hw); } @@ -3431,7 +3415,7 @@ index e9238b5..6ed904a 100644 static struct clk __init *clk_register_gate_fn(struct device *dev, const char *name, -@@ -184,14 +193,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev, +@@ -190,14 +199,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev, gate_fn->fn_en = fn_en; gate_fn->fn_dis = fn_dis; @@ -3460,7 +3444,7 @@ index 827d1500..2885dc6 100644 }; diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c -index f3fdd6a..3564800 100644 +index 579697a..1d5a3b2 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -148,7 +148,6 @@ struct omap3_gpmc_regs { @@ -3468,7 +3452,7 @@ index f3fdd6a..3564800 100644 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ]; -static struct irq_chip gpmc_irq_chip; - static unsigned gpmc_irq_start; + static int gpmc_irq_start; static struct resource gpmc_mem_root; @@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { } @@ -3542,7 +3526,7 @@ index 813c615..ce467c6 100644 }; diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c -index f99f68e..e573e20 100644 +index 53f0735..5b54eb6 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -504,7 +504,7 @@ void omap_device_delete(struct omap_device *od) @@ -3583,7 +3567,7 @@ index 17ca1ae..beba869 100644 struct omap_device *omap_device_alloc(struct platform_device *pdev, struct omap_hwmod **ohs, int oh_cnt); diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c -index 7f4db12..0243012 100644 +index 3d5db8c..ddfa144 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops { @@ -3624,7 +3608,7 @@ index d15c7bb..b2d1f0c 100644 sizeof(struct omap_wd_timer_platform_data)); WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n", diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c -index 706aa42..f85e9131 100644 +index b82dcae..44ee5b6 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c @@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev, @@ -3637,10 +3621,10 @@ index 706aa42..f85e9131 100644 cpuidle_coupled_parallel_barrier(dev, &abort_barrier); diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h -index cad3ca86..1d79e0f 100644 +index 656324a..0beba28 100644 --- a/arch/arm/mach-ux500/setup.h +++ b/arch/arm/mach-ux500/setup.h -@@ -37,13 +37,6 @@ extern void ux500_timer_init(void); +@@ -40,13 +40,6 @@ extern void ux500_timer_init(void); .type = MT_DEVICE, \ } @@ -3655,7 +3639,7 @@ index cad3ca86..1d79e0f 100644 extern void ux500_cpu_die(unsigned int cpu); diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig -index cd2c88e..7430282 100644 +index cd2c88e..4dd9b67 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -446,7 +446,7 @@ config CPU_32v5 @@ -3671,7 +3655,7 @@ index cd2c88e..7430282 100644 config CPU_USE_DOMAINS bool -+ depends on !ARM_LPAE && !PAX_KERNEXEC ++ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF help This option enables or disables the use of domain switching via the set_fs() function. @@ -3679,7 +3663,7 @@ index cd2c88e..7430282 100644 config KUSER_HELPERS bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS default y -+ depends on !(CPU_V6 || CPU_V6K || CPU_V7) ++ depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND help Warning: disabling this option may break user programs. @@ -3757,8 +3741,21 @@ index 6f4585b..7b6f52b 100644 if (err) \ goto fault; \ } while (0) +diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c +index 447da6f..77a5057 100644 +--- a/arch/arm/mm/cache-l2x0.c ++++ b/arch/arm/mm/cache-l2x0.c +@@ -45,7 +45,7 @@ struct l2x0_of_data { + void (*setup)(const struct device_node *, u32 *, u32 *); + void (*save)(void); + struct outer_cache_fns outer_cache; +-}; ++} __do_const; + + static bool of_init = false; + diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c -index 4a05444..d21968c 100644 +index 84e6f77..0b52f31 100644 --- a/arch/arm/mm/context.c +++ b/arch/arm/mm/context.c @@ -43,7 +43,7 @@ @@ -3770,7 +3767,7 @@ index 4a05444..d21968c 100644 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS); static DEFINE_PER_CPU(atomic64_t, active_asids); -@@ -183,7 +183,7 @@ static int is_reserved_asid(u64 asid) +@@ -180,7 +180,7 @@ static int is_reserved_asid(u64 asid) static u64 new_context(struct mm_struct *mm, unsigned int cpu) { u64 asid = atomic64_read(&mm->context.id); @@ -3779,7 +3776,7 @@ index 4a05444..d21968c 100644 if (asid != 0 && is_reserved_asid(asid)) { /* -@@ -201,7 +201,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu) +@@ -198,7 +198,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu) */ asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1); if (asid == NUM_USER_ASIDS) { @@ -3788,7 +3785,7 @@ index 4a05444..d21968c 100644 &asid_generation); flush_context(cpu); asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1); -@@ -230,14 +230,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk) +@@ -227,14 +227,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk) cpu_set_reserved_ttbr0(); asid = atomic64_read(&mm->context.id); @@ -3806,7 +3803,7 @@ index 4a05444..d21968c 100644 atomic64_set(&mm->context.id, asid); } diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c -index c97f794..6461880 100644 +index eb8830a..5360ce7 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -25,6 +25,7 @@ @@ -3817,10 +3814,21 @@ index c97f794..6461880 100644 #include "fault.h" -@@ -138,6 +139,20 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, +@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, if (fixup_exception(regs)) return; ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (addr < TASK_SIZE) { ++ if (current->signal->curr_ip) ++ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", ¤t->signal->curr_ip, current->comm, task_pid_nr(current), ++ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr); ++ else ++ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current), ++ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr); ++ } ++#endif ++ +#ifdef CONFIG_PAX_KERNEXEC + if ((fsr & FSR_WRITE) && + (((unsigned long)_stext <= addr && addr < init_mm.end_code) || @@ -3838,7 +3846,7 @@ index c97f794..6461880 100644 /* * No handler, we'll have to terminate things with extreme prejudice. */ -@@ -174,6 +189,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr, +@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr, } #endif @@ -3852,7 +3860,7 @@ index c97f794..6461880 100644 tsk->thread.address = addr; tsk->thread.error_code = fsr; tsk->thread.trap_no = 14; -@@ -398,6 +420,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) +@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) } #endif /* CONFIG_MMU */ @@ -3886,7 +3894,7 @@ index c97f794..6461880 100644 /* * First Level Translation Fault Handler * -@@ -545,9 +594,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) +@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs) const struct fsr_info *inf = fsr_info + fsr_fs(fsr); struct siginfo info; @@ -3909,7 +3917,7 @@ index c97f794..6461880 100644 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n", inf->name, fsr, addr); -@@ -571,15 +633,92 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs * +@@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs * ifsr_info[nr].name = name; } @@ -3954,6 +3962,12 @@ index c97f794..6461880 100644 + * PaX: __kuser_cmpxchg emulation + */ + // TODO ++ //long new; ++ //int op; ++ ++ //op = FUTEX_OP_SET << 28; ++ //new = futex_atomic_op_inuser(op, regs->ARM_r2); ++ //regs->ARM_r0 = old != new; + //regs->ARM_pc = regs->ARM_lr; + //return; + } @@ -4033,7 +4047,7 @@ index cf08bdf..772656c 100644 unsigned long search_exception_table(unsigned long addr); diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c -index 15225d8..25e2e3c 100644 +index 18ec4c5..479bb6a 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -30,6 +30,8 @@ @@ -4045,7 +4059,7 @@ index 15225d8..25e2e3c 100644 #include #include -@@ -683,7 +685,46 @@ void free_initmem(void) +@@ -684,7 +686,46 @@ void free_initmem(void) { #ifdef CONFIG_HAVE_TCM extern char __tcm_start, __tcm_end; @@ -4220,7 +4234,7 @@ index 0c63562..7128a90 100644 } } diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c -index 53cdbd3..670f177 100644 +index b1d17ee..7a6f4d3 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -36,6 +36,22 @@ @@ -4490,7 +4504,7 @@ index 53cdbd3..670f177 100644 + +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE); + - static void __init devicemaps_init(struct machine_desc *mdesc) + static void __init devicemaps_init(const struct machine_desc *mdesc) { struct map_desc map; unsigned long addr; @@ -4506,7 +4520,7 @@ index 53cdbd3..670f177 100644 for (addr = VMALLOC_START; addr; addr += PMD_SIZE) pmd_clear(pmd_off_k(addr)); -@@ -1237,7 +1323,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) +@@ -1237,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc) * location (0xffff0000). If we aren't using high-vectors, also * create a mapping at the low-vectors virtual address. */ @@ -4635,7 +4649,7 @@ index 479330b..53717a8 100644 #endif /* __ASM_AVR32_KMAP_TYPES_H */ diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c -index b2f2d2d..d1c85cb 100644 +index 0eca933..eb78c7b 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap) @@ -4662,7 +4676,7 @@ index b2f2d2d..d1c85cb 100644 /* * This routine handles page faults. It determines the address and the * problem, and then passes it off to one of the appropriate routines. -@@ -174,6 +191,16 @@ bad_area: +@@ -176,6 +193,16 @@ bad_area: up_read(&mm->mmap_sem); if (user_mode(regs)) { @@ -4831,6 +4845,18 @@ index f4ca594..adc72fd6 100644 #define __cacheline_aligned __aligned(L1_CACHE_BYTES) #define ____cacheline_aligned __aligned(L1_CACHE_BYTES) +diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig +index 7740ab1..17fa8c5 100644 +--- a/arch/ia64/Kconfig ++++ b/arch/ia64/Kconfig +@@ -554,6 +554,7 @@ source "drivers/sn/Kconfig" + config KEXEC + bool "kexec system call" + depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) ++ depends on !GRKERNSEC_KMEM + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h index 6e6fe18..a6ae668 100644 --- a/arch/ia64/include/asm/atomic.h @@ -4953,7 +4979,7 @@ index 7935115..c0eca6a 100644 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h -index 54ff557..70c88b7 100644 +index 45698cd..e8e2dbc 100644 --- a/arch/ia64/include/asm/spinlock.h +++ b/arch/ia64/include/asm/spinlock.h @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock) @@ -5133,7 +5159,7 @@ index ab33328..f39506c 100644 .notifier_call = palinfo_cpu_callback, .priority = 0, diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c -index 41e33f8..65180b2 100644 +index 41e33f8..65180b2a 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len @@ -5180,7 +5206,7 @@ index 0ccb28f..8992469 100644 * ensure percpu data fits * into percpu page size diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c -index 6cf0341..d352594 100644 +index 7225dad..2a7c8256 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address) @@ -5207,7 +5233,7 @@ index 6cf0341..d352594 100644 # define VM_READ_BIT 0 # define VM_WRITE_BIT 1 # define VM_EXEC_BIT 2 -@@ -149,8 +166,21 @@ retry: +@@ -151,8 +168,21 @@ retry: if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE)))) goto bad_area; @@ -5231,10 +5257,10 @@ index 6cf0341..d352594 100644 /* * If for any reason at all we couldn't handle the fault, make diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c -index 76069c1..c2aa816 100644 +index 68232db..6ca80af 100644 --- a/arch/ia64/mm/hugetlbpage.c +++ b/arch/ia64/mm/hugetlbpage.c -@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u +@@ -154,6 +154,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u unsigned long pgoff, unsigned long flags) { struct vm_unmapped_area_info info; @@ -5242,7 +5268,7 @@ index 76069c1..c2aa816 100644 if (len > RGN_MAP_LIMIT) return -ENOMEM; -@@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u +@@ -177,6 +178,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT; info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1); info.align_offset = 0; @@ -5332,10 +5358,10 @@ index 0395c51..5f26031 100644 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c -index 3c52fa6..11b2ad8 100644 +index 0424315..defcca9 100644 --- a/arch/metag/mm/hugetlbpage.c +++ b/arch/metag/mm/hugetlbpage.c -@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len) +@@ -205,6 +205,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len) info.high_limit = TASK_SIZE; info.align_mask = PAGE_MASK & HUGEPT_MASK; info.align_offset = 0; @@ -5361,6 +5387,18 @@ index 4efe96a..60e8699 100644 #define SMP_CACHE_BYTES L1_CACHE_BYTES +diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig +index f75ab4a..adc6968 100644 +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -2283,6 +2283,7 @@ source "kernel/Kconfig.preempt" + + config KEXEC + bool "Kexec system call" ++ depends on !GRKERNSEC_KMEM + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h index 08b6079..8b554d2 100644 --- a/arch/mips/include/asm/atomic.h @@ -6714,10 +6752,10 @@ index 84536bf..79caa4d 100644 } /* Arrange for an interrupt in a short while */ diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c -index aec3408..74d79d3 100644 +index 524841f..3eef41e 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c -@@ -683,7 +683,18 @@ asmlinkage void do_ov(struct pt_regs *regs) +@@ -684,7 +684,18 @@ asmlinkage void do_ov(struct pt_regs *regs) siginfo_t info; prev_state = exception_enter(); @@ -6738,7 +6776,7 @@ index aec3408..74d79d3 100644 info.si_code = FPE_INTOVF; info.si_signo = SIGFPE; diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c -index 85df1cd..4f0a4de 100644 +index becc42b..9e43d4b 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -28,6 +28,23 @@ @@ -6765,7 +6803,7 @@ index 85df1cd..4f0a4de 100644 /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -@@ -197,6 +214,14 @@ bad_area: +@@ -199,6 +216,14 @@ bad_area: bad_area_nosemaphore: /* User mode accesses just cause a SIGSEGV */ if (user_mode(regs)) { @@ -7278,10 +7316,10 @@ index 5dfd248..64914ac 100644 return addr; } diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c -index b3f87a3..5d5d03d 100644 +index 1cd1d0c..44ec918 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c -@@ -727,9 +727,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) +@@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) down_read(¤t->mm->mmap_sem); vma = find_vma(current->mm,regs->iaoq[0]); @@ -7293,7 +7331,7 @@ index b3f87a3..5d5d03d 100644 fault_space = regs->iasq[0]; diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c -index f247a34..dc0f219 100644 +index 0293588..3b229aa 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -15,6 +15,7 @@ @@ -7430,9 +7468,9 @@ index f247a34..dc0f219 100644 int fixup_exception(struct pt_regs *regs) { const struct exception_table_entry *fix; -@@ -194,8 +305,33 @@ good_area: +@@ -204,8 +315,33 @@ retry: - acc_type = parisc_acctyp(code,regs->iir); + good_area: - if ((vma->vm_flags & acc_type) != acc_type) + if ((vma->vm_flags & acc_type) != acc_type) { @@ -7465,6 +7503,18 @@ index f247a34..dc0f219 100644 /* * If for any reason at all we couldn't handle the fault, make +diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig +index 38f3b7e..7e485c0 100644 +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig +@@ -378,6 +378,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE + config KEXEC + bool "kexec system call" + depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) ++ depends on !GRKERNSEC_KMEM + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h index e3b1d41..8e81edf 100644 --- a/arch/powerpc/include/asm/atomic.h @@ -7690,7 +7740,7 @@ index 4aad413..85d86bf 100644 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h -index 99222e2..f629aef 100644 +index 10d1ef0..8f83abc 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -234,6 +234,7 @@ @@ -7702,7 +7752,7 @@ index 99222e2..f629aef 100644 #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h -index 48cfc85..891382f 100644 +index 98da78e..dc68271 100644 --- a/arch/powerpc/include/asm/smp.h +++ b/arch/powerpc/include/asm/smp.h @@ -50,7 +50,7 @@ struct smp_ops_t { @@ -7921,7 +7971,7 @@ index 9485b43..4718d50 100644 static inline unsigned long clear_user(void __user *addr, unsigned long size) diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S -index 645170a..6cf0271 100644 +index 2d06704..1616f1b 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -757,6 +757,7 @@ storage_fault_common: @@ -7943,10 +7993,10 @@ index 645170a..6cf0271 100644 ld r4,_DAR(r1) bl .bad_page_fault diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S -index 902ca3c..e942155 100644 +index 3a9ed6a..b534681 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S -@@ -1357,10 +1357,10 @@ handle_page_fault: +@@ -1364,10 +1364,10 @@ handle_page_fault: 11: ld r4,_DAR(r1) ld r5,_DSISR(r1) addi r3,r1,STACK_FRAME_OVERHEAD @@ -7992,10 +8042,10 @@ index 2e3200c..72095ce 100644 /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c -index 8083be2..10aa352 100644 +index 96d2fdf..f6d10c8 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c -@@ -884,8 +884,8 @@ void show_regs(struct pt_regs * regs) +@@ -886,8 +886,8 @@ void show_regs(struct pt_regs * regs) * Lookup NIP late so we have the best change of getting the * above info out without failing */ @@ -8006,7 +8056,7 @@ index 8083be2..10aa352 100644 #endif #ifdef CONFIG_PPC_TRANSACTIONAL_MEM printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch); -@@ -1349,10 +1349,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) +@@ -1352,10 +1352,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) newsp = stack[0]; ip = stack[STACK_FRAME_LR_SAVE]; if (!firstframe || ip != lr) { @@ -8019,7 +8069,7 @@ index 8083be2..10aa352 100644 (void *)current->ret_stack[curr_frame].ret); curr_frame--; } -@@ -1372,7 +1372,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) +@@ -1375,7 +1375,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack) struct pt_regs *regs = (struct pt_regs *) (sp + STACK_FRAME_OVERHEAD); lr = regs->link; @@ -8028,7 +8078,7 @@ index 8083be2..10aa352 100644 regs->trap, (void *)regs->nip, (void *)lr); firstframe = 1; } -@@ -1408,58 +1408,3 @@ void notrace __ppc64_runlatch_off(void) +@@ -1411,58 +1411,3 @@ void notrace __ppc64_runlatch_off(void) mtspr(SPRN_CTRLT, ctrl); } #endif /* CONFIG_PPC64 */ @@ -8127,10 +8177,10 @@ index 9a0d24c..e7fbedf 100644 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c -index 0f83122..c0aca6a 100644 +index fea2dba..a779f6b 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c -@@ -987,7 +987,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka, +@@ -1002,7 +1002,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka, /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; addr = frame; @@ -8140,10 +8190,10 @@ index 0f83122..c0aca6a 100644 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp; } else { diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c -index 887e99d..310bc11 100644 +index 1e7ba88..17afb1b 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c -@@ -751,7 +751,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, +@@ -763,7 +763,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, #endif /* Set up to return from userspace. */ @@ -8153,10 +8203,10 @@ index 887e99d..310bc11 100644 } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c -index e435bc0..41c2964 100644 +index f783c93..619baf1 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c -@@ -141,6 +141,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs) +@@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs) return flags; } @@ -8165,7 +8215,7 @@ index e435bc0..41c2964 100644 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) { -@@ -190,6 +192,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, +@@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, panic("Fatal exception in interrupt"); if (panic_on_oops) panic("Fatal exception"); @@ -8241,7 +8291,7 @@ index 5eea6f3..5d10396 100644 EXPORT_SYMBOL(copy_in_user); diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c -index 8726779..a33c512 100644 +index 51ab9e7..7d3c78b 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -33,6 +33,10 @@ @@ -8298,7 +8348,7 @@ index 8726779..a33c512 100644 else is_write = error_code & DSISR_ISSTORE; #else -@@ -371,7 +402,7 @@ good_area: +@@ -378,7 +409,7 @@ good_area: * "undefined". Of those that can be set, this is the only * one which seems bad. */ @@ -8307,7 +8357,7 @@ index 8726779..a33c512 100644 /* Guarded storage error. */ goto bad_area; #endif /* CONFIG_8xx */ -@@ -386,7 +417,7 @@ good_area: +@@ -393,7 +424,7 @@ good_area: * processors use the same I/D cache coherency mechanism * as embedded. */ @@ -8316,7 +8366,7 @@ index 8726779..a33c512 100644 goto bad_area; #endif /* CONFIG_PPC_STD_MMU */ -@@ -471,6 +502,23 @@ bad_area: +@@ -483,6 +514,23 @@ bad_area: bad_area_nosemaphore: /* User mode accesses cause a SIGSEGV */ if (user_mode(regs)) { @@ -8378,7 +8428,7 @@ index cb8bdbe..d770680 100644 } } diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c -index 3e99c14..f00953c 100644 +index 7ce9cf3..a964087 100644 --- a/arch/powerpc/mm/slice.c +++ b/arch/powerpc/mm/slice.c @@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr, @@ -8629,10 +8679,10 @@ index 7845e15..59c4353 100644 if (r_type == R_390_GOTPC) rc = apply_rela_bits(loc, val, 1, 32, 0); diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c -index 2bc3edd..ab9d598 100644 +index c5dbb33..b41f4ee 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c -@@ -236,39 +236,3 @@ unsigned long get_wchan(struct task_struct *p) +@@ -237,39 +237,3 @@ unsigned long get_wchan(struct task_struct *p) } return 0; } @@ -8748,7 +8798,7 @@ index f9f3cd5..58ff438 100644 #endif /* _ASM_SCORE_EXEC_H */ diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c -index f4c6d02..e9355c3 100644 +index a1519ad3..e8ac1ff 100644 --- a/arch/score/kernel/process.c +++ b/arch/score/kernel/process.c @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task) @@ -9454,10 +9504,10 @@ index e562d3c..191f176 100644 ret = copy_to_user_fixup(to, from, size); return ret; diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile -index d432fb2..6056af1 100644 +index d15cc17..d0ae796 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile -@@ -3,7 +3,7 @@ +@@ -4,7 +4,7 @@ # asflags-y := -ansi @@ -9550,10 +9600,10 @@ index 79cc0d1..ec62734 100644 .getproplen = prom_getproplen, .getproperty = prom_getproperty, diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c -index 7ff45e4..a58f271 100644 +index 773c1f2..a8bdd87 100644 --- a/arch/sparc/kernel/ptrace_64.c +++ b/arch/sparc/kernel/ptrace_64.c -@@ -1057,6 +1057,10 @@ long arch_ptrace(struct task_struct *child, long request, +@@ -1059,6 +1059,10 @@ long arch_ptrace(struct task_struct *child, long request, return ret; } @@ -9564,7 +9614,7 @@ index 7ff45e4..a58f271 100644 asmlinkage int syscall_trace_enter(struct pt_regs *regs) { int ret = 0; -@@ -1064,6 +1068,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) +@@ -1066,6 +1070,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) /* do the secure computing check first */ secure_computing_strict(regs->u_regs[UREG_G1]); @@ -9576,7 +9626,7 @@ index 7ff45e4..a58f271 100644 if (test_thread_flag(TIF_SYSCALL_TRACE)) ret = tracehook_report_syscall_entry(regs); -@@ -1084,6 +1093,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) +@@ -1086,6 +1095,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) asmlinkage void syscall_trace_leave(struct pt_regs *regs) { @@ -9826,7 +9876,7 @@ index 51561b8..8256764 100644 } } diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S -index 73ec8a7..4611979 100644 +index d950197..192f9d8 100644 --- a/arch/sparc/kernel/syscalls.S +++ b/arch/sparc/kernel/syscalls.S @@ -52,7 +52,7 @@ sys32_rt_sigreturn: @@ -10365,7 +10415,7 @@ index 30c3ecc..736f015 100644 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o obj-y += fault_$(BITS).o diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c -index e98bfda..ea8d221 100644 +index 59dbd46..1dd7f5e 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -21,6 +21,9 @@ @@ -10656,7 +10706,7 @@ index e98bfda..ea8d221 100644 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs, int text_fault) { -@@ -230,6 +504,24 @@ good_area: +@@ -229,6 +503,24 @@ good_area: if (!(vma->vm_flags & VM_WRITE)) goto bad_area; } else { @@ -10682,7 +10732,7 @@ index e98bfda..ea8d221 100644 if (!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c -index 5062ff3..e0b75f3 100644 +index 2ebec26..b212598 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c @@ -21,6 +21,9 @@ @@ -11171,7 +11221,7 @@ index 5062ff3..e0b75f3 100644 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) { struct mm_struct *mm = current->mm; -@@ -341,6 +804,29 @@ retry: +@@ -342,6 +805,29 @@ retry: if (!vma) goto bad_area; @@ -11202,7 +11252,7 @@ index 5062ff3..e0b75f3 100644 * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c -index d2b5944..d878f3c 100644 +index 9639964..806cd0c 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c @@ -28,7 +28,8 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp, @@ -11343,11 +11393,23 @@ index ed82eda..0d80e77 100644 #endif /* CONFIG_SMP */ #endif /* CONFIG_DEBUG_DCFLUSH */ } +diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig +index d45a2c4..3c05a78 100644 +--- a/arch/tile/Kconfig ++++ b/arch/tile/Kconfig +@@ -185,6 +185,7 @@ source "kernel/Kconfig.hz" + + config KEXEC + bool "kexec system call" ++ depends on !GRKERNSEC_KMEM + ---help--- + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h -index f4500c6..889656c 100644 +index ad220ee..2f537b3 100644 --- a/arch/tile/include/asm/atomic_64.h +++ b/arch/tile/include/asm/atomic_64.h -@@ -143,6 +143,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u) +@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u) #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) @@ -11365,7 +11427,7 @@ index f4500c6..889656c 100644 #define smp_mb__before_atomic_dec() smp_mb() #define smp_mb__after_atomic_dec() smp_mb() diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h -index a9a5299..0fce79e 100644 +index 6160761..00cac88 100644 --- a/arch/tile/include/asm/cache.h +++ b/arch/tile/include/asm/cache.h @@ -15,11 +15,12 @@ @@ -11383,10 +11445,10 @@ index a9a5299..0fce79e 100644 /* bytes per L2 cache line */ #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE() diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h -index e4d44bd..99927a3 100644 +index b6cde32..c0cb736 100644 --- a/arch/tile/include/asm/uaccess.h +++ b/arch/tile/include/asm/uaccess.h -@@ -408,9 +408,9 @@ static inline unsigned long __must_check copy_from_user(void *to, +@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { @@ -11399,10 +11461,10 @@ index e4d44bd..99927a3 100644 else copy_from_user_overflow(); diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c -index 650ccff..45fe2d6 100644 +index 0cb3bba..7338b2d 100644 --- a/arch/tile/mm/hugetlbpage.c +++ b/arch/tile/mm/hugetlbpage.c -@@ -239,6 +239,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file, +@@ -212,6 +212,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file, info.high_limit = TASK_SIZE; info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; @@ -11410,7 +11472,7 @@ index 650ccff..45fe2d6 100644 return vm_unmapped_area(&info); } -@@ -256,6 +257,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, +@@ -229,6 +230,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, info.high_limit = current->mm->mmap_base; info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; @@ -11434,7 +11496,7 @@ index 133f7de..1d6f2f1 100644 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) diff --git a/arch/um/defconfig b/arch/um/defconfig -index 08107a7..ab22afe 100644 +index 2665e6b..3e3822b 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig @@ -51,7 +51,6 @@ CONFIG_X86_CMPXCHG=y @@ -11548,10 +11610,10 @@ index ad8f795..2c7eec6 100644 /* * Memory returned by kmalloc() may be used for DMA, so we must make diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index b32ebf9..5704f98 100644 +index f67e839..bfd4748 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -248,7 +248,7 @@ config X86_HT +@@ -247,7 +247,7 @@ config X86_HT config X86_32_LAZY_GS def_bool y @@ -11560,7 +11622,7 @@ index b32ebf9..5704f98 100644 config ARCH_HWEIGHT_CFLAGS string -@@ -1088,6 +1088,7 @@ config MICROCODE_EARLY +@@ -1099,6 +1099,7 @@ config MICROCODE_EARLY config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" @@ -11568,7 +11630,7 @@ index b32ebf9..5704f98 100644 ---help--- This device gives privileged processes access to the x86 Model-Specific Registers (MSRs). It is a character device with -@@ -1111,7 +1112,7 @@ choice +@@ -1122,7 +1123,7 @@ choice config NOHIGHMEM bool "off" @@ -11577,7 +11639,7 @@ index b32ebf9..5704f98 100644 ---help--- Linux can use up to 64 Gigabytes of physical memory on x86 systems. However, the address space of 32-bit x86 processors is only 4 -@@ -1148,7 +1149,7 @@ config NOHIGHMEM +@@ -1159,7 +1160,7 @@ config NOHIGHMEM config HIGHMEM4G bool "4GB" @@ -11586,7 +11648,7 @@ index b32ebf9..5704f98 100644 ---help--- Select this if you have a 32-bit processor and between 1 and 4 gigabytes of physical RAM. -@@ -1201,7 +1202,7 @@ config PAGE_OFFSET +@@ -1212,7 +1213,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT default 0x80000000 if VMSPLIT_2G @@ -11595,7 +11657,7 @@ index b32ebf9..5704f98 100644 default 0x40000000 if VMSPLIT_1G default 0xC0000000 depends on X86_32 -@@ -1599,6 +1600,7 @@ config SECCOMP +@@ -1614,6 +1615,7 @@ config SECCOMP config CC_STACKPROTECTOR bool "Enable -fstack-protector buffer overflow detection" @@ -11603,16 +11665,24 @@ index b32ebf9..5704f98 100644 ---help--- This option turns on the -fstack-protector GCC feature. This feature puts, at the beginning of functions, a canary value on -@@ -1718,6 +1720,8 @@ config X86_NEED_RELOCS +@@ -1632,6 +1634,7 @@ source kernel/Kconfig.hz + + config KEXEC + bool "kexec system call" ++ depends on !GRKERNSEC_KMEM + ---help--- + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot +@@ -1733,6 +1736,8 @@ config X86_NEED_RELOCS config PHYSICAL_ALIGN - hex "Alignment value to which kernel should be aligned" if X86_32 + hex "Alignment value to which kernel should be aligned" default "0x1000000" + range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE + range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE - range 0x2000 0x1000000 + range 0x2000 0x1000000 if X86_32 + range 0x200000 0x1000000 if X86_64 ---help--- - This value puts the alignment restrictions on physical address -@@ -1793,9 +1797,10 @@ config DEBUG_HOTPLUG_CPU0 +@@ -1812,9 +1817,10 @@ config DEBUG_HOTPLUG_CPU0 If unsure, say N. config COMPAT_VDSO @@ -11678,10 +11748,18 @@ index 78d91af..8ceb94b 100644 This option helps catch unintended modifications to loadable kernel module's text and read-only data. It also prevents execution diff --git a/arch/x86/Makefile b/arch/x86/Makefile -index 07639c6..6f2c901 100644 +index 41250fb..863762e 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile -@@ -54,6 +54,7 @@ else +@@ -46,14 +46,12 @@ ifeq ($(CONFIG_X86_32),y) + # CPU-specific tuning. Anything which can be shared with UML should go here. + include $(srctree)/arch/x86/Makefile_32.cpu + KBUILD_CFLAGS += $(cflags-y) +- +- # temporary until string.h is fixed +- KBUILD_CFLAGS += -ffreestanding + else + BITS := 64 UTS_MACHINE := x86_64 CHECKFLAGS += -D__x86_64__ -m64 @@ -11689,6 +11767,16 @@ index 07639c6..6f2c901 100644 KBUILD_AFLAGS += -m64 KBUILD_CFLAGS += -m64 +@@ -83,6 +81,9 @@ else + KBUILD_CFLAGS += -maccumulate-outgoing-args + endif + ++# temporary until string.h is fixed ++KBUILD_CFLAGS += -ffreestanding ++ + ifdef CONFIG_CC_STACKPROTECTOR + cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh + ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y) @@ -241,3 +242,12 @@ define archhelp echo ' FDINITRD=file initrd for the booted kernel' echo ' kvmconfig - Enable additional options for guest kernel support' @@ -11739,7 +11827,7 @@ index 878e4b9..20537ab 100644 #endif /* BOOT_BITOPS_H */ diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h -index 5b75319..331a4ca 100644 +index ef72bae..353a184 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -85,7 +85,7 @@ static inline void io_delay(void) @@ -11837,7 +11925,7 @@ index a53440e..c3dbf1e 100644 .previous diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S -index 1e3184f..0d11e2e 100644 +index 5d6f689..9d06730 100644 --- a/arch/x86/boot/compressed/head_32.S +++ b/arch/x86/boot/compressed/head_32.S @@ -118,7 +118,7 @@ preferred_addr: @@ -11849,27 +11937,8 @@ index 1e3184f..0d11e2e 100644 #endif /* Target address to relocate to for decompression */ -@@ -204,7 +204,7 @@ relocated: - * and where it was actually loaded. - */ - movl %ebp, %ebx -- subl $LOAD_PHYSICAL_ADDR, %ebx -+ subl $____LOAD_PHYSICAL_ADDR, %ebx - jz 2f /* Nothing to be done if loaded at compiled addr. */ - /* - * Process relocations. -@@ -212,8 +212,7 @@ relocated: - - 1: subl $4, %edi - movl (%edi), %ecx -- testl %ecx, %ecx -- jz 2f -+ jecxz 2f - addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) - jmp 1b - 2: diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S -index 06e71c2..88a98264 100644 +index c337422..2c5be72 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S @@ -95,7 +95,7 @@ ENTRY(startup_32) @@ -11890,7 +11959,7 @@ index 06e71c2..88a98264 100644 #endif /* Target address to relocate to for decompression */ -@@ -361,8 +361,8 @@ gdt: +@@ -362,8 +362,8 @@ gdt: .long gdt .word 0 .quad 0x0000000000000000 /* NULL descriptor */ @@ -11902,10 +11971,19 @@ index 06e71c2..88a98264 100644 .quad 0x0000000000000000 /* TS continued */ gdt_end: diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c -index 0319c88..7c1931f 100644 +index 434f077..b6b4b38 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c -@@ -307,7 +307,7 @@ static void parse_elf(void *output) +@@ -283,7 +283,7 @@ static void handle_relocations(void *output, unsigned long output_len) + * Calculate the delta between where vmlinux was linked to load + * and where it was actually loaded. + */ +- delta = min_addr - LOAD_PHYSICAL_ADDR; ++ delta = min_addr - ____LOAD_PHYSICAL_ADDR; + if (!delta) { + debug_putstr("No relocation needed... "); + return; +@@ -380,7 +380,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE dest = output; @@ -11914,7 +11992,7 @@ index 0319c88..7c1931f 100644 #else dest = (void *)(phdr->p_paddr); #endif -@@ -358,7 +358,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, +@@ -432,7 +432,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap, error("Destination address too large"); #endif #ifndef CONFIG_RELOCATABLE @@ -13321,7 +13399,7 @@ index 665a730..8e7a67a 100644 err |= copy_siginfo_to_user32(&frame->info, &ksig->info); diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S -index 474dc1b..9297c58 100644 +index 4299eb0..904b82a 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S @@ -15,8 +15,10 @@ @@ -13719,10 +13797,10 @@ index 372231c..a5aa1a1 100644 .long \orig - . .long \alt - . diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h -index 58ed6d9..f1cbe58 100644 +index 0a3f9c9..c9d081d 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h -@@ -105,7 +105,7 @@ static inline int alternatives_text_reserved(void *start, void *end) +@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end) ".pushsection .discard,\"aw\",@progbits\n" \ DISCARD_ENTRY(1) \ ".popsection\n" \ @@ -13731,7 +13809,7 @@ index 58ed6d9..f1cbe58 100644 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ ".popsection" -@@ -119,7 +119,7 @@ static inline int alternatives_text_reserved(void *start, void *end) +@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end) DISCARD_ENTRY(1) \ DISCARD_ENTRY(2) \ ".popsection\n" \ @@ -13741,7 +13819,7 @@ index 58ed6d9..f1cbe58 100644 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ ".popsection" diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h -index f8119b5..7209d5b 100644 +index 1d2091a..f5074c1 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void) @@ -14692,10 +14770,10 @@ index 0e1cbfc..5623683 100644 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h -index 6dfd019..28e188d 100644 +index 41639ce..ebce552 100644 --- a/arch/x86/include/asm/bitops.h +++ b/arch/x86/include/asm/bitops.h -@@ -40,7 +40,7 @@ +@@ -48,7 +48,7 @@ * a mask operation on a byte. */ #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr)) @@ -14704,7 +14782,43 @@ index 6dfd019..28e188d 100644 #define CONST_MASK(nr) (1 << ((nr) & 7)) /** -@@ -486,7 +486,7 @@ static inline int fls(int x) +@@ -361,7 +361,7 @@ static int test_bit(int nr, const volatile unsigned long *addr); + * + * Undefined if no bit exists, so code should check against 0 first. + */ +-static inline unsigned long __ffs(unsigned long word) ++static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word) + { + asm("rep; bsf %1,%0" + : "=r" (word) +@@ -375,7 +375,7 @@ static inline unsigned long __ffs(unsigned long word) + * + * Undefined if no zero exists, so code should check against ~0UL first. + */ +-static inline unsigned long ffz(unsigned long word) ++static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word) + { + asm("rep; bsf %1,%0" + : "=r" (word) +@@ -389,7 +389,7 @@ static inline unsigned long ffz(unsigned long word) + * + * Undefined if no set bit exists, so code should check against 0 first. + */ +-static inline unsigned long __fls(unsigned long word) ++static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word) + { + asm("bsr %1,%0" + : "=r" (word) +@@ -452,7 +452,7 @@ static inline int ffs(int x) + * set bit if value is nonzero. The last (most significant) bit is + * at position 32. + */ +-static inline int fls(int x) ++static inline int __intentional_overflow(-1) fls(int x) + { + int r; + +@@ -494,7 +494,7 @@ static inline int fls(int x) * at position 64. */ #ifdef CONFIG_X86_64 @@ -14880,7 +14994,7 @@ index 59c6c40..5e0b22c 100644 struct compat_timespec { compat_time_t tv_sec; diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h -index 7290585..717e89e 100644 +index 89270b4..f0abf8e 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -203,7 +203,7 @@ @@ -14909,7 +15023,7 @@ index 7290585..717e89e 100644 #endif /* CONFIG_X86_64 */ #if __GNUC__ >= 4 -@@ -403,7 +404,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) +@@ -405,7 +406,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS t_warn: @@ -14918,8 +15032,8 @@ index 7290585..717e89e 100644 + warn_pre_alternatives(); return false; #endif - #else /* GCC_VERSION >= 40500 */ -@@ -421,7 +423,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) + +@@ -425,7 +427,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ ".previous\n" @@ -14928,7 +15042,7 @@ index 7290585..717e89e 100644 "3: movb $1,%0\n" "4:\n" ".previous\n" -@@ -457,7 +459,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) +@@ -462,7 +464,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) " .byte 2b - 1b\n" /* src len */ " .byte 4f - 3f\n" /* repl len */ ".previous\n" @@ -14937,7 +15051,7 @@ index 7290585..717e89e 100644 "3: .byte 0xe9\n .long %l[t_no] - 2b\n" "4:\n" ".previous\n" -@@ -490,7 +492,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) +@@ -495,7 +497,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */ ".previous\n" @@ -14946,7 +15060,7 @@ index 7290585..717e89e 100644 "3: movb $0,%0\n" "4:\n" ".previous\n" -@@ -504,7 +506,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) +@@ -509,7 +511,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) ".section .discard,\"aw\",@progbits\n" " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */ ".previous\n" @@ -15405,7 +15519,7 @@ index be27ba1..04a8801 100644 *uval = oldval; return ret; diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h -index e4ac559..c1c0c87 100644 +index 92b3bae..3866449 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void); @@ -15497,7 +15611,7 @@ index bba3cf8..06bc8da 100644 #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h -index 5a6d287..f815789 100644 +index 9454c16..e4100e3 100644 --- a/arch/x86/include/asm/kprobes.h +++ b/arch/x86/include/asm/kprobes.h @@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t; @@ -15790,7 +15904,7 @@ index 5f55e69..e20bfb1 100644 #ifdef CONFIG_SMP diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h -index be12c53..2124e35 100644 +index be12c53..4d24039 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm); @@ -15814,7 +15928,7 @@ index be12c53..2124e35 100644 #ifdef CONFIG_SMP if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY); -@@ -34,16 +48,55 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, +@@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk) { unsigned cpu = smp_processor_id(); @@ -15853,6 +15967,10 @@ index be12c53..2124e35 100644 + u64 descriptor[2]; + descriptor[0] = PCID_USER; + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory"); ++ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) { ++ descriptor[0] = PCID_KERNEL; ++ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory"); ++ } + } else { + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER); + if (static_cpu_has(X86_FEATURE_STRONGUDEREF)) @@ -15870,7 +15988,7 @@ index be12c53..2124e35 100644 /* Stop flush ipis for the previous mm */ cpumask_clear_cpu(cpu, mm_cpumask(prev)); -@@ -51,9 +104,63 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, +@@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, /* Load the LDT, if the LDT is different: */ if (unlikely(prev->context.ldt != next->context.ldt)) load_LDT_nolock(&next->context); @@ -15917,6 +16035,10 @@ index be12c53..2124e35 100644 + u64 descriptor[2]; + descriptor[0] = PCID_USER; + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory"); ++ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) { ++ descriptor[0] = PCID_KERNEL; ++ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory"); ++ } + } else { + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER); + if (static_cpu_has(X86_FEATURE_STRONGUDEREF)) @@ -15935,7 +16057,7 @@ index be12c53..2124e35 100644 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK); BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next); -@@ -70,11 +177,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, +@@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, * tlb flush IPI delivery. We must reload CR3 * to make sure to use no freed page tables. */ @@ -16056,7 +16178,7 @@ index 0f1ddee..e2fc3d1 100644 unsigned long y = x - __START_KERNEL_map; diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h -index cfdc9ee..3f7b5d6 100644 +index 401f350..dee5d13 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val) @@ -16108,8 +16230,8 @@ index cfdc9ee..3f7b5d6 100644 + #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS) - static inline int arch_spin_is_locked(struct arch_spinlock *lock) -@@ -926,7 +953,7 @@ extern void default_banner(void); + static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock, +@@ -906,7 +933,7 @@ extern void default_banner(void); #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4) @@ -16118,7 +16240,7 @@ index cfdc9ee..3f7b5d6 100644 #endif #define INTERRUPT_RETURN \ -@@ -1001,6 +1028,21 @@ extern void default_banner(void); +@@ -981,6 +1008,21 @@ extern void default_banner(void); PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \ CLBR_NONE, \ jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit)) @@ -16141,7 +16263,7 @@ index cfdc9ee..3f7b5d6 100644 #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h -index 0db1fca..52310cc 100644 +index aab8f67..2531748 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -84,7 +84,7 @@ struct pv_init_ops { @@ -16201,15 +16323,6 @@ index 0db1fca..52310cc 100644 }; struct arch_spinlock; -@@ -334,7 +341,7 @@ struct pv_lock_ops { - void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags); - int (*spin_trylock)(struct arch_spinlock *lock); - void (*spin_unlock)(struct arch_spinlock *lock); --}; -+} __no_const; - - /* This contains all the paravirt structures: we get a convenient - * number for each function using the offset which we use to indicate diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h index b4389a4..7024269 100644 --- a/arch/x86/include/asm/pgalloc.h @@ -16300,10 +16413,10 @@ index 81bb91b..9392125 100644 /* diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h -index 1c00631..845f898 100644 +index 3d19994..732a48c 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h -@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); +@@ -45,6 +45,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); #ifndef __PAGETABLE_PUD_FOLDED #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd) @@ -16311,7 +16424,7 @@ index 1c00631..845f898 100644 #define pgd_clear(pgd) native_pgd_clear(pgd) #endif -@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); +@@ -82,12 +83,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page); #define arch_end_context_switch(prev) do {} while(0) @@ -16363,7 +16476,7 @@ index 1c00631..845f898 100644 static inline int pte_dirty(pte_t pte) { return pte_flags(pte) & _PAGE_DIRTY; -@@ -147,6 +187,11 @@ static inline unsigned long pud_pfn(pud_t pud) +@@ -148,6 +188,11 @@ static inline unsigned long pud_pfn(pud_t pud) return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT; } @@ -16375,7 +16488,7 @@ index 1c00631..845f898 100644 #define pte_page(pte) pfn_to_page(pte_pfn(pte)) static inline int pmd_large(pmd_t pte) -@@ -200,9 +245,29 @@ static inline pte_t pte_wrprotect(pte_t pte) +@@ -201,9 +246,29 @@ static inline pte_t pte_wrprotect(pte_t pte) return pte_clear_flags(pte, _PAGE_RW); } @@ -16406,7 +16519,7 @@ index 1c00631..845f898 100644 } static inline pte_t pte_mkdirty(pte_t pte) -@@ -444,6 +509,16 @@ pte_t *populate_extra_pte(unsigned long vaddr); +@@ -430,6 +495,16 @@ pte_t *populate_extra_pte(unsigned long vaddr); #endif #ifndef __ASSEMBLY__ @@ -16421,9 +16534,9 @@ index 1c00631..845f898 100644 +#endif + #include + #include #include - -@@ -576,7 +651,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud) +@@ -563,7 +638,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ @@ -16432,7 +16545,7 @@ index 1c00631..845f898 100644 /* Find an entry in the second-level page table.. */ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) -@@ -616,7 +691,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) +@@ -603,7 +678,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) * Currently stuck as a macro due to indirect forward reference to * linux/mmzone.h's __section_mem_map_addr() definition: */ @@ -16441,7 +16554,7 @@ index 1c00631..845f898 100644 /* to find an entry in a page-table-directory. */ static inline unsigned long pud_index(unsigned long address) -@@ -631,7 +706,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) +@@ -618,7 +693,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) static inline int pgd_bad(pgd_t pgd) { @@ -16450,7 +16563,7 @@ index 1c00631..845f898 100644 } static inline int pgd_none(pgd_t pgd) -@@ -654,7 +729,12 @@ static inline int pgd_none(pgd_t pgd) +@@ -641,7 +716,12 @@ static inline int pgd_none(pgd_t pgd) * pgd_offset() returns a (pgd_t *) * pgd_index() is used get the offset into the pgd page's array of pgd_t's; */ @@ -16464,7 +16577,7 @@ index 1c00631..845f898 100644 /* * a shortcut which implies the use of the kernel's pgd, instead * of a process's -@@ -665,6 +745,23 @@ static inline int pgd_none(pgd_t pgd) +@@ -652,6 +732,23 @@ static inline int pgd_none(pgd_t pgd) #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET) #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY) @@ -16488,7 +16601,7 @@ index 1c00631..845f898 100644 #ifndef __ASSEMBLY__ extern int direct_gbpages; -@@ -831,11 +928,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, +@@ -818,11 +915,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, * dst and src can be on the same page, but the range must not overlap, * and must not cross a page boundary. */ @@ -16665,7 +16778,7 @@ index 2d88344..4679fc3 100644 #define EARLY_DYNAMIC_PAGE_TABLES 64 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h -index f4843e0..a2526f8 100644 +index 0ecac25..306c276 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -16,13 +16,12 @@ @@ -16693,7 +16806,7 @@ index f4843e0..a2526f8 100644 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP) #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT) #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE) -@@ -84,8 +82,10 @@ +@@ -87,8 +85,10 @@ #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX) @@ -16705,7 +16818,7 @@ index f4843e0..a2526f8 100644 #endif #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE) -@@ -143,6 +143,9 @@ +@@ -146,6 +146,9 @@ #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \ _PAGE_ACCESSED) @@ -16715,7 +16828,7 @@ index f4843e0..a2526f8 100644 #define __PAGE_KERNEL_EXEC \ (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL) #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX) -@@ -153,7 +156,7 @@ +@@ -156,7 +159,7 @@ #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC) #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT) #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD) @@ -16724,7 +16837,7 @@ index f4843e0..a2526f8 100644 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER) #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT) #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) -@@ -215,8 +218,8 @@ +@@ -218,8 +221,8 @@ * bits are combined, this will alow user to access the high address mapped * VDSO in the presence of CONFIG_COMPAT_VDSO */ @@ -16735,7 +16848,7 @@ index f4843e0..a2526f8 100644 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif -@@ -254,7 +257,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd) +@@ -257,7 +260,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd) { return native_pgd_val(pgd) & PTE_FLAGS_MASK; } @@ -16753,7 +16866,7 @@ index f4843e0..a2526f8 100644 #if PAGETABLE_LEVELS > 3 typedef struct { pudval_t pud; } pud_t; -@@ -268,8 +281,6 @@ static inline pudval_t native_pud_val(pud_t pud) +@@ -271,8 +284,6 @@ static inline pudval_t native_pud_val(pud_t pud) return pud.pud; } #else @@ -16762,7 +16875,7 @@ index f4843e0..a2526f8 100644 static inline pudval_t native_pud_val(pud_t pud) { return native_pgd_val(pud.pgd); -@@ -289,8 +300,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) +@@ -292,8 +303,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) return pmd.pmd; } #else @@ -16771,7 +16884,7 @@ index f4843e0..a2526f8 100644 static inline pmdval_t native_pmd_val(pmd_t pmd) { return native_pgd_val(pmd.pud.pgd); -@@ -330,7 +339,6 @@ typedef struct page *pgtable_t; +@@ -333,7 +342,6 @@ typedef struct page *pgtable_t; extern pteval_t __supported_pte_mask; extern void set_nx(void); @@ -16780,7 +16893,7 @@ index f4843e0..a2526f8 100644 #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h -index 24cf5ae..4d9fa2d 100644 +index 987c75e..2723054 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, @@ -16948,18 +17061,8 @@ index 24cf5ae..4d9fa2d 100644 #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -@@ -943,7 +942,8 @@ extern int set_tsc_mode(unsigned int val); - extern u16 amd_get_nb_id(int cpu); - - struct aperfmperf { -- u64 aperf, mperf; -+ u64 aperf __intentional_overflow(0); -+ u64 mperf __intentional_overflow(0); - }; - - static inline void get_aperfmperf(struct aperfmperf *am) -@@ -971,7 +971,7 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, - return ratio; +@@ -957,7 +956,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves) + return 0; } -extern unsigned long arch_align_stack(unsigned long sp); @@ -16967,7 +17070,7 @@ index 24cf5ae..4d9fa2d 100644 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -@@ -981,6 +981,6 @@ bool xen_set_default_idle(void); +@@ -967,6 +966,6 @@ bool xen_set_default_idle(void); #define xen_set_default_idle 0 #endif @@ -17443,10 +17546,10 @@ index 4137890..03fa172 100644 #endif diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h -index e3ddd7d..3611fce 100644 +index bf156de..1a782ab 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h -@@ -172,6 +172,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock) +@@ -223,6 +223,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock) static inline void arch_read_lock(arch_rwlock_t *rw) { asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t" @@ -17461,7 +17564,7 @@ index e3ddd7d..3611fce 100644 "jns 1f\n" "call __read_lock_failed\n\t" "1:\n" -@@ -181,6 +189,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw) +@@ -232,6 +240,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw) static inline void arch_write_lock(arch_rwlock_t *rw) { asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t" @@ -17476,7 +17579,7 @@ index e3ddd7d..3611fce 100644 "jz 1f\n" "call __write_lock_failed\n\t" "1:\n" -@@ -210,13 +226,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock) +@@ -261,13 +277,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock) static inline void arch_read_unlock(arch_rwlock_t *rw) { @@ -17584,7 +17687,7 @@ index 70bbe39..4ae2bd4 100644 void dump_trace(struct task_struct *tsk, struct pt_regs *regs, diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h -index 4ec45b3..a4f0a8a 100644 +index d7f3b3b..3cc39f1 100644 --- a/arch/x86/include/asm/switch_to.h +++ b/arch/x86/include/asm/switch_to.h @@ -108,7 +108,7 @@ do { \ @@ -17809,7 +17912,7 @@ index 2781119..618b59b 100644 #endif #endif /* _ASM_X86_THREAD_INFO_H */ diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h -index cf51200..63ff068 100644 +index e6d90ba..0897f44 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -17,18 +17,44 @@ @@ -17907,7 +18010,7 @@ index cf51200..63ff068 100644 } diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h -index 5ee2687..74590b9 100644 +index 5838fa9..f7ae572 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -7,6 +7,7 @@ @@ -17967,8 +18070,8 @@ index 5ee2687..74590b9 100644 /* * The exception table consists of pairs of addresses relative to the -@@ -165,10 +196,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) - register __inttype(*(ptr)) __val_gu asm("%edx"); \ +@@ -168,10 +199,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) + register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \ __chk_user_ptr(ptr); \ might_fault(); \ + pax_open_userland(); \ @@ -17980,7 +18083,7 @@ index 5ee2687..74590b9 100644 __ret_gu; \ }) -@@ -176,13 +209,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) +@@ -179,13 +212,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") @@ -18005,7 +18108,7 @@ index 5ee2687..74590b9 100644 "3: " ASM_CLAC "\n" \ ".section .fixup,\"ax\"\n" \ "4: movl %3,%0\n" \ -@@ -195,8 +236,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) +@@ -198,8 +239,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) #define __put_user_asm_ex_u64(x, addr) \ asm volatile(ASM_STAC "\n" \ @@ -18016,7 +18119,7 @@ index 5ee2687..74590b9 100644 "3: " ASM_CLAC "\n" \ _ASM_EXTABLE_EX(1b, 2b) \ _ASM_EXTABLE_EX(2b, 3b) \ -@@ -246,7 +287,8 @@ extern void __put_user_8(void); +@@ -249,7 +290,8 @@ extern void __put_user_8(void); __typeof__(*(ptr)) __pu_val; \ __chk_user_ptr(ptr); \ might_fault(); \ @@ -18026,7 +18129,7 @@ index 5ee2687..74590b9 100644 switch (sizeof(*(ptr))) { \ case 1: \ __put_user_x(1, __pu_val, ptr, __ret_pu); \ -@@ -264,6 +306,7 @@ extern void __put_user_8(void); +@@ -267,6 +309,7 @@ extern void __put_user_8(void); __put_user_x(X, __pu_val, ptr, __ret_pu); \ break; \ } \ @@ -18034,7 +18137,7 @@ index 5ee2687..74590b9 100644 __ret_pu; \ }) -@@ -344,8 +387,10 @@ do { \ +@@ -347,8 +390,10 @@ do { \ } while (0) #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -18046,7 +18149,7 @@ index 5ee2687..74590b9 100644 "2: " ASM_CLAC "\n" \ ".section .fixup,\"ax\"\n" \ "3: mov %3,%0\n" \ -@@ -353,8 +398,10 @@ do { \ +@@ -356,8 +401,10 @@ do { \ " jmp 2b\n" \ ".previous\n" \ _ASM_EXTABLE(1b, 3b) \ @@ -18059,7 +18162,7 @@ index 5ee2687..74590b9 100644 #define __get_user_size_ex(x, ptr, size) \ do { \ -@@ -378,7 +425,7 @@ do { \ +@@ -381,7 +428,7 @@ do { \ } while (0) #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ @@ -18068,7 +18171,7 @@ index 5ee2687..74590b9 100644 "2:\n" \ _ASM_EXTABLE_EX(1b, 2b) \ : ltype(x) : "m" (__m(addr))) -@@ -395,13 +442,24 @@ do { \ +@@ -398,13 +445,24 @@ do { \ int __gu_err; \ unsigned long __gu_val; \ __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ @@ -18095,7 +18198,7 @@ index 5ee2687..74590b9 100644 /* * Tell gcc we read from memory instead of writing: this is because -@@ -409,8 +467,10 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -412,8 +470,10 @@ struct __large_struct { unsigned long buf[100]; }; * aliasing issues. */ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -18107,7 +18210,7 @@ index 5ee2687..74590b9 100644 "2: " ASM_CLAC "\n" \ ".section .fixup,\"ax\"\n" \ "3: mov %3,%0\n" \ -@@ -418,10 +478,12 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -421,10 +481,12 @@ struct __large_struct { unsigned long buf[100]; }; ".previous\n" \ _ASM_EXTABLE(1b, 3b) \ : "=r"(err) \ @@ -18122,7 +18225,7 @@ index 5ee2687..74590b9 100644 "2:\n" \ _ASM_EXTABLE_EX(1b, 2b) \ : : ltype(x), "m" (__m(addr))) -@@ -431,11 +493,13 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -434,11 +496,13 @@ struct __large_struct { unsigned long buf[100]; }; */ #define uaccess_try do { \ current_thread_info()->uaccess_err = 0; \ @@ -18136,7 +18239,7 @@ index 5ee2687..74590b9 100644 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \ } while (0) -@@ -460,8 +524,12 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -463,8 +527,12 @@ struct __large_struct { unsigned long buf[100]; }; * On error, the variable @x is set to zero. */ @@ -18149,7 +18252,7 @@ index 5ee2687..74590b9 100644 /** * __put_user: - Write a simple value into user space, with less checking. -@@ -483,8 +551,12 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -486,8 +554,12 @@ struct __large_struct { unsigned long buf[100]; }; * Returns zero on success, or -EFAULT on error. */ @@ -18162,7 +18265,7 @@ index 5ee2687..74590b9 100644 #define __get_user_unaligned __get_user #define __put_user_unaligned __put_user -@@ -502,7 +574,7 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -505,7 +577,7 @@ struct __large_struct { unsigned long buf[100]; }; #define get_user_ex(x, ptr) do { \ unsigned long __gue_val; \ __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ @@ -18171,42 +18274,10 @@ index 5ee2687..74590b9 100644 } while (0) #define put_user_try uaccess_try -@@ -519,8 +591,8 @@ strncpy_from_user(char *dst, const char __user *src, long count); - extern __must_check long strlen_user(const char __user *str); - extern __must_check long strnlen_user(const char __user *str, long n); - --unsigned long __must_check clear_user(void __user *mem, unsigned long len); --unsigned long __must_check __clear_user(void __user *mem, unsigned long len); -+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2); -+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2); - - /* - * movsl can be slow when source and dest are not both 8-byte aligned diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h -index 7f760a9..04b1c65 100644 +index 7f760a9..b596b9a 100644 --- a/arch/x86/include/asm/uaccess_32.h +++ b/arch/x86/include/asm/uaccess_32.h -@@ -11,15 +11,15 @@ - #include - - unsigned long __must_check __copy_to_user_ll -- (void __user *to, const void *from, unsigned long n); -+ (void __user *to, const void *from, unsigned long n) __size_overflow(3); - unsigned long __must_check __copy_from_user_ll -- (void *to, const void __user *from, unsigned long n); -+ (void *to, const void __user *from, unsigned long n) __size_overflow(3); - unsigned long __must_check __copy_from_user_ll_nozero -- (void *to, const void __user *from, unsigned long n); -+ (void *to, const void __user *from, unsigned long n) __size_overflow(3); - unsigned long __must_check __copy_from_user_ll_nocache -- (void *to, const void __user *from, unsigned long n); -+ (void *to, const void __user *from, unsigned long n) __size_overflow(3); - unsigned long __must_check __copy_from_user_ll_nocache_nozero -- (void *to, const void __user *from, unsigned long n); -+ (void *to, const void __user *from, unsigned long n) __size_overflow(3); - - /** - * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking. @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero static __always_inline unsigned long __must_check __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) @@ -18357,7 +18428,7 @@ index 7f760a9..04b1c65 100644 } diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h -index 4f7923d..20cb24e 100644 +index 4f7923d..201b58d 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h @@ -10,6 +10,9 @@ @@ -18370,7 +18441,7 @@ index 4f7923d..20cb24e 100644 /* * Copy To/From Userspace -@@ -17,13 +20,13 @@ +@@ -17,14 +20,14 @@ /* Handles exceptions in both to and from, but doesn't do access_ok */ __must_check unsigned long @@ -18384,16 +18455,13 @@ index 4f7923d..20cb24e 100644 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3); -static __always_inline __must_check unsigned long -+static __always_inline __must_check __size_overflow(3) unsigned long - copy_user_generic(void *to, const void *from, unsigned len) +-copy_user_generic(void *to, const void *from, unsigned len) ++static __always_inline __must_check unsigned long ++copy_user_generic(void *to, const void *from, unsigned long len) { unsigned ret; -@@ -41,142 +44,204 @@ copy_user_generic(void *to, const void *from, unsigned len) - ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from), - "=d" (len)), - "1" (to), "2" (from), "3" (len) -- : "memory", "rcx", "r8", "r9", "r10", "r11"); -+ : "memory", "rcx", "r8", "r9", "r11"); + +@@ -45,138 +48,200 @@ copy_user_generic(void *to, const void *from, unsigned len) return ret; } @@ -18713,7 +18781,7 @@ index 4f7923d..20cb24e 100644 -extern long __copy_user_nocache(void *dst, const void __user *src, - unsigned size, int zerorest); +extern unsigned long __copy_user_nocache(void *dst, const void __user *src, -+ unsigned long size, int zerorest) __size_overflow(3); ++ unsigned long size, int zerorest); -static inline int -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size) @@ -18817,6 +18885,19 @@ index 828a156..650e625 100644 extern struct x86_init_ops x86_init; extern struct x86_cpuinit_ops x86_cpuinit; +diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h +index b913915..4f5a581 100644 +--- a/arch/x86/include/asm/xen/page.h ++++ b/arch/x86/include/asm/xen/page.h +@@ -56,7 +56,7 @@ extern int m2p_remove_override(struct page *page, + extern struct page *m2p_find_override(unsigned long mfn); + extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn); + +-static inline unsigned long pfn_to_mfn(unsigned long pfn) ++static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn) + { + unsigned long mfn; + diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h index 0415cda..3b22adc 100644 --- a/arch/x86/include/asm/xsave.h @@ -18881,7 +18962,7 @@ index bbae024..e1528f9 100644 #define BIOS_ROM_BASE 0xffe00000 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile -index 88d99ea..9fc7e17 100644 +index a5408b9..5133813 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o @@ -18894,10 +18975,10 @@ index 88d99ea..9fc7e17 100644 obj-y += syscall_$(BITS).o obj-$(CONFIG_X86_64) += vsyscall_64.o diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c -index 2627a81..cd8325e 100644 +index 40c7660..f709f4b 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c -@@ -1368,7 +1368,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) +@@ -1365,7 +1365,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) * If your system is blacklisted here, but you find that acpi=force * works for you, please contact linux-acpi@vger.kernel.org */ @@ -18906,7 +18987,7 @@ index 2627a81..cd8325e 100644 /* * Boxes that need ACPI disabled */ -@@ -1443,7 +1443,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { +@@ -1440,7 +1440,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { }; /* second table for DMI checks that should run after early-quirks */ @@ -18953,10 +19034,10 @@ index d1daa66..59fecba 100644 bogus_magic: jmp bogus_magic diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c -index c15cf9a..0e63558 100644 +index 15e8563..323cbe1 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c -@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start, +@@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start, */ for (a = start; a < end; a++) { instr = (u8 *)&a->instr_offset + a->instr_offset; @@ -18970,7 +19051,7 @@ index c15cf9a..0e63558 100644 replacement = (u8 *)&a->repl_offset + a->repl_offset; BUG_ON(a->replacementlen > a->instrlen); BUG_ON(a->instrlen > sizeof(insnbuf)); -@@ -299,10 +306,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end, +@@ -300,10 +307,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end, for (poff = start; poff < end; poff++) { u8 *ptr = (u8 *)poff + *poff; @@ -18988,7 +19069,7 @@ index c15cf9a..0e63558 100644 text_poke(ptr, ((unsigned char []){0xf0}), 1); } mutex_unlock(&text_mutex); -@@ -317,10 +330,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end, +@@ -318,10 +331,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end, for (poff = start; poff < end; poff++) { u8 *ptr = (u8 *)poff + *poff; @@ -19006,7 +19087,7 @@ index c15cf9a..0e63558 100644 text_poke(ptr, ((unsigned char []){0x3E}), 1); } mutex_unlock(&text_mutex); -@@ -468,7 +487,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start, +@@ -469,7 +488,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start, BUG_ON(p->len > MAX_PATCH_LEN); /* prep the buffer with the original instructions */ @@ -19015,7 +19096,7 @@ index c15cf9a..0e63558 100644 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, (unsigned long)p->instr, p->len); -@@ -515,7 +534,7 @@ void __init alternative_instructions(void) +@@ -516,7 +535,7 @@ void __init alternative_instructions(void) if (!uniproc_patched || num_possible_cpus() == 1) free_init_pages("SMP alternatives", (unsigned long)__smp_locks, @@ -19024,7 +19105,7 @@ index c15cf9a..0e63558 100644 #endif apply_paravirt(__parainstructions, __parainstructions_end); -@@ -535,13 +554,17 @@ void __init alternative_instructions(void) +@@ -536,13 +555,17 @@ void __init alternative_instructions(void) * instructions. And on the local CPU you need to be protected again NMI or MCE * handlers seeing an inconsistent instruction while you patch. */ @@ -19044,7 +19125,7 @@ index c15cf9a..0e63558 100644 local_irq_restore(flags); /* Could also do a CLFLUSH here to speed up CPU recovery; but that causes hangs on some VIA CPUs. */ -@@ -563,36 +586,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode, +@@ -564,36 +587,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode, */ void *__kprobes text_poke(void *addr, const void *opcode, size_t len) { @@ -19089,8 +19170,26 @@ index c15cf9a..0e63558 100644 return addr; } +@@ -613,7 +622,7 @@ int poke_int3_handler(struct pt_regs *regs) + if (likely(!bp_patching_in_progress)) + return 0; + +- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr) ++ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr) + return 0; + + /* set up the specified breakpoint handler */ +@@ -647,7 +656,7 @@ int poke_int3_handler(struct pt_regs *regs) + */ + void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler) + { +- unsigned char int3 = 0xcc; ++ const unsigned char int3 = 0xcc; + + bp_int3_handler = handler; + bp_int3_addr = (u8 *)addr + sizeof(int3); diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c -index eca89c5..d566b78 100644 +index a7eb82d..f6e52d4 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -190,7 +190,7 @@ int first_system_vector = 0xfe; @@ -19183,7 +19282,7 @@ index c552247..587a316 100644 .name = "es7000", .probe = probe_es7000, diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c -index 9ed796c..e930fe4 100644 +index e63a5bd..c0babf8 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1060,7 +1060,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin, @@ -19204,7 +19303,7 @@ index 9ed796c..e930fe4 100644 { raw_spin_unlock(&vector_lock); } -@@ -2362,7 +2362,7 @@ static void ack_apic_edge(struct irq_data *data) +@@ -2367,7 +2367,7 @@ static void ack_apic_edge(struct irq_data *data) ack_APIC_irq(); } @@ -19213,7 +19312,7 @@ index 9ed796c..e930fe4 100644 #ifdef CONFIG_GENERIC_PENDING_IRQ static bool io_apic_level_ack_pending(struct irq_cfg *cfg) -@@ -2503,7 +2503,7 @@ static void ack_apic_level(struct irq_data *data) +@@ -2508,7 +2508,7 @@ static void ack_apic_level(struct irq_data *data) * at the cpu. */ if (!(v & (1 << (i & 0x1f)))) { @@ -19298,7 +19397,7 @@ index 562a76d..a003c0f 100644 .name = "physical x2apic", .probe = x2apic_phys_probe, diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c -index 1191ac1..2335fa4 100644 +index a419814..1dd34a0 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -357,7 +357,7 @@ static int uv_probe(void) @@ -19311,7 +19410,7 @@ index 1191ac1..2335fa4 100644 .name = "UV large system", .probe = uv_probe, diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c -index 53a4e27..038760a 100644 +index 3ab0343..814c4787 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex); @@ -19453,7 +19552,7 @@ index 47b56a7..efc2bc6 100644 obj-y += proc.o capflags.o powerflags.o common.o obj-y += rdrand.o diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c -index 08a0890..e557865 100644 +index 903a264..fc955f3 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -743,7 +743,7 @@ static void init_amd(struct cpuinfo_x86 *c) @@ -19466,7 +19565,7 @@ index 08a0890..e557865 100644 if (c->x86_model == 3 && c->x86_mask == 0) size = 64; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 25eb274..3a92d93 100644 +index 2793d1f..b4f313a 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = { @@ -19530,7 +19629,7 @@ index 25eb274..3a92d93 100644 static int __init x86_xsave_setup(char *s) { setup_clear_cpu_cap(X86_FEATURE_XSAVE); -@@ -288,6 +234,57 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c) +@@ -288,6 +234,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c) set_in_cr4(X86_CR4_SMAP); } @@ -19538,6 +19637,7 @@ index 25eb274..3a92d93 100644 +static __init int setup_disable_pcid(char *arg) +{ + setup_clear_cpu_cap(X86_FEATURE_PCID); ++ setup_clear_cpu_cap(X86_FEATURE_INVPCID); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (clone_pgd_mask != ~(pgdval_t)0UL) @@ -19551,6 +19651,7 @@ index 25eb274..3a92d93 100644 +static void setup_pcid(struct cpuinfo_x86 *c) +{ + if (!cpu_has(c, X86_FEATURE_PCID)) { ++ clear_cpu_cap(c, X86_FEATURE_INVPCID); + +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (clone_pgd_mask != ~(pgdval_t)0UL) { @@ -19588,7 +19689,7 @@ index 25eb274..3a92d93 100644 /* * Some CPU features depend on higher CPUID levels, which may not always * be available due to CPUID level capping or broken virtualization -@@ -386,7 +383,7 @@ void switch_to_new_gdt(int cpu) +@@ -386,7 +385,7 @@ void switch_to_new_gdt(int cpu) { struct desc_ptr gdt_descr; @@ -19597,7 +19698,7 @@ index 25eb274..3a92d93 100644 gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); /* Reload the per-cpu base */ -@@ -875,6 +872,10 @@ static void identify_cpu(struct cpuinfo_x86 *c) +@@ -875,6 +874,10 @@ static void identify_cpu(struct cpuinfo_x86 *c) setup_smep(c); setup_smap(c); @@ -19608,7 +19709,7 @@ index 25eb274..3a92d93 100644 /* * The vendor-specific functions might have changed features. * Now we do "generic changes." -@@ -883,6 +884,10 @@ static void identify_cpu(struct cpuinfo_x86 *c) +@@ -883,6 +886,10 @@ static void identify_cpu(struct cpuinfo_x86 *c) /* Filter out anything that depends on CPUID levels we don't have */ filter_cpuid_features(c, true); @@ -19619,7 +19720,7 @@ index 25eb274..3a92d93 100644 /* If the model name is still unset, do table lookup. */ if (!c->x86_model_id[0]) { const char *p; -@@ -1070,10 +1075,12 @@ static __init int setup_disablecpuid(char *arg) +@@ -1070,10 +1077,12 @@ static __init int setup_disablecpuid(char *arg) } __setup("clearcpuid=", setup_disablecpuid); @@ -19634,8 +19735,8 @@ index 25eb274..3a92d93 100644 +const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table }; DEFINE_PER_CPU_FIRST(union irq_stack_union, - irq_stack_union) __aligned(PAGE_SIZE); -@@ -1087,7 +1094,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned = + irq_stack_union) __aligned(PAGE_SIZE) __visible; +@@ -1087,7 +1096,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned = EXPORT_PER_CPU_SYMBOL(current_task); DEFINE_PER_CPU(unsigned long, kernel_stack) = @@ -19644,7 +19745,7 @@ index 25eb274..3a92d93 100644 EXPORT_PER_CPU_SYMBOL(kernel_stack); DEFINE_PER_CPU(char *, irq_stack_ptr) = -@@ -1232,7 +1239,7 @@ void cpu_init(void) +@@ -1232,7 +1241,7 @@ void cpu_init(void) load_ucode_ap(); cpu = stack_smp_processor_id(); @@ -19653,7 +19754,7 @@ index 25eb274..3a92d93 100644 oist = &per_cpu(orig_ist, cpu); #ifdef CONFIG_NUMA -@@ -1267,7 +1274,6 @@ void cpu_init(void) +@@ -1267,7 +1276,6 @@ void cpu_init(void) wrmsrl(MSR_KERNEL_GS_BASE, 0); barrier(); @@ -19661,7 +19762,7 @@ index 25eb274..3a92d93 100644 enable_x2apic(); /* -@@ -1319,7 +1325,7 @@ void cpu_init(void) +@@ -1319,7 +1327,7 @@ void cpu_init(void) { int cpu = smp_processor_id(); struct task_struct *curr = current; @@ -19762,7 +19863,7 @@ index 1414c90..1159406 100644 "index%1lu", i); if (unlikely(retval)) { diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c -index 87a65c9..92fcce6 100644 +index b3218cd..99a75de 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -45,6 +45,7 @@ @@ -19773,7 +19874,7 @@ index 87a65c9..92fcce6 100644 #include "mce-internal.h" -@@ -249,7 +250,7 @@ static void print_mce(struct mce *m) +@@ -258,7 +259,7 @@ static void print_mce(struct mce *m) !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", m->cs, m->ip); @@ -19782,7 +19883,7 @@ index 87a65c9..92fcce6 100644 print_symbol("{%s}", m->ip); pr_cont("\n"); } -@@ -282,10 +283,10 @@ static void print_mce(struct mce *m) +@@ -291,10 +292,10 @@ static void print_mce(struct mce *m) #define PANIC_TIMEOUT 5 /* 5 seconds */ @@ -19795,7 +19896,7 @@ index 87a65c9..92fcce6 100644 /* Panic in progress. Enable interrupts and wait for final IPI */ static void wait_for_panic(void) -@@ -309,7 +310,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) +@@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) /* * Make sure only one CPU runs in machine check panic */ @@ -19804,7 +19905,7 @@ index 87a65c9..92fcce6 100644 wait_for_panic(); barrier(); -@@ -317,7 +318,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) +@@ -326,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) console_verbose(); } else { /* Don't log too much for fake panic */ @@ -19813,7 +19914,7 @@ index 87a65c9..92fcce6 100644 return; } /* First print corrected ones that are still unlogged */ -@@ -356,7 +357,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) +@@ -365,7 +366,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp) if (!fake_panic) { if (panic_timeout == 0) panic_timeout = mca_cfg.panic_timeout; @@ -19822,7 +19923,7 @@ index 87a65c9..92fcce6 100644 } else pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg); } -@@ -686,7 +687,7 @@ static int mce_timed_out(u64 *t) +@@ -695,7 +696,7 @@ static int mce_timed_out(u64 *t) * might have been modified by someone else. */ rmb(); @@ -19831,7 +19932,7 @@ index 87a65c9..92fcce6 100644 wait_for_panic(); if (!mca_cfg.monarch_timeout) goto out; -@@ -1657,7 +1658,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code) +@@ -1666,7 +1667,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code) } /* Call the installed machine check handler for this CPU setup. */ @@ -19840,7 +19941,7 @@ index 87a65c9..92fcce6 100644 unexpected_machine_check; /* -@@ -1680,7 +1681,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) +@@ -1689,7 +1690,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) return; } @@ -19850,7 +19951,7 @@ index 87a65c9..92fcce6 100644 __mcheck_cpu_init_generic(); __mcheck_cpu_init_vendor(c); -@@ -1694,7 +1697,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) +@@ -1703,7 +1706,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) */ static DEFINE_SPINLOCK(mce_chrdev_state_lock); @@ -19859,7 +19960,7 @@ index 87a65c9..92fcce6 100644 static int mce_chrdev_open_exclu; /* already open exclusive? */ static int mce_chrdev_open(struct inode *inode, struct file *file) -@@ -1702,7 +1705,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) +@@ -1711,7 +1714,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) spin_lock(&mce_chrdev_state_lock); if (mce_chrdev_open_exclu || @@ -19868,7 +19969,7 @@ index 87a65c9..92fcce6 100644 spin_unlock(&mce_chrdev_state_lock); return -EBUSY; -@@ -1710,7 +1713,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) +@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file) if (file->f_flags & O_EXCL) mce_chrdev_open_exclu = 1; @@ -19877,7 +19978,7 @@ index 87a65c9..92fcce6 100644 spin_unlock(&mce_chrdev_state_lock); -@@ -1721,7 +1724,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file) +@@ -1730,7 +1733,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file) { spin_lock(&mce_chrdev_state_lock); @@ -19886,7 +19987,7 @@ index 87a65c9..92fcce6 100644 mce_chrdev_open_exclu = 0; spin_unlock(&mce_chrdev_state_lock); -@@ -2376,7 +2379,7 @@ static __init void mce_init_banks(void) +@@ -2404,7 +2407,7 @@ static __init void mce_init_banks(void) for (i = 0; i < mca_cfg.banks; i++) { struct mce_bank *b = &mce_banks[i]; @@ -19895,7 +19996,7 @@ index 87a65c9..92fcce6 100644 sysfs_attr_init(&a->attr); a->attr.name = b->attrname; -@@ -2444,7 +2447,7 @@ struct dentry *mce_get_debugfs_dir(void) +@@ -2472,7 +2475,7 @@ struct dentry *mce_get_debugfs_dir(void) static void mce_reset(void) { cpu_missing = 0; @@ -19975,7 +20076,7 @@ index df5e41f..816c719 100644 extern int generic_get_free_region(unsigned long base, unsigned long size, int replace_reg); diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c -index a7c7305..b9705ab 100644 +index 8a87a32..682a22a 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1348,7 +1348,7 @@ static void __init pmu_check_apic(void) @@ -19996,7 +20097,7 @@ index a7c7305..b9705ab 100644 .name = "events", .attrs = events_attr, }; -@@ -1957,7 +1957,7 @@ static unsigned long get_segment_base(unsigned int segment) +@@ -1958,7 +1958,7 @@ static unsigned long get_segment_base(unsigned int segment) if (idx > GDT_ENTRIES) return 0; @@ -20005,7 +20106,7 @@ index a7c7305..b9705ab 100644 } return get_desc_base(desc + idx); -@@ -2047,7 +2047,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) +@@ -2048,7 +2048,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) break; perf_callchain_store(entry, frame.return_address); @@ -20028,10 +20129,10 @@ index 639d128..e92d7e5 100644 while (amd_iommu_v2_event_descs[i].attr.attr.name) diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c -index a45d8d4..8abd32c 100644 +index f31a165..7b46cd8 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c -@@ -2099,10 +2099,10 @@ __init int intel_pmu_init(void) +@@ -2247,10 +2247,10 @@ __init int intel_pmu_init(void) * v2 and above have a perf capabilities MSR */ if (version > 1) { @@ -20046,10 +20147,10 @@ index a45d8d4..8abd32c 100644 intel_ds_init(); diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c -index 1fb6c72..f5fa2a3 100644 +index 4118f9f..f91d0ab 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c -@@ -3095,7 +3095,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types) +@@ -3204,7 +3204,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types) static int __init uncore_type_init(struct intel_uncore_type *type) { struct intel_uncore_pmu *pmus; @@ -20059,10 +20160,10 @@ index 1fb6c72..f5fa2a3 100644 int i, j; diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h -index 47b3d00c..2cf1751 100644 +index a80ab71..4089da5 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h -@@ -488,7 +488,7 @@ struct intel_uncore_box { +@@ -498,7 +498,7 @@ struct intel_uncore_box { struct uncore_event_desc { struct kobj_attribute attr; const char *config; @@ -20085,7 +20186,7 @@ index 7d9481c..99c7e4b 100644 .notifier_call = cpuid_class_cpu_callback, }; diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c -index 74467fe..18793d5 100644 +index 18677a9..f67c45b 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -58,10 +58,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs) @@ -20536,7 +20637,7 @@ index d15f575..d692043 100644 #include #include diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S -index 2cfbc3a..b756682 100644 +index f0dcb0c..9f39b80 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -177,13 +177,153 @@ @@ -21203,7 +21304,7 @@ index 2cfbc3a..b756682 100644 ENTRY(ftrace_regs_caller) pushf /* push flags before compare (in cs location) */ -@@ -1207,7 +1446,7 @@ trace: +@@ -1210,7 +1449,7 @@ trace: popl %ecx popl %eax jmp ftrace_stub @@ -21212,7 +21313,7 @@ index 2cfbc3a..b756682 100644 #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_FUNCTION_TRACER */ -@@ -1225,7 +1464,7 @@ ENTRY(ftrace_graph_caller) +@@ -1228,7 +1467,7 @@ ENTRY(ftrace_graph_caller) popl %ecx popl %eax ret @@ -21221,7 +21322,7 @@ index 2cfbc3a..b756682 100644 .globl return_to_handler return_to_handler: -@@ -1281,15 +1520,18 @@ error_code: +@@ -1284,15 +1523,18 @@ error_code: movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart REG_TO_PTGS %ecx SET_KERNEL_GS %ecx @@ -21242,7 +21343,7 @@ index 2cfbc3a..b756682 100644 /* * Debug traps and NMI can happen at the one SYSENTER instruction -@@ -1332,7 +1574,7 @@ debug_stack_correct: +@@ -1335,7 +1577,7 @@ debug_stack_correct: call do_debug jmp ret_from_exception CFI_ENDPROC @@ -21251,7 +21352,7 @@ index 2cfbc3a..b756682 100644 /* * NMI is doubly nasty. It can happen _while_ we're handling -@@ -1370,6 +1612,9 @@ nmi_stack_correct: +@@ -1373,6 +1615,9 @@ nmi_stack_correct: xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi @@ -21261,7 +21362,7 @@ index 2cfbc3a..b756682 100644 jmp restore_all_notrace CFI_ENDPROC -@@ -1406,12 +1651,15 @@ nmi_espfix_stack: +@@ -1409,12 +1654,15 @@ nmi_espfix_stack: FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx,%edx # zero error code call do_nmi @@ -21278,7 +21379,7 @@ index 2cfbc3a..b756682 100644 ENTRY(int3) RING0_INT_FRAME -@@ -1424,14 +1672,14 @@ ENTRY(int3) +@@ -1427,14 +1675,14 @@ ENTRY(int3) call do_int3 jmp ret_from_exception CFI_ENDPROC @@ -21295,7 +21396,7 @@ index 2cfbc3a..b756682 100644 #ifdef CONFIG_KVM_GUEST ENTRY(async_page_fault) -@@ -1440,7 +1688,7 @@ ENTRY(async_page_fault) +@@ -1443,7 +1691,7 @@ ENTRY(async_page_fault) pushl_cfi $do_async_page_fault jmp error_code CFI_ENDPROC @@ -21305,7 +21406,7 @@ index 2cfbc3a..b756682 100644 /* diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S -index 1b69951..8430a6d 100644 +index b077f4c..feb26c1 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -59,6 +59,8 @@ @@ -21843,19 +21944,7 @@ index 1b69951..8430a6d 100644 je 1f SWAPGS /* -@@ -498,9 +931,10 @@ ENTRY(save_rest) - movq_cfi r15, R15+16 - movq %r11, 8(%rsp) /* return address */ - FIXUP_TOP_OF_STACK %r11, 16 -+ pax_force_retaddr - ret - CFI_ENDPROC --END(save_rest) -+ENDPROC(save_rest) - - /* save complete stack frame */ - .pushsection .kprobes.text, "ax" -@@ -529,9 +963,10 @@ ENTRY(save_paranoid) +@@ -514,9 +947,10 @@ ENTRY(save_paranoid) js 1f /* negative -> in kernel */ SWAPGS xorl %ebx,%ebx @@ -21868,7 +21957,7 @@ index 1b69951..8430a6d 100644 .popsection /* -@@ -553,7 +988,7 @@ ENTRY(ret_from_fork) +@@ -538,7 +972,7 @@ ENTRY(ret_from_fork) RESTORE_REST @@ -21877,7 +21966,7 @@ index 1b69951..8430a6d 100644 jz 1f testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET -@@ -571,7 +1006,7 @@ ENTRY(ret_from_fork) +@@ -556,7 +990,7 @@ ENTRY(ret_from_fork) RESTORE_REST jmp int_ret_from_sys_call CFI_ENDPROC @@ -21886,7 +21975,7 @@ index 1b69951..8430a6d 100644 /* * System call entry. Up to 6 arguments in registers are supported. -@@ -608,7 +1043,7 @@ END(ret_from_fork) +@@ -593,7 +1027,7 @@ END(ret_from_fork) ENTRY(system_call) CFI_STARTPROC simple CFI_SIGNAL_FRAME @@ -21895,7 +21984,7 @@ index 1b69951..8430a6d 100644 CFI_REGISTER rip,rcx /*CFI_REGISTER rflags,r11*/ SWAPGS_UNSAFE_STACK -@@ -621,16 +1056,23 @@ GLOBAL(system_call_after_swapgs) +@@ -606,16 +1040,23 @@ GLOBAL(system_call_after_swapgs) movq %rsp,PER_CPU_VAR(old_rsp) movq PER_CPU_VAR(kernel_stack),%rsp @@ -21921,7 +22010,7 @@ index 1b69951..8430a6d 100644 jnz tracesys system_call_fastpath: #if __SYSCALL_MASK == ~0 -@@ -640,7 +1082,7 @@ system_call_fastpath: +@@ -625,7 +1066,7 @@ system_call_fastpath: cmpl $__NR_syscall_max,%eax #endif ja badsys @@ -21930,7 +22019,7 @@ index 1b69951..8430a6d 100644 call *sys_call_table(,%rax,8) # XXX: rip relative movq %rax,RAX-ARGOFFSET(%rsp) /* -@@ -654,10 +1096,13 @@ sysret_check: +@@ -639,10 +1080,13 @@ sysret_check: LOCKDEP_SYS_EXIT DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF @@ -21945,7 +22034,7 @@ index 1b69951..8430a6d 100644 /* * sysretq will re-enable interrupts: */ -@@ -709,14 +1154,18 @@ badsys: +@@ -694,14 +1138,18 @@ badsys: * jump back to the normal fast path. */ auditsys: @@ -21965,7 +22054,7 @@ index 1b69951..8430a6d 100644 jmp system_call_fastpath /* -@@ -737,7 +1186,7 @@ sysret_audit: +@@ -722,7 +1170,7 @@ sysret_audit: /* Do syscall tracing */ tracesys: #ifdef CONFIG_AUDITSYSCALL @@ -21974,7 +22063,7 @@ index 1b69951..8430a6d 100644 jz auditsys #endif SAVE_REST -@@ -745,12 +1194,16 @@ tracesys: +@@ -730,12 +1178,16 @@ tracesys: FIXUP_TOP_OF_STACK %rdi movq %rsp,%rdi call syscall_trace_enter @@ -21991,7 +22080,7 @@ index 1b69951..8430a6d 100644 RESTORE_REST #if __SYSCALL_MASK == ~0 cmpq $__NR_syscall_max,%rax -@@ -759,7 +1212,7 @@ tracesys: +@@ -744,7 +1196,7 @@ tracesys: cmpl $__NR_syscall_max,%eax #endif ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */ @@ -22000,7 +22089,7 @@ index 1b69951..8430a6d 100644 call *sys_call_table(,%rax,8) movq %rax,RAX-ARGOFFSET(%rsp) /* Use IRET because user could have changed frame */ -@@ -780,7 +1233,9 @@ GLOBAL(int_with_check) +@@ -765,7 +1217,9 @@ GLOBAL(int_with_check) andl %edi,%edx jnz int_careful andl $~TS_COMPAT,TI_status(%rcx) @@ -22011,7 +22100,7 @@ index 1b69951..8430a6d 100644 /* Either reschedule or signal or syscall exit tracking needed. */ /* First do a reschedule test. */ -@@ -826,7 +1281,7 @@ int_restore_rest: +@@ -811,7 +1265,7 @@ int_restore_rest: TRACE_IRQS_OFF jmp int_with_check CFI_ENDPROC @@ -22020,7 +22109,7 @@ index 1b69951..8430a6d 100644 .macro FORK_LIKE func ENTRY(stub_\func) -@@ -839,9 +1294,10 @@ ENTRY(stub_\func) +@@ -824,9 +1278,10 @@ ENTRY(stub_\func) DEFAULT_FRAME 0 8 /* offset 8: return address */ call sys_\func RESTORE_TOP_OF_STACK %r11, 8 @@ -22032,7 +22121,7 @@ index 1b69951..8430a6d 100644 .endm .macro FIXED_FRAME label,func -@@ -851,9 +1307,10 @@ ENTRY(\label) +@@ -836,9 +1291,10 @@ ENTRY(\label) FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET call \func RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET @@ -22044,7 +22133,7 @@ index 1b69951..8430a6d 100644 .endm FORK_LIKE clone -@@ -870,9 +1327,10 @@ ENTRY(ptregscall_common) +@@ -855,9 +1311,10 @@ ENTRY(ptregscall_common) movq_cfi_restore R12+8, r12 movq_cfi_restore RBP+8, rbp movq_cfi_restore RBX+8, rbx @@ -22056,7 +22145,7 @@ index 1b69951..8430a6d 100644 ENTRY(stub_execve) CFI_STARTPROC -@@ -885,7 +1343,7 @@ ENTRY(stub_execve) +@@ -870,7 +1327,7 @@ ENTRY(stub_execve) RESTORE_REST jmp int_ret_from_sys_call CFI_ENDPROC @@ -22065,7 +22154,7 @@ index 1b69951..8430a6d 100644 /* * sigreturn is special because it needs to restore all registers on return. -@@ -902,7 +1360,7 @@ ENTRY(stub_rt_sigreturn) +@@ -887,7 +1344,7 @@ ENTRY(stub_rt_sigreturn) RESTORE_REST jmp int_ret_from_sys_call CFI_ENDPROC @@ -22074,7 +22163,7 @@ index 1b69951..8430a6d 100644 #ifdef CONFIG_X86_X32_ABI ENTRY(stub_x32_rt_sigreturn) -@@ -916,7 +1374,7 @@ ENTRY(stub_x32_rt_sigreturn) +@@ -901,7 +1358,7 @@ ENTRY(stub_x32_rt_sigreturn) RESTORE_REST jmp int_ret_from_sys_call CFI_ENDPROC @@ -22083,7 +22172,7 @@ index 1b69951..8430a6d 100644 ENTRY(stub_x32_execve) CFI_STARTPROC -@@ -930,7 +1388,7 @@ ENTRY(stub_x32_execve) +@@ -915,7 +1372,7 @@ ENTRY(stub_x32_execve) RESTORE_REST jmp int_ret_from_sys_call CFI_ENDPROC @@ -22092,7 +22181,7 @@ index 1b69951..8430a6d 100644 #endif -@@ -967,7 +1425,7 @@ vector=vector+1 +@@ -952,7 +1409,7 @@ vector=vector+1 2: jmp common_interrupt .endr CFI_ENDPROC @@ -22101,7 +22190,7 @@ index 1b69951..8430a6d 100644 .previous END(interrupt) -@@ -987,6 +1445,16 @@ END(interrupt) +@@ -972,6 +1429,16 @@ END(interrupt) subq $ORIG_RAX-RBP, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP SAVE_ARGS_IRQ @@ -22118,7 +22207,7 @@ index 1b69951..8430a6d 100644 call \func .endm -@@ -1019,7 +1487,7 @@ ret_from_intr: +@@ -1004,7 +1471,7 @@ ret_from_intr: exit_intr: GET_THREAD_INFO(%rcx) @@ -22127,7 +22216,7 @@ index 1b69951..8430a6d 100644 je retint_kernel /* Interrupt came from user space */ -@@ -1041,12 +1509,16 @@ retint_swapgs: /* return to user-space */ +@@ -1026,12 +1493,16 @@ retint_swapgs: /* return to user-space */ * The iretq could re-enable interrupts: */ DISABLE_INTERRUPTS(CLBR_ANY) @@ -22144,7 +22233,7 @@ index 1b69951..8430a6d 100644 /* * The iretq could re-enable interrupts: */ -@@ -1129,7 +1601,7 @@ ENTRY(retint_kernel) +@@ -1114,7 +1585,7 @@ ENTRY(retint_kernel) #endif CFI_ENDPROC @@ -22153,7 +22242,7 @@ index 1b69951..8430a6d 100644 /* * End of kprobes section */ -@@ -1147,7 +1619,7 @@ ENTRY(\sym) +@@ -1132,7 +1603,7 @@ ENTRY(\sym) interrupt \do_sym jmp ret_from_intr CFI_ENDPROC @@ -22162,7 +22251,7 @@ index 1b69951..8430a6d 100644 .endm #ifdef CONFIG_TRACING -@@ -1230,12 +1702,22 @@ ENTRY(\sym) +@@ -1215,12 +1686,22 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 @@ -22186,7 +22275,7 @@ index 1b69951..8430a6d 100644 .endm .macro paranoidzeroentry sym do_sym -@@ -1248,15 +1730,25 @@ ENTRY(\sym) +@@ -1233,15 +1714,25 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF @@ -22214,7 +22303,7 @@ index 1b69951..8430a6d 100644 .macro paranoidzeroentry_ist sym do_sym ist ENTRY(\sym) INTR_FRAME -@@ -1267,14 +1759,30 @@ ENTRY(\sym) +@@ -1252,14 +1743,30 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF_DEBUG @@ -22246,7 +22335,7 @@ index 1b69951..8430a6d 100644 .endm .macro errorentry sym do_sym -@@ -1286,13 +1794,23 @@ ENTRY(\sym) +@@ -1271,13 +1778,23 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry DEFAULT_FRAME 0 @@ -22271,7 +22360,7 @@ index 1b69951..8430a6d 100644 .endm /* error code is on the stack already */ -@@ -1306,13 +1824,23 @@ ENTRY(\sym) +@@ -1291,13 +1808,23 @@ ENTRY(\sym) call save_paranoid DEFAULT_FRAME 0 TRACE_IRQS_OFF @@ -22296,7 +22385,7 @@ index 1b69951..8430a6d 100644 .endm zeroentry divide_error do_divide_error -@@ -1342,9 +1870,10 @@ gs_change: +@@ -1327,9 +1854,10 @@ gs_change: 2: mfence /* workaround */ SWAPGS popfq_cfi @@ -22308,7 +22397,7 @@ index 1b69951..8430a6d 100644 _ASM_EXTABLE(gs_change,bad_gs) .section .fixup,"ax" -@@ -1372,9 +1901,10 @@ ENTRY(call_softirq) +@@ -1357,9 +1885,10 @@ ENTRY(call_softirq) CFI_DEF_CFA_REGISTER rsp CFI_ADJUST_CFA_OFFSET -8 decl PER_CPU_VAR(irq_count) @@ -22320,7 +22409,7 @@ index 1b69951..8430a6d 100644 #ifdef CONFIG_XEN zeroentry xen_hypervisor_callback xen_do_hypervisor_callback -@@ -1412,7 +1942,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) +@@ -1397,7 +1926,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs) decl PER_CPU_VAR(irq_count) jmp error_exit CFI_ENDPROC @@ -22329,7 +22418,7 @@ index 1b69951..8430a6d 100644 /* * Hypervisor uses this for application faults while it executes. -@@ -1471,7 +2001,7 @@ ENTRY(xen_failsafe_callback) +@@ -1456,7 +1985,7 @@ ENTRY(xen_failsafe_callback) SAVE_ALL jmp error_exit CFI_ENDPROC @@ -22338,7 +22427,7 @@ index 1b69951..8430a6d 100644 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ xen_hvm_callback_vector xen_evtchn_do_upcall -@@ -1523,18 +2053,33 @@ ENTRY(paranoid_exit) +@@ -1508,18 +2037,33 @@ ENTRY(paranoid_exit) DEFAULT_FRAME DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF_DEBUG @@ -22374,7 +22463,7 @@ index 1b69951..8430a6d 100644 jmp irq_return paranoid_userspace: GET_THREAD_INFO(%rcx) -@@ -1563,7 +2108,7 @@ paranoid_schedule: +@@ -1548,7 +2092,7 @@ paranoid_schedule: TRACE_IRQS_OFF jmp paranoid_userspace CFI_ENDPROC @@ -22383,7 +22472,7 @@ index 1b69951..8430a6d 100644 /* * Exception entry point. This expects an error code/orig_rax on the stack. -@@ -1590,12 +2135,13 @@ ENTRY(error_entry) +@@ -1575,12 +2119,13 @@ ENTRY(error_entry) movq_cfi r14, R14+8 movq_cfi r15, R15+8 xorl %ebx,%ebx @@ -22398,7 +22487,7 @@ index 1b69951..8430a6d 100644 ret /* -@@ -1622,7 +2168,7 @@ bstep_iret: +@@ -1607,7 +2152,7 @@ bstep_iret: movq %rcx,RIP+8(%rsp) jmp error_swapgs CFI_ENDPROC @@ -22407,7 +22496,7 @@ index 1b69951..8430a6d 100644 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */ -@@ -1633,7 +2179,7 @@ ENTRY(error_exit) +@@ -1618,7 +2163,7 @@ ENTRY(error_exit) DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF GET_THREAD_INFO(%rcx) @@ -22416,7 +22505,7 @@ index 1b69951..8430a6d 100644 jne retint_kernel LOCKDEP_SYS_EXIT_IRQ movl TI_flags(%rcx),%edx -@@ -1642,7 +2188,7 @@ ENTRY(error_exit) +@@ -1627,7 +2172,7 @@ ENTRY(error_exit) jnz retint_careful jmp retint_swapgs CFI_ENDPROC @@ -22425,7 +22514,7 @@ index 1b69951..8430a6d 100644 /* * Test if a given stack is an NMI stack or not. -@@ -1700,9 +2246,11 @@ ENTRY(nmi) +@@ -1685,9 +2230,11 @@ ENTRY(nmi) * If %cs was not the kernel segment, then the NMI triggered in user * space, which means it is definitely not nested. */ @@ -22438,7 +22527,7 @@ index 1b69951..8430a6d 100644 /* * Check the special variable on the stack to see if NMIs are * executing. -@@ -1736,8 +2284,7 @@ nested_nmi: +@@ -1721,8 +2268,7 @@ nested_nmi: 1: /* Set up the interrupted NMIs stack to jump to repeat_nmi */ @@ -22448,7 +22537,7 @@ index 1b69951..8430a6d 100644 CFI_ADJUST_CFA_OFFSET 1*8 leaq -10*8(%rsp), %rdx pushq_cfi $__KERNEL_DS -@@ -1755,6 +2302,7 @@ nested_nmi_out: +@@ -1740,6 +2286,7 @@ nested_nmi_out: CFI_RESTORE rdx /* No need to check faults here */ @@ -22456,7 +22545,7 @@ index 1b69951..8430a6d 100644 INTERRUPT_RETURN CFI_RESTORE_STATE -@@ -1871,6 +2419,8 @@ end_repeat_nmi: +@@ -1856,6 +2403,8 @@ end_repeat_nmi: */ movq %cr2, %r12 @@ -22465,7 +22554,7 @@ index 1b69951..8430a6d 100644 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ movq %rsp,%rdi movq $-1,%rsi -@@ -1883,26 +2433,31 @@ end_repeat_nmi: +@@ -1868,26 +2417,31 @@ end_repeat_nmi: movq %r12, %cr2 1: @@ -22501,7 +22590,7 @@ index 1b69951..8430a6d 100644 /* * End of kprobes section diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c -index 42a392a..fbbd930 100644 +index d4bdd25..912664c 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code, @@ -22531,7 +22620,7 @@ index 42a392a..fbbd930 100644 new = ftrace_call_replace(ip, (unsigned long)func); ret = ftrace_modify_code(ip, old, new); } -@@ -279,7 +281,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size) +@@ -291,7 +293,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size) * kernel identity mapping to modify code. */ if (within(ip, (unsigned long)_text, (unsigned long)_etext)) @@ -22540,7 +22629,7 @@ index 42a392a..fbbd930 100644 return probe_kernel_write((void *)ip, val, size); } -@@ -289,7 +291,7 @@ static int add_break(unsigned long ip, const char *old) +@@ -301,7 +303,7 @@ static int add_break(unsigned long ip, const char *old) unsigned char replaced[MCOUNT_INSN_SIZE]; unsigned char brk = BREAKPOINT_INSTRUCTION; @@ -22549,7 +22638,7 @@ index 42a392a..fbbd930 100644 return -EFAULT; /* Make sure it is what we expect it to be */ -@@ -637,7 +639,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code, +@@ -649,7 +651,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code, return ret; fail_update: @@ -22558,7 +22647,7 @@ index 42a392a..fbbd930 100644 goto out; } -@@ -670,6 +672,8 @@ static int ftrace_mod_jmp(unsigned long ip, +@@ -682,6 +684,8 @@ static int ftrace_mod_jmp(unsigned long ip, { unsigned char code[MCOUNT_INSN_SIZE]; @@ -22568,7 +22657,7 @@ index 42a392a..fbbd930 100644 return -EFAULT; diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c -index 55b6761..a6456fc 100644 +index 1be8e43..d9b9ef6 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -67,12 +67,12 @@ again: @@ -22612,7 +22701,7 @@ index 55b6761..a6456fc 100644 } pmd = (physaddr & PMD_MASK) + early_pmd_flags; pmd_p[pmd_index(address)] = pmd; -@@ -175,7 +175,6 @@ void __init x86_64_start_kernel(char * real_mode_data) +@@ -175,7 +175,6 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data) if (console_loglevel == 10) early_printk("Kernel alive\n"); @@ -22621,7 +22710,7 @@ index 55b6761..a6456fc 100644 init_level4_pgt[511] = early_level4_pgt[511]; diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S -index 5dd87a8..d68b3f4 100644 +index 81ba276..30c5411 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -26,6 +26,12 @@ @@ -23044,7 +23133,7 @@ index 5dd87a8..d68b3f4 100644 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S -index e1aabdb..73dcad8 100644 +index e1aabdb..fee4fee 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -20,6 +20,8 @@ @@ -23069,7 +23158,7 @@ index e1aabdb..73dcad8 100644 .text __HEAD -@@ -89,11 +97,23 @@ startup_64: +@@ -89,11 +97,24 @@ startup_64: * Fixup the physical addresses in the page table */ addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip) @@ -23085,18 +23174,18 @@ index e1aabdb..73dcad8 100644 +#ifndef CONFIG_XEN + addq %rbp, level3_ident_pgt + (1*8)(%rip) +#endif - -- addq %rbp, level2_fixmap_pgt + (506*8)(%rip) ++ + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip) + + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip) + addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip) -+ + + addq %rbp, level2_fixmap_pgt + (506*8)(%rip) + addq %rbp, level2_fixmap_pgt + (507*8)(%rip) /* * Set up the identity mapping for the switchover. These -@@ -177,8 +197,8 @@ ENTRY(secondary_startup_64) +@@ -177,8 +198,8 @@ ENTRY(secondary_startup_64) movq $(init_level4_pgt - __START_KERNEL_map), %rax 1: @@ -23107,7 +23196,7 @@ index e1aabdb..73dcad8 100644 movq %rcx, %cr4 /* Setup early boot stage 4 level pagetables. */ -@@ -199,10 +219,18 @@ ENTRY(secondary_startup_64) +@@ -199,10 +220,19 @@ ENTRY(secondary_startup_64) movl $MSR_EFER, %ecx rdmsr btsl $_EFER_SCE, %eax /* Enable System Call */ @@ -23116,18 +23205,19 @@ index e1aabdb..73dcad8 100644 jnc 1f btsl $_EFER_NX, %eax btsq $_PAGE_BIT_NX,early_pmd_flags(%rip) -+ leaq init_level4_pgt(%rip), %rdi +#ifndef CONFIG_EFI -+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi) ++ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip) +#endif -+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi) -+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi) -+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi) ++ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip) ++ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip) ++ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip) ++ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip) ++ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip) + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip) 1: wrmsr /* Make changes effective */ /* Setup cr0 */ -@@ -282,6 +310,7 @@ ENTRY(secondary_startup_64) +@@ -282,6 +312,7 @@ ENTRY(secondary_startup_64) * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect, * address given in m16:64. */ @@ -23135,7 +23225,7 @@ index e1aabdb..73dcad8 100644 movq initial_code(%rip),%rax pushq $0 # fake return address to stop unwinder pushq $__KERNEL_CS # set correct cs -@@ -388,7 +417,7 @@ ENTRY(early_idt_handler) +@@ -388,7 +419,7 @@ ENTRY(early_idt_handler) call dump_stack #ifdef CONFIG_KALLSYMS leaq early_idt_ripmsg(%rip),%rdi @@ -23144,7 +23234,7 @@ index e1aabdb..73dcad8 100644 call __print_symbol #endif #endif /* EARLY_PRINTK */ -@@ -416,6 +445,7 @@ ENDPROC(early_idt_handler) +@@ -416,6 +447,7 @@ ENDPROC(early_idt_handler) early_recursion_flag: .long 0 @@ -23152,7 +23242,7 @@ index e1aabdb..73dcad8 100644 #ifdef CONFIG_EARLY_PRINTK early_idt_msg: .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n" -@@ -443,29 +473,52 @@ NEXT_PAGE(early_level4_pgt) +@@ -443,29 +475,52 @@ NEXT_PAGE(early_level4_pgt) NEXT_PAGE(early_dynamic_pgts) .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0 @@ -23214,7 +23304,7 @@ index e1aabdb..73dcad8 100644 NEXT_PAGE(level3_kernel_pgt) .fill L3_START_KERNEL,8,0 -@@ -473,6 +526,9 @@ NEXT_PAGE(level3_kernel_pgt) +@@ -473,6 +528,9 @@ NEXT_PAGE(level3_kernel_pgt) .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE @@ -23224,23 +23314,22 @@ index e1aabdb..73dcad8 100644 NEXT_PAGE(level2_kernel_pgt) /* * 512 MB kernel mapping. We spend a full page on this pagetable -@@ -488,30 +544,62 @@ NEXT_PAGE(level2_kernel_pgt) - KERNEL_IMAGE_SIZE/PMD_SIZE) - +@@ -490,28 +548,64 @@ NEXT_PAGE(level2_kernel_pgt) NEXT_PAGE(level2_fixmap_pgt) -- .fill 506,8,0 -- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE + .fill 506,8,0 + .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */ - .fill 5,8,0 -+ .fill 507,8,0 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */ + .fill 4,8,0 --NEXT_PAGE(level1_fixmap_pgt) -+NEXT_PAGE(level1_vsyscall_pgt) + NEXT_PAGE(level1_fixmap_pgt) .fill 512,8,0 ++NEXT_PAGE(level1_vsyscall_pgt) ++ .fill 512,8,0 ++ #undef PMDS - .data @@ -23393,7 +23482,7 @@ index a979b5b..1d6db75 100644 .callback = dmi_io_delay_0xed_port, .ident = "Compaq Presario V6000", diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c -index 4ddaf66..6292f4e 100644 +index 4ddaf66..49d5c18 100644 --- a/arch/x86/kernel/ioport.c +++ b/arch/x86/kernel/ioport.c @@ -6,6 +6,7 @@ @@ -23404,19 +23493,19 @@ index 4ddaf66..6292f4e 100644 #include #include #include -@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) - - if ((from + num <= from) || (from + num > IO_BITMAP_BITS)) +@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) return -EINVAL; + if (turn_on && !capable(CAP_SYS_RAWIO)) + return -EPERM; +#ifdef CONFIG_GRKERNSEC_IO + if (turn_on && grsec_disable_privio) { + gr_handle_ioperm(); -+ return -EPERM; ++ return -ENODEV; + } +#endif - if (turn_on && !capable(CAP_SYS_RAWIO)) - return -EPERM; + /* + * If it's the first ioperm() call in this thread's lifetime, set the @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on) * because the ->io_bitmap_max value must match the bitmap * contents: @@ -23426,21 +23515,21 @@ index 4ddaf66..6292f4e 100644 if (turn_on) bitmap_clear(t->io_bitmap_ptr, from, num); -@@ -103,6 +110,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level) - return -EINVAL; - /* Trying to gain more privileges? */ +@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level) if (level > old) { + if (!capable(CAP_SYS_RAWIO)) + return -EPERM; +#ifdef CONFIG_GRKERNSEC_IO + if (grsec_disable_privio) { + gr_handle_iopl(); -+ return -EPERM; ++ return -ENODEV; + } +#endif - if (!capable(CAP_SYS_RAWIO)) - return -EPERM; } + regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); + t->iopl = level << 12; diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c -index 3a8185c..3c042ee 100644 +index 22d0687..e07b2a5 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -21,7 +21,7 @@ @@ -23635,19 +23724,35 @@ index d04d3ec..ea4b374 100644 return; if (regs->sp >= curbase + sizeof(struct thread_info) + -diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c -index dc1404b..bbc43e7 100644 ---- a/arch/x86/kernel/kdebugfs.c -+++ b/arch/x86/kernel/kdebugfs.c -@@ -27,7 +27,7 @@ struct setup_data_node { - u32 len; - }; +diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c +index ee11b7d..4df4d0c 100644 +--- a/arch/x86/kernel/jump_label.c ++++ b/arch/x86/kernel/jump_label.c +@@ -49,7 +49,7 @@ static void __jump_label_transform(struct jump_entry *entry, + * We are enabling this jump label. If it is not a nop + * then something must have gone wrong. + */ +- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5) != 0)) ++ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5) != 0)) + bug_at((void *)entry->code, __LINE__); --static ssize_t setup_data_read(struct file *file, char __user *user_buf, -+static ssize_t __size_overflow(3) setup_data_read(struct file *file, char __user *user_buf, - size_t count, loff_t *ppos) - { - struct setup_data_node *node = file->private_data; + code.jump = 0xe9; +@@ -64,13 +64,13 @@ static void __jump_label_transform(struct jump_entry *entry, + */ + if (init) { + const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP }; +- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0)) ++ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0)) + bug_at((void *)entry->code, __LINE__); + } else { + code.jump = 0xe9; + code.offset = entry->target - + (entry->code + JUMP_LABEL_NOP_SIZE); +- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0)) ++ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0)) + bug_at((void *)entry->code, __LINE__); + } + memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE); diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index 836f832..a8bda67 100644 --- a/arch/x86/kernel/kgdb.c @@ -23742,7 +23847,7 @@ index 836f832..a8bda67 100644 } diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c -index 211bce4..6e2580a 100644 +index 79a3f96..6ba030a 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op) @@ -23859,7 +23964,7 @@ index 211bce4..6e2580a 100644 switch (val) { diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c -index 76dc6f0..66bdfc3 100644 +index 898160b..758cde8 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -79,6 +79,7 @@ found: @@ -23877,8 +23982,8 @@ index 76dc6f0..66bdfc3 100644 + pax_close_kernel(); } - static void __used __kprobes kprobes_optinsn_template_holder(void) -@@ -338,7 +340,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op) + asm ( +@@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op) * Verify if the address gap is in 2GB range, because this uses * a relative jump. */ @@ -23887,7 +23992,7 @@ index 76dc6f0..66bdfc3 100644 if (abs(rel) > 0x7fffffff) return -ERANGE; -@@ -353,16 +355,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op) +@@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op) op->optinsn.size = ret; /* Copy arch-dep-instance from template */ @@ -23909,16 +24014,16 @@ index 76dc6f0..66bdfc3 100644 (u8 *)op->kp.addr + op->optinsn.size); flush_icache_range((unsigned long) buf, -@@ -385,7 +389,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm, - ((long)op->kp.addr + RELATIVEJUMP_SIZE)); +@@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist) + WARN_ON(kprobe_disabled(&op->kp)); - /* Backup instructions which will be replaced by jump address */ -- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE, -+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE, - RELATIVE_ADDR_SIZE); + /* Backup instructions which will be replaced by jump address */ +- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE, ++ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE, + RELATIVE_ADDR_SIZE); - insn_buf[0] = RELATIVEJUMP_OPCODE; -@@ -483,7 +487,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter) + insn_buf[0] = RELATIVEJUMP_OPCODE; +@@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter) /* This kprobe is really able to run optimized path. */ op = container_of(p, struct optimized_kprobe, kp); /* Detour through copied instructions */ @@ -24210,7 +24315,7 @@ index 88458fa..349f7a4 100644 }; diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c -index ba77ebc..65da999 100644 +index 6fcb49c..5b3f4ff 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2 @@ -24284,20 +24389,20 @@ index 6d9582e..f746287 100644 return; } diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c -index 676b8c7..870ba04 100644 +index bbb6c73..24a58ef 100644 --- a/arch/x86/kernel/paravirt-spinlocks.c +++ b/arch/x86/kernel/paravirt-spinlocks.c -@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags) - arch_spin_lock(lock); - } +@@ -8,7 +8,7 @@ + + #include -struct pv_lock_ops pv_lock_ops = { +struct pv_lock_ops pv_lock_ops __read_only = { #ifdef CONFIG_SMP - .spin_is_locked = __ticket_spin_is_locked, - .spin_is_contended = __ticket_spin_is_contended, + .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop), + .unlock_kick = paravirt_nop, diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c -index cd6de64..27c6af0 100644 +index 1b10af8..0b58cbc 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x) @@ -24310,7 +24415,7 @@ index cd6de64..27c6af0 100644 void __init default_banner(void) { -@@ -147,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, +@@ -142,15 +145,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, if (opfunc == NULL) /* If there's no function, patch it with a ud2a (BUG) */ ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); @@ -24333,7 +24438,7 @@ index cd6de64..27c6af0 100644 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) || -@@ -180,7 +187,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len, +@@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len, if (insn_len > len || start == NULL) insn_len = len; else @@ -24342,7 +24447,7 @@ index cd6de64..27c6af0 100644 return insn_len; } -@@ -304,7 +311,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) +@@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) return this_cpu_read(paravirt_lazy_mode); } @@ -24351,7 +24456,7 @@ index cd6de64..27c6af0 100644 .name = "bare hardware", .paravirt_enabled = 0, .kernel_rpl = 0, -@@ -315,16 +322,16 @@ struct pv_info pv_info = { +@@ -310,16 +317,16 @@ struct pv_info pv_info = { #endif }; @@ -24366,21 +24471,21 @@ index cd6de64..27c6af0 100644 .steal_clock = native_steal_clock, }; --struct pv_irq_ops pv_irq_ops = { -+struct pv_irq_ops pv_irq_ops __read_only = { +-__visible struct pv_irq_ops pv_irq_ops = { ++__visible struct pv_irq_ops pv_irq_ops __read_only = { .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl), .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl), .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable), -@@ -336,7 +343,7 @@ struct pv_irq_ops pv_irq_ops = { +@@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = { #endif }; --struct pv_cpu_ops pv_cpu_ops = { -+struct pv_cpu_ops pv_cpu_ops __read_only = { +-__visible struct pv_cpu_ops pv_cpu_ops = { ++__visible struct pv_cpu_ops pv_cpu_ops __read_only = { .cpuid = native_cpuid, .get_debugreg = native_get_debugreg, .set_debugreg = native_set_debugreg, -@@ -394,21 +401,26 @@ struct pv_cpu_ops pv_cpu_ops = { +@@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = { .end_context_switch = paravirt_nop, }; @@ -24410,7 +24515,7 @@ index cd6de64..27c6af0 100644 .read_cr2 = native_read_cr2, .write_cr2 = native_write_cr2, -@@ -458,6 +470,7 @@ struct pv_mmu_ops pv_mmu_ops = { +@@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = { .make_pud = PTE_IDENT, .set_pgd = native_set_pgd, @@ -24418,7 +24523,7 @@ index cd6de64..27c6af0 100644 #endif #endif /* PAGETABLE_LEVELS >= 3 */ -@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = { +@@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = { }, .set_fixmap = native_set_fixmap, @@ -24471,15 +24576,15 @@ index 6c483ba..d10ce2f 100644 static struct dma_map_ops swiotlb_dma_ops = { diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c -index 83369e5..52b93f0 100644 +index 3fb8d95..254dc51 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -36,7 +36,8 @@ * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. */ --DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS; -+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS; ++struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); #ifdef CONFIG_X86_64 @@ -24579,7 +24684,7 @@ index 83369e5..52b93f0 100644 +} +#endif diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c -index f8adefc..4bce3d6 100644 +index 884f98f..ec23e04 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread"); @@ -24684,7 +24789,7 @@ index f8adefc..4bce3d6 100644 } - diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c -index 05646ba..0c2906d 100644 +index bb1dc51..08dda7f 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, @@ -24886,7 +24991,7 @@ index 7461f50..1334029 100644 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT))) diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c -index 2cb9470..ff1fd80 100644 +index a16bae3..1f65f25 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -43,11 +43,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src) @@ -24918,7 +25023,7 @@ index 2cb9470..ff1fd80 100644 return ret; diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index 5f4ad27..9d96c99 100644 +index 618ce26..ec7e21c 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d) @@ -24964,7 +25069,7 @@ index 5f4ad27..9d96c99 100644 "rm" (real_mode_header->machine_real_restart_asm), "a" (type)); #else -@@ -458,7 +485,7 @@ void __attribute__((weak)) mach_reboot_fixups(void) +@@ -466,7 +493,7 @@ void __attribute__((weak)) mach_reboot_fixups(void) * try to force a triple fault and then cycle between hitting the keyboard * controller and doing that */ @@ -24973,7 +25078,7 @@ index 5f4ad27..9d96c99 100644 { int i; int attempt = 0; -@@ -567,13 +594,13 @@ void native_machine_shutdown(void) +@@ -575,13 +602,13 @@ void native_machine_shutdown(void) #endif } @@ -24989,7 +25094,7 @@ index 5f4ad27..9d96c99 100644 { pr_notice("machine restart\n"); -@@ -582,7 +609,7 @@ static void native_machine_restart(char *__unused) +@@ -590,7 +617,7 @@ static void native_machine_restart(char *__unused) __machine_emergency_restart(0); } @@ -24998,7 +25103,7 @@ index 5f4ad27..9d96c99 100644 { /* Stop other cpus and apics */ machine_shutdown(); -@@ -592,7 +619,7 @@ static void native_machine_halt(void) +@@ -600,7 +627,7 @@ static void native_machine_halt(void) stop_this_cpu(NULL); } @@ -25007,7 +25112,7 @@ index 5f4ad27..9d96c99 100644 { if (pm_power_off) { if (!reboot_force) -@@ -601,9 +628,10 @@ static void native_machine_power_off(void) +@@ -609,9 +636,10 @@ static void native_machine_power_off(void) } /* A fallback in case there is no PM info available */ tboot_shutdown(TB_SHUTDOWN_HALT); @@ -25063,7 +25168,7 @@ index 3fd2c69..16ef367 100644 1: diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 234e1e3..1246d05 100644 +index f0de629..a4978a8f 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -110,6 +110,7 @@ @@ -25079,14 +25184,14 @@ index 234e1e3..1246d05 100644 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64) --unsigned long mmu_cr4_features; +-__visible unsigned long mmu_cr4_features; +#ifdef CONFIG_X86_64 -+unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE; ++__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE; +#elif defined(CONFIG_X86_PAE) -+unsigned long mmu_cr4_features __read_only = X86_CR4_PAE; ++__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE; #else --unsigned long mmu_cr4_features = X86_CR4_PAE; -+unsigned long mmu_cr4_features __read_only; +-__visible unsigned long mmu_cr4_features = X86_CR4_PAE; ++__visible unsigned long mmu_cr4_features __read_only; #endif +void set_in_cr4(unsigned long mask) @@ -25128,15 +25233,6 @@ index 234e1e3..1246d05 100644 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */ int bootloader_type, bootloader_version; -@@ -442,7 +481,7 @@ static void __init parse_setup_data(void) - - switch (data_type) { - case SETUP_E820_EXT: -- parse_e820_ext(pa_data, data_len); -+ parse_e820_ext((struct setup_data __force_kernel *)pa_data, data_len); - break; - case SETUP_DTB: - add_dtb(pa_data); @@ -768,7 +807,7 @@ static void __init trim_bios_range(void) * area (640->1Mb) as ram even though it is not. * take them out. @@ -25265,7 +25361,7 @@ index 5cdff03..80fa283 100644 * Up to this point, the boot CPU has been using .init.data * area. Reload any changed state for the boot CPU. diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c -index d859eea..44e17c4 100644 +index 9e5de68..16c53cb 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp) @@ -25343,7 +25439,7 @@ index d859eea..44e17c4 100644 } diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c -index cdaa347..f5af55d 100644 +index 7c3a5a6..f0a8961 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c @@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str) @@ -25356,7 +25452,7 @@ index cdaa347..f5af55d 100644 .smp_prepare_cpus = native_smp_prepare_cpus, .smp_cpus_done = native_smp_cpus_done, diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c -index aecc98a..0244a53 100644 +index 6cacab6..750636a 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -251,14 +251,18 @@ static void notrace start_secondary(void *unused) @@ -25384,7 +25480,7 @@ index aecc98a..0244a53 100644 /* * Check TSC synchronization with the BP: */ -@@ -748,6 +752,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle) +@@ -749,6 +753,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle) idle->thread.sp = (unsigned long) (((struct pt_regs *) (THREAD_SIZE + task_stack_page(idle))) - 1); per_cpu(current_task, cpu) = idle; @@ -25392,7 +25488,7 @@ index aecc98a..0244a53 100644 #ifdef CONFIG_X86_32 /* Stack for startup_32 can be just as for start_secondary onwards */ -@@ -755,11 +760,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle) +@@ -756,11 +761,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle) #else clear_tsk_thread_flag(idle, TIF_FORK); initial_gs = per_cpu_offset(cpu); @@ -25409,7 +25505,7 @@ index aecc98a..0244a53 100644 initial_code = (unsigned long)start_secondary; stack_start = idle->thread.sp; -@@ -908,6 +915,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle) +@@ -909,6 +916,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle) /* the FPU context is blank, nobody can own it */ __cpu_disable_lazy_restore(cpu); @@ -25752,7 +25848,7 @@ index 30277e2..5664a29 100644 if (!(addr & ~PAGE_MASK)) return addr; diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c -index addf7b5..f960685 100644 +index 91a4496..1730bff 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -221,7 +221,7 @@ static int tboot_setup_sleep(void) @@ -25773,8 +25869,8 @@ index addf7b5..f960685 100644 shutdown(); /* should not reach here */ -@@ -301,7 +301,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) - return 0; +@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b) + return -ENODEV; } -static atomic_t ap_wfs_count; @@ -25782,7 +25878,7 @@ index addf7b5..f960685 100644 static int tboot_wait_for_aps(int num_aps) { -@@ -325,9 +325,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action, +@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action, { switch (action) { case CPU_DYING: @@ -25794,7 +25890,7 @@ index addf7b5..f960685 100644 return NOTIFY_BAD; break; } -@@ -413,7 +413,7 @@ static __init int tboot_late_init(void) +@@ -422,7 +422,7 @@ static __init int tboot_late_init(void) tboot_create_trampoline(); @@ -25881,10 +25977,10 @@ index 1c113db..287b42e 100644 static int trace_irq_vector_refcount; static DEFINE_MUTEX(irq_vector_mutex); diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c -index 1b23a1c..910de0d 100644 +index 8c8093b..c93f581 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ #include /* No need to be aligned, but done to keep all IDTs defined the same way. */ @@ -25893,7 +25989,7 @@ index 1b23a1c..910de0d 100644 #else #include #include -@@ -74,7 +74,7 @@ asmlinkage int system_call(void); +@@ -75,7 +75,7 @@ asmlinkage int system_call(void); #endif /* Must be page-aligned because the real IDT is used in a fixmap. */ @@ -25902,7 +25998,7 @@ index 1b23a1c..910de0d 100644 DECLARE_BITMAP(used_vectors, NR_VECTORS); EXPORT_SYMBOL_GPL(used_vectors); -@@ -106,11 +106,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) +@@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs) } static int __kprobes @@ -25916,7 +26012,7 @@ index 1b23a1c..910de0d 100644 /* * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. -@@ -123,12 +123,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, +@@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, return -1; } #endif @@ -25942,7 +26038,7 @@ index 1b23a1c..910de0d 100644 return 0; } -@@ -136,7 +148,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, +@@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str, } static void __kprobes @@ -25951,7 +26047,7 @@ index 1b23a1c..910de0d 100644 long error_code, siginfo_t *info) { struct task_struct *tsk = current; -@@ -160,7 +172,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, +@@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, if (show_unhandled_signals && unhandled_signal(tsk, signr) && printk_ratelimit()) { pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx", @@ -25960,7 +26056,7 @@ index 1b23a1c..910de0d 100644 regs->ip, regs->sp, error_code); print_vma_addr(" in ", regs->ip); pr_cont("\n"); -@@ -276,7 +288,7 @@ do_general_protection(struct pt_regs *regs, long error_code) +@@ -277,7 +289,7 @@ do_general_protection(struct pt_regs *regs, long error_code) conditional_sti(regs); #ifdef CONFIG_X86_32 @@ -25969,7 +26065,7 @@ index 1b23a1c..910de0d 100644 local_irq_enable(); handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code); goto exit; -@@ -284,18 +296,42 @@ do_general_protection(struct pt_regs *regs, long error_code) +@@ -285,18 +297,42 @@ do_general_protection(struct pt_regs *regs, long error_code) #endif tsk = current; @@ -26014,7 +26110,7 @@ index 1b23a1c..910de0d 100644 tsk->thread.error_code = error_code; tsk->thread.trap_nr = X86_TRAP_GP; -@@ -453,7 +489,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) +@@ -457,7 +493,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) /* It's safe to allow irq's after DR6 has been saved */ preempt_conditional_sti(regs); @@ -26023,7 +26119,7 @@ index 1b23a1c..910de0d 100644 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, X86_TRAP_DB); preempt_conditional_cli(regs); -@@ -468,7 +504,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) +@@ -472,7 +508,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code) * We already checked v86 mode above, so we can check for kernel mode * by just checking the CPL of CS. */ @@ -26032,7 +26128,7 @@ index 1b23a1c..910de0d 100644 tsk->thread.debugreg6 &= ~DR_STEP; set_tsk_thread_flag(tsk, TIF_SINGLESTEP); regs->flags &= ~X86_EFLAGS_TF; -@@ -500,7 +536,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) +@@ -504,7 +540,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr) return; conditional_sti(regs); @@ -26472,7 +26568,7 @@ index b014d94..e775258 100644 +EXPORT_SYMBOL(cpu_pgd); +#endif diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c -index 5f24c71..1dadf09 100644 +index 8ce0072..431a0e7 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = { @@ -26484,18 +26580,18 @@ index 5f24c71..1dadf09 100644 .calibrate_tsc = native_calibrate_tsc, .get_wallclock = mach_get_cmos_time, .set_wallclock = mach_set_rtc_mmss, -@@ -107,7 +107,7 @@ struct x86_platform_ops x86_platform = { - }; - +@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = { EXPORT_SYMBOL_GPL(x86_platform); + + #if defined(CONFIG_PCI_MSI) -struct x86_msi_ops x86_msi = { +struct x86_msi_ops x86_msi __read_only = { .setup_msi_irqs = native_setup_msi_irqs, .compose_msi_msg = native_compose_msi_msg, .teardown_msi_irq = native_teardown_msi_irq, -@@ -116,7 +116,7 @@ struct x86_msi_ops x86_msi = { - .setup_hpet_msi = default_setup_hpet_msi, - }; +@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev, int irq) + } + #endif -struct x86_io_apic_ops x86_io_apic_ops = { +struct x86_io_apic_ops x86_io_apic_ops __read_only = { @@ -26523,7 +26619,7 @@ index 422fd82..c3687ca 100644 if ((unsigned long)buf % 64 || fx_only) { u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE; diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c -index a20ecb5..d0e2194 100644 +index b110fe6..d9c19f2 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, @@ -26574,7 +26670,7 @@ index a20ecb5..d0e2194 100644 out: diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c -index afc1124..3e431f2 100644 +index 5439117..d08f3d4 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -55,7 +55,7 @@ @@ -26587,10 +26683,10 @@ index afc1124..3e431f2 100644 #define APIC_LVT_NUM 6 /* 14 is the version for Xeon and Pentium 8.4.8*/ diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h -index 7769699..c8aca4a7f 100644 +index ad75d77..a679d32 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h -@@ -208,7 +208,7 @@ retry_walk: +@@ -331,7 +331,7 @@ retry_walk: if (unlikely(kvm_is_error_hva(host_addr))) goto error; @@ -26627,10 +26723,10 @@ index c0bc803..6837a50 100644 local_irq_disable(); diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index 064d0be..f5f758e 100644 +index 2b2fce1..da76be4 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c -@@ -1311,12 +1311,12 @@ static void vmcs_write64(unsigned long field, u64 value) +@@ -1316,12 +1316,12 @@ static void vmcs_write64(unsigned long field, u64 value) #endif } @@ -26645,7 +26741,7 @@ index 064d0be..f5f758e 100644 { vmcs_writel(field, vmcs_readl(field) | mask); } -@@ -1517,7 +1517,11 @@ static void reload_tss(void) +@@ -1522,7 +1522,11 @@ static void reload_tss(void) struct desc_struct *descs; descs = (void *)gdt->address; @@ -26657,7 +26753,7 @@ index 064d0be..f5f758e 100644 load_TR_desc(); } -@@ -1741,6 +1745,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) +@@ -1746,6 +1750,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */ vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */ @@ -26668,7 +26764,16 @@ index 064d0be..f5f758e 100644 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp); vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */ vmx->loaded_vmcs->cpu = cpu; -@@ -2940,8 +2948,11 @@ static __init int hardware_setup(void) +@@ -2037,7 +2045,7 @@ static void setup_msrs(struct vcpu_vmx *vmx) + * reads and returns guest's timestamp counter "register" + * guest_tsc = host_tsc + tsc_offset -- 21.3 + */ +-static u64 guest_read_tsc(void) ++static u64 __intentional_overflow(-1) guest_read_tsc(void) + { + u64 host_tsc, tsc_offset; + +@@ -2982,8 +2990,11 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_flexpriority()) flexpriority_enabled = 0; @@ -26682,7 +26787,7 @@ index 064d0be..f5f758e 100644 if (enable_ept && !cpu_has_vmx_ept_2m_page()) kvm_disable_largepages(); -@@ -2952,13 +2963,15 @@ static __init int hardware_setup(void) +@@ -2994,13 +3005,15 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_apicv()) enable_apicv = 0; @@ -26702,7 +26807,7 @@ index 064d0be..f5f758e 100644 if (nested) nested_vmx_setup_ctls_msrs(); -@@ -4081,7 +4094,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) +@@ -4127,7 +4140,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */ vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */ @@ -26713,7 +26818,7 @@ index 064d0be..f5f758e 100644 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */ #ifdef CONFIG_X86_64 -@@ -4103,7 +4119,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) +@@ -4149,7 +4165,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx) vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */ vmx->host_idt_base = dt.address; @@ -26722,7 +26827,7 @@ index 064d0be..f5f758e 100644 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32); vmcs_write32(HOST_IA32_SYSENTER_CS, low32); -@@ -7039,6 +7055,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7191,6 +7207,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) "jmp 2f \n\t" "1: " __ex(ASM_VMX_VMRESUME) "\n\t" "2: " @@ -26735,7 +26840,7 @@ index 064d0be..f5f758e 100644 /* Save guest registers, load host registers, keep flags */ "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t" "pop %0 \n\t" -@@ -7091,6 +7113,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7243,6 +7265,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)), [wordsize]"i"(sizeof(ulong)) @@ -26747,7 +26852,7 @@ index 064d0be..f5f758e 100644 : "cc", "memory" #ifdef CONFIG_X86_64 , "rax", "rbx", "rdi", "rsi" -@@ -7104,7 +7131,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7256,7 +7283,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) if (debugctlmsr) update_debugctlmsr(debugctlmsr); @@ -26756,7 +26861,7 @@ index 064d0be..f5f758e 100644 /* * The sysexit path does not restore ds/es, so we must set them to * a reasonable value ourselves. -@@ -7113,8 +7140,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) +@@ -7265,8 +7292,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) * may be executed in interrupt context, which saves and restore segments * around it, nullifying its effect. */ @@ -26778,10 +26883,10 @@ index 064d0be..f5f758e 100644 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index d21bce5..fdae9f1 100644 +index e5ca72a..83d5177 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c -@@ -1766,8 +1766,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data) +@@ -1779,8 +1779,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data) { struct kvm *kvm = vcpu->kvm; int lm = is_long_mode(vcpu); @@ -26792,7 +26897,7 @@ index d21bce5..fdae9f1 100644 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64 : kvm->arch.xen_hvm_config.blob_size_32; u32 page_num = data & ~PAGE_MASK; -@@ -2650,6 +2650,8 @@ long kvm_arch_dev_ioctl(struct file *filp, +@@ -2663,6 +2663,8 @@ long kvm_arch_dev_ioctl(struct file *filp, if (n < msr_list.nmsrs) goto out; r = -EFAULT; @@ -26801,7 +26906,7 @@ index d21bce5..fdae9f1 100644 if (copy_to_user(user_msr_list->indices, &msrs_to_save, num_msrs_to_save * sizeof(u32))) goto out; -@@ -5344,7 +5346,7 @@ static struct notifier_block pvclock_gtod_notifier = { +@@ -5462,7 +5464,7 @@ static struct notifier_block pvclock_gtod_notifier = { }; #endif @@ -26809,12 +26914,12 @@ index d21bce5..fdae9f1 100644 +int kvm_arch_init(const void *opaque) { int r; - struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; + struct kvm_x86_ops *ops = opaque; diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c -index 6a22c19..1763f04 100644 +index bdf8532..f63c587 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c -@@ -1201,9 +1201,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count) +@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count) * Rebooting also tells the Host we're finished, but the RESTART flag tells the * Launcher to reboot us. */ @@ -29135,7 +29240,7 @@ index a63efd6..ccecad8 100644 ret CFI_ENDPROC diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c -index 3eb18ac..6890bc3 100644 +index 3eb18ac..4b22130 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c @@ -42,11 +42,13 @@ do { \ @@ -29214,7 +29319,7 @@ index 3eb18ac..6890bc3 100644 " addl $-64, %0\n" " addl $64, %4\n" " addl $64, %3\n" -@@ -149,10 +151,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size) +@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size) " shrl $2, %0\n" " andl $3, %%eax\n" " cld\n" @@ -29224,13 +29329,55 @@ index 3eb18ac..6890bc3 100644 "37: rep; movsb\n" "100:\n" + __COPYUSER_RESTORE_ES - ".section .fixup,\"ax\"\n" - "101: lea 0(%%eax,%0,4),%0\n" - " jmp 100b\n" -@@ -202,46 +206,150 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size) - } - - static unsigned long ++ ".section .fixup,\"ax\"\n" ++ "101: lea 0(%%eax,%0,4),%0\n" ++ " jmp 100b\n" ++ ".previous\n" ++ _ASM_EXTABLE(1b,100b) ++ _ASM_EXTABLE(2b,100b) ++ _ASM_EXTABLE(3b,100b) ++ _ASM_EXTABLE(4b,100b) ++ _ASM_EXTABLE(5b,100b) ++ _ASM_EXTABLE(6b,100b) ++ _ASM_EXTABLE(7b,100b) ++ _ASM_EXTABLE(8b,100b) ++ _ASM_EXTABLE(9b,100b) ++ _ASM_EXTABLE(10b,100b) ++ _ASM_EXTABLE(11b,100b) ++ _ASM_EXTABLE(12b,100b) ++ _ASM_EXTABLE(13b,100b) ++ _ASM_EXTABLE(14b,100b) ++ _ASM_EXTABLE(15b,100b) ++ _ASM_EXTABLE(16b,100b) ++ _ASM_EXTABLE(17b,100b) ++ _ASM_EXTABLE(18b,100b) ++ _ASM_EXTABLE(19b,100b) ++ _ASM_EXTABLE(20b,100b) ++ _ASM_EXTABLE(21b,100b) ++ _ASM_EXTABLE(22b,100b) ++ _ASM_EXTABLE(23b,100b) ++ _ASM_EXTABLE(24b,100b) ++ _ASM_EXTABLE(25b,100b) ++ _ASM_EXTABLE(26b,100b) ++ _ASM_EXTABLE(27b,100b) ++ _ASM_EXTABLE(28b,100b) ++ _ASM_EXTABLE(29b,100b) ++ _ASM_EXTABLE(30b,100b) ++ _ASM_EXTABLE(31b,100b) ++ _ASM_EXTABLE(32b,100b) ++ _ASM_EXTABLE(33b,100b) ++ _ASM_EXTABLE(34b,100b) ++ _ASM_EXTABLE(35b,100b) ++ _ASM_EXTABLE(36b,100b) ++ _ASM_EXTABLE(37b,100b) ++ _ASM_EXTABLE(99b,101b) ++ : "=&c"(size), "=&D" (d0), "=&S" (d1) ++ : "1"(to), "2"(from), "0"(size) ++ : "eax", "edx", "memory"); ++ return size; ++} ++ ++static unsigned long +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size) +{ + int d0, d1; @@ -29286,57 +29433,10 @@ index 3eb18ac..6890bc3 100644 + "36: movl %%eax, %0\n" + "37: rep; "__copyuser_seg" movsb\n" + "100:\n" -+ ".section .fixup,\"ax\"\n" -+ "101: lea 0(%%eax,%0,4),%0\n" -+ " jmp 100b\n" -+ ".previous\n" -+ _ASM_EXTABLE(1b,100b) -+ _ASM_EXTABLE(2b,100b) -+ _ASM_EXTABLE(3b,100b) -+ _ASM_EXTABLE(4b,100b) -+ _ASM_EXTABLE(5b,100b) -+ _ASM_EXTABLE(6b,100b) -+ _ASM_EXTABLE(7b,100b) -+ _ASM_EXTABLE(8b,100b) -+ _ASM_EXTABLE(9b,100b) -+ _ASM_EXTABLE(10b,100b) -+ _ASM_EXTABLE(11b,100b) -+ _ASM_EXTABLE(12b,100b) -+ _ASM_EXTABLE(13b,100b) -+ _ASM_EXTABLE(14b,100b) -+ _ASM_EXTABLE(15b,100b) -+ _ASM_EXTABLE(16b,100b) -+ _ASM_EXTABLE(17b,100b) -+ _ASM_EXTABLE(18b,100b) -+ _ASM_EXTABLE(19b,100b) -+ _ASM_EXTABLE(20b,100b) -+ _ASM_EXTABLE(21b,100b) -+ _ASM_EXTABLE(22b,100b) -+ _ASM_EXTABLE(23b,100b) -+ _ASM_EXTABLE(24b,100b) -+ _ASM_EXTABLE(25b,100b) -+ _ASM_EXTABLE(26b,100b) -+ _ASM_EXTABLE(27b,100b) -+ _ASM_EXTABLE(28b,100b) -+ _ASM_EXTABLE(29b,100b) -+ _ASM_EXTABLE(30b,100b) -+ _ASM_EXTABLE(31b,100b) -+ _ASM_EXTABLE(32b,100b) -+ _ASM_EXTABLE(33b,100b) -+ _ASM_EXTABLE(34b,100b) -+ _ASM_EXTABLE(35b,100b) -+ _ASM_EXTABLE(36b,100b) -+ _ASM_EXTABLE(37b,100b) -+ _ASM_EXTABLE(99b,101b) -+ : "=&c"(size), "=&D" (d0), "=&S" (d1) -+ : "1"(to), "2"(from), "0"(size) -+ : "eax", "edx", "memory"); -+ return size; -+} -+ -+static unsigned long __size_overflow(3) - __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) - { + ".section .fixup,\"ax\"\n" + "101: lea 0(%%eax,%0,4),%0\n" + " jmp 100b\n" +@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) int d0, d1; __asm__ __volatile__( " .align 2,0x90\n" @@ -29408,15 +29508,7 @@ index 3eb18ac..6890bc3 100644 "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" -@@ -298,48 +406,48 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) - * hyoshiok@miraclelinux.com - */ - --static unsigned long __copy_user_zeroing_intel_nocache(void *to, -+static unsigned long __size_overflow(3) __copy_user_zeroing_intel_nocache(void *to, - const void __user *from, unsigned long size) - { - int d0, d1; +@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to, __asm__ __volatile__( " .align 2,0x90\n" @@ -29488,15 +29580,7 @@ index 3eb18ac..6890bc3 100644 "8:\n" ".section .fixup,\"ax\"\n" "9: lea 0(%%eax,%0,4),%0\n" -@@ -392,48 +500,48 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to, - return size; - } - --static unsigned long __copy_user_intel_nocache(void *to, -+static unsigned long __size_overflow(3) __copy_user_intel_nocache(void *to, - const void __user *from, unsigned long size) - { - int d0, d1; +@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to, __asm__ __volatile__( " .align 2,0x90\n" @@ -29738,7 +29822,7 @@ index 3eb18ac..6890bc3 100644 +EXPORT_SYMBOL(set_fs); +#endif diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c -index 906fea3..0194a18 100644 +index c905e89..01ab928 100644 --- a/arch/x86/lib/usercopy_64.c +++ b/arch/x86/lib/usercopy_64.c @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size) @@ -29781,7 +29865,7 @@ index 906fea3..0194a18 100644 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user); * it is not necessary to optimize tail handling. */ - unsigned long + __visible unsigned long -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest) +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) { @@ -29867,7 +29951,7 @@ index 903ec1e..c4166b2 100644 } diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c -index 654be4a..a4a3da1 100644 +index 3aaeffc..42ea9fb 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -14,11 +14,18 @@ @@ -30121,7 +30205,7 @@ index 654be4a..a4a3da1 100644 code = BUS_MCEERR_AR; } #endif -@@ -898,6 +1010,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte) +@@ -889,6 +1001,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte) return 1; } @@ -30221,7 +30305,7 @@ index 654be4a..a4a3da1 100644 /* * Handle a spurious fault caused by a stale TLB entry. * -@@ -964,6 +1169,9 @@ int show_unhandled_signals = 1; +@@ -955,6 +1160,9 @@ int show_unhandled_signals = 1; static inline int access_error(unsigned long error_code, struct vm_area_struct *vma) { @@ -30231,7 +30315,7 @@ index 654be4a..a4a3da1 100644 if (error_code & PF_WRITE) { /* write, present and write, not present: */ if (unlikely(!(vma->vm_flags & VM_WRITE))) -@@ -992,7 +1200,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs) +@@ -983,7 +1191,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs) if (error_code & PF_USER) return false; @@ -30240,24 +30324,10 @@ index 654be4a..a4a3da1 100644 return false; return true; -@@ -1008,18 +1216,33 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code) - { - struct vm_area_struct *vma; - struct task_struct *tsk; -- unsigned long address; - struct mm_struct *mm; - int fault; - int write = error_code & PF_WRITE; - unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE | - (write ? FAULT_FLAG_WRITE : 0); - -- tsk = current; -- mm = tsk->mm; -- +@@ -1010,6 +1218,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code) /* Get the faulting address: */ -- address = read_cr2(); -+ unsigned long address = read_cr2(); -+ + address = read_cr2(); + +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) + if (!user_mode(regs) && address < 2 * pax_user_shadow_base) { + if (!search_exception_tables(regs->ip)) { @@ -30274,12 +30344,10 @@ index 654be4a..a4a3da1 100644 + } +#endif + -+ tsk = current; -+ mm = tsk->mm; - /* * Detect and handle instructions that would cause a page fault for -@@ -1080,7 +1303,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code) + * both a tracked kernel page and a userspace page. +@@ -1069,7 +1293,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code) * User-mode registers count as a user access even for any * potential system fault or CPU buglet: */ @@ -30287,8 +30355,8 @@ index 654be4a..a4a3da1 100644 + if (user_mode(regs)) { local_irq_enable(); error_code |= PF_USER; - } else { -@@ -1142,6 +1365,11 @@ retry: + flags |= FAULT_FLAG_USER; +@@ -1135,6 +1359,11 @@ retry: might_sleep(); } @@ -30300,7 +30368,7 @@ index 654be4a..a4a3da1 100644 vma = find_vma(mm, address); if (unlikely(!vma)) { bad_area(regs, error_code, address); -@@ -1153,18 +1381,24 @@ retry: +@@ -1146,18 +1375,24 @@ retry: bad_area(regs, error_code, address); return; } @@ -30336,7 +30404,7 @@ index 654be4a..a4a3da1 100644 if (unlikely(expand_stack(vma, address))) { bad_area(regs, error_code, address); return; -@@ -1230,3 +1464,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code) +@@ -1231,3 +1466,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code) __do_page_fault(regs, error_code); exception_exit(prev_state); } @@ -30659,10 +30727,10 @@ index 4500142..53a363c 100644 return (void *)vaddr; diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c -index 7e73e8c..11d3b86 100644 +index 9d980d8..6bbfacb 100644 --- a/arch/x86/mm/hugetlbpage.c +++ b/arch/x86/mm/hugetlbpage.c -@@ -84,23 +84,30 @@ int pud_huge(pud_t pud) +@@ -92,23 +92,30 @@ int pmd_huge_support(void) #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file, unsigned long addr, unsigned long len, @@ -30696,7 +30764,7 @@ index 7e73e8c..11d3b86 100644 { struct hstate *h = hstate_file(file); struct vm_unmapped_area_info info; -@@ -112,6 +119,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, +@@ -120,6 +127,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, info.high_limit = current->mm->mmap_base; info.align_mask = PAGE_MASK & ~huge_page_mask(h); info.align_offset = 0; @@ -30704,7 +30772,7 @@ index 7e73e8c..11d3b86 100644 addr = vm_unmapped_area(&info); /* -@@ -124,6 +132,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, +@@ -132,6 +140,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file, VM_BUG_ON(addr != -ENOMEM); info.flags = 0; info.low_limit = TASK_UNMAPPED_BASE; @@ -30717,7 +30785,7 @@ index 7e73e8c..11d3b86 100644 info.high_limit = TASK_SIZE; addr = vm_unmapped_area(&info); } -@@ -138,10 +152,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, +@@ -146,10 +160,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; struct vm_area_struct *vma; @@ -30739,7 +30807,7 @@ index 7e73e8c..11d3b86 100644 return -ENOMEM; if (flags & MAP_FIXED) { -@@ -150,19 +174,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, +@@ -158,19 +182,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, return addr; } @@ -31220,7 +31288,7 @@ index 4287f1f..3b99c71 100644 printk(KERN_INFO "Write protecting the kernel text: %luk\n", size >> 10); diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c -index 104d56a..62ba13f 100644 +index 104d56a..62ba13f1 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on); @@ -31381,7 +31449,7 @@ index 7b179b4..6bd17777 100644 return (void *)vaddr; diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c -index 0215e2c..1c62dab 100644 +index 799580c..72f9fe0 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, @@ -32145,7 +32213,7 @@ index 90555bf..f5f1828 100644 } diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c -index 282375f..e03a98f 100644 +index ae699b3..f1b2ad2 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c @@ -48,7 +48,11 @@ void leave_mm(int cpu) @@ -32317,7 +32385,7 @@ index 877b9a1..a8ecf42 100644 + pax_force_retaddr ret diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c -index 79c216a..08d39cc 100644 +index 26328e8..5f96c25 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len) @@ -32603,18 +32671,19 @@ index 79c216a..08d39cc 100644 fp->bpf_func = (void *)image; } out: -@@ -776,9 +883,7 @@ void bpf_jit_free(struct sk_filter *fp) +@@ -776,10 +883,9 @@ static void bpf_jit_free_deferred(struct work_struct *work) { - if (fp->bpf_func != sk_run_filter) { - unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; -- struct bpf_binary_header *header = (void *)addr; -- -- set_memory_rw(addr, header->pages); -- module_free(NULL, header); -+ set_memory_rw(addr, 1); -+ module_free_exec(NULL, (void *)addr); - } + struct sk_filter *fp = container_of(work, struct sk_filter, work); + unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; +- struct bpf_binary_header *header = (void *)addr; + +- set_memory_rw(addr, header->pages); +- module_free(NULL, header); ++ set_memory_rw(addr, 1); ++ module_free_exec(NULL, (void *)addr); + kfree(fp); } + diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c index d6aa6e8..266395a 100644 --- a/arch/x86/oprofile/backtrace.c @@ -32652,7 +32721,7 @@ index d6aa6e8..266395a 100644 if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c -index 48768df..ba9143c 100644 +index 6890d84..1dad1f1 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -23,6 +23,7 @@ @@ -32678,7 +32747,7 @@ index 48768df..ba9143c 100644 mux_init(ops); diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c -index b2b9443..be58856 100644 +index 50d86c0..7985318 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops) @@ -32775,11 +32844,11 @@ index 372e9b8..e775a6c 100644 .callback = fix_broken_hp_bios_irq9, .ident = "HP Pavilion N5400 Series Laptop", diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c -index 6eb18c4..20d83de 100644 +index 903fded..94b0d88 100644 --- a/arch/x86/pci/mrst.c +++ b/arch/x86/pci/mrst.c -@@ -238,7 +238,9 @@ int __init pci_mrst_init(void) - printk(KERN_INFO "Intel MID platform detected, using MID PCI ops\n"); +@@ -241,7 +241,9 @@ int __init pci_mrst_init(void) + pr_info("Intel MID platform detected, using MID PCI ops\n"); pci_mmcfg_late_init(); pcibios_enable_irq = mrst_pci_irq_enable; - pci_root_ops = pci_mrst_ops; @@ -33368,7 +33437,7 @@ index 4c07cca..2c8427d 100644 ret ENDPROC(efi_call6) diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c -index 47fe66f..6206449 100644 +index 3ca5957..7909c18 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c @@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX]; @@ -33403,7 +33472,7 @@ index d6ee929..3637cb5 100644 .getproplen = olpc_dt_getproplen, .getproperty = olpc_dt_getproperty, diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c -index 1cf5b30..fd45732 100644 +index 424f4c9..f2a2988 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c @@ -137,11 +137,8 @@ static void do_fpu_end(void) @@ -33966,7 +34035,7 @@ index 431e875..cbb23f3 100644 -} -__setup("vdso=", vdso_setup); diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c -index 193097e..7590269 100644 +index fa6ade7..73da73a5 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); @@ -33978,7 +34047,7 @@ index 193097e..7590269 100644 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE); __read_mostly int xen_have_vector_callback; EXPORT_SYMBOL_GPL(xen_have_vector_callback); -@@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr) +@@ -541,8 +539,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr) { unsigned long va = dtr->address; unsigned int size = dtr->size + 1; @@ -33988,7 +34057,7 @@ index 193097e..7590269 100644 int f; /* -@@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) +@@ -590,8 +587,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) { unsigned long va = dtr->address; unsigned int size = dtr->size + 1; @@ -33998,7 +34067,7 @@ index 193097e..7590269 100644 int f; /* -@@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) +@@ -599,7 +595,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) * 8-byte entries, or 16 4k pages.. */ @@ -34007,7 +34076,7 @@ index 193097e..7590269 100644 BUG_ON(va & ~PAGE_MASK); for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) { -@@ -985,7 +981,7 @@ static u32 xen_safe_apic_wait_icr_idle(void) +@@ -988,7 +984,7 @@ static u32 xen_safe_apic_wait_icr_idle(void) return 0; } @@ -34016,7 +34085,7 @@ index 193097e..7590269 100644 { apic->read = xen_apic_read; apic->write = xen_apic_write; -@@ -1290,30 +1286,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = { +@@ -1293,30 +1289,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = { #endif }; @@ -34054,7 +34123,7 @@ index 193097e..7590269 100644 { if (pm_power_off) pm_power_off(); -@@ -1464,7 +1460,17 @@ asmlinkage void __init xen_start_kernel(void) +@@ -1467,7 +1463,17 @@ asmlinkage void __init xen_start_kernel(void) __userpte_alloc_gfp &= ~__GFP_HIGHMEM; /* Work out if we support NX */ @@ -34073,7 +34142,7 @@ index 193097e..7590269 100644 xen_setup_features(); -@@ -1495,13 +1501,6 @@ asmlinkage void __init xen_start_kernel(void) +@@ -1498,13 +1504,6 @@ asmlinkage void __init xen_start_kernel(void) machine_ops = xen_machine_ops; @@ -34088,9 +34157,18 @@ index 193097e..7590269 100644 #ifdef CONFIG_ACPI_NUMA diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c -index fdc3ba2..3daee39 100644 +index fdc3ba2..23cae00 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c +@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val) + return val; + } + +-static pteval_t pte_pfn_to_mfn(pteval_t val) ++static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val) + { + if (val & _PAGE_PRESENT) { + unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT; @@ -1894,6 +1894,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) /* L3_k[510] -> level2_kernel_pgt * L3_i[511] -> level2_fixmap_pgt */ @@ -34131,22 +34209,30 @@ index fdc3ba2..3daee39 100644 .alloc_pud = xen_alloc_pmd_init, .release_pud = xen_release_pmd_init, diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c -index b81c88e..2cbe7b8 100644 +index 31d0475..51af671 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c -@@ -272,11 +272,6 @@ static void __init xen_smp_prepare_boot_cpu(void) - { - BUG_ON(smp_processor_id() != 0); +@@ -274,17 +274,13 @@ static void __init xen_smp_prepare_boot_cpu(void) native_smp_prepare_boot_cpu(); + + if (xen_pv_domain()) { +- /* We've switched to the "real" per-cpu gdt, so make sure the +- old memory can be recycled */ +- make_lowmem_page_readwrite(xen_initial_gdt); - -- /* We've switched to the "real" per-cpu gdt, so make sure the -- old memory can be recycled */ -- make_lowmem_page_readwrite(xen_initial_gdt); -- - xen_filter_cpu_maps(); - xen_setup_vcpu_info_placement(); - } -@@ -346,7 +341,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) + #ifdef CONFIG_X86_32 + /* + * Xen starts us with XEN_FLAT_RING1_DS, but linux code + * expects __USER_DS + */ +- loadsegment(ds, __USER_DS); +- loadsegment(es, __USER_DS); ++ loadsegment(ds, __KERNEL_DS); ++ loadsegment(es, __KERNEL_DS); + #endif + + xen_filter_cpu_maps(); +@@ -364,7 +360,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; @@ -34155,7 +34241,7 @@ index b81c88e..2cbe7b8 100644 #else ctxt->gs_base_kernel = per_cpu_offset(cpu); #endif -@@ -356,8 +351,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) +@@ -374,8 +370,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) { ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ @@ -34166,7 +34252,7 @@ index b81c88e..2cbe7b8 100644 xen_copy_trap_info(ctxt->trap_ctxt); -@@ -402,13 +397,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle) +@@ -420,13 +416,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle) int rc; per_cpu(current_task, cpu) = idle; @@ -34182,15 +34268,15 @@ index b81c88e..2cbe7b8 100644 #endif xen_setup_runstate_info(cpu); xen_setup_timer(cpu); -@@ -678,7 +672,7 @@ static const struct smp_ops xen_smp_ops __initconst = { +@@ -702,7 +697,7 @@ static const struct smp_ops xen_smp_ops __initconst = { void __init xen_smp_init(void) { - smp_ops = xen_smp_ops; + memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops); xen_fill_possible_map(); - xen_init_spinlocks(); } + diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S index 33ca6e4..0ded929 100644 --- a/arch/x86/xen/xen-asm_32.S @@ -34239,7 +34325,7 @@ index 7faed58..ba4427c 100644 mov %rsi,xen_start_info mov $init_thread_union+THREAD_SIZE,%rsp diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h -index 86782c5..fa272c8 100644 +index 95f8c61..611d6e8 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -10,8 +10,6 @@ @@ -34313,19 +34399,19 @@ index af00795..2bb8105 100644 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */ #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */ diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c -index 290792a..416f287 100644 +index 4e491d9..c8e18e4 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c -@@ -808,7 +808,7 @@ static void blkcg_css_free(struct cgroup *cgroup) - - static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup) +@@ -812,7 +812,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css) + static struct cgroup_subsys_state * + blkcg_css_alloc(struct cgroup_subsys_state *parent_css) { - static atomic64_t id_seq = ATOMIC64_INIT(0); + static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0); struct blkcg *blkcg; - struct cgroup *parent = cgroup->parent; -@@ -823,7 +823,7 @@ static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup) + if (!parent_css) { +@@ -826,7 +826,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css) blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT; blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT; @@ -34405,7 +34491,7 @@ index 420a5a9..23834aa 100644 if (blk_verify_command(rq->cmd, has_write_perm)) return -EPERM; diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c -index 7e5d474..0cf0017 100644 +index fbd5a67..5d631b5 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode, @@ -34418,7 +34504,7 @@ index 7e5d474..0cf0017 100644 err = -EFAULT; goto out; diff --git a/block/genhd.c b/block/genhd.c -index dadf42b..48dc887 100644 +index 791f419..89f21c4 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf) @@ -34450,10 +34536,10 @@ index dadf42b..48dc887 100644 EXPORT_SYMBOL(blk_unregister_region); diff --git a/block/partitions/efi.c b/block/partitions/efi.c -index c85fc89..51e690b 100644 +index a8287b4..241a48e 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c -@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state, +@@ -292,14 +292,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state, if (!gpt) return NULL; @@ -34472,12 +34558,21 @@ index c85fc89..51e690b 100644 - return NULL; - if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba), - (u8 *) pte, - count) < count) { + (u8 *) pte, count) < count) { + kfree(pte); diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c -index a5ffcc9..3cedc9c 100644 +index a5ffcc9..e057498 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c +@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p) + return put_user(0, p); + } + +-static int sg_get_timeout(struct request_queue *q) ++static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q) + { + return jiffies_to_clock_t(q->sg_timeout); + } @@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command); static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, struct sg_io_hdr *hdr, fmode_t mode) @@ -34599,10 +34694,10 @@ index 33dc6a0..4b24b47 100644 EXPORT_SYMBOL_GPL(cper_next_record_id); diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c -index ec9b57d..9682b3a 100644 +index 8ec37bb..b0716e5 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c -@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx, +@@ -498,7 +498,7 @@ static void __ghes_print_estatus(const char *pfx, const struct acpi_hest_generic *generic, const struct acpi_hest_generic_status *estatus) { @@ -34611,7 +34706,7 @@ index ec9b57d..9682b3a 100644 unsigned int curr_seqno; char pfx_seq[64]; -@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx, +@@ -509,7 +509,7 @@ static void __ghes_print_estatus(const char *pfx, else pfx = KERN_ERR; } @@ -34621,24 +34716,24 @@ index ec9b57d..9682b3a 100644 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n", pfx_seq, generic->header.source_id); diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c -index be60399..778b33e8 100644 +index a83e3c6..c3d617f 100644 --- a/drivers/acpi/bgrt.c +++ b/drivers/acpi/bgrt.c -@@ -87,8 +87,10 @@ static int __init bgrt_init(void) +@@ -86,8 +86,10 @@ static int __init bgrt_init(void) + if (!bgrt_image) return -ENODEV; - sysfs_bin_attr_init(&image_attr); -- image_attr.private = bgrt_image; -- image_attr.size = bgrt_image_size; +- bin_attr_image.private = bgrt_image; +- bin_attr_image.size = bgrt_image_size; + pax_open_kernel(); -+ *(void **)&image_attr.private = bgrt_image; -+ *(size_t *)&image_attr.size = bgrt_image_size; ++ *(void **)&bin_attr_image.private = bgrt_image; ++ *(size_t *)&bin_attr_image.size = bgrt_image_size; + pax_close_kernel(); bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj); if (!bgrt_kobj) diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c -index cb96296..b81293b 100644 +index 9515f18..4b149c9 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -52,7 +52,7 @@ struct acpi_blacklist_item { @@ -34650,7 +34745,7 @@ index cb96296..b81293b 100644 /* * POLICY: If *anything* doesn't work, put it on the blacklist. -@@ -193,7 +193,7 @@ static int __init dmi_disable_osi_win7(const struct dmi_system_id *d) +@@ -199,7 +199,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d) return 0; } @@ -34660,10 +34755,10 @@ index cb96296..b81293b 100644 .callback = dmi_disable_osi_vista, .ident = "Fujitsu Siemens", diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c -index f98dd00..7b69865 100644 +index c7414a5..d5afd71 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c -@@ -992,7 +992,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) +@@ -966,7 +966,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) { int i, count = CPUIDLE_DRIVER_STATE_START; struct acpi_processor_cx *cx; @@ -34691,10 +34786,10 @@ index 05306a5..733d1f0 100644 static void delete_gpe_attr_array(void) { diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index acfd0f7..e5acb08 100644 +index cfb7447..98f2149 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c -@@ -1231,7 +1231,7 @@ int ahci_kick_engine(struct ata_port *ap) +@@ -1239,7 +1239,7 @@ int ahci_kick_engine(struct ata_port *ap) } EXPORT_SYMBOL_GPL(ahci_kick_engine); @@ -34704,7 +34799,7 @@ index acfd0f7..e5acb08 100644 unsigned long timeout_msec) { diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c -index c24354d..335c975 100644 +index 81a94a3..b711c74 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev); @@ -34716,7 +34811,7 @@ index c24354d..335c975 100644 struct ata_force_param { const char *name; -@@ -4792,7 +4792,7 @@ void ata_qc_free(struct ata_queued_cmd *qc) +@@ -4809,7 +4809,7 @@ void ata_qc_free(struct ata_queued_cmd *qc) struct ata_port *ap; unsigned int tag; @@ -34725,7 +34820,7 @@ index c24354d..335c975 100644 ap = qc->ap; qc->flags = 0; -@@ -4808,7 +4808,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc) +@@ -4825,7 +4825,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc) struct ata_port *ap; struct ata_link *link; @@ -34734,7 +34829,7 @@ index c24354d..335c975 100644 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE)); ap = qc->ap; link = qc->dev->link; -@@ -5927,6 +5927,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) +@@ -5944,6 +5944,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) return; spin_lock(&lock); @@ -34742,7 +34837,7 @@ index c24354d..335c975 100644 for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; -@@ -5940,8 +5941,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) +@@ -5957,8 +5958,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops) if (IS_ERR(*pp)) *pp = NULL; @@ -34753,7 +34848,7 @@ index c24354d..335c975 100644 spin_unlock(&lock); } -@@ -6134,7 +6136,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) +@@ -6151,7 +6153,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) /* give ports names and add SCSI hosts */ for (i = 0; i < host->n_ports; i++) { @@ -34763,10 +34858,10 @@ index c24354d..335c975 100644 } diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c -index b1e880a..8cf82e1 100644 +index db6dfcf..770d1f0 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c -@@ -4104,7 +4104,7 @@ int ata_sas_port_init(struct ata_port *ap) +@@ -4113,7 +4113,7 @@ int ata_sas_port_init(struct ata_port *ap) if (rc) return rc; @@ -34776,7 +34871,7 @@ index b1e880a..8cf82e1 100644 } EXPORT_SYMBOL_GPL(ata_sas_port_init); diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h -index 577d902b..cb4781e 100644 +index 45b5ab3..98446b8 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -53,7 +53,7 @@ enum { @@ -34789,7 +34884,7 @@ index 577d902b..cb4781e 100644 extern int libata_fua; extern int libata_noacpi; diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c -index 848ed32..132f39d 100644 +index 853f610..97d24da 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev) @@ -35056,10 +35151,10 @@ index 204814e..cede831 100644 fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", diff --git a/drivers/atm/he.c b/drivers/atm/he.c -index 507362a..a845e57 100644 +index 8557adc..3fb5d55 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c -@@ -1698,7 +1698,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) +@@ -1691,7 +1691,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { hprintk("HBUF_ERR! (cid 0x%x)\n", cid); @@ -35068,7 +35163,7 @@ index 507362a..a845e57 100644 goto return_host_buffers; } -@@ -1725,7 +1725,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) +@@ -1718,7 +1718,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) RBRQ_LEN_ERR(he_dev->rbrq_head) ? "LEN_ERR" : "", vcc->vpi, vcc->vci); @@ -35077,7 +35172,7 @@ index 507362a..a845e57 100644 goto return_host_buffers; } -@@ -1777,7 +1777,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) +@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, int group) vcc->push(vcc, skb); spin_lock(&he_dev->global_lock); @@ -35086,7 +35181,7 @@ index 507362a..a845e57 100644 return_host_buffers: ++pdus_assembled; -@@ -2103,7 +2103,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid) +@@ -2096,7 +2096,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid) tpd->vcc->pop(tpd->vcc, tpd->skb); else dev_kfree_skb_any(tpd->skb); @@ -35095,7 +35190,7 @@ index 507362a..a845e57 100644 } pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status)); return; -@@ -2515,7 +2515,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -2508,7 +2508,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -35104,7 +35199,7 @@ index 507362a..a845e57 100644 return -EINVAL; } -@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -2519,7 +2519,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -35113,7 +35208,7 @@ index 507362a..a845e57 100644 return -EINVAL; } #endif -@@ -2538,7 +2538,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -2531,7 +2531,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -35122,7 +35217,7 @@ index 507362a..a845e57 100644 spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } -@@ -2580,7 +2580,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -2573,7 +2573,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -35131,7 +35226,7 @@ index 507362a..a845e57 100644 spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } -@@ -2611,7 +2611,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -2604,7 +2604,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb) __enqueue_tpd(he_dev, tpd, cid); spin_unlock_irqrestore(&he_dev->global_lock, flags); @@ -35163,7 +35258,7 @@ index 1dc0519..1aadaf7 100644 // free the skb hrz_kfree_skb (skb); diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c -index 272f009..a18ba55 100644 +index 1bdf104..9dc44b1 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc) @@ -35479,10 +35574,10 @@ index fa7d701..1e404c7 100644 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c -index 6587dc2..149833d 100644 +index 5aca5f4..ce3a6b0 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c -@@ -1641,7 +1641,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) if ((vc = (vc_map *) vcc->dev_data) == NULL) { printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index); @@ -35491,7 +35586,7 @@ index 6587dc2..149833d 100644 dev_kfree_skb_any(skb); return -EINVAL; } -@@ -1649,7 +1649,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) if (!vc->tx) { printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index); @@ -35500,7 +35595,7 @@ index 6587dc2..149833d 100644 dev_kfree_skb_any(skb); return -EINVAL; } -@@ -1657,14 +1657,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) { printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index); @@ -35517,7 +35612,7 @@ index 6587dc2..149833d 100644 dev_kfree_skb_any(skb); return -EINVAL; } -@@ -1712,11 +1712,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) +@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb) } if (push_scqe(card, vc, scq, &scqe, skb) != 0) { @@ -35531,7 +35626,7 @@ index 6587dc2..149833d 100644 return 0; } -@@ -2033,14 +2033,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) printk ("nicstar%d: Can't allocate buffers for aal0.\n", card->index); @@ -35548,7 +35643,7 @@ index 6587dc2..149833d 100644 dev_kfree_skb_any(sb); break; } -@@ -2055,7 +2055,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); @@ -35557,7 +35652,7 @@ index 6587dc2..149833d 100644 cell += ATM_CELL_PAYLOAD; } -@@ -2072,7 +2072,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) if (iovb == NULL) { printk("nicstar%d: Out of iovec buffers.\n", card->index); @@ -35566,7 +35661,7 @@ index 6587dc2..149833d 100644 recycle_rx_buf(card, skb); return; } -@@ -2096,7 +2096,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) small or large buffer itself. */ } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) { printk("nicstar%d: received too big AAL5 SDU.\n", card->index); @@ -35575,7 +35670,7 @@ index 6587dc2..149833d 100644 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_MAX_IOVECS); NS_PRV_IOVCNT(iovb) = 0; -@@ -2116,7 +2116,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ("nicstar%d: Expected a small buffer, and this is not one.\n", card->index); which_list(card, skb); @@ -35584,7 +35679,7 @@ index 6587dc2..149833d 100644 recycle_rx_buf(card, skb); vc->rx_iov = NULL; recycle_iov_buf(card, iovb); -@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ("nicstar%d: Expected a large buffer, and this is not one.\n", card->index); which_list(card, skb); @@ -35593,7 +35688,7 @@ index 6587dc2..149833d 100644 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_PRV_IOVCNT(iovb)); vc->rx_iov = NULL; -@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) printk(" - PDU size mismatch.\n"); else printk(".\n"); @@ -35602,7 +35697,7 @@ index 6587dc2..149833d 100644 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data, NS_PRV_IOVCNT(iovb)); vc->rx_iov = NULL; -@@ -2166,7 +2166,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) /* skb points to a small buffer */ if (!atm_charge(vcc, skb->truesize)) { push_rxbufs(card, skb); @@ -35611,7 +35706,7 @@ index 6587dc2..149833d 100644 } else { skb_put(skb, len); dequeue_sm_buf(card, skb); -@@ -2176,7 +2176,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(skb)->vcc = vcc; __net_timestamp(skb); vcc->push(vcc, skb); @@ -35620,7 +35715,7 @@ index 6587dc2..149833d 100644 } } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */ struct sk_buff *sb; -@@ -2187,7 +2187,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) if (len <= NS_SMBUFSIZE) { if (!atm_charge(vcc, sb->truesize)) { push_rxbufs(card, sb); @@ -35629,7 +35724,7 @@ index 6587dc2..149833d 100644 } else { skb_put(sb, len); dequeue_sm_buf(card, sb); -@@ -2197,7 +2197,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(sb)->vcc = vcc; __net_timestamp(sb); vcc->push(vcc, sb); @@ -35638,7 +35733,7 @@ index 6587dc2..149833d 100644 } push_rxbufs(card, skb); -@@ -2206,7 +2206,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) if (!atm_charge(vcc, skb->truesize)) { push_rxbufs(card, skb); @@ -35647,7 +35742,7 @@ index 6587dc2..149833d 100644 } else { dequeue_lg_buf(card, skb); #ifdef NS_USE_DESTRUCTORS -@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) ATM_SKB(skb)->vcc = vcc; __net_timestamp(skb); vcc->push(vcc, skb); @@ -35656,7 +35751,7 @@ index 6587dc2..149833d 100644 } push_rxbufs(card, sb); -@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) printk ("nicstar%d: Out of huge buffers.\n", card->index); @@ -35665,7 +35760,7 @@ index 6587dc2..149833d 100644 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, -@@ -2291,7 +2291,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) card->hbpool.count++; } else dev_kfree_skb_any(hb); @@ -35674,7 +35769,7 @@ index 6587dc2..149833d 100644 } else { /* Copy the small buffer to the huge buffer */ sb = (struct sk_buff *)iov->iov_base; -@@ -2328,7 +2328,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) +@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe) #endif /* NS_USE_DESTRUCTORS */ __net_timestamp(hb); vcc->push(vcc, hb); @@ -35800,10 +35895,10 @@ index 969c3c2..9b72956 100644 } diff --git a/drivers/base/bus.c b/drivers/base/bus.c -index d414331..b4dd4ba 100644 +index 4c289ab..de1c333 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c -@@ -1163,7 +1163,7 @@ int subsys_interface_register(struct subsys_interface *sif) +@@ -1193,7 +1193,7 @@ int subsys_interface_register(struct subsys_interface *sif) return -EINVAL; mutex_lock(&subsys->p->mutex); @@ -35812,7 +35907,7 @@ index d414331..b4dd4ba 100644 if (sif->add_dev) { subsys_dev_iter_init(&iter, subsys, NULL, NULL); while ((dev = subsys_dev_iter_next(&iter))) -@@ -1188,7 +1188,7 @@ void subsys_interface_unregister(struct subsys_interface *sif) +@@ -1218,7 +1218,7 @@ void subsys_interface_unregister(struct subsys_interface *sif) subsys = sif->subsys; mutex_lock(&subsys->p->mutex); @@ -35850,10 +35945,10 @@ index 7413d06..79155fa 100644 while (1) { spin_lock(&req_lock); diff --git a/drivers/base/node.c b/drivers/base/node.c -index 7616a77c..8f57f51 100644 +index bc9f43b..29703b8 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c -@@ -626,7 +626,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf) +@@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf) struct node_attr { struct device_attribute attr; enum node_states state; @@ -35885,7 +35980,7 @@ index bfb8955..42c9b9a 100644 if (IS_ERR_OR_NULL(genpd)) diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c -index a53ebd2..8f73eeb 100644 +index 03e089a..0e9560c 100644 --- a/drivers/base/power/sysfs.c +++ b/drivers/base/power/sysfs.c @@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev, @@ -35959,7 +36054,7 @@ index e8d11b6..7b1b36f 100644 } EXPORT_SYMBOL_GPL(unregister_syscore_ops); diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c -index 90a4e6b..002d10f 100644 +index edfa251..1734d4d 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h) @@ -36019,7 +36114,7 @@ index 90a4e6b..002d10f 100644 h->transMethod = CFGTBL_Trans_Performant; return; -@@ -4320,7 +4320,7 @@ static int cciss_pci_init(ctlr_info_t *h) +@@ -4327,7 +4327,7 @@ static int cciss_pci_init(ctlr_info_t *h) if (prod_index < 0) return -ENODEV; h->product_name = products[prod_index].product_name; @@ -36028,7 +36123,7 @@ index 90a4e6b..002d10f 100644 if (cciss_board_disabled(h)) { dev_warn(&h->pdev->dev, "controller appears to be disabled\n"); -@@ -5052,7 +5052,7 @@ reinit_after_soft_reset: +@@ -5059,7 +5059,7 @@ reinit_after_soft_reset: } /* make sure the board interrupts are off */ @@ -36037,7 +36132,7 @@ index 90a4e6b..002d10f 100644 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx); if (rc) goto clean2; -@@ -5102,7 +5102,7 @@ reinit_after_soft_reset: +@@ -5109,7 +5109,7 @@ reinit_after_soft_reset: * fake ones to scoop up any residual completions. */ spin_lock_irqsave(&h->lock, flags); @@ -36046,7 +36141,7 @@ index 90a4e6b..002d10f 100644 spin_unlock_irqrestore(&h->lock, flags); free_irq(h->intr[h->intr_mode], h); rc = cciss_request_irq(h, cciss_msix_discard_completions, -@@ -5122,9 +5122,9 @@ reinit_after_soft_reset: +@@ -5129,9 +5129,9 @@ reinit_after_soft_reset: dev_info(&h->pdev->dev, "Board READY.\n"); dev_info(&h->pdev->dev, "Waiting for stale completions to drain.\n"); @@ -36058,7 +36153,7 @@ index 90a4e6b..002d10f 100644 rc = controller_reset_failed(h->cfgtable); if (rc) -@@ -5147,7 +5147,7 @@ reinit_after_soft_reset: +@@ -5154,7 +5154,7 @@ reinit_after_soft_reset: cciss_scsi_setup(h); /* Turn the interrupts on so we can service requests */ @@ -36067,7 +36162,7 @@ index 90a4e6b..002d10f 100644 /* Get the firmware version */ inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL); -@@ -5219,7 +5219,7 @@ static void cciss_shutdown(struct pci_dev *pdev) +@@ -5226,7 +5226,7 @@ static void cciss_shutdown(struct pci_dev *pdev) kfree(flush_buf); if (return_code != IO_OK) dev_warn(&h->pdev->dev, "Error flushing cache\n"); @@ -36408,7 +36503,7 @@ index cc29cd3..d4b058b 100644 static struct asender_cmd asender_tbl[] = { [P_PING] = { 0, got_Ping }, diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index 40e7155..df5c79a 100644 +index c8dac73..1800093 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file, @@ -36421,23 +36516,45 @@ index 40e7155..df5c79a 100644 file_end_write(file); if (likely(bw == len)) diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c -index f5d0ea1..c62380a 100644 +index 5618847..5a46f3b 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c -@@ -84,7 +84,7 @@ - #define MAX_SPEED 0xffff +@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p); + + static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd) + { +- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1); ++ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL); + } - #define ZONE(sector, pd) (((sector) + (pd)->offset) & \ -- ~(sector_t)((pd)->settings.size - 1)) -+ ~(sector_t)((pd)->settings.size - 1UL)) + /* +@@ -1897,7 +1897,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd) + return -EROFS; + } + pd->settings.fp = ti.fp; +- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1); ++ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL); + + if (ti.nwa_v) { + pd->nwa = be32_to_cpu(ti.next_writable); +diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c +index 60abf59..80789e1 100644 +--- a/drivers/bluetooth/btwilink.c ++++ b/drivers/bluetooth/btwilink.c +@@ -293,7 +293,7 @@ static int ti_st_send_frame(struct sk_buff *skb) + + static int bt_ti_probe(struct platform_device *pdev) + { +- static struct ti_st *hst; ++ struct ti_st *hst; + struct hci_dev *hdev; + int err; - static DEFINE_MUTEX(pktcdvd_mutex); - static struct pktcdvd_device *pkt_devs[MAX_WRITERS]; diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c -index 7332889..9ece19e 100644 +index 2009266..7be9ca2 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c -@@ -419,7 +419,7 @@ static int __init cci_probe(void) +@@ -405,7 +405,7 @@ static int __init cci_probe(void) nb_cci_ports = cci_config->nb_ace + cci_config->nb_ace_lite; @@ -36606,7 +36723,7 @@ index 86fe45c..c0ea948 100644 } diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c -index 4445fa1..7c6de37 100644 +index ec4e10f..f2a763b 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -420,7 +420,7 @@ struct ipmi_smi { @@ -36640,10 +36757,10 @@ index 4445fa1..7c6de37 100644 intf->proc_dir = NULL; diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c -index af4b23f..79806fc 100644 +index 15e4a60..b046093 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c -@@ -275,7 +275,7 @@ struct smi_info { +@@ -280,7 +280,7 @@ struct smi_info { unsigned char slave_addr; /* Counters and things for the proc filesystem. */ @@ -36652,7 +36769,7 @@ index af4b23f..79806fc 100644 struct task_struct *thread; -@@ -284,9 +284,9 @@ struct smi_info { +@@ -289,9 +289,9 @@ struct smi_info { }; #define smi_inc_stat(smi, stat) \ @@ -36664,7 +36781,7 @@ index af4b23f..79806fc 100644 #define SI_MAX_PARMS 4 -@@ -3258,7 +3258,7 @@ static int try_smi_init(struct smi_info *new_smi) +@@ -3324,7 +3324,7 @@ static int try_smi_init(struct smi_info *new_smi) atomic_set(&new_smi->req_events, 0); new_smi->run_to_completion = 0; for (i = 0; i < SI_NUM_STATS; i++) @@ -36832,7 +36949,7 @@ index 9df78e2..01ba9ae 100644 *ppos = i; diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c -index 5c5cc00..ac9edb7 100644 +index d39cca6..8c1e269 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp) @@ -36907,10 +37024,10 @@ index 5c5cc00..ac9edb7 100644 if (cmd != SIOCWANDEV) diff --git a/drivers/char/random.c b/drivers/char/random.c -index 92e6c67..c640ec3 100644 +index 7a744d3..35a177ee 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -272,8 +272,13 @@ +@@ -269,8 +269,13 @@ /* * Configuration information */ @@ -36924,7 +37041,7 @@ index 92e6c67..c640ec3 100644 #define SEC_XFER_SIZE 512 #define EXTRACT_SIZE 10 -@@ -313,10 +318,17 @@ static struct poolinfo { +@@ -310,10 +315,17 @@ static struct poolinfo { int poolwords; int tap1, tap2, tap3, tap4, tap5; } poolinfo_table[] = { @@ -36942,7 +37059,7 @@ index 92e6c67..c640ec3 100644 #if 0 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ { 2048, 1638, 1231, 819, 411, 1 }, -@@ -524,8 +536,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in, +@@ -521,8 +533,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in, input_rotate += i ? 7 : 14; } @@ -36953,7 +37070,7 @@ index 92e6c67..c640ec3 100644 smp_wmb(); if (out) -@@ -1032,7 +1044,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf, +@@ -1029,7 +1041,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf, extract_buf(r, tmp); i = min_t(int, nbytes, EXTRACT_SIZE); @@ -36962,7 +37079,7 @@ index 92e6c67..c640ec3 100644 ret = -EFAULT; break; } -@@ -1368,7 +1380,7 @@ EXPORT_SYMBOL(generate_random_uuid); +@@ -1365,7 +1377,7 @@ EXPORT_SYMBOL(generate_random_uuid); #include static int min_read_thresh = 8, min_write_thresh; @@ -36971,7 +37088,7 @@ index 92e6c67..c640ec3 100644 static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -@@ -1384,7 +1396,7 @@ static char sysctl_bootid[16]; +@@ -1381,7 +1393,7 @@ static char sysctl_bootid[16]; static int proc_do_uuid(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -36981,7 +37098,7 @@ index 92e6c67..c640ec3 100644 uuid = table->data; diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c -index bf2349db..5456d53 100644 +index 7cc1fe22..b602d6b 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -54,6 +54,7 @@ @@ -37001,7 +37118,7 @@ index bf2349db..5456d53 100644 int model; struct input_dev *input_jog_dev; struct input_dev *input_key_dev; -@@ -897,7 +898,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) +@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on) static int sonypi_misc_release(struct inode *inode, struct file *file) { mutex_lock(&sonypi_device.lock); @@ -37010,7 +37127,7 @@ index bf2349db..5456d53 100644 mutex_unlock(&sonypi_device.lock); return 0; } -@@ -906,9 +907,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file) +@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file) { mutex_lock(&sonypi_device.lock); /* Flush input queue on first open */ @@ -37073,7 +37190,7 @@ index 84ddc55..1d32f1e 100644 return 0; } diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c -index fc45567..fa2a590 100644 +index b79cf3e..de172d64f 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -682,7 +682,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count, @@ -37108,7 +37225,7 @@ index a33f46f..a720eed 100644 composite = kzalloc(sizeof(*composite), GFP_KERNEL); if (!composite) { diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c -index 5bb848c..f1d4fc9 100644 +index 81dd31a..ef5c542 100644 --- a/drivers/clk/socfpga/clk.c +++ b/drivers/clk/socfpga/clk.c @@ -22,6 +22,7 @@ @@ -37141,185 +37258,11 @@ index 5bb848c..f1d4fc9 100644 .recalc_rate = socfpga_clk_recalc_rate, .get_parent = socfpga_clk_get_parent, .set_parent = socfpga_clk_set_parent, -diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c -index 08ae128..c73fc2b 100644 ---- a/drivers/connector/cn_proc.c -+++ b/drivers/connector/cn_proc.c -@@ -65,6 +65,7 @@ void proc_fork_connector(struct task_struct *task) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -80,6 +81,7 @@ void proc_fork_connector(struct task_struct *task) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - /* If cn_netlink_send() failed, the data is not sent */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } -@@ -96,6 +98,7 @@ void proc_exec_connector(struct task_struct *task) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -106,6 +109,7 @@ void proc_exec_connector(struct task_struct *task) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -@@ -122,6 +126,7 @@ void proc_id_connector(struct task_struct *task, int which_id) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - ev->what = which_id; - ev->event_data.id.process_pid = task->pid; - ev->event_data.id.process_tgid = task->tgid; -@@ -145,6 +150,7 @@ void proc_id_connector(struct task_struct *task, int which_id) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -@@ -160,6 +166,7 @@ void proc_sid_connector(struct task_struct *task) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -170,6 +177,7 @@ void proc_sid_connector(struct task_struct *task) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -@@ -185,6 +193,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -203,6 +212,7 @@ void proc_ptrace_connector(struct task_struct *task, int ptrace_id) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -@@ -218,6 +228,7 @@ void proc_comm_connector(struct task_struct *task) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -229,6 +240,7 @@ void proc_comm_connector(struct task_struct *task) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -@@ -244,6 +256,7 @@ void proc_coredump_connector(struct task_struct *task) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -254,6 +267,7 @@ void proc_coredump_connector(struct task_struct *task) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -@@ -269,6 +283,7 @@ void proc_exit_connector(struct task_struct *task) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - get_seq(&msg->seq, &ev->cpu); - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -281,6 +296,7 @@ void proc_exit_connector(struct task_struct *task) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = 0; /* not used */ - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -@@ -304,6 +320,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) - - msg = (struct cn_msg *)buffer; - ev = (struct proc_event *)msg->data; -+ memset(&ev->event_data, 0, sizeof(ev->event_data)); - msg->seq = rcvd_seq; - ktime_get_ts(&ts); /* get high res monotonic timestamp */ - put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns); -@@ -313,6 +330,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) - memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); - msg->ack = rcvd_ack + 1; - msg->len = sizeof(*ev); -+ msg->flags = 0; /* not used */ - cn_netlink_send(msg, CN_IDX_PROC, GFP_KERNEL); - } - -diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c -index 6ecfa75..0daa11e 100644 ---- a/drivers/connector/connector.c -+++ b/drivers/connector/connector.c -@@ -157,17 +157,18 @@ static int cn_call_callback(struct sk_buff *skb) - static void cn_rx_skb(struct sk_buff *__skb) - { - struct nlmsghdr *nlh; -- int err; - struct sk_buff *skb; -+ int len, err; - - skb = skb_get(__skb); - - if (skb->len >= NLMSG_HDRLEN) { - nlh = nlmsg_hdr(skb); -+ len = nlmsg_len(nlh); - -- if (nlh->nlmsg_len < sizeof(struct cn_msg) || -+ if (len < (int)sizeof(struct cn_msg) || - skb->len < nlh->nlmsg_len || -- nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) { -+ len > CONNECTOR_MAX_MSG_SIZE) { - kfree_skb(skb); - return; - } diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c -index 3926402..37b580d 100644 +index 506fd23..01a593f 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c -@@ -173,7 +173,7 @@ static ssize_t show_global_boost(struct kobject *kobj, +@@ -172,7 +172,7 @@ static ssize_t show_global_boost(struct kobject *kobj, return sprintf(buf, "%u\n", boost_enabled); } @@ -37328,7 +37271,7 @@ index 3926402..37b580d 100644 show_global_boost, store_global_boost); -@@ -722,8 +722,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) +@@ -721,8 +721,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu); per_cpu(acfreq_data, cpu) = data; @@ -37342,7 +37285,7 @@ index 3926402..37b580d 100644 result = acpi_processor_register_performance(data->acpi_data, cpu); if (result) -@@ -851,7 +854,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) +@@ -850,7 +853,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu); break; case ACPI_ADR_SPACE_FIXED_HARDWARE: @@ -37353,25 +37296,11 @@ index 3926402..37b580d 100644 policy->cur = get_cur_freq_on_cpu(cpu); break; default: -@@ -862,8 +867,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) - acpi_processor_notify_smm(THIS_MODULE); - - /* Check for APERF/MPERF support in hardware */ -- if (boot_cpu_has(X86_FEATURE_APERFMPERF)) -- acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf; -+ if (boot_cpu_has(X86_FEATURE_APERFMPERF)) { -+ pax_open_kernel(); -+ *(void **)&acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf; -+ pax_close_kernel(); -+ } - - pr_debug("CPU%u - ACPI performance management activated.\n", cpu); - for (i = 0; i < perf->state_count; i++) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index f0a5e2b..0a7ee46 100644 +index 04548f7..457a342 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c -@@ -1959,7 +1959,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb, +@@ -2069,7 +2069,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb, return NOTIFY_OK; } @@ -37380,7 +37309,7 @@ index f0a5e2b..0a7ee46 100644 .notifier_call = cpufreq_cpu_callback, }; -@@ -1991,8 +1991,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) +@@ -2101,8 +2101,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) pr_debug("trying to register driver %s\n", driver_data->name); @@ -37395,10 +37324,10 @@ index f0a5e2b..0a7ee46 100644 write_lock_irqsave(&cpufreq_driver_lock, flags); if (cpufreq_driver) { diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c -index e59afaa..a53a3ff 100644 +index 0806c31..6a73276 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c -@@ -191,7 +191,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, +@@ -187,7 +187,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, struct dbs_data *dbs_data; struct od_cpu_dbs_info_s *od_dbs_info = NULL; struct cs_cpu_dbs_info_s *cs_dbs_info = NULL; @@ -37407,7 +37336,7 @@ index e59afaa..a53a3ff 100644 struct od_dbs_tuners *od_tuners = NULL; struct cs_dbs_tuners *cs_tuners = NULL; struct cpu_dbs_common_info *cpu_cdbs; -@@ -257,7 +257,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, +@@ -253,7 +253,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, if ((cdata->governor == GOV_CONSERVATIVE) && (!policy->governor->initialized)) { @@ -37416,7 +37345,7 @@ index e59afaa..a53a3ff 100644 cpufreq_register_notifier(cs_ops->notifier_block, CPUFREQ_TRANSITION_NOTIFIER); -@@ -277,7 +277,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, +@@ -273,7 +273,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy, if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) && (policy->governor->initialized == 1)) { @@ -37426,10 +37355,10 @@ index e59afaa..a53a3ff 100644 cpufreq_unregister_notifier(cs_ops->notifier_block, CPUFREQ_TRANSITION_NOTIFIER); diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h -index d5f12b4..eb30af1 100644 +index 88cd39f..87f0393 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h -@@ -204,7 +204,7 @@ struct common_dbs_data { +@@ -202,7 +202,7 @@ struct common_dbs_data { void (*exit)(struct dbs_data *dbs_data); /* Governor specific ops, see below */ @@ -37437,21 +37366,21 @@ index d5f12b4..eb30af1 100644 + const void *gov_ops; }; - /* Governer Per policy data */ -@@ -224,7 +224,7 @@ struct od_ops { + /* Governor Per policy data */ +@@ -222,7 +222,7 @@ struct od_ops { unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy, unsigned int freq_next, unsigned int relation); - void (*freq_increase)(struct cpufreq_policy *p, unsigned int freq); + void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq); -}; +} __no_const; struct cs_ops { struct notifier_block *notifier_block; diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c -index c087347..989aa2e 100644 +index 32f26f6..feb657b 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c -@@ -560,7 +560,7 @@ static void od_exit(struct dbs_data *dbs_data) +@@ -522,7 +522,7 @@ static void od_exit(struct dbs_data *dbs_data) define_get_cpu_dbs_routines(od_cpu_dbs_info); @@ -37460,7 +37389,7 @@ index c087347..989aa2e 100644 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu, .powersave_bias_target = generic_powersave_bias_target, .freq_increase = dbs_freq_increase, -@@ -615,14 +615,18 @@ void od_register_powersave_bias_handler(unsigned int (*f) +@@ -577,14 +577,18 @@ void od_register_powersave_bias_handler(unsigned int (*f) (struct cpufreq_policy *, unsigned int, unsigned int), unsigned int powersave_bias) { @@ -37482,10 +37411,10 @@ index c087347..989aa2e 100644 } EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler); diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c -index d37568c..fbb19a1 100644 +index 4cf0d28..5830372 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c -@@ -365,7 +365,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb, +@@ -352,7 +352,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb, } /* priority=1 so this will get called before cpufreq_remove_dev */ @@ -37495,7 +37424,7 @@ index d37568c..fbb19a1 100644 .priority = 1, }; diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c -index 9ee7817..17b658e 100644 +index 2f0a2a6..93d728e 100644 --- a/drivers/cpufreq/p4-clockmod.c +++ b/drivers/cpufreq/p4-clockmod.c @@ -160,10 +160,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c) @@ -37527,7 +37456,7 @@ index 9ee7817..17b658e 100644 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) { printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. " diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c -index 880ee29..2445bc6 100644 +index ac76b48..2445bc6 100644 --- a/drivers/cpufreq/sparc-us3-cpufreq.c +++ b/drivers/cpufreq/sparc-us3-cpufreq.c @@ -18,14 +18,12 @@ @@ -37574,7 +37503,7 @@ index 880ee29..2445bc6 100644 static int __init us3_freq_init(void) { unsigned long manuf, impl, ver; -@@ -208,57 +219,15 @@ static int __init us3_freq_init(void) +@@ -208,55 +219,15 @@ static int __init us3_freq_init(void) (impl == CHEETAH_IMPL || impl == CHEETAH_PLUS_IMPL || impl == JAGUAR_IMPL || @@ -37582,12 +37511,11 @@ index 880ee29..2445bc6 100644 - struct cpufreq_driver *driver; - - ret = -ENOMEM; -- driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL); +- driver = kzalloc(sizeof(*driver), GFP_KERNEL); - if (!driver) - goto err_out; - -- us3_freq_table = kzalloc( -- (NR_CPUS * sizeof(struct us3_freq_percpu_info)), +- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)), - GFP_KERNEL); - if (!us3_freq_table) - goto err_out; @@ -37597,7 +37525,6 @@ index 880ee29..2445bc6 100644 - driver->target = us3_freq_target; - driver->get = us3_freq_get; - driver->exit = us3_freq_cpu_exit; -- driver->owner = THIS_MODULE, - strcpy(driver->name, "UltraSPARC-III"); - - cpufreq_us3_driver = driver; @@ -37636,7 +37563,7 @@ index 880ee29..2445bc6 100644 MODULE_AUTHOR("David S. Miller "); diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c -index 0915e71..53376ed 100644 +index f897d51..15da295 100644 --- a/drivers/cpufreq/speedstep-centrino.c +++ b/drivers/cpufreq/speedstep-centrino.c @@ -353,8 +353,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy) @@ -37654,10 +37581,10 @@ index 0915e71..53376ed 100644 if (policy->cpu != 0) return -ENODEV; diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c -index fdc432f..98e64e2 100644 +index d75040d..4738ca5 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c -@@ -254,7 +254,7 @@ static int poll_idle(struct cpuidle_device *dev, +@@ -252,7 +252,7 @@ static int poll_idle(struct cpuidle_device *dev, static void poll_idle_init(struct cpuidle_driver *drv) { @@ -37689,10 +37616,10 @@ index ea2f8e7..70ac501 100644 } diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c -index 428754a..8bdf9cc 100644 +index 8739cc0..dc859d0 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c -@@ -131,7 +131,7 @@ static struct attribute *cpuidle_switch_attrs[] = { +@@ -134,7 +134,7 @@ static struct attribute *cpuidle_switch_attrs[] = { NULL }; @@ -37724,7 +37651,7 @@ index 12fea3e..1e28f47 100644 err = pci_request_regions(pdev, name); if (err) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c -index e94e619..f7e249c 100644 +index c99c00d..990a4b2 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor) @@ -37745,11 +37672,11 @@ index e94e619..f7e249c 100644 err_out: mutex_unlock(&devfreq_list_lock); -diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c -index 5039fbc..841169f 100644 ---- a/drivers/dma/sh/shdma.c -+++ b/drivers/dma/sh/shdma.c -@@ -488,7 +488,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self, +diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c +index 1069e88..dfcd642 100644 +--- a/drivers/dma/sh/shdmac.c ++++ b/drivers/dma/sh/shdmac.c +@@ -511,7 +511,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self, return ret; } @@ -37775,10 +37702,10 @@ index 211021d..201d47f 100644 EXPORT_SYMBOL_GPL(edac_device_alloc_index); diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c -index e7c32c4..6397af1 100644 +index 9f7e0e60..348c875 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c -@@ -148,7 +148,7 @@ static const char * const edac_caps[] = { +@@ -150,7 +150,7 @@ static const char * const edac_caps[] = { struct dev_ch_attribute { struct device_attribute attr; int channel; @@ -37787,7 +37714,7 @@ index e7c32c4..6397af1 100644 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \ struct dev_ch_attribute dev_attr_legacy_##_name = \ -@@ -1005,14 +1005,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci) +@@ -1007,14 +1007,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci) } if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) { @@ -37978,7 +37905,7 @@ index de4aa40..49ab1f2 100644 static ssize_t show_immediate(struct device *dev, struct device_attribute *dattr, char *buf) diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c -index 28a94c7..58da63a 100644 +index e5af0e3..d318058 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -38,6 +38,7 @@ @@ -38015,22 +37942,10 @@ index 94a58a0..f5eba42 100644 container_of(_dev_attr, struct dmi_device_attribute, dev_attr) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c -index 232fa8f..386c255 100644 +index fa0affb..aa448eb 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c -@@ -504,11 +504,6 @@ void __init dmi_scan_machine(void) - } - } - else { -- /* -- * no iounmap() for that ioremap(); it would be a no-op, but -- * it's so early in setup that sucker gets confused into doing -- * what it shouldn't if we actually call it. -- */ - p = dmi_ioremap(0xF0000, 0x10000); - if (p == NULL) - goto error; -@@ -806,7 +801,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), +@@ -791,7 +791,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *), if (buf == NULL) return -1; @@ -38094,7 +38009,7 @@ index 2a90ba6..07f3733 100644 ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr); diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c -index 2729e3d..f9deca1 100644 +index 814addb..0937d7f 100644 --- a/drivers/gpio/gpio-ich.c +++ b/drivers/gpio/gpio-ich.c @@ -71,7 +71,7 @@ struct ichx_desc { @@ -38120,10 +38035,10 @@ index 9902732..64b62dd 100644 return -EINVAL; } diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c -index 6a64749..0767a9f 100644 +index c722c3b..2ec6040 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c -@@ -322,7 +322,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, +@@ -328,7 +328,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder, struct drm_crtc *tmp; int crtc_mask = 1; @@ -38133,10 +38048,19 @@ index 6a64749..0767a9f 100644 dev = crtc->dev; diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c -index 99fcd7c..13cf6c5 100644 +index fe58d08..07bc38e 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c -@@ -307,7 +307,7 @@ module_exit(drm_core_exit); +@@ -186,7 +186,7 @@ static void drm_legacy_dev_reinit(struct drm_device *dev) + atomic_set(&dev->vma_count, 0); + + for (i = 0; i < ARRAY_SIZE(dev->counts); i++) +- atomic_set(&dev->counts[i], 0); ++ atomic_set_unchecked(&dev->counts[i], 0); + + dev->sigdata.lock = NULL; + +@@ -302,7 +302,7 @@ module_exit(drm_core_exit); /** * Copy and IOCTL return string to user space */ @@ -38145,7 +38069,7 @@ index 99fcd7c..13cf6c5 100644 { int len; -@@ -377,7 +377,7 @@ long drm_ioctl(struct file *filp, +@@ -372,7 +372,7 @@ long drm_ioctl(struct file *filp, struct drm_file *file_priv = filp->private_data; struct drm_device *dev; const struct drm_ioctl_desc *ioctl = NULL; @@ -38154,7 +38078,7 @@ index 99fcd7c..13cf6c5 100644 unsigned int nr = DRM_IOCTL_NR(cmd); int retcode = -EINVAL; char stack_kdata[128]; -@@ -390,7 +390,7 @@ long drm_ioctl(struct file *filp, +@@ -385,7 +385,7 @@ long drm_ioctl(struct file *filp, return -ENODEV; atomic_inc(&dev->ioctl_count); @@ -38164,19 +38088,10 @@ index 99fcd7c..13cf6c5 100644 if ((nr >= DRM_CORE_IOCTL_COUNT) && diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c -index 3a24385..4e426e0 100644 +index 3f84277..c627c54 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c -@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev) - } - - for (i = 0; i < ARRAY_SIZE(dev->counts); i++) -- atomic_set(&dev->counts[i], 0); -+ atomic_set_unchecked(&dev->counts[i], 0); - - dev->sigdata.lock = NULL; - -@@ -135,7 +135,7 @@ int drm_open(struct inode *inode, struct file *filp) +@@ -97,7 +97,7 @@ int drm_open(struct inode *inode, struct file *filp) if (drm_device_is_unplugged(dev)) return -ENODEV; @@ -38185,7 +38100,7 @@ index 3a24385..4e426e0 100644 need_setup = 1; mutex_lock(&dev->struct_mutex); old_imapping = inode->i_mapping; -@@ -151,7 +151,7 @@ int drm_open(struct inode *inode, struct file *filp) +@@ -113,7 +113,7 @@ int drm_open(struct inode *inode, struct file *filp) retcode = drm_open_helper(inode, filp, dev); if (retcode) goto err_undo; @@ -38194,7 +38109,7 @@ index 3a24385..4e426e0 100644 if (need_setup) { retcode = drm_setup(dev); if (retcode) -@@ -166,7 +166,7 @@ err_undo: +@@ -128,7 +128,7 @@ err_undo: iput(container_of(dev->dev_mapping, struct inode, i_data)); dev->dev_mapping = old_mapping; mutex_unlock(&dev->struct_mutex); @@ -38203,7 +38118,7 @@ index 3a24385..4e426e0 100644 return retcode; } EXPORT_SYMBOL(drm_open); -@@ -456,7 +456,7 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -405,7 +405,7 @@ int drm_release(struct inode *inode, struct file *filp) mutex_lock(&drm_global_mutex); @@ -38212,7 +38127,7 @@ index 3a24385..4e426e0 100644 if (dev->driver->preclose) dev->driver->preclose(dev, file_priv); -@@ -465,10 +465,10 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -414,10 +414,10 @@ int drm_release(struct inode *inode, struct file *filp) * Begin inline drm_release */ @@ -38225,7 +38140,7 @@ index 3a24385..4e426e0 100644 /* Release any auth tokens that might point to this file_priv, (do that under the drm_global_mutex) */ -@@ -565,8 +565,8 @@ int drm_release(struct inode *inode, struct file *filp) +@@ -516,8 +516,8 @@ int drm_release(struct inode *inode, struct file *filp) * End inline drm_release */ @@ -38298,7 +38213,7 @@ index f731116..629842c 100644 item->object = NULL; } diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c -index d4b20ce..77a8d41 100644 +index 5329832..b503f49 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data) @@ -38329,7 +38244,7 @@ index d4b20ce..77a8d41 100644 type = "??"; else type = types[map->type]; -@@ -253,7 +257,11 @@ int drm_vma_info(struct seq_file *m, void *data) +@@ -257,7 +261,11 @@ int drm_vma_info(struct seq_file *m, void *data) vma->vm_flags & VM_MAYSHARE ? 's' : 'p', vma->vm_flags & VM_LOCKED ? 'l' : '-', vma->vm_flags & VM_IO ? 'i' : '-', @@ -38393,19 +38308,6 @@ index 2f4c434..dd12cd2 100644 else ret = drm_ioctl(filp, cmd, arg); -diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c -index ffd7a7b..a64643e 100644 ---- a/drivers/gpu/drm/drm_ioctl.c -+++ b/drivers/gpu/drm/drm_ioctl.c -@@ -265,7 +265,7 @@ int drm_getstats(struct drm_device *dev, void *data, - stats->data[i].value = - (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); - else -- stats->data[i].value = atomic_read(&dev->counts[i]); -+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]); - stats->data[i].type = dev->types[i]; - } - diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index d752c96..fe08455 100644 --- a/drivers/gpu/drm/drm_lock.c @@ -38429,10 +38331,10 @@ index d752c96..fe08455 100644 if (drm_lock_free(&master->lock, lock->context)) { /* FIXME: Should really bail out here. */ diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c -index 327ca19..684d3c0 100644 +index 39d8645..59e06fa 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c -@@ -495,7 +495,7 @@ void drm_unplug_dev(struct drm_device *dev) +@@ -484,7 +484,7 @@ void drm_unplug_dev(struct drm_device *dev) drm_device_set_unplugged(dev); @@ -38455,10 +38357,10 @@ index 2290b3b..22056a1 100644 minor->kdev.parent = minor->dev->dev; diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c -index ada49ed..29275a0 100644 +index ab1892eb..d7009ca 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c -@@ -945,8 +945,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data, +@@ -944,8 +944,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data, dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -38469,7 +38371,7 @@ index ada49ed..29275a0 100644 sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -@@ -1106,8 +1106,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data, +@@ -1105,8 +1105,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data, i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used, mc->last_render); @@ -38481,7 +38383,7 @@ index ada49ed..29275a0 100644 sarea_priv->last_dispatch = (int)hw_status[5]; diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h -index 6e0acad..93c8289 100644 +index d4d16ed..8fb0b51 100644 --- a/drivers/gpu/drm/i810/i810_drv.h +++ b/drivers/gpu/drm/i810/i810_drv.h @@ -108,8 +108,8 @@ typedef struct drm_i810_private { @@ -38496,10 +38398,10 @@ index 6e0acad..93c8289 100644 int front_offset; } drm_i810_private_t; diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c -index 47d6c74..279123f 100644 +index a6f4cb5..6b2beb2 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c -@@ -541,7 +541,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) +@@ -624,7 +624,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data) I915_READ(GTIMR)); } seq_printf(m, "Interrupts received: %d\n", @@ -38509,10 +38411,10 @@ index 47d6c74..279123f 100644 if (IS_GEN6(dev) || IS_GEN7(dev)) { seq_printf(m, diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c -index f466980..8f2883f 100644 +index d5c784d..06e5c36 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1260,7 +1260,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) +@@ -1263,7 +1263,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -38522,10 +38424,10 @@ index f466980..8f2883f 100644 return can_switch; } diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h -index 2f09e80..077876d 100644 +index ab0f2c0..53c1bda 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -1028,7 +1028,7 @@ typedef struct drm_i915_private { +@@ -1181,7 +1181,7 @@ typedef struct drm_i915_private { drm_dma_handle_t *status_page_dmah; struct resource mch_res; @@ -38535,10 +38437,10 @@ index 2f09e80..077876d 100644 /* protects the irq masks */ spinlock_t irq_lock; diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c -index 87a3227..cd13d8f 100644 +index bf34577..3fd2ffa 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c -@@ -727,9 +727,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec) +@@ -768,9 +768,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec) static int validate_exec_list(struct drm_i915_gem_exec_object2 *exec, @@ -38586,10 +38488,10 @@ index 3c59584..500f2e9 100644 return ret; diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c -index 46d46ba..6e49848 100644 +index 4b91228..590c643 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -975,7 +975,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) +@@ -1085,7 +1085,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) int pipe; u32 pipe_stats[I915_MAX_PIPES]; @@ -38598,34 +38500,16 @@ index 46d46ba..6e49848 100644 while (true) { iir = I915_READ(VLV_IIR); -@@ -1192,7 +1192,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg) +@@ -1390,7 +1390,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) irqreturn_t ret = IRQ_NONE; - int i; + bool err_int_reenable = false; - atomic_inc(&dev_priv->irq_received); + atomic_inc_unchecked(&dev_priv->irq_received); /* We get interrupts on unclaimed registers, so check for this before we * do any I915_{READ,WRITE}. */ -@@ -1312,7 +1312,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg) - int ret = IRQ_NONE; - u32 de_iir, gt_iir, de_ier, pm_iir, sde_ier; - -- atomic_inc(&dev_priv->irq_received); -+ atomic_inc_unchecked(&dev_priv->irq_received); - - /* disable master interrupt before clearing iir */ - de_ier = I915_READ(DEIER); -@@ -2617,7 +2617,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) - { - drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; - -- atomic_set(&dev_priv->irq_received, 0); -+ atomic_set_unchecked(&dev_priv->irq_received, 0); - - I915_WRITE(HWSTAM, 0xeffe); - -@@ -2639,7 +2639,7 @@ static void ivybridge_irq_preinstall(struct drm_device *dev) +@@ -2146,7 +2146,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; @@ -38634,7 +38518,7 @@ index 46d46ba..6e49848 100644 I915_WRITE(HWSTAM, 0xeffe); -@@ -2667,7 +2667,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev) +@@ -2164,7 +2164,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -38643,7 +38527,7 @@ index 46d46ba..6e49848 100644 /* VLV magic */ I915_WRITE(VLV_IMR, 0); -@@ -2979,7 +2979,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev) +@@ -2452,7 +2452,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -38652,7 +38536,7 @@ index 46d46ba..6e49848 100644 for_each_pipe(pipe) I915_WRITE(PIPESTAT(pipe), 0); -@@ -3058,7 +3058,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) +@@ -2530,7 +2530,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT; @@ -38661,7 +38545,7 @@ index 46d46ba..6e49848 100644 iir = I915_READ16(IIR); if (iir == 0) -@@ -3133,7 +3133,7 @@ static void i915_irq_preinstall(struct drm_device * dev) +@@ -2604,7 +2604,7 @@ static void i915_irq_preinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -38670,7 +38554,7 @@ index 46d46ba..6e49848 100644 if (I915_HAS_HOTPLUG(dev)) { I915_WRITE(PORT_HOTPLUG_EN, 0); -@@ -3232,7 +3232,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) +@@ -2703,7 +2703,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT; int pipe, ret = IRQ_NONE; @@ -38679,7 +38563,7 @@ index 46d46ba..6e49848 100644 iir = I915_READ(IIR); do { -@@ -3356,7 +3356,7 @@ static void i965_irq_preinstall(struct drm_device * dev) +@@ -2827,7 +2827,7 @@ static void i965_irq_preinstall(struct drm_device * dev) drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; int pipe; @@ -38688,7 +38572,7 @@ index 46d46ba..6e49848 100644 I915_WRITE(PORT_HOTPLUG_EN, 0); I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT)); -@@ -3465,7 +3465,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) +@@ -2941,7 +2941,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT | I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT; @@ -38698,10 +38582,10 @@ index 46d46ba..6e49848 100644 iir = I915_READ(IIR); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 90a7c17..ecedc6a 100644 +index 333aa1b..0183e38 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -9424,13 +9424,13 @@ struct intel_quirk { +@@ -9976,13 +9976,13 @@ struct intel_quirk { int subsystem_vendor; int subsystem_device; void (*hook)(struct drm_device *dev); @@ -38717,7 +38601,7 @@ index 90a7c17..ecedc6a 100644 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) { -@@ -9438,18 +9438,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) +@@ -9990,18 +9990,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) return 1; } @@ -38749,7 +38633,7 @@ index 90a7c17..ecedc6a 100644 }, }; diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h -index 54558a0..2d97005 100644 +index ca4bc54..ee598a2 100644 --- a/drivers/gpu/drm/mga/mga_drv.h +++ b/drivers/gpu/drm/mga/mga_drv.h @@ -120,9 +120,9 @@ typedef struct drm_mga_private { @@ -38853,10 +38737,10 @@ index 3e72876..d1c15ad 100644 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry }) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h -index 41ff7e0..fa854ef 100644 +index 994fd6e..6e12565 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h -@@ -92,7 +92,6 @@ struct nouveau_drm { +@@ -94,7 +94,6 @@ struct nouveau_drm { struct drm_global_reference mem_global_ref; struct ttm_bo_global_ref bo_global_ref; struct ttm_bo_device bdev; @@ -38865,7 +38749,7 @@ index 41ff7e0..fa854ef 100644 struct ttm_buffer_object *, struct ttm_mem_reg *, struct ttm_mem_reg *); diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c -index 08214bc..9208577 100644 +index c1a7e5a..38b8539 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd, @@ -38878,10 +38762,10 @@ index 08214bc..9208577 100644 if (nr < DRM_COMMAND_BASE) diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c -index 25d3495..d81aaf6 100644 +index 81638d7..2e45854 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c -@@ -62,7 +62,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev) +@@ -65,7 +65,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -38890,8 +38774,127 @@ index 25d3495..d81aaf6 100644 spin_unlock(&dev->count_lock); return can_switch; } +diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c +index eb89653..613cf71 100644 +--- a/drivers/gpu/drm/qxl/qxl_cmd.c ++++ b/drivers/gpu/drm/qxl/qxl_cmd.c +@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port, + int ret; + + mutex_lock(&qdev->async_io_mutex); +- irq_num = atomic_read(&qdev->irq_received_io_cmd); ++ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd); + if (qdev->last_sent_io_cmd > irq_num) { + if (intr) + ret = wait_event_interruptible_timeout(qdev->io_cmd_event, +- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); ++ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); + else + ret = wait_event_timeout(qdev->io_cmd_event, +- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); ++ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); + /* 0 is timeout, just bail the "hw" has gone away */ + if (ret <= 0) + goto out; +- irq_num = atomic_read(&qdev->irq_received_io_cmd); ++ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd); + } + outb(val, addr); + qdev->last_sent_io_cmd = irq_num + 1; + if (intr) + ret = wait_event_interruptible_timeout(qdev->io_cmd_event, +- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); ++ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); + else + ret = wait_event_timeout(qdev->io_cmd_event, +- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); ++ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ); + out: + if (ret > 0) + ret = 0; +diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c +index c3c2bbd..bc3c0fb 100644 +--- a/drivers/gpu/drm/qxl/qxl_debugfs.c ++++ b/drivers/gpu/drm/qxl/qxl_debugfs.c +@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data) + struct drm_info_node *node = (struct drm_info_node *) m->private; + struct qxl_device *qdev = node->minor->dev->dev_private; + +- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received)); +- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display)); +- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor)); +- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd)); ++ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received)); ++ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display)); ++ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor)); ++ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd)); + seq_printf(m, "%d\n", qdev->irq_received_error); + return 0; + } +diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h +index f7c9add..fb971d2 100644 +--- a/drivers/gpu/drm/qxl/qxl_drv.h ++++ b/drivers/gpu/drm/qxl/qxl_drv.h +@@ -290,10 +290,10 @@ struct qxl_device { + unsigned int last_sent_io_cmd; + + /* interrupt handling */ +- atomic_t irq_received; +- atomic_t irq_received_display; +- atomic_t irq_received_cursor; +- atomic_t irq_received_io_cmd; ++ atomic_unchecked_t irq_received; ++ atomic_unchecked_t irq_received_display; ++ atomic_unchecked_t irq_received_cursor; ++ atomic_unchecked_t irq_received_io_cmd; + unsigned irq_received_error; + wait_queue_head_t display_event; + wait_queue_head_t cursor_event; +diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c +index 21393dc..329f3a9 100644 +--- a/drivers/gpu/drm/qxl/qxl_irq.c ++++ b/drivers/gpu/drm/qxl/qxl_irq.c +@@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(DRM_IRQ_ARGS) + + pending = xchg(&qdev->ram_header->int_pending, 0); + +- atomic_inc(&qdev->irq_received); ++ atomic_inc_unchecked(&qdev->irq_received); + + if (pending & QXL_INTERRUPT_DISPLAY) { +- atomic_inc(&qdev->irq_received_display); ++ atomic_inc_unchecked(&qdev->irq_received_display); + wake_up_all(&qdev->display_event); + qxl_queue_garbage_collect(qdev, false); + } + if (pending & QXL_INTERRUPT_CURSOR) { +- atomic_inc(&qdev->irq_received_cursor); ++ atomic_inc_unchecked(&qdev->irq_received_cursor); + wake_up_all(&qdev->cursor_event); + } + if (pending & QXL_INTERRUPT_IO_CMD) { +- atomic_inc(&qdev->irq_received_io_cmd); ++ atomic_inc_unchecked(&qdev->irq_received_io_cmd); + wake_up_all(&qdev->io_cmd_event); + } + if (pending & QXL_INTERRUPT_ERROR) { +@@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev) + init_waitqueue_head(&qdev->io_cmd_event); + INIT_WORK(&qdev->client_monitors_config_work, + qxl_client_monitors_config_work_func); +- atomic_set(&qdev->irq_received, 0); +- atomic_set(&qdev->irq_received_display, 0); +- atomic_set(&qdev->irq_received_cursor, 0); +- atomic_set(&qdev->irq_received_io_cmd, 0); ++ atomic_set_unchecked(&qdev->irq_received, 0); ++ atomic_set_unchecked(&qdev->irq_received_display, 0); ++ atomic_set_unchecked(&qdev->irq_received_cursor, 0); ++ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0); + qdev->irq_received_error = 0; + ret = drm_irq_install(qdev->ddev); + qdev->ram_header->int_mask = QXL_INTERRUPT_MASK; diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c -index 1dfd84c..104896c 100644 +index 037786d..2a95e33 100644 --- a/drivers/gpu/drm/qxl/qxl_ttm.c +++ b/drivers/gpu/drm/qxl/qxl_ttm.c @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev) @@ -38914,7 +38917,7 @@ index 1dfd84c..104896c 100644 } vma->vm_ops = &qxl_ttm_vm_ops; return 0; -@@ -556,25 +558,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data) +@@ -558,25 +560,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data) static int qxl_ttm_debugfs_init(struct qxl_device *qdev) { #if defined(CONFIG_DEBUG_FS) @@ -38956,7 +38959,7 @@ index 1dfd84c..104896c 100644 return 0; #endif diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c -index d4660cf..70dbe65 100644 +index c451257..0ad2134 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init) @@ -38969,7 +38972,7 @@ index d4660cf..70dbe65 100644 /* We don't support anything other than bus-mastering ring mode, * but the ring can be in either AGP or PCI space for the ring diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h -index 930c71b..499aded 100644 +index 56eb5e3..c4ec43d 100644 --- a/drivers/gpu/drm/r128/r128_drv.h +++ b/drivers/gpu/drm/r128/r128_drv.h @@ -90,14 +90,14 @@ typedef struct drm_r128_private { @@ -39047,7 +39050,7 @@ index 2ea4f09..d391371 100644 return IRQ_HANDLED; } diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c -index 19bb7e6..de7e2a2 100644 +index 01dd9ae..6352f04 100644 --- a/drivers/gpu/drm/r128/r128_state.c +++ b/drivers/gpu/drm/r128/r128_state.c @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv, @@ -39085,10 +39088,10 @@ index af85299..ed9ac8d 100644 if (regcomp (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c -index d15f27e..ef11ffc 100644 +index 841d0e0..9eaa268 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c -@@ -1105,7 +1105,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev) +@@ -1117,7 +1117,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev) bool can_switch; spin_lock(&dev->count_lock); @@ -39201,10 +39204,10 @@ index 4d20910..6726b6d 100644 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c -index 6c0ce89..57a2529 100644 +index 71245d6..94c556d 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c -@@ -782,7 +782,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size) +@@ -784,7 +784,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size) man->size = size >> PAGE_SHIFT; } @@ -39213,7 +39216,7 @@ index 6c0ce89..57a2529 100644 static const struct vm_operations_struct *ttm_vm_ops = NULL; static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -@@ -823,8 +823,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma) +@@ -825,8 +825,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma) } if (unlikely(ttm_vm_ops == NULL)) { ttm_vm_ops = vma->vm_ops; @@ -39224,12 +39227,13 @@ index 6c0ce89..57a2529 100644 } vma->vm_ops = &radeon_ttm_vm_ops; return 0; -@@ -853,38 +855,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data) +@@ -855,38 +857,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data) static int radeon_ttm_debugfs_init(struct radeon_device *rdev) { #if defined(CONFIG_DEBUG_FS) - static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2]; - static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32]; +- unsigned i; + static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2] = { + { + .name = "radeon_vram_mm", @@ -39248,7 +39252,7 @@ index 6c0ce89..57a2529 100644 + .show = &ttm_dma_page_alloc_debugfs, + }, + }; - unsigned i; ++ unsigned i = RADEON_DEBUGFS_MEM_TYPES + 1; - for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) { - if (i == 0) @@ -39288,7 +39292,7 @@ index 6c0ce89..57a2529 100644 return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i); diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c -index d8ddfb3..609de1d 100644 +index 1447d79..40b2a5b 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -345,9 +345,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev, @@ -39327,12 +39331,12 @@ index dbc2def..0a9f710 100644 kobject_put(&zone->kobj); return ret; diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c -index bd2a3b4..122d9ad 100644 +index 863bef9..cba15cf 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c -@@ -394,9 +394,9 @@ static int ttm_pool_get_num_unused_pages(void) - static int ttm_pool_mm_shrink(struct shrinker *shrink, - struct shrink_control *sc) +@@ -391,9 +391,9 @@ out: + static unsigned long + ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { - static atomic_t start_pool = ATOMIC_INIT(0); + static atomic_unchecked_t start_pool = ATOMIC_INIT(0); @@ -39341,7 +39345,7 @@ index bd2a3b4..122d9ad 100644 + unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool); struct ttm_page_pool *pool; int shrink_pages = sc->nr_to_scan; - + unsigned long freed = 0; diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index 97e9d61..bf23c461 100644 --- a/drivers/gpu/drm/udl/udl_fb.c @@ -39355,7 +39359,7 @@ index 97e9d61..bf23c461 100644 pr_warn("released /dev/fb%d user=%d count=%d\n", diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h -index 893a650..6190d3b 100644 +index a811ef2..ff99b05 100644 --- a/drivers/gpu/drm/via/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { @@ -39451,7 +39455,7 @@ index ac98964..5dbf512 100644 case VIA_IRQ_ABSOLUTE: break; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h -index 13aeda7..4a952d1 100644 +index 150ec64..f5165f2 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -290,7 +290,7 @@ struct vmw_private { @@ -39561,7 +39565,7 @@ index 8a8725c2..afed796 100644 marker = list_first_entry(&queue->head, struct vmw_marker, head); diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c -index 5360e5a..c2c0d26 100644 +index b1a05ad..1c9d899 100644 --- a/drivers/gpu/host1x/drm/dc.c +++ b/drivers/gpu/host1x/drm/dc.c @@ -1004,7 +1004,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor) @@ -39573,11 +39577,33 @@ index 5360e5a..c2c0d26 100644 err = drm_debugfs_create_files(dc->debugfs_files, ARRAY_SIZE(debugfs_files), +diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c +index ec0ae2d..dc0780b 100644 +--- a/drivers/gpu/vga/vga_switcheroo.c ++++ b/drivers/gpu/vga/vga_switcheroo.c +@@ -643,7 +643,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev) + + /* this version is for the case where the power switch is separate + to the device being powered down. */ +-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) ++int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) + { + /* copy over all the bus versions */ + if (dev->bus && dev->bus->pm) { +@@ -688,7 +688,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev) + return ret; + } + +-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) ++int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) + { + /* copy over all the bus versions */ + if (dev->bus && dev->bus->pm) { diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 9f60d63..c89e0b7 100644 +index c08b5c1..6c3d50b 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -2370,7 +2370,7 @@ EXPORT_SYMBOL_GPL(hid_ignore); +@@ -2415,7 +2415,7 @@ EXPORT_SYMBOL_GPL(hid_ignore); int hid_add_device(struct hid_device *hdev) { @@ -39586,7 +39612,7 @@ index 9f60d63..c89e0b7 100644 int ret; if (WARN_ON(hdev->status & HID_STAT_ADDED)) -@@ -2404,7 +2404,7 @@ int hid_add_device(struct hid_device *hdev) +@@ -2449,7 +2449,7 @@ int hid_add_device(struct hid_device *hdev) /* XXX hack, any other cleaner solution after the driver core * is converted to allow more than 20 bytes as the device name? */ dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, @@ -39609,7 +39635,7 @@ index c13fb5b..55a3802 100644 *off += size; diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c -index 145a4cb..2353a3e 100644 +index cedc6da..2c3da2a 100644 --- a/drivers/hid/uhid.c +++ b/drivers/hid/uhid.c @@ -47,7 +47,7 @@ struct uhid_device { @@ -39621,7 +39647,7 @@ index 145a4cb..2353a3e 100644 struct uhid_event report_buf; }; -@@ -187,7 +187,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum, +@@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum, spin_lock_irqsave(&uhid->qlock, flags); ev->type = UHID_FEATURE; @@ -39630,7 +39656,7 @@ index 145a4cb..2353a3e 100644 ev->u.feature.rnum = rnum; ev->u.feature.rtype = report_type; -@@ -471,7 +471,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid, +@@ -446,7 +446,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid, spin_lock_irqsave(&uhid->qlock, flags); /* id for old report; drop it silently */ @@ -39668,7 +39694,7 @@ index 88f4096..e50452e 100644 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi), "=a"(hv_status_lo) : "d" (control_hi), diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c -index deb5c25..ed2d4fd 100644 +index 7e17a54..a50a33d 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -464,7 +464,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add"); @@ -39680,15 +39706,15 @@ index deb5c25..ed2d4fd 100644 static int dm_ring_size = (5 * PAGE_SIZE); -@@ -825,7 +825,7 @@ static void hot_add_req(struct work_struct *dummy) - memset(&resp, 0, sizeof(struct dm_hot_add_response)); - resp.hdr.type = DM_MEM_HOT_ADD_RESPONSE; - resp.hdr.size = sizeof(struct dm_hot_add_response); +@@ -886,7 +886,7 @@ static void hot_add_req(struct work_struct *dummy) + pr_info("Memory hot add failed\n"); + + dm->state = DM_INITIALIZED; - resp.hdr.trans_id = atomic_inc_return(&trans_id); + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id); - - #ifdef CONFIG_MEMORY_HOTPLUG - pg_start = dm->ha_wrk.ha_page_range.finfo.start_page; + vmbus_sendpacket(dm->dev->channel, &resp, + sizeof(struct dm_hot_add_response), + (unsigned long)NULL, @@ -960,7 +960,7 @@ static void post_status(struct hv_dynmem_device *dm) memset(&status, 0, sizeof(struct dm_status)); status.hdr.type = DM_STATUS_REPORT; @@ -39707,15 +39733,15 @@ index deb5c25..ed2d4fd 100644 return; vmbus_sendpacket(dm->dev->channel, &status, -@@ -1081,7 +1081,7 @@ static void balloon_up(struct work_struct *dummy) - bl_resp = (struct dm_balloon_response *)send_buffer; - memset(send_buffer, 0, PAGE_SIZE); - bl_resp->hdr.type = DM_BALLOON_RESPONSE; -- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id); -+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id); - bl_resp->hdr.size = sizeof(struct dm_balloon_response); - bl_resp->more_pages = 1; +@@ -1108,7 +1108,7 @@ static void balloon_up(struct work_struct *dummy) + */ + do { +- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id); ++ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id); + ret = vmbus_sendpacket(dm_device.dev->channel, + bl_resp, + bl_resp->hdr.size, @@ -1152,7 +1152,7 @@ static void balloon_down(struct hv_dynmem_device *dm, memset(&resp, 0, sizeof(struct dm_unballoon_response)); @@ -39766,7 +39792,7 @@ index d84918f..7f38f9f 100644 /* * Represents channel interrupts. Each bit position represents a diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c -index e8e071f..5b4b245 100644 +index f9fe46f..356b119 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -672,10 +672,10 @@ int vmbus_device_register(struct hv_device *child_device_obj) @@ -39783,7 +39809,7 @@ index e8e071f..5b4b245 100644 child_device_obj->device.bus = &hv_bus; child_device_obj->device.parent = &hv_acpi_dev->dev; diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c -index 6351aba..dc4aaf4 100644 +index a9e3d01..9dd246e 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -117,7 +117,7 @@ struct sensor_template { @@ -39846,10 +39872,10 @@ index b25c643..a13460d 100644 { sysfs_attr_init(&attr->attr); diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c -index 2e5e2dc..5208b31 100644 +index 78be661..4dd032f 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c -@@ -785,7 +785,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb, +@@ -797,7 +797,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb, return NOTIFY_OK; } @@ -39859,7 +39885,7 @@ index 2e5e2dc..5208b31 100644 }; diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c -index 1429f6e..ee03d59 100644 +index 632f1dc..57e6a58 100644 --- a/drivers/hwmon/ibmaem.c +++ b/drivers/hwmon/ibmaem.c @@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data, @@ -39884,8 +39910,26 @@ index 708081b..fe2d4ab 100644 int ret, i; int in_i = 1, temp_i = 1, curr_i = 1; enum iio_chan_type type; +diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c +index 6eb03ce..bea7e3e 100644 +--- a/drivers/hwmon/nct6775.c ++++ b/drivers/hwmon/nct6775.c +@@ -936,10 +936,10 @@ static struct attribute_group * + nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg, + int repeat) + { +- struct attribute_group *group; ++ attribute_group_no_const *group; + struct sensor_device_attr_u *su; +- struct sensor_device_attribute *a; +- struct sensor_device_attribute_2 *a2; ++ sensor_device_attribute_no_const *a; ++ sensor_device_attribute_2_no_const *a2; + struct attribute **attrs; + struct sensor_device_template **t; + int err, i, j, count; diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c -index 9add6092..ee7ba3f 100644 +index 9319fcf..189ff45 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -781,7 +781,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr) @@ -39934,7 +39978,7 @@ index 9add6092..ee7ba3f 100644 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL); if (!label) diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c -index 2507f90..1645765 100644 +index 97cd45a..ac54d8b 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c @@ -169,7 +169,7 @@ struct sht15_data { @@ -40011,6 +40055,19 @@ index 07f01ac..d79ad3d 100644 /* Wrapper access functions for multiplexed SMBus */ static DEFINE_MUTEX(amd756_lock); +diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c +index dae3ddf..26e21d1 100644 +--- a/drivers/i2c/busses/i2c-diolan-u2c.c ++++ b/drivers/i2c/busses/i2c-diolan-u2c.c +@@ -99,7 +99,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz"); + /* usb layer */ + + /* Send command to device, and get response. */ +-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev) ++static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev) + { + int ret = 0; + int actual; diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c index 2ca268d..c6acbdf 100644 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c @@ -40051,7 +40108,7 @@ index 0b510ba..4fbb5085 100644 } } diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c -index e145931..08bfc59 100644 +index f95c697..0a1b05c 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -506,7 +506,7 @@ static ssize_t iio_write_channel_info(struct device *dev, @@ -40380,10 +40437,10 @@ index 25b2cdf..099ff97 100644 ctx->mcg_wq = create_singlethread_workqueue(name); if (!ctx->mcg_wq) diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h -index f61ec26..ebf72cf 100644 +index 036b663..c9a8c73 100644 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h -@@ -398,7 +398,7 @@ struct mlx4_ib_demux_ctx { +@@ -404,7 +404,7 @@ struct mlx4_ib_demux_ctx { struct list_head mcg_mgid0_list; struct workqueue_struct *mcg_wq; struct mlx4_ib_demux_pv_ctx **tun; @@ -40393,7 +40450,7 @@ index f61ec26..ebf72cf 100644 }; diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c -index 9d3e5c1..d9afe4a 100644 +index 9d3e5c1..6f166df 100644 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base) @@ -40405,10 +40462,59 @@ index 9d3e5c1..d9afe4a 100644 { struct mthca_mailbox *mailbox; u32 *outbox; +@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox, + CMD_TIME_CLASS_B); + } + +-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox, ++int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox, + int num_mtt) + { + return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT, +@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap, + 0, CMD_MAP_EQ, CMD_TIME_CLASS_B); + } + +-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox, ++int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox, + int eq_num) + { + return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ, +@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn) + CMD_TIME_CLASS_B); + } + +-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey, ++int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey, + int port, struct ib_wc *in_wc, struct ib_grh *in_grh, + void *in_mad, void *response_mad) + { +diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c +index 87897b9..7e79542 100644 +--- a/drivers/infiniband/hw/mthca/mthca_main.c ++++ b/drivers/infiniband/hw/mthca/mthca_main.c +@@ -692,7 +692,7 @@ err_close: + return err; + } + +-static int mthca_setup_hca(struct mthca_dev *dev) ++static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev) + { + int err; + diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c -index ed9a989..e0c5871 100644 +index ed9a989..6aa5dc2 100644 --- a/drivers/infiniband/hw/mthca/mthca_mr.c +++ b/drivers/infiniband/hw/mthca/mthca_mr.c +@@ -81,7 +81,7 @@ struct mthca_mpt_entry { + * through the bitmaps) + */ + +-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order) ++static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order) + { + int o; + int m; @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key) return key; } @@ -40418,6 +40524,28 @@ index ed9a989..e0c5871 100644 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr) { struct mthca_mailbox *mailbox; +@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd, + return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr); + } + +-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd, ++int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd, + u64 *buffer_list, int buffer_size_shift, + int list_len, u64 iova, u64 total_size, + u32 access, struct mthca_mr *mr) +diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c +index 5b71d43..35a9e14 100644 +--- a/drivers/infiniband/hw/mthca/mthca_provider.c ++++ b/drivers/infiniband/hw/mthca/mthca_provider.c +@@ -763,7 +763,7 @@ unlock: + return 0; + } + +-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) ++static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) + { + struct mthca_dev *dev = to_mdev(ibcq->device); + struct mthca_cq *cq = to_mcq(ibcq); diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 4291410..d2ab1fb 100644 --- a/drivers/infiniband/hw/nes/nes.c @@ -40500,7 +40628,7 @@ index 33cc589..3bd6538 100644 extern u32 int_mod_timer_init; extern u32 int_mod_cq_depth_256; diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c -index 24b9f1a..00fd004 100644 +index 6b29249..57081dd 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c @@ -68,14 +68,14 @@ u32 cm_packets_dropped; @@ -40627,7 +40755,7 @@ index 24b9f1a..00fd004 100644 nes_disconnect(nesqp, 1); cm_id->provider_data = nesqp; -@@ -3033,7 +3033,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) +@@ -3035,7 +3035,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n", nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener); @@ -40636,7 +40764,7 @@ index 24b9f1a..00fd004 100644 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n", netdev_refcnt_read(nesvnic->netdev)); -@@ -3228,7 +3228,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len) +@@ -3224,7 +3224,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len) struct nes_cm_core *cm_core; u8 *start_buff; @@ -40645,9 +40773,9 @@ index 24b9f1a..00fd004 100644 cm_node = (struct nes_cm_node *)cm_id->provider_data; loopback = cm_node->loopbackpartner; cm_core = cm_node->cm_core; -@@ -3288,7 +3288,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) - ntohl(cm_id->local_addr.sin_addr.s_addr), - ntohs(cm_id->local_addr.sin_port)); +@@ -3286,7 +3286,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) + ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr), + ntohs(laddr->sin_port)); - atomic_inc(&cm_connects); + atomic_inc_unchecked(&cm_connects); @@ -40663,7 +40791,7 @@ index 24b9f1a..00fd004 100644 } cm_id->add_ref(cm_id); -@@ -3499,7 +3499,7 @@ static void cm_event_connected(struct nes_cm_event *event) +@@ -3505,7 +3505,7 @@ static void cm_event_connected(struct nes_cm_event *event) if (nesqp->destroyed) return; @@ -40671,8 +40799,8 @@ index 24b9f1a..00fd004 100644 + atomic_inc_unchecked(&cm_connecteds); nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on" " local port 0x%04X. jiffies = %lu.\n", - nesqp->hwqp.qp_id, -@@ -3679,7 +3679,7 @@ static void cm_event_reset(struct nes_cm_event *event) + nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr), +@@ -3686,7 +3686,7 @@ static void cm_event_reset(struct nes_cm_event *event) cm_id->add_ref(cm_id); ret = cm_id->event_handler(cm_id, &cm_event); @@ -40681,7 +40809,7 @@ index 24b9f1a..00fd004 100644 cm_event.event = IW_CM_EVENT_CLOSE; cm_event.status = 0; cm_event.provider_data = cm_id->provider_data; -@@ -3715,7 +3715,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event) +@@ -3726,7 +3726,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event) return; cm_id = cm_node->cm_id; @@ -40690,7 +40818,7 @@ index 24b9f1a..00fd004 100644 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n", cm_node, cm_id, jiffies); -@@ -3755,7 +3755,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event) +@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event) return; cm_id = cm_node->cm_id; @@ -40832,7 +40960,7 @@ index 5b53ca5..443da3c 100644 /* Blow away the connection if it exists. */ diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h -index 4a9af79..b993f75 100644 +index 1946101..09766d2 100644 --- a/drivers/infiniband/hw/qib/qib.h +++ b/drivers/infiniband/hw/qib/qib.h @@ -52,6 +52,7 @@ @@ -40844,7 +40972,7 @@ index 4a9af79..b993f75 100644 #include "qib_common.h" #include "qib_verbs.h" diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c -index da739d9..da1c7f4 100644 +index 922a7fe..bb035db 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c @@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys); @@ -40865,27 +40993,27 @@ index da739d9..da1c7f4 100644 gameport->dev.release = gameport_release_port; if (gameport->parent) diff --git a/drivers/input/input.c b/drivers/input/input.c -index c044699..174d71a 100644 +index e75d015..57d1c28 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c -@@ -2019,7 +2019,7 @@ static void devm_input_device_unregister(struct device *dev, void *res) +@@ -1734,7 +1734,7 @@ EXPORT_SYMBOL_GPL(input_class); */ - int input_register_device(struct input_dev *dev) + struct input_dev *input_allocate_device(void) { - static atomic_t input_no = ATOMIC_INIT(0); + static atomic_unchecked_t input_no = ATOMIC_INIT(0); - struct input_devres *devres = NULL; - struct input_handler *handler; - unsigned int packet_size; -@@ -2074,7 +2074,7 @@ int input_register_device(struct input_dev *dev) - dev->setkeycode = input_default_setkeycode; + struct input_dev *dev; - dev_set_name(&dev->dev, "input%ld", -- (unsigned long) atomic_inc_return(&input_no) - 1); -+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1); + dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL); +@@ -1749,7 +1749,7 @@ struct input_dev *input_allocate_device(void) + INIT_LIST_HEAD(&dev->node); - error = device_add(&dev->dev); - if (error) + dev_set_name(&dev->dev, "input%ld", +- (unsigned long) atomic_inc_return(&input_no) - 1); ++ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1); + + __module_get(THIS_MODULE); + } diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c index 04c69af..5f92d00 100644 --- a/drivers/input/joystick/sidewinder.c @@ -40969,7 +41097,7 @@ index 4c842c3..590b0bf 100644 return count; diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c -index 25fc597..558bf3b3 100644 +index 2b56855..5a55837 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev) @@ -41056,7 +41184,7 @@ index 39f81ae..2660096 100644 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c -index ee7c503..5d4ce08 100644 +index d0e9480..d2b6340 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly; @@ -41181,611 +41309,6 @@ index 4d9b195..455075c 100644 return -EFAULT; } else { memcpy(buf, dp, left); -diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c -index 1063bab..36817e0 100644 ---- a/drivers/isdn/hisax/amd7930_fn.c -+++ b/drivers/isdn/hisax/amd7930_fn.c -@@ -314,7 +314,7 @@ Amd7930_empty_Dfifo(struct IsdnCardState *cs, int flag) - - t += sprintf(t, "Amd7930: empty_Dfifo cnt: %d |", cs->rcvidx); - QuickHex(t, cs->rcvbuf, cs->rcvidx); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - /* moves received data in sk-buffer */ - memcpy(skb_put(skb, cs->rcvidx), cs->rcvbuf, cs->rcvidx); -@@ -406,7 +406,7 @@ Amd7930_fill_Dfifo(struct IsdnCardState *cs) - - t += sprintf(t, "Amd7930: fill_Dfifo cnt: %d |", count); - QuickHex(t, deb_ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - /* AMD interrupts on */ - AmdIrqOn(cs); -diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c -index ee9b9a0..d1427bd 100644 ---- a/drivers/isdn/hisax/avm_pci.c -+++ b/drivers/isdn/hisax/avm_pci.c -@@ -285,7 +285,7 @@ hdlc_empty_fifo(struct BCState *bcs, int count) - t += sprintf(t, "hdlc_empty_fifo %c cnt %d", - bcs->channel ? 'B' : 'A', count); - QuickHex(t, p, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -@@ -345,7 +345,7 @@ hdlc_fill_fifo(struct BCState *bcs) - t += sprintf(t, "hdlc_fill_fifo %c cnt %d", - bcs->channel ? 'B' : 'A', count); - QuickHex(t, p, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c -index bf04d2a..b33f53b 100644 ---- a/drivers/isdn/hisax/config.c -+++ b/drivers/isdn/hisax/config.c -@@ -1896,7 +1896,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if) - ptr--; - *ptr++ = '\n'; - *ptr = 0; -- HiSax_putstatus(cs, NULL, cs->dlog); -+ HiSax_putstatus(cs, NULL, "%s", cs->dlog); - } else - HiSax_putstatus(cs, "LogEcho: ", - "warning Frame too big (%d)", -diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c -index 8d0cf6e..4fc90de 100644 ---- a/drivers/isdn/hisax/diva.c -+++ b/drivers/isdn/hisax/diva.c -@@ -427,7 +427,7 @@ Memhscx_empty_fifo(struct BCState *bcs, int count) - t += sprintf(t, "hscx_empty_fifo %c cnt %d", - bcs->hw.hscx.hscx ? 'B' : 'A', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -@@ -469,7 +469,7 @@ Memhscx_fill_fifo(struct BCState *bcs) - t += sprintf(t, "hscx_fill_fifo %c cnt %d", - bcs->hw.hscx.hscx ? 'B' : 'A', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c -index 1df6f9a..2be1c8a 100644 ---- a/drivers/isdn/hisax/elsa.c -+++ b/drivers/isdn/hisax/elsa.c -@@ -535,7 +535,7 @@ check_arcofi(struct IsdnCardState *cs) - t = tmp; - t += sprintf(tmp, "Arcofi data"); - QuickHex(t, p, cs->dc.isac.mon_rxp); -- debugl1(cs, tmp); -+ debugl1(cs, "%s", tmp); - if ((cs->dc.isac.mon_rxp == 2) && (cs->dc.isac.mon_rx[0] == 0xa0)) { - switch (cs->dc.isac.mon_rx[1]) { - case 0x80: -diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c -index d4c98d3..3f84dd8 100644 ---- a/drivers/isdn/hisax/elsa_ser.c -+++ b/drivers/isdn/hisax/elsa_ser.c -@@ -344,7 +344,7 @@ static inline void receive_chars(struct IsdnCardState *cs, - - t += sprintf(t, "modem read cnt %d", cs->hw.elsa.rcvcnt); - QuickHex(t, cs->hw.elsa.rcvbuf, cs->hw.elsa.rcvcnt); -- debugl1(cs, tmp); -+ debugl1(cs, "%s", tmp); - } - cs->hw.elsa.rcvcnt = 0; - } -diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c -index 3ccd724..497bd02 100644 ---- a/drivers/isdn/hisax/hfc_pci.c -+++ b/drivers/isdn/hisax/hfc_pci.c -@@ -901,7 +901,7 @@ Begin: - ptr--; - *ptr++ = '\n'; - *ptr = 0; -- HiSax_putstatus(cs, NULL, cs->dlog); -+ HiSax_putstatus(cs, NULL, "%s", cs->dlog); - } else - HiSax_putstatus(cs, "LogEcho: ", "warning Frame too big (%d)", total - 3); - } -diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c -index dc4574f..fa1fefd 100644 ---- a/drivers/isdn/hisax/hfc_sx.c -+++ b/drivers/isdn/hisax/hfc_sx.c -@@ -674,7 +674,7 @@ receive_emsg(struct IsdnCardState *cs) - ptr--; - *ptr++ = '\n'; - *ptr = 0; -- HiSax_putstatus(cs, NULL, cs->dlog); -+ HiSax_putstatus(cs, NULL, "%s", cs->dlog); - } else - HiSax_putstatus(cs, "LogEcho: ", "warning Frame too big (%d)", skb->len); - } -diff --git a/drivers/isdn/hisax/hscx_irq.c b/drivers/isdn/hisax/hscx_irq.c -index f398d48..a8d6188 100644 ---- a/drivers/isdn/hisax/hscx_irq.c -+++ b/drivers/isdn/hisax/hscx_irq.c -@@ -75,7 +75,7 @@ hscx_empty_fifo(struct BCState *bcs, int count) - t += sprintf(t, "hscx_empty_fifo %c cnt %d", - bcs->hw.hscx.hscx ? 'B' : 'A', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -@@ -115,7 +115,7 @@ hscx_fill_fifo(struct BCState *bcs) - t += sprintf(t, "hscx_fill_fifo %c cnt %d", - bcs->hw.hscx.hscx ? 'B' : 'A', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c -index db5321f..51dae91 100644 ---- a/drivers/isdn/hisax/icc.c -+++ b/drivers/isdn/hisax/icc.c -@@ -134,7 +134,7 @@ icc_empty_fifo(struct IsdnCardState *cs, int count) - - t += sprintf(t, "icc_empty_fifo cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -@@ -176,7 +176,7 @@ icc_fill_fifo(struct IsdnCardState *cs) - - t += sprintf(t, "icc_fill_fifo cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c -index 74feb5c..5faa5de 100644 ---- a/drivers/isdn/hisax/ipacx.c -+++ b/drivers/isdn/hisax/ipacx.c -@@ -260,7 +260,7 @@ dch_empty_fifo(struct IsdnCardState *cs, int count) - - t += sprintf(t, "dch_empty_fifo() cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -@@ -307,7 +307,7 @@ dch_fill_fifo(struct IsdnCardState *cs) - - t += sprintf(t, "dch_fill_fifo() cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -@@ -539,7 +539,7 @@ bch_empty_fifo(struct BCState *bcs, int count) - - t += sprintf(t, "bch_empty_fifo() B-%d cnt %d", hscx, count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -@@ -582,7 +582,7 @@ bch_fill_fifo(struct BCState *bcs) - - t += sprintf(t, "chb_fill_fifo() B-%d cnt %d", hscx, count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c -index a365ccc..7fdf78f 100644 ---- a/drivers/isdn/hisax/isac.c -+++ b/drivers/isdn/hisax/isac.c -@@ -137,7 +137,7 @@ isac_empty_fifo(struct IsdnCardState *cs, int count) - - t += sprintf(t, "isac_empty_fifo cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -@@ -179,7 +179,7 @@ isac_fill_fifo(struct IsdnCardState *cs) - - t += sprintf(t, "isac_fill_fifo cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c -index 7fdf347..f4956c7 100644 ---- a/drivers/isdn/hisax/isar.c -+++ b/drivers/isdn/hisax/isar.c -@@ -74,7 +74,7 @@ sendmsg(struct IsdnCardState *cs, u_char his, u_char creg, u_char len, - t = tmp; - t += sprintf(t, "sendmbox cnt %d", len); - QuickHex(t, &msg[len-i], (i > 64) ? 64 : i); -- debugl1(cs, tmp); -+ debugl1(cs, "%s", tmp); - i -= 64; - } - } -@@ -105,7 +105,7 @@ rcv_mbox(struct IsdnCardState *cs, struct isar_reg *ireg, u_char *msg) - t = tmp; - t += sprintf(t, "rcv_mbox cnt %d", ireg->clsb); - QuickHex(t, &msg[ireg->clsb - i], (i > 64) ? 64 : i); -- debugl1(cs, tmp); -+ debugl1(cs, "%s", tmp); - i -= 64; - } - } -@@ -1248,7 +1248,7 @@ isar_int_main(struct IsdnCardState *cs) - tp += sprintf(debbuf, "msg iis(%x) msb(%x)", - ireg->iis, ireg->cmsb); - QuickHex(tp, (u_char *)ireg->par, ireg->clsb); -- debugl1(cs, debbuf); -+ debugl1(cs, "%s", debbuf); - } - break; - case ISAR_IIS_INVMSG: -diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c -index f946c58..e2ae787 100644 ---- a/drivers/isdn/hisax/jade.c -+++ b/drivers/isdn/hisax/jade.c -@@ -81,10 +81,7 @@ modejade(struct BCState *bcs, int mode, int bc) - int jade = bcs->hw.hscx.hscx; - - if (cs->debug & L1_DEB_HSCX) { -- char tmp[40]; -- sprintf(tmp, "jade %c mode %d ichan %d", -- 'A' + jade, mode, bc); -- debugl1(cs, tmp); -+ debugl1(cs, "jade %c mode %d ichan %d", 'A' + jade, mode, bc); - } - bcs->mode = mode; - bcs->channel = bc; -@@ -257,23 +254,18 @@ void - clear_pending_jade_ints(struct IsdnCardState *cs) - { - int val; -- char tmp[64]; - - cs->BC_Write_Reg(cs, 0, jade_HDLC_IMR, 0x00); - cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); - - val = cs->BC_Read_Reg(cs, 1, jade_HDLC_ISR); -- sprintf(tmp, "jade B ISTA %x", val); -- debugl1(cs, tmp); -+ debugl1(cs, "jade B ISTA %x", val); - val = cs->BC_Read_Reg(cs, 0, jade_HDLC_ISR); -- sprintf(tmp, "jade A ISTA %x", val); -- debugl1(cs, tmp); -+ debugl1(cs, "jade A ISTA %x", val); - val = cs->BC_Read_Reg(cs, 1, jade_HDLC_STAR); -- sprintf(tmp, "jade B STAR %x", val); -- debugl1(cs, tmp); -+ debugl1(cs, "jade B STAR %x", val); - val = cs->BC_Read_Reg(cs, 0, jade_HDLC_STAR); -- sprintf(tmp, "jade A STAR %x", val); -- debugl1(cs, tmp); -+ debugl1(cs, "jade A STAR %x", val); - /* Unmask ints */ - cs->BC_Write_Reg(cs, 0, jade_HDLC_IMR, 0xF8); - cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0xF8); -diff --git a/drivers/isdn/hisax/jade_irq.c b/drivers/isdn/hisax/jade_irq.c -index f521fc8..b930da9 100644 ---- a/drivers/isdn/hisax/jade_irq.c -+++ b/drivers/isdn/hisax/jade_irq.c -@@ -65,7 +65,7 @@ jade_empty_fifo(struct BCState *bcs, int count) - t += sprintf(t, "jade_empty_fifo %c cnt %d", - bcs->hw.hscx.hscx ? 'B' : 'A', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -@@ -105,7 +105,7 @@ jade_fill_fifo(struct BCState *bcs) - t += sprintf(t, "jade_fill_fifo %c cnt %d", - bcs->hw.hscx.hscx ? 'B' : 'A', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c -index 4c1bca5..875402e 100644 ---- a/drivers/isdn/hisax/l3_1tr6.c -+++ b/drivers/isdn/hisax/l3_1tr6.c -@@ -63,7 +63,7 @@ l3_1tr6_error(struct l3_process *pc, u_char *msg, struct sk_buff *skb) - { - dev_kfree_skb(skb); - if (pc->st->l3.debug & L3_DEB_WARN) -- l3_debug(pc->st, msg); -+ l3_debug(pc->st, "%s", msg); - l3_1tr6_release_req(pc, 0, NULL); - } - -@@ -161,7 +161,6 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg) - { - u_char *p; - int bcfound = 0; -- char tmp[80]; - struct sk_buff *skb = arg; - - /* Channel Identification */ -@@ -214,10 +213,9 @@ l3_1tr6_setup(struct l3_process *pc, u_char pr, void *arg) - /* Signal all services, linklevel takes care of Service-Indicator */ - if (bcfound) { - if ((pc->para.setup.si1 != 7) && (pc->st->l3.debug & L3_DEB_WARN)) { -- sprintf(tmp, "non-digital call: %s -> %s", -+ l3_debug(pc->st, "non-digital call: %s -> %s", - pc->para.setup.phone, - pc->para.setup.eazmsn); -- l3_debug(pc->st, tmp); - } - newl3state(pc, 6); - pc->st->l3.l3l4(pc->st, CC_SETUP | INDICATION, pc); -@@ -301,7 +299,7 @@ l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg) - { - u_char *p; - int i, tmpcharge = 0; -- char a_charge[8], tmp[32]; -+ char a_charge[8]; - struct sk_buff *skb = arg; - - p = skb->data; -@@ -316,8 +314,8 @@ l3_1tr6_info(struct l3_process *pc, u_char pr, void *arg) - pc->st->l3.l3l4(pc->st, CC_CHARGE | INDICATION, pc); - } - if (pc->st->l3.debug & L3_DEB_CHARGE) { -- sprintf(tmp, "charging info %d", pc->para.chargeinfo); -- l3_debug(pc->st, tmp); -+ l3_debug(pc->st, "charging info %d", -+ pc->para.chargeinfo); - } - } else if (pc->st->l3.debug & L3_DEB_CHARGE) - l3_debug(pc->st, "charging info not found"); -@@ -399,7 +397,7 @@ l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg) - struct sk_buff *skb = arg; - u_char *p; - int i, tmpcharge = 0; -- char a_charge[8], tmp[32]; -+ char a_charge[8]; - - StopAllL3Timer(pc); - p = skb->data; -@@ -414,8 +412,8 @@ l3_1tr6_disc(struct l3_process *pc, u_char pr, void *arg) - pc->st->l3.l3l4(pc->st, CC_CHARGE | INDICATION, pc); - } - if (pc->st->l3.debug & L3_DEB_CHARGE) { -- sprintf(tmp, "charging info %d", pc->para.chargeinfo); -- l3_debug(pc->st, tmp); -+ l3_debug(pc->st, "charging info %d", -+ pc->para.chargeinfo); - } - } else if (pc->st->l3.debug & L3_DEB_CHARGE) - l3_debug(pc->st, "charging info not found"); -@@ -746,7 +744,6 @@ up1tr6(struct PStack *st, int pr, void *arg) - int i, mt, cr; - struct l3_process *proc; - struct sk_buff *skb = arg; -- char tmp[80]; - - switch (pr) { - case (DL_DATA | INDICATION): -@@ -762,26 +759,23 @@ up1tr6(struct PStack *st, int pr, void *arg) - } - if (skb->len < 4) { - if (st->l3.debug & L3_DEB_PROTERR) { -- sprintf(tmp, "up1tr6 len only %d", skb->len); -- l3_debug(st, tmp); -+ l3_debug(st, "up1tr6 len only %d", skb->len); - } - dev_kfree_skb(skb); - return; - } - if ((skb->data[0] & 0xfe) != PROTO_DIS_N0) { - if (st->l3.debug & L3_DEB_PROTERR) { -- sprintf(tmp, "up1tr6%sunexpected discriminator %x message len %d", -+ l3_debug(st, "up1tr6%sunexpected discriminator %x message len %d", - (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", - skb->data[0], skb->len); -- l3_debug(st, tmp); - } - dev_kfree_skb(skb); - return; - } - if (skb->data[1] != 1) { - if (st->l3.debug & L3_DEB_PROTERR) { -- sprintf(tmp, "up1tr6 CR len not 1"); -- l3_debug(st, tmp); -+ l3_debug(st, "up1tr6 CR len not 1"); - } - dev_kfree_skb(skb); - return; -@@ -791,9 +785,8 @@ up1tr6(struct PStack *st, int pr, void *arg) - if (skb->data[0] == PROTO_DIS_N0) { - dev_kfree_skb(skb); - if (st->l3.debug & L3_DEB_STATE) { -- sprintf(tmp, "up1tr6%s N0 mt %x unhandled", -+ l3_debug(st, "up1tr6%s N0 mt %x unhandled", - (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", mt); -- l3_debug(st, tmp); - } - } else if (skb->data[0] == PROTO_DIS_N1) { - if (!(proc = getl3proc(st, cr))) { -@@ -801,8 +794,7 @@ up1tr6(struct PStack *st, int pr, void *arg) - if (cr < 128) { - if (!(proc = new_l3_process(st, cr))) { - if (st->l3.debug & L3_DEB_PROTERR) { -- sprintf(tmp, "up1tr6 no roc mem"); -- l3_debug(st, tmp); -+ l3_debug(st, "up1tr6 no roc mem"); - } - dev_kfree_skb(skb); - return; -@@ -821,8 +813,7 @@ up1tr6(struct PStack *st, int pr, void *arg) - } else { - if (!(proc = new_l3_process(st, cr))) { - if (st->l3.debug & L3_DEB_PROTERR) { -- sprintf(tmp, "up1tr6 no roc mem"); -- l3_debug(st, tmp); -+ l3_debug(st, "up1tr6 no roc mem"); - } - dev_kfree_skb(skb); - return; -@@ -837,18 +828,16 @@ up1tr6(struct PStack *st, int pr, void *arg) - if (i == ARRAY_SIZE(datastln1)) { - dev_kfree_skb(skb); - if (st->l3.debug & L3_DEB_STATE) { -- sprintf(tmp, "up1tr6%sstate %d mt %x unhandled", -+ l3_debug(st, "up1tr6%sstate %d mt %x unhandled", - (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", - proc->state, mt); -- l3_debug(st, tmp); - } - return; - } else { - if (st->l3.debug & L3_DEB_STATE) { -- sprintf(tmp, "up1tr6%sstate %d mt %x", -+ l3_debug(st, "up1tr6%sstate %d mt %x", - (pr == (DL_DATA | INDICATION)) ? " " : "(broadcast) ", - proc->state, mt); -- l3_debug(st, tmp); - } - datastln1[i].rout(proc, pr, skb); - } -@@ -861,7 +850,6 @@ down1tr6(struct PStack *st, int pr, void *arg) - int i, cr; - struct l3_process *proc; - struct Channel *chan; -- char tmp[80]; - - if ((DL_ESTABLISH | REQUEST) == pr) { - l3_msg(st, pr, NULL); -@@ -888,15 +876,13 @@ down1tr6(struct PStack *st, int pr, void *arg) - break; - if (i == ARRAY_SIZE(downstl)) { - if (st->l3.debug & L3_DEB_STATE) { -- sprintf(tmp, "down1tr6 state %d prim %d unhandled", -+ l3_debug(st, "down1tr6 state %d prim %d unhandled", - proc->state, pr); -- l3_debug(st, tmp); - } - } else { - if (st->l3.debug & L3_DEB_STATE) { -- sprintf(tmp, "down1tr6 state %d prim %d", -+ l3_debug(st, "down1tr6 state %d prim %d", - proc->state, pr); -- l3_debug(st, tmp); - } - downstl[i].rout(proc, pr, arg); - } -diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c -index b646eed..233e432 100644 ---- a/drivers/isdn/hisax/netjet.c -+++ b/drivers/isdn/hisax/netjet.c -@@ -176,7 +176,7 @@ static void printframe(struct IsdnCardState *cs, u_char *buf, int count, char *s - else - j = i; - QuickHex(t, p, j); -- debugl1(cs, tmp); -+ debugl1(cs, "%s", tmp); - p += j; - i -= j; - t = tmp; -diff --git a/drivers/isdn/hisax/q931.c b/drivers/isdn/hisax/q931.c -index 041bf52..af1b020 100644 ---- a/drivers/isdn/hisax/q931.c -+++ b/drivers/isdn/hisax/q931.c -@@ -1179,7 +1179,7 @@ LogFrame(struct IsdnCardState *cs, u_char *buf, int size) - dp--; - *dp++ = '\n'; - *dp = 0; -- HiSax_putstatus(cs, NULL, cs->dlog); -+ HiSax_putstatus(cs, NULL, "%s", cs->dlog); - } else - HiSax_putstatus(cs, "LogFrame: ", "warning Frame too big (%d)", size); - } -@@ -1246,7 +1246,7 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) - } - if (finish) { - *dp = 0; -- HiSax_putstatus(cs, NULL, cs->dlog); -+ HiSax_putstatus(cs, NULL, "%s", cs->dlog); - return; - } - if ((0xfe & buf[0]) == PROTO_DIS_N0) { /* 1TR6 */ -@@ -1509,5 +1509,5 @@ dlogframe(struct IsdnCardState *cs, struct sk_buff *skb, int dir) - dp += sprintf(dp, "Unknown protocol %x!", buf[0]); - } - *dp = 0; -- HiSax_putstatus(cs, NULL, cs->dlog); -+ HiSax_putstatus(cs, NULL, "%s", cs->dlog); - } -diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c -index d8cac69..a858955 100644 ---- a/drivers/isdn/hisax/w6692.c -+++ b/drivers/isdn/hisax/w6692.c -@@ -154,7 +154,7 @@ W6692_empty_fifo(struct IsdnCardState *cs, int count) - - t += sprintf(t, "W6692_empty_fifo cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -@@ -196,7 +196,7 @@ W6692_fill_fifo(struct IsdnCardState *cs) - - t += sprintf(t, "W6692_fill_fifo cnt %d", count); - QuickHex(t, ptr, count); -- debugl1(cs, cs->dlog); -+ debugl1(cs, "%s", cs->dlog); - } - } - -@@ -226,7 +226,7 @@ W6692B_empty_fifo(struct BCState *bcs, int count) - t += sprintf(t, "W6692B_empty_fifo %c cnt %d", - bcs->channel + '1', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - -@@ -264,7 +264,7 @@ W6692B_fill_fifo(struct BCState *bcs) - t += sprintf(t, "W6692B_fill_fifo %c cnt %d", - bcs->channel + '1', count); - QuickHex(t, ptr, count); -- debugl1(cs, bcs->blog); -+ debugl1(cs, "%s", bcs->blog); - } - } - diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 9bb12ba..d4262f7 100644 --- a/drivers/isdn/i4l/isdn_common.c @@ -41877,29 +41400,42 @@ index e74df7c..03a03ba 100644 return -EFAULT; } else memcpy(msg, buf, count); +diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c +index a4f05c5..1433bc5 100644 +--- a/drivers/isdn/mISDN/dsp_cmx.c ++++ b/drivers/isdn/mISDN/dsp_cmx.c +@@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */ + static u16 dsp_count; /* last sample count */ + static int dsp_count_valid; /* if we have last sample count */ + +-void ++void __intentional_overflow(-1) + dsp_cmx_send(void *arg) + { + struct dsp_conf *conf; diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c -index 6a8405d..0bd1c7e 100644 +index d93e245..e7ece6b 100644 --- a/drivers/leds/leds-clevo-mail.c +++ b/drivers/leds/leds-clevo-mail.c @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id) * detected as working, but in reality it is not) as low as * possible. */ --static struct dmi_system_id __initdata clevo_mail_led_dmi_table[] = { -+static const struct dmi_system_id __initconst clevo_mail_led_dmi_table[] = { +-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = { ++static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = { { .callback = clevo_mail_led_dmi_callback, .ident = "Clevo D410J", diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c -index 64e204e..c6bf189 100644 +index 5b8f938..b73d657 100644 --- a/drivers/leds/leds-ss4200.c +++ b/drivers/leds/leds-ss4200.c @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection"); * detected as working, but in reality it is not) as low as * possible. */ --static struct dmi_system_id __initdata nas_led_whitelist[] = { -+static const struct dmi_system_id __initconst nas_led_whitelist[] = { +-static struct dmi_system_id nas_led_whitelist[] __initdata = { ++static struct dmi_system_id nas_led_whitelist[] __initconst = { { .callback = ss4200_led_dmi_callback, .ident = "Intel SS4200-E", @@ -41935,7 +41471,7 @@ index 0bf1e4e..b4bf44e 100644 printk(KERN_INFO "lguest: mapped switcher at %p\n", diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c -index a35d8d1..59fb772 100644 +index bfb39bb..08a603b 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr) @@ -42094,10 +41630,10 @@ index a7fd821..9dcf6c3 100644 seq_printf(seq, "\n"); diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c -index f1b7586..a49c4bd 100644 +index afe0814..8cf3794 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c -@@ -1739,7 +1739,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param) +@@ -1745,7 +1745,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param) cmd == DM_LIST_VERSIONS_CMD) return 0; @@ -42107,7 +41643,7 @@ index f1b7586..a49c4bd 100644 DMWARN("name not supplied when creating device"); return -EINVAL; diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c -index 699b5be..eac0a15 100644 +index 9584443..9fc9ac9 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c @@ -40,7 +40,7 @@ enum dm_raid1_error { @@ -42173,7 +41709,7 @@ index 699b5be..eac0a15 100644 ms->mirror[mirror].error_type = 0; ms->mirror[mirror].offset = offset; -@@ -1340,7 +1340,7 @@ static void mirror_resume(struct dm_target *ti) +@@ -1339,7 +1339,7 @@ static void mirror_resume(struct dm_target *ti) */ static char device_status_char(struct mirror *m) { @@ -42182,11 +41718,35 @@ index 699b5be..eac0a15 100644 return 'A'; return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' : +diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c +index 3d404c1..b62af0e 100644 +--- a/drivers/md/dm-stats.c ++++ b/drivers/md/dm-stats.c +@@ -382,7 +382,7 @@ do_sync_free: + synchronize_rcu_expedited(); + dm_stat_free(&s->rcu_head); + } else { +- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1; ++ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1; + call_rcu(&s->rcu_head, dm_stat_free); + } + return 0; +@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw, + ((bi_rw & (REQ_WRITE | REQ_DISCARD)) == + (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD))) + )); +- ACCESS_ONCE(last->last_sector) = end_sector; +- ACCESS_ONCE(last->last_rw) = bi_rw; ++ ACCESS_ONCE_RW(last->last_sector) = end_sector; ++ ACCESS_ONCE_RW(last->last_rw) = bi_rw; + } + + rcu_read_lock(); diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c -index d907ca6..cfb8384 100644 +index 73c1712..7347292 100644 --- a/drivers/md/dm-stripe.c +++ b/drivers/md/dm-stripe.c -@@ -20,7 +20,7 @@ struct stripe { +@@ -21,7 +21,7 @@ struct stripe { struct dm_dev *dev; sector_t physical_start; @@ -42195,7 +41755,7 @@ index d907ca6..cfb8384 100644 }; struct stripe_c { -@@ -185,7 +185,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv) +@@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv) kfree(sc); return r; } @@ -42204,7 +41764,7 @@ index d907ca6..cfb8384 100644 } ti->private = sc; -@@ -326,7 +326,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type, +@@ -327,7 +327,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type, DMEMIT("%d ", sc->stripes); for (i = 0; i < sc->stripes; i++) { DMEMIT("%s ", sc->stripe[i].dev->name); @@ -42213,7 +41773,7 @@ index d907ca6..cfb8384 100644 'D' : 'A'; } buffer[i] = '\0'; -@@ -371,8 +371,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error) +@@ -372,8 +372,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error) */ for (i = 0; i < sc->stripes; i++) if (!strcmp(sc->stripe[i].dev->name, major_minor)) { @@ -42225,9 +41785,18 @@ index d907ca6..cfb8384 100644 schedule_work(&sc->trigger_event); } diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c -index f221812..aca962b 100644 +index 41d907b..34b87ee 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c +@@ -286,7 +286,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev) + static int open_dev(struct dm_dev_internal *d, dev_t dev, + struct mapped_device *md) + { +- static char *_claim_ptr = "I belong to device-mapper"; ++ static char _claim_ptr[] = "I belong to device-mapper"; + struct block_device *bdev; + + int r; @@ -354,7 +354,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev, if (!dev_size) return 0; @@ -42260,10 +41829,10 @@ index 60bce43..9b997d0 100644 pmd->bl_info.value_type.inc = data_block_inc; pmd->bl_info.value_type.dec = data_block_dec; diff --git a/drivers/md/dm.c b/drivers/md/dm.c -index 995e1fc..2468cec 100644 +index b3e26c7..1efca94 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c -@@ -178,9 +178,9 @@ struct mapped_device { +@@ -179,9 +179,9 @@ struct mapped_device { /* * Event handling. */ @@ -42275,7 +41844,7 @@ index 995e1fc..2468cec 100644 struct list_head uevent_list; spinlock_t uevent_lock; /* Protect access to uevent_list */ -@@ -1916,8 +1916,8 @@ static struct mapped_device *alloc_dev(int minor) +@@ -1985,8 +1985,8 @@ static struct mapped_device *alloc_dev(int minor) spin_lock_init(&md->deferred_lock); atomic_set(&md->holders, 1); atomic_set(&md->open_count, 0); @@ -42286,7 +41855,7 @@ index 995e1fc..2468cec 100644 INIT_LIST_HEAD(&md->uevent_list); spin_lock_init(&md->uevent_lock); -@@ -2068,7 +2068,7 @@ static void event_callback(void *context) +@@ -2139,7 +2139,7 @@ static void event_callback(void *context) dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); @@ -42295,7 +41864,7 @@ index 995e1fc..2468cec 100644 wake_up(&md->eventq); } -@@ -2727,18 +2727,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, +@@ -2832,18 +2832,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action, uint32_t dm_next_uevent_seq(struct mapped_device *md) { @@ -42318,7 +41887,7 @@ index 995e1fc..2468cec 100644 void dm_uevent_add(struct mapped_device *md, struct list_head *elist) diff --git a/drivers/md/md.c b/drivers/md/md.c -index 9f13e13..411a5b8 100644 +index ba46d97..f8f5019 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio); @@ -42390,7 +41959,7 @@ index 9f13e13..411a5b8 100644 INIT_LIST_HEAD(&rdev->same_set); init_waitqueue_head(&rdev->blocked_wait); -@@ -7024,7 +7024,7 @@ static int md_seq_show(struct seq_file *seq, void *v) +@@ -7043,7 +7043,7 @@ static int md_seq_show(struct seq_file *seq, void *v) spin_unlock(&pers_lock); seq_printf(seq, "\n"); @@ -42399,7 +41968,7 @@ index 9f13e13..411a5b8 100644 return 0; } if (v == (void*)2) { -@@ -7127,7 +7127,7 @@ static int md_seq_open(struct inode *inode, struct file *file) +@@ -7146,7 +7146,7 @@ static int md_seq_open(struct inode *inode, struct file *file) return error; seq = file->private_data; @@ -42408,7 +41977,7 @@ index 9f13e13..411a5b8 100644 return error; } -@@ -7141,7 +7141,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait) +@@ -7160,7 +7160,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait) /* always allow read */ mask = POLLIN | POLLRDNORM; @@ -42417,7 +41986,7 @@ index 9f13e13..411a5b8 100644 mask |= POLLERR | POLLPRI; return mask; } -@@ -7185,7 +7185,7 @@ static int is_mddev_idle(struct mddev *mddev, int init) +@@ -7204,7 +7204,7 @@ static int is_mddev_idle(struct mddev *mddev, int init) struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + (int)part_stat_read(&disk->part0, sectors[1]) - @@ -42427,7 +41996,7 @@ index 9f13e13..411a5b8 100644 * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. diff --git a/drivers/md/md.h b/drivers/md/md.h -index 20f02c0..fd8c821 100644 +index 608050c..6e77db5d 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -94,13 +94,13 @@ struct md_rdev { @@ -42446,7 +42015,7 @@ index 20f02c0..fd8c821 100644 * for reporting to userspace and storing * in superblock. */ -@@ -442,7 +442,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev) +@@ -446,7 +446,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev) static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) { @@ -42468,10 +42037,10 @@ index 3e6d115..ffecdeb 100644 /*----------------------------------------------------------------*/ diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c -index d60412c..8d4c982 100644 +index aacf6bf..67d63f2 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c -@@ -1823,7 +1823,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) +@@ -1824,7 +1824,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) if (r1_sync_page_io(rdev, sect, s, bio->bi_io_vec[idx].bv_page, READ) != 0) @@ -42480,7 +42049,7 @@ index d60412c..8d4c982 100644 } sectors -= s; sect += s; -@@ -2050,7 +2050,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, +@@ -2051,7 +2051,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, test_bit(In_sync, &rdev->flags)) { if (r1_sync_page_io(rdev, sect, s, conf->tmppage, READ)) { @@ -42490,10 +42059,10 @@ index d60412c..8d4c982 100644 "md/raid1:%s: read error corrected " "(%d sectors at %llu on %s)\n", diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c -index df7b0a0..a257495 100644 +index 73dc8a3..bdd515a 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c -@@ -1962,7 +1962,7 @@ static void end_sync_read(struct bio *bio, int error) +@@ -1963,7 +1963,7 @@ static void end_sync_read(struct bio *bio, int error) /* The write handler will notice the lack of * R10BIO_Uptodate and record any errors etc */ @@ -42502,7 +42071,7 @@ index df7b0a0..a257495 100644 &conf->mirrors[d].rdev->corrected_errors); /* for reconstruct, we always reschedule after a read. -@@ -2320,7 +2320,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2321,7 +2321,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) { struct timespec cur_time_mon; unsigned long hours_since_last; @@ -42511,7 +42080,7 @@ index df7b0a0..a257495 100644 ktime_get_ts(&cur_time_mon); -@@ -2342,9 +2342,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2343,9 +2343,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) * overflowing the shift of read_errors by hours_since_last. */ if (hours_since_last >= 8 * sizeof(read_errors)) @@ -42523,7 +42092,7 @@ index df7b0a0..a257495 100644 } static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector, -@@ -2398,8 +2398,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2399,8 +2399,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 return; check_decay_read_errors(mddev, rdev); @@ -42534,7 +42103,7 @@ index df7b0a0..a257495 100644 char b[BDEVNAME_SIZE]; bdevname(rdev->bdev, b); -@@ -2407,7 +2407,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2408,7 +2408,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 "md/raid10:%s: %s: Raid device exceeded " "read_error threshold [cur %d:max %d]\n", mdname(mddev), b, @@ -42543,7 +42112,7 @@ index df7b0a0..a257495 100644 printk(KERN_NOTICE "md/raid10:%s: %s: Failing raid device\n", mdname(mddev), b); -@@ -2562,7 +2562,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2563,7 +2563,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 sect + choose_data_offset(r10_bio, rdev)), bdevname(rdev->bdev, b)); @@ -42553,10 +42122,10 @@ index df7b0a0..a257495 100644 rdev_dec_pending(rdev, mddev); diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c -index 78ea443..7d57513 100644 +index 8a0665d..984c46d 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c -@@ -1764,21 +1764,21 @@ static void raid5_end_read_request(struct bio * bi, int error) +@@ -1887,21 +1887,21 @@ static void raid5_end_read_request(struct bio * bi, int error) mdname(conf->mddev), STRIPE_SECTORS, (unsigned long long)s, bdevname(rdev->bdev, b)); @@ -42582,7 +42151,7 @@ index 78ea443..7d57513 100644 if (test_bit(R5_ReadRepl, &sh->dev[i].flags)) printk_ratelimited( KERN_WARNING -@@ -1806,7 +1806,7 @@ static void raid5_end_read_request(struct bio * bi, int error) +@@ -1929,7 +1929,7 @@ static void raid5_end_read_request(struct bio * bi, int error) mdname(conf->mddev), (unsigned long long)s, bdn); @@ -42858,7 +42427,7 @@ index 545c04c..a14bded 100644 unlock: mutex_unlock(&dev->lock); diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c -index bd4d3a7..ffc0b9d 100644 +index 5236035..c622c74 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number"); @@ -42871,7 +42440,7 @@ index bd4d3a7..ffc0b9d 100644 #define PCI_VENDOR_ID_GUILLEMOT 0x5046 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c -index 8fa18ab..caee70f 100644 +index b914772..7ddbf9b 100644 --- a/drivers/media/radio/radio-shark.c +++ b/drivers/media/radio/radio-shark.c @@ -79,7 +79,7 @@ struct shark_device { @@ -42910,10 +42479,10 @@ index 9c9084c..a9e8dfb 100644 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL); if (!radio) diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c -index 1cf382a..c22998c 100644 +index 46da365..3ba4206 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c -@@ -1030,7 +1030,7 @@ EXPORT_SYMBOL_GPL(rc_free_device); +@@ -1065,7 +1065,7 @@ EXPORT_SYMBOL_GPL(rc_free_device); int rc_register_device(struct rc_dev *dev) { static bool raw_init = false; /* raw decoders loaded? */ @@ -42922,7 +42491,7 @@ index 1cf382a..c22998c 100644 struct rc_map *rc_map; const char *path; int rc; -@@ -1061,7 +1061,7 @@ int rc_register_device(struct rc_dev *dev) +@@ -1096,7 +1096,7 @@ int rc_register_device(struct rc_dev *dev) */ mutex_lock(&dev->lock); @@ -42932,10 +42501,10 @@ index 1cf382a..c22998c 100644 dev_set_drvdata(&dev->dev, dev); rc = device_add(&dev->dev); diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c -index 3940bb0..fb3952a 100644 +index 20e345d..da56fe4 100644 --- a/drivers/media/usb/dvb-usb/cxusb.c +++ b/drivers/media/usb/dvb-usb/cxusb.c -@@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = { +@@ -1101,7 +1101,7 @@ static struct dib0070_config dib7070p_dib0070_config = { struct dib0700_adapter_state { int (*set_param_save) (struct dvb_frontend *); @@ -42945,10 +42514,10 @@ index 3940bb0..fb3952a 100644 static int dib7070_set_param_override(struct dvb_frontend *fe) { diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c -index 6e237b6..dc25556 100644 +index 71b22f5..a63b33f 100644 --- a/drivers/media/usb/dvb-usb/dw2102.c +++ b/drivers/media/usb/dvb-usb/dw2102.c -@@ -118,7 +118,7 @@ struct su3000_state { +@@ -121,7 +121,7 @@ struct su3000_state { struct s6x0_state { int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v); @@ -43166,7 +42735,7 @@ index 727819c..ad74694 100644 return h->info_kbuf; } diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c -index b7d87cd..9890039 100644 +index b7d87cd..3fb36da 100644 --- a/drivers/message/i2o/i2o_proc.c +++ b/drivers/message/i2o/i2o_proc.c @@ -255,12 +255,6 @@ static char *scsi_devices[] = { @@ -43182,6 +42751,19 @@ index b7d87cd..9890039 100644 static int i2o_report_query_status(struct seq_file *seq, int block_status, char *group) { +@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v) + static int i2o_seq_show_hw(struct seq_file *seq, void *v) + { + struct i2o_controller *c = (struct i2o_controller *)seq->private; +- static u32 work32[5]; +- static u8 *work8 = (u8 *) work32; +- static u16 *work16 = (u16 *) work32; ++ u32 work32[5]; ++ u8 *work8 = (u8 *) work32; ++ u16 *work16 = (u16 *) work32; + int token; + u32 hwcap; + @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v) } *result; @@ -43220,9 +42802,15 @@ index b7d87cd..9890039 100644 seq_printf(seq, "%8d ", dst->module_size); seq_printf(seq, "%8d ", dst->mpb_size); seq_printf(seq, "0x%04x", dst->module_flags); -@@ -1250,7 +1240,6 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v) +@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v) + static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v) + { + struct i2o_device *d = (struct i2o_device *)seq->private; +- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number ++ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number // == (allow) 512d bytes (max) - static u16 *work16 = (u16 *) work32; +- static u16 *work16 = (u16 *) work32; ++ u16 *work16 = (u16 *) work32; int token; - char tmp[16 + 1]; @@ -43297,6 +42885,19 @@ index b7d87cd..9890039 100644 return 0; } +@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v) + static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v) + { + struct i2o_device *d = (struct i2o_device *)seq->private; +- static u32 work32[12]; +- static u16 *work16 = (u16 *) work32; +- static u8 *work8 = (u8 *) work32; ++ u32 work32[12]; ++ u16 *work16 = (u16 *) work32; ++ u8 *work8 = (u8 *) work32; + int token; + + token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32)); diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index a8c08f3..155fe3d 100644 --- a/drivers/message/i2o/iop.c @@ -43336,6 +42937,32 @@ index fcbb2e9..2635e11 100644 #include #include #include +diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c +index de7fb80..7c1b931 100644 +--- a/drivers/mfd/max8925-i2c.c ++++ b/drivers/mfd/max8925-i2c.c +@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client, + const struct i2c_device_id *id) + { + struct max8925_platform_data *pdata = dev_get_platdata(&client->dev); +- static struct max8925_chip *chip; ++ struct max8925_chip *chip; + struct device_node *node = client->dev.of_node; + + if (node && !pdata) { +diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c +index d792772..cd73ba3 100644 +--- a/drivers/mfd/tps65910.c ++++ b/drivers/mfd/tps65910.c +@@ -229,7 +229,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq, + struct tps65910_platform_data *pdata) + { + int ret = 0; +- static struct regmap_irq_chip *tps6591x_irqs_chip; ++ struct regmap_irq_chip *tps6591x_irqs_chip; + + if (!irq) { + dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n"); diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 9aa6d1e..1631bfc 100644 --- a/drivers/mfd/twl4030-irq.c @@ -43364,42 +42991,21 @@ index 9aa6d1e..1631bfc 100644 for (i = irq_base; i < irq_end; i++) { irq_set_chip_and_handler(i, &twl4030_irq_chip, -diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c -index 277a8db..0e0b754 100644 ---- a/drivers/mfd/twl6030-irq.c -+++ b/drivers/mfd/twl6030-irq.c -@@ -387,10 +387,12 @@ int twl6030_init_irq(struct device *dev, int irq_num) - * install an irq handler for each of the modules; - * clone dummy irq_chip since PIH can't *do* anything - */ -- twl6030_irq_chip = dummy_irq_chip; -- twl6030_irq_chip.name = "twl6030"; -- twl6030_irq_chip.irq_set_type = NULL; -- twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake; -+ pax_open_kernel(); -+ memcpy((void *)&twl6030_irq_chip, &dummy_irq_chip, sizeof twl6030_irq_chip); -+ *(const char **)&twl6030_irq_chip.name = "twl6030"; -+ *(void **)&twl6030_irq_chip.irq_set_type = NULL; -+ *(void **)&twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake; -+ pax_close_kernel(); - - for (i = irq_base; i < irq_end; i++) { - irq_set_chip_and_handler(i, &twl6030_irq_chip, diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c -index f32550a..e3e52a2 100644 +index 464419b..64bae8d 100644 --- a/drivers/misc/c2port/core.c +++ b/drivers/misc/c2port/core.c -@@ -920,7 +920,9 @@ struct c2port_device *c2port_device_register(char *name, - mutex_init(&c2dev->mutex); +@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name, + goto error_idr_alloc; + c2dev->id = ret; - /* Create binary file */ -- c2port_bin_attrs.size = ops->blocks_num * ops->block_size; +- bin_attr_flash_data.size = ops->blocks_num * ops->block_size; + pax_open_kernel(); -+ *(size_t *)&c2port_bin_attrs.size = ops->blocks_num * ops->block_size; ++ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size; + pax_close_kernel(); - ret = device_create_bin_file(c2dev->dev, &c2port_bin_attrs); - if (unlikely(ret)) - goto error_device_create_bin_file; + + c2dev->dev = device_create(c2port_class, NULL, 0, c2dev, + "c2port%d", c2dev->id); diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index 36f5d52..32311c3 100644 --- a/drivers/misc/kgdbts.c @@ -43755,7 +43361,7 @@ index 82dc574..8539ab2 100644 break; diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c -index 837fc73..acb5862 100644 +index ef18348..1b53cf0 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -213,7 +213,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host, @@ -43794,10 +43400,10 @@ index c3785ed..1984c44 100644 } diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c -index 926aaf6..8e153e2 100644 +index 6debda9..2ba7427 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c -@@ -664,9 +664,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev) +@@ -668,9 +668,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev) * we can use overriding functions instead of default. */ if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) { @@ -43812,8 +43418,21 @@ index 926aaf6..8e153e2 100644 } /* It supports additional host capabilities if needed */ +diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c +index 096993f..f02c23b 100644 +--- a/drivers/mtd/chips/cfi_cmdset_0020.c ++++ b/drivers/mtd/chips/cfi_cmdset_0020.c +@@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs, + size_t totlen = 0, thislen; + int ret = 0; + size_t buflen = 0; +- static char *buffer; ++ char *buffer; + + if (!ECCBUF_SIZE) { + /* We should fall back to a general writev implementation. diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c -index 0c8bb6b..6f35deb 100644 +index 2ed2bb3..2d0b82e 100644 --- a/drivers/mtd/nand/denali.c +++ b/drivers/mtd/nand/denali.c @@ -24,6 +24,7 @@ @@ -43837,12 +43456,12 @@ index 51b9d6a..52af9a7 100644 #include #include diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c -index f9d5615..99dd95f 100644 +index 4b8e895..6b3c498 100644 --- a/drivers/mtd/sm_ftl.c +++ b/drivers/mtd/sm_ftl.c -@@ -56,7 +56,7 @@ ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr, +@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr, #define SM_CIS_VENDOR_OFFSET 0x59 - struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl) + static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl) { - struct attribute_group *attr_group; + attribute_group_no_const *attr_group; @@ -43850,10 +43469,10 @@ index f9d5615..99dd95f 100644 struct sm_sysfs_attribute *vendor_attribute; diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c -index 5e31046..82f8ddc 100644 +index dd8057d..22aaf36 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c -@@ -4839,7 +4839,7 @@ static unsigned int bond_get_num_tx_queues(void) +@@ -4511,7 +4511,7 @@ static unsigned int bond_get_num_tx_queues(void) return tx_queues; } @@ -43862,7 +43481,7 @@ index 5e31046..82f8ddc 100644 .kind = "bond", .priv_size = sizeof(struct bonding), .setup = bond_setup, -@@ -4964,8 +4964,8 @@ static void __exit bonding_exit(void) +@@ -4636,8 +4636,8 @@ static void __exit bonding_exit(void) bond_destroy_debugfs(); @@ -43873,7 +43492,7 @@ index 5e31046..82f8ddc 100644 #ifdef CONFIG_NET_POLL_CONTROLLER /* diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c -index e1d2643..7f4133b 100644 +index f92f001..0b2f9bf 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -872,9 +872,11 @@ static int ax_probe(struct platform_device *pdev) @@ -43890,10 +43509,10 @@ index e1d2643..7f4133b 100644 if (!request_mem_region(mem->start, mem_size, pdev->name)) { diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h -index c07a6d0..ca88c45 100644 +index da8fcaa..f4b5d3b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h -@@ -1137,7 +1137,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp) +@@ -1138,7 +1138,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp) static inline void bnx2x_init_bp_objs(struct bnx2x *bp) { /* RX_MODE controlling object */ @@ -43903,10 +43522,10 @@ index c07a6d0..ca88c45 100644 /* multicast configuration controlling object */ bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid, diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c -index 8f03c98..dd0ef10 100644 +index 9fbeee5..5e3e37a 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c -@@ -2345,15 +2345,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp, +@@ -2590,15 +2590,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp, return rc; } @@ -43928,10 +43547,10 @@ index 8f03c98..dd0ef10 100644 } diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h -index 798dfe9..05d0a44 100644 +index 658f4e3..15074a6 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h -@@ -1311,8 +1311,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp, +@@ -1325,8 +1325,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp, /********************* RX MODE ****************/ @@ -43942,7 +43561,7 @@ index 798dfe9..05d0a44 100644 /** * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters. diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h -index cd63d11..b67dd78 100644 +index 7025780..e55a71c 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h @@ -147,6 +147,7 @@ @@ -43966,21 +43585,21 @@ index 8cffcdf..aadf043 100644 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb) -diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c -index 9c89dc8..725ecc3 100644 ---- a/drivers/net/ethernet/chelsio/cxgb3/sge.c -+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c -@@ -1599,7 +1599,7 @@ static void write_ofld_wr(struct adapter *adap, struct sk_buff *skb, - flits = skb_transport_offset(skb) / 8; - sgp = ndesc == 1 ? (struct sg_ent *)&d->flit[flits] : sgl; - sgl_flits = make_sgl(skb, sgp, skb_transport_header(skb), -- skb->tail - skb->transport_header, -+ skb_tail_pointer(skb) - skb_transport_header(skb), - adap->pdev); - if (need_skb_unmap()) { - setup_deferred_unmapping(skb, adap->pdev, sgp, sgl_flits); +diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +index c73cabd..cd278b1 100644 +--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c ++++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +@@ -2186,7 +2186,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs, + + int i; + struct adapter *ap = netdev2adap(dev); +- static const unsigned int *reg_ranges; ++ const unsigned int *reg_ranges; + int arr_size = 0, buf_size = 0; + + if (is_t4(ap->chip)) { diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c -index 4c83003..2a2a5b9 100644 +index 263b92c..f05134b 100644 --- a/drivers/net/ethernet/dec/tulip/de4x5.c +++ b/drivers/net/ethernet/dec/tulip/de4x5.c @@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) @@ -44002,10 +43621,10 @@ index 4c83003..2a2a5b9 100644 break; } diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c -index 3d91a5e..1014702 100644 +index 2c38cc4..0323f6e 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c -@@ -469,7 +469,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val) +@@ -470,7 +470,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val) if (wrapped) newacc += 65536; @@ -44013,9 +43632,9 @@ index 3d91a5e..1014702 100644 + ACCESS_ONCE_RW(*acc) = newacc; } - void populate_erx_stats(struct be_adapter *adapter, + static void populate_erx_stats(struct be_adapter *adapter, diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c -index 934e1ae..b262e6b 100644 +index 212f44b..fb69959 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -31,6 +31,8 @@ @@ -44028,7 +43647,7 @@ index 934e1ae..b262e6b 100644 #include "ftgmac100.h" diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c -index 4658f4c..407d155 100644 +index 8be5b40..081bc1b 100644 --- a/drivers/net/ethernet/faraday/ftmac100.c +++ b/drivers/net/ethernet/faraday/ftmac100.c @@ -31,6 +31,8 @@ @@ -44041,7 +43660,7 @@ index 4658f4c..407d155 100644 #include "ftmac100.h" diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c -index 331987d..3be1135 100644 +index 5184e2a..acb28c3 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c @@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) @@ -44079,13 +43698,13 @@ index fbe5363..266b4e3 100644 __vxge_hw_mempool_create(vpath->hldev, fifo->config->memblock_size, diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c -index 345d987..af69721 100644 +index f09e787..f3916a8 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c -@@ -2011,7 +2011,9 @@ int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *adapter) - op_mode = QLC_83XX_DEFAULT_OPMODE; +@@ -2055,7 +2055,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter) - if (op_mode == QLC_83XX_DEFAULT_OPMODE) { + } else if (ret == QLC_83XX_DEFAULT_OPMODE) { + ahw->nic_mode = QLC_83XX_DEFAULT_MODE; - adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver; + pax_open_kernel(); + *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver; @@ -44094,7 +43713,7 @@ index 345d987..af69721 100644 } else { return -EIO; diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c -index 599d1fd..59868fe 100644 +index 0248a4c..9648d96 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c @@ -191,17 +191,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter) @@ -44124,8 +43743,21 @@ index 599d1fd..59868fe 100644 break; default: dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n"); +diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c +index 1551360..ed6510f 100644 +--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c ++++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c +@@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter) + struct qlcnic_dump_entry *entry; + struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump; + struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr; +- static const struct qlcnic_dump_operations *fw_dump_ops; ++ const struct qlcnic_dump_operations *fw_dump_ops; + struct device *dev = &adapter->pdev->dev; + struct qlcnic_hardware_context *ahw; + void *temp_buffer; diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c -index 7ba68e0..618c73d 100644 +index fb3f8dc..9d2ff38 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -759,22 +759,22 @@ struct rtl8169_private { @@ -44156,18 +43788,18 @@ index 7ba68e0..618c73d 100644 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv); int (*get_settings)(struct net_device *, struct ethtool_cmd *); diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c -index b495394..0748c54 100644 +index 03acf57..e1251ff 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c -@@ -535,7 +535,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings) - (u32)((u64)ptp->start.dma_addr >> 32)); +@@ -539,7 +539,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings) + ptp->start.dma_addr); /* Clear flag that signals MC ready */ - ACCESS_ONCE(*start) = 0; + ACCESS_ONCE_RW(*start) = 0; - efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf, - MC_CMD_PTP_IN_SYNCHRONIZE_LEN); - + rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf, + MC_CMD_PTP_IN_SYNCHRONIZE_LEN); + EFX_BUG_ON_PARANOID(rc); diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c index 50617c5..b13724c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c @@ -44232,10 +43864,10 @@ index bf0d55e..82bcfbd1 100644 priv = netdev_priv(dev); priv->phy = phy; diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c -index 16b43bf..ead0c35 100644 +index 9bf46bd..bfdaa84 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c -@@ -934,13 +934,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = { +@@ -939,13 +939,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = { int macvlan_link_register(struct rtnl_link_ops *ops) { /* common fields */ @@ -44258,7 +43890,7 @@ index 16b43bf..ead0c35 100644 return rtnl_link_register(ops); }; -@@ -996,7 +998,7 @@ static int macvlan_device_event(struct notifier_block *unused, +@@ -1001,7 +1003,7 @@ static int macvlan_device_event(struct notifier_block *unused, return NOTIFY_DONE; } @@ -44268,10 +43900,10 @@ index 16b43bf..ead0c35 100644 }; diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c -index ea53abb..2e4d087 100644 +index dc76670..e18f39c 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c -@@ -1286,7 +1286,7 @@ static int macvtap_device_event(struct notifier_block *unused, +@@ -1189,7 +1189,7 @@ static int macvtap_device_event(struct notifier_block *unused, return NOTIFY_DONE; } @@ -44328,10 +43960,10 @@ index 1252d9c..80e660b 100644 /* We've got a compressed packet; read the change byte */ diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c -index bff7e0b..7315137 100644 +index 6327df2..e6e1ebe 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c -@@ -2702,7 +2702,7 @@ static int team_device_event(struct notifier_block *unused, +@@ -2873,7 +2873,7 @@ static int team_device_event(struct notifier_block *unused, return NOTIFY_DONE; } @@ -44341,10 +43973,10 @@ index bff7e0b..7315137 100644 }; diff --git a/drivers/net/tun.c b/drivers/net/tun.c -index 68b9aa3..b3c20f3 100644 +index 782e38b..d076fdc 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c -@@ -1874,7 +1874,7 @@ unlock: +@@ -1834,7 +1834,7 @@ unlock: } static long __tun_chr_ioctl(struct file *file, unsigned int cmd, @@ -44353,8 +43985,8 @@ index 68b9aa3..b3c20f3 100644 { struct tun_file *tfile = file->private_data; struct tun_struct *tun; -@@ -1886,6 +1886,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, - int vnet_hdr_sz; +@@ -1847,6 +1847,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, + unsigned int ifindex; int ret; + if (ifreq_len > sizeof ifr) @@ -44477,10 +44109,10 @@ index a79e9d3..78cd4fa 100644 /* we will have to manufacture ethernet headers, prepare template */ diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c -index 8a05d77..ba8b9c5 100644 +index 2ef5b62..6fa0ec3 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c -@@ -1870,7 +1870,7 @@ nla_put_failure: +@@ -2615,7 +2615,7 @@ nla_put_failure: return -EMSGSIZE; } @@ -44489,18 +44121,6 @@ index 8a05d77..ba8b9c5 100644 .kind = "vxlan", .maxtype = IFLA_VXLAN_MAX, .policy = vxlan_policy, -diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c -index 3f0c4f2..bcfff0d 100644 ---- a/drivers/net/wan/farsync.c -+++ b/drivers/net/wan/farsync.c -@@ -1972,6 +1972,7 @@ fst_get_iface(struct fst_card_info *card, struct fst_port_info *port, - } - - i = port->index; -+ memset(&sync, 0, sizeof(sync)); - sync.clock_rate = FST_RDL(card, portConfig[i].lineSpeed); - /* Lucky card and linux use same encoding here */ - sync.clock_type = FST_RDB(card, portConfig[i].internalClock) == diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index 0b60295..b8bfa5b 100644 --- a/drivers/net/wimax/i2400m/rx.c @@ -44514,6 +44134,19 @@ index 0b60295..b8bfa5b 100644 GFP_KERNEL); if (rd == NULL) { result = -ENOMEM; +diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c +index 7fe1964..7016de0 100644 +--- a/drivers/net/wireless/airo.c ++++ b/drivers/net/wireless/airo.c +@@ -7844,7 +7844,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) { + struct airo_info *ai = dev->ml_priv; + int ridcode; + int enabled; +- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int); ++ int (* writer)(struct airo_info *, u16 rid, const void *, int, int); + unsigned char *iobuf; + + /* Only super-user can write RIDs */ diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c index 34c8a33..3261fdc 100644 --- a/drivers/net/wireless/at76c50x-usb.c @@ -44527,37 +44160,13 @@ index 34c8a33..3261fdc 100644 { return msecs_to_jiffies((s->poll_timeout[2] << 16) | (s->poll_timeout[1] << 8) -diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c -index 2b3426b..1f564be 100644 ---- a/drivers/net/wireless/ath/ath10k/core.c -+++ b/drivers/net/wireless/ath/ath10k/core.c -@@ -507,7 +507,9 @@ EXPORT_SYMBOL(ath10k_core_destroy); - - int ath10k_core_register(struct ath10k *ar) - { -- struct ath10k_htc_ops htc_ops; -+ static struct ath10k_htc_ops htc_ops = { -+ .target_send_suspend_complete = ath10k_send_suspend_complete, -+ }; - struct bmi_target_info target_info; - int status; - -@@ -536,8 +538,6 @@ int ath10k_core_register(struct ath10k *ar) - if (status) - goto err; - -- htc_ops.target_send_suspend_complete = ath10k_send_suspend_complete; -- - ar->htc = ath10k_htc_create(ar, &htc_ops); - if (IS_ERR(ar->htc)) { - status = PTR_ERR(ar->htc); diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c -index 74363c9..237b926 100644 +index ef3329e..c28ff5d 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -963,7 +963,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc) - struct ath10k_htc *ath10k_htc_create(struct ath10k *ar, - struct ath10k_htc_ops *htc_ops) + /* registered target arrival callback from the HIF layer */ + int ath10k_htc_init(struct ath10k *ar) { - struct ath10k_hif_cb htc_callbacks; + static struct ath10k_hif_cb htc_callbacks = { @@ -44565,9 +44174,9 @@ index 74363c9..237b926 100644 + .tx_completion = ath10k_htc_tx_completion_handler, + }; struct ath10k_htc_ep *ep = NULL; - struct ath10k_htc *htc = NULL; + struct ath10k_htc *htc = &ar->htc; -@@ -979,8 +982,6 @@ struct ath10k_htc *ath10k_htc_create(struct ath10k *ar, +@@ -973,8 +976,6 @@ int ath10k_htc_init(struct ath10k *ar) ath10k_htc_reset_endpoint_states(htc); /* setup HIF layer callbacks */ @@ -44576,6 +44185,25 @@ index 74363c9..237b926 100644 htc->ar = ar; /* Get HIF default pipe for HTC message exchange */ +diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h +index e1dd8c7..9f91b3f 100644 +--- a/drivers/net/wireless/ath/ath10k/htc.h ++++ b/drivers/net/wireless/ath/ath10k/htc.h +@@ -271,12 +271,12 @@ enum ath10k_htc_ep_id { + + struct ath10k_htc_ops { + void (*target_send_suspend_complete)(struct ath10k *ar); +-}; ++} __no_const; + + struct ath10k_htc_ep_ops { + void (*ep_tx_complete)(struct ath10k *, struct sk_buff *); + void (*ep_rx_complete)(struct ath10k *, struct sk_buff *); +-}; ++} __no_const; + + /* service connection information */ + struct ath10k_htc_svc_conn_req { diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c index 8d78253..bebbb68 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c @@ -44660,7 +44288,7 @@ index 8d78253..bebbb68 100644 | set11nRateFlags(i->rates, 2) | set11nRateFlags(i->rates, 3) diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c -index 5163abd..3ada4c2 100644 +index f6c5c1b..6058354 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) @@ -44782,10 +44410,10 @@ index 5163abd..3ada4c2 100644 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads) diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h -index cd74b3a..6a28d24 100644 +index 69a907b..91e071c 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -652,7 +652,7 @@ struct ath_hw_private_ops { +@@ -657,7 +657,7 @@ struct ath_hw_private_ops { /* ANI */ void (*ani_cache_ini_regs)(struct ath_hw *ah); @@ -44794,15 +44422,28 @@ index cd74b3a..6a28d24 100644 /** * struct ath_spec_scan - parameters for Atheros spectral scan -@@ -721,7 +721,7 @@ struct ath_hw_ops { - struct ath_spec_scan *param); - void (*spectral_scan_trigger)(struct ath_hw *ah); - void (*spectral_scan_wait)(struct ath_hw *ah); +@@ -729,7 +729,7 @@ struct ath_hw_ops { + #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT + void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable); + #endif -}; +} __no_const; struct ath_nf_limits { s16 max; +diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c +index 92190da..f3a4c4c 100644 +--- a/drivers/net/wireless/b43/phy_lp.c ++++ b/drivers/net/wireless/b43/phy_lp.c +@@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev, + { + struct ssb_bus *bus = dev->dev->sdev->bus; + +- static const struct b206x_channel *chandata = NULL; ++ const struct b206x_channel *chandata = NULL; + u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000; + u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count; + u16 old_comm15, scale; diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 9581d07..84f6a76 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c @@ -44819,10 +44460,10 @@ index 9581d07..84f6a76 100644 D_INFO("*** LOAD DRIVER ***\n"); diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c -index d532948..e0d8bb1 100644 +index d94f8ab..5b568c8 100644 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c -@@ -203,7 +203,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file, +@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file, { struct iwl_priv *priv = file->private_data; char buf[64]; @@ -44831,7 +44472,7 @@ index d532948..e0d8bb1 100644 u32 offset, len; memset(buf, 0, sizeof(buf)); -@@ -473,7 +473,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file, +@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file, struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44840,7 +44481,7 @@ index d532948..e0d8bb1 100644 u32 reset_flag; memset(buf, 0, sizeof(buf)); -@@ -554,7 +554,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file, +@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file, { struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44849,7 +44490,7 @@ index d532948..e0d8bb1 100644 int ht40; memset(buf, 0, sizeof(buf)); -@@ -606,7 +606,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file, +@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file, { struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44858,7 +44499,7 @@ index d532948..e0d8bb1 100644 int value; memset(buf, 0, sizeof(buf)); -@@ -698,10 +698,10 @@ DEBUGFS_READ_FILE_OPS(temperature); +@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature); DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override); DEBUGFS_READ_FILE_OPS(current_sleep_command); @@ -44873,7 +44514,7 @@ index d532948..e0d8bb1 100644 "%-32s current cumulative delta max\n"; static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz) -@@ -1871,7 +1871,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file, +@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file, { struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44882,7 +44523,7 @@ index d532948..e0d8bb1 100644 int clear; memset(buf, 0, sizeof(buf)); -@@ -1916,7 +1916,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file, +@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file, { struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44891,7 +44532,7 @@ index d532948..e0d8bb1 100644 int trace; memset(buf, 0, sizeof(buf)); -@@ -1987,7 +1987,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file, +@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file, { struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44900,7 +44541,7 @@ index d532948..e0d8bb1 100644 int missed; memset(buf, 0, sizeof(buf)); -@@ -2028,7 +2028,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file, +@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file, struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44909,7 +44550,7 @@ index d532948..e0d8bb1 100644 int plcp; memset(buf, 0, sizeof(buf)); -@@ -2088,7 +2088,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file, +@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file, struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44918,7 +44559,7 @@ index d532948..e0d8bb1 100644 int flush; memset(buf, 0, sizeof(buf)); -@@ -2178,7 +2178,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file, +@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file, struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44927,7 +44568,7 @@ index d532948..e0d8bb1 100644 int rts; if (!priv->cfg->ht_params) -@@ -2220,7 +2220,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file, +@@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file, { struct iwl_priv *priv = file->private_data; char buf[8]; @@ -44936,7 +44577,7 @@ index d532948..e0d8bb1 100644 memset(buf, 0, sizeof(buf)); buf_size = min(count, sizeof(buf) - 1); -@@ -2254,7 +2254,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file, +@@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file, struct iwl_priv *priv = file->private_data; u32 event_log_flag; char buf[8]; @@ -44945,7 +44586,7 @@ index d532948..e0d8bb1 100644 /* check that the interface is up */ if (!iwl_is_ready(priv)) -@@ -2308,7 +2308,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file, +@@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file, struct iwl_priv *priv = file->private_data; char buf[8]; u32 calib_disabled; @@ -44955,10 +44596,10 @@ index d532948..e0d8bb1 100644 memset(buf, 0, sizeof(buf)); buf_size = min(count, sizeof(buf) - 1); diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c -index 1531a4f..21d2641 100644 +index 7aad766..06addb4 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c -@@ -1180,7 +1180,7 @@ static void iwl_option_config(struct iwl_priv *priv) +@@ -1123,7 +1123,7 @@ static void iwl_option_config(struct iwl_priv *priv) static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) { struct iwl_nvm_data *data = priv->nvm_data; @@ -44967,7 +44608,7 @@ index 1531a4f..21d2641 100644 if (data->sku_cap_11n_enable && !priv->cfg->ht_params) { -@@ -1194,7 +1194,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) +@@ -1137,7 +1137,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) return -EINVAL; } @@ -44976,10 +44617,10 @@ index 1531a4f..21d2641 100644 data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled", data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled", diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c -index 390e2f0..75cfbaf 100644 +index c3f904d..4cadf83 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -1350,7 +1350,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file, +@@ -1252,7 +1252,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file, struct isr_statistics *isr_stats = &trans_pcie->isr_stats; char buf[8]; @@ -44988,7 +44629,7 @@ index 390e2f0..75cfbaf 100644 u32 reset_flag; memset(buf, 0, sizeof(buf)); -@@ -1371,7 +1371,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file, +@@ -1273,7 +1273,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file, { struct iwl_trans *trans = file->private_data; char buf[8]; @@ -44998,10 +44639,10 @@ index 390e2f0..75cfbaf 100644 memset(buf, 0, sizeof(buf)); diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c -index cb34c78..9fec0dc 100644 +index 2cd3f54..e936f90 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -2195,25 +2195,19 @@ static int __init init_mac80211_hwsim(void) +@@ -2196,25 +2196,19 @@ static int __init init_mac80211_hwsim(void) if (channels > 1) { hwsim_if_comb.num_different_channels = channels; @@ -45054,10 +44695,10 @@ index 8169a85..7fa3b47 100644 tmp = cpu_to_le32(rts_threshold); diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h -index ee3fc57..ed5ddc9 100644 +index fe4c572..99dedfa 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -386,7 +386,7 @@ struct rt2x00_intf { +@@ -387,7 +387,7 @@ struct rt2x00_intf { * for hardware which doesn't support hardware * sequence counting. */ @@ -45067,7 +44708,7 @@ index ee3fc57..ed5ddc9 100644 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif) diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c -index aa95c6c..a59dd67 100644 +index 66a2db8..70cad04 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev, @@ -45164,6 +44805,19 @@ index 7ef0b4a..ff65c28 100644 u16 int_num; ZD_ASSERT(in_interrupt()); +diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c +index 59f95d8..53e0e7f 100644 +--- a/drivers/nfc/nfcwilink.c ++++ b/drivers/nfc/nfcwilink.c +@@ -513,7 +513,7 @@ static struct nci_ops nfcwilink_ops = { + + static int nfcwilink_probe(struct platform_device *pdev) + { +- static struct nfcwilink *drv; ++ struct nfcwilink *drv; + int rc; + __u32 protocols; + diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c index d93b2b6..ae50401 100644 --- a/drivers/oprofile/buffer_sync.c @@ -45230,7 +44884,7 @@ index ed2c3ec..deda85a 100644 } diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c -index 84a208d..d61b0a1 100644 +index ee2cfce..7f8f699 100644 --- a/drivers/oprofile/oprofile_files.c +++ b/drivers/oprofile/oprofile_files.c @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice; @@ -45243,7 +44897,7 @@ index 84a208d..d61b0a1 100644 { return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice), diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c -index 917d28e..d62d981 100644 +index 59659ce..6c860a0 100644 --- a/drivers/oprofile/oprofile_stats.c +++ b/drivers/oprofile/oprofile_stats.c @@ -30,11 +30,11 @@ void oprofile_reset_stats(void) @@ -45264,7 +44918,7 @@ index 917d28e..d62d981 100644 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h -index 38b6fc0..b5cbfce 100644 +index 1fc622b..8c48fc3 100644 --- a/drivers/oprofile/oprofile_stats.h +++ b/drivers/oprofile/oprofile_stats.h @@ -13,11 +13,11 @@ @@ -45285,17 +44939,28 @@ index 38b6fc0..b5cbfce 100644 extern struct oprofile_stat_struct oprofile_stats; diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c -index 7c12d9c..558bf3bb 100644 +index 3f49345..c750d0b 100644 --- a/drivers/oprofile/oprofilefs.c +++ b/drivers/oprofile/oprofilefs.c -@@ -190,7 +190,7 @@ static const struct file_operations atomic_ro_fops = { +@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root, + static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset) + { +- atomic_t *val = file->private_data; +- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset); ++ atomic_unchecked_t *val = file->private_data; ++ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset); + } - int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root, + +@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = { + + + int oprofilefs_create_ro_atomic(struct dentry *root, - char const *name, atomic_t *val) + char const *name, atomic_unchecked_t *val) { - return __oprofilefs_create_file(sb, root, name, + return __oprofilefs_create_file(root, name, &atomic_ro_fops, 0444, val); diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c index 61be1d9..dec05d7 100644 @@ -45333,10 +44998,10 @@ index 92ed045..62d39bd7 100644 #endif /* IEEE1284.3 support. */ diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c -index c35e8ad..fc33beb 100644 +index 2f5786c..61ab4d1 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c -@@ -464,7 +464,9 @@ static int __init ibm_acpiphp_init(void) +@@ -463,7 +463,9 @@ static int __init ibm_acpiphp_init(void) goto init_cleanup; } @@ -45459,10 +45124,10 @@ index ec20f74..c1d961e 100644 mutex_lock(&pci_hp_mutex); /* diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c -index 7d72c5e..edce02c 100644 +index f4a18f5..ff2463c 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c -@@ -91,7 +91,7 @@ static int init_slot(struct controller *ctrl) +@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl) struct slot *slot = ctrl->slot; struct hotplug_slot *hotplug = NULL; struct hotplug_slot_info *info = NULL; @@ -45472,10 +45137,10 @@ index 7d72c5e..edce02c 100644 int retval = -ENOMEM; diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c -index c0dbe1f..94cf3d8 100644 +index 7128cfd..a0640d6 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c -@@ -1073,7 +1073,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) +@@ -1083,7 +1083,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) { /* allocate attribute structure, piggyback attribute name */ int name_len = write_combine ? 13 : 10; @@ -45484,7 +45149,7 @@ index c0dbe1f..94cf3d8 100644 int retval; res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC); -@@ -1258,7 +1258,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor +@@ -1268,7 +1268,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor static int pci_create_capabilities_sysfs(struct pci_dev *dev) { int retval; @@ -45493,7 +45158,7 @@ index c0dbe1f..94cf3d8 100644 /* If the device has VPD, try to expose it in sysfs. */ if (dev->vpd) { -@@ -1305,7 +1305,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) +@@ -1315,7 +1315,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev) { int retval; int rom_size = 0; @@ -45503,10 +45168,10 @@ index c0dbe1f..94cf3d8 100644 if (!sysfs_initialized) return -EACCES; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h -index d1182c4..2a138ec 100644 +index 8a00c06..18a9715 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h -@@ -92,7 +92,7 @@ struct pci_vpd_ops { +@@ -95,7 +95,7 @@ struct pci_vpd_ops { struct pci_vpd { unsigned int len; const struct pci_vpd_ops *ops; @@ -45533,10 +45198,10 @@ index 403a443..034e050 100644 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c -index 46ada5c..20da716 100644 +index 7ef0f86..17b710f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c -@@ -173,7 +173,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, +@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, struct pci_bus_region region, inverted_region; bool bar_too_big = false, bar_disabled = false; @@ -45604,11 +45269,24 @@ index 62f8030..c7f2a45 100644 } /* disable hardware control by fn key */ +diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c +index 70222f2..8c8ce66 100644 +--- a/drivers/platform/x86/msi-wmi.c ++++ b/drivers/platform/x86/msi-wmi.c +@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = { + static void msi_wmi_notify(u32 value, void *context) + { + struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; +- static struct key_entry *key; ++ struct key_entry *key; + union acpi_object *obj; + acpi_status status; + diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c -index 3a1b6bf..b453930 100644 +index 3484dd2..13ee730 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c -@@ -2486,7 +2486,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd) +@@ -2448,7 +2448,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd) } /* High speed charging function */ @@ -45618,10 +45296,10 @@ index 3a1b6bf..b453930 100644 static ssize_t sony_nc_highspeed_charging_store(struct device *dev, struct device_attribute *attr, diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c -index 54d31c0..3f896d3 100644 +index 4e86e97..04d50d1 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c -@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void) +@@ -2091,7 +2091,7 @@ static int hotkey_mask_get(void) return 0; } @@ -45630,7 +45308,7 @@ index 54d31c0..3f896d3 100644 { /* log only what the user can fix... */ const u32 wantedmask = hotkey_driver_mask & -@@ -2324,11 +2324,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m) +@@ -2318,11 +2318,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m) } } @@ -45642,7 +45320,7 @@ index 54d31c0..3f896d3 100644 #define TPACPI_COMPARE_KEY(__scancode, __member) \ do { \ if ((event_mask & (1 << __scancode)) && \ -@@ -2342,36 +2337,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, +@@ -2336,36 +2331,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, tpacpi_hotkey_send_key(__scancode); \ } while (0) @@ -45709,7 +45387,7 @@ index 54d31c0..3f896d3 100644 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle); TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle); TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle); -@@ -2405,7 +2406,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, +@@ -2399,7 +2400,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, oldn->volume_level != newn->volume_level) { /* recently muted, or repeated mute keypress, or * multiple presses ending in mute */ @@ -45718,7 +45396,7 @@ index 54d31c0..3f896d3 100644 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE); } } else { -@@ -2415,7 +2416,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, +@@ -2409,7 +2410,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP); } if (oldn->volume_level != newn->volume_level) { @@ -45727,7 +45405,7 @@ index 54d31c0..3f896d3 100644 } else if (oldn->volume_toggle != newn->volume_toggle) { /* repeated vol up/down keypress at end of scale ? */ if (newn->volume_level == 0) -@@ -2428,7 +2429,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, +@@ -2422,7 +2423,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, /* handle brightness */ if (oldn->brightness_level != newn->brightness_level) { issue_brightnesschange(oldn->brightness_level, @@ -45737,7 +45415,7 @@ index 54d31c0..3f896d3 100644 } else if (oldn->brightness_toggle != newn->brightness_toggle) { /* repeated key presses that didn't change state */ if (newn->brightness_level == 0) -@@ -2437,10 +2439,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, +@@ -2431,10 +2433,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn, && !tp_features.bright_unkfw) TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME); } @@ -45876,7 +45554,7 @@ index cc439fd..8fa30df 100644 #endif /* CONFIG_SYSFS */ diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c -index 3b2d5df..3207114 100644 +index 00e6672..2642c08 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -24,7 +24,10 @@ @@ -45891,7 +45569,7 @@ index 3b2d5df..3207114 100644 static bool __power_supply_is_supplied_by(struct power_supply *supplier, struct power_supply *supply) -@@ -558,7 +561,7 @@ static int __init power_supply_class_init(void) +@@ -584,7 +587,7 @@ static int __init power_supply_class_init(void) return PTR_ERR(power_supply_class); power_supply_class->dev_uevent = power_supply_uevent; @@ -45901,7 +45579,7 @@ index 3b2d5df..3207114 100644 return 0; } diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c -index 29178f7..c65f324 100644 +index 44420d1..967126e 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = { @@ -45925,10 +45603,10 @@ index 29178f7..c65f324 100644 __power_supply_attrs[i] = &power_supply_attrs[i].attr; } diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c -index 288c75a..065bc84 100644 +index a01b8b3..37c2afe 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c -@@ -3544,7 +3544,7 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -3307,7 +3307,7 @@ regulator_register(const struct regulator_desc *regulator_desc, { const struct regulation_constraints *constraints = NULL; const struct regulator_init_data *init_data; @@ -45937,7 +45615,7 @@ index 288c75a..065bc84 100644 struct regulator_dev *rdev; struct device *dev; int ret, i; -@@ -3614,7 +3614,7 @@ regulator_register(const struct regulator_desc *regulator_desc, +@@ -3377,7 +3377,7 @@ regulator_register(const struct regulator_desc *regulator_desc, rdev->dev.of_node = config->of_node; rdev->dev.parent = dev; dev_set_name(&rdev->dev, "regulator.%d", @@ -45947,10 +45625,10 @@ index 288c75a..065bc84 100644 if (ret != 0) { put_device(&rdev->dev); diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c -index d428ef9..fdc0357 100644 +index 144bcac..d20e7db 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c -@@ -333,8 +333,10 @@ static int max8660_probe(struct i2c_client *client, +@@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client, max8660->shadow_regs[MAX8660_OVER1] = 5; } else { /* Otherwise devices can be toggled via software */ @@ -45964,7 +45642,7 @@ index d428ef9..fdc0357 100644 /* diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c -index 0c5195a..637a453d 100644 +index 5b77ab7..a62f061 100644 --- a/drivers/regulator/max8973-regulator.c +++ b/drivers/regulator/max8973-regulator.c @@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client, @@ -46002,7 +45680,7 @@ index 1037e07..e64dea1 100644 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators, ARRAY_SIZE(mc13892_regulators)); diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c -index be06d71..264aee9 100644 +index 24e733c..bfbaa3e 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -731,7 +731,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) @@ -46065,6 +45743,47 @@ index fcb0329..d77b7f2 100644 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr); if (ret) +diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c +index 14b5f8d..cc9bd26 100644 +--- a/drivers/scsi/aic7xxx/aic79xx_pci.c ++++ b/drivers/scsi/aic7xxx/aic79xx_pci.c +@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd) + for (bit = 0; bit < 8; bit++) { + + if ((pci_status[i] & (0x1 << bit)) != 0) { +- static const char *s; ++ const char *s; + + s = pci_status_strings[bit]; + if (i == 7/*TARG*/ && bit == 3) +@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat) + + for (bit = 0; bit < 8; bit++) { + +- if ((split_status[i] & (0x1 << bit)) != 0) { +- static const char *s; +- +- s = split_status_strings[bit]; +- printk(s, ahd_name(ahd), ++ if ((split_status[i] & (0x1 << bit)) != 0) ++ printk(split_status_strings[bit], ahd_name(ahd), + split_status_source[i]); +- } + + if (i > 1) + continue; + +- if ((sg_split_status[i] & (0x1 << bit)) != 0) { +- static const char *s; +- +- s = split_status_strings[bit]; +- printk(s, ahd_name(ahd), "SG"); +- } ++ if ((sg_split_status[i] & (0x1 << bit)) != 0) ++ printk(split_status_strings[bit], ahd_name(ahd), "SG"); + } + } + /* diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h index e693af6..2e525b6 100644 --- a/drivers/scsi/bfa/bfa_fcpim.h @@ -46167,10 +45886,10 @@ index df0c3c7..b00e1d0 100644 /* These three are default values which can be overridden */ diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index 7f4f790..b75b92a 100644 +index 891c86b..dd1224a0 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c -@@ -554,7 +554,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q) +@@ -578,7 +578,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q) unsigned long flags; if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant))) @@ -46179,7 +45898,7 @@ index 7f4f790..b75b92a 100644 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) { a = rq->head[rq->current_entry]; -@@ -3422,7 +3422,7 @@ static void start_io(struct ctlr_info *h) +@@ -3444,7 +3444,7 @@ static void start_io(struct ctlr_info *h) while (!list_empty(&h->reqQ)) { c = list_entry(h->reqQ.next, struct CommandList, list); /* can't do anything if fifo is full */ @@ -46188,7 +45907,7 @@ index 7f4f790..b75b92a 100644 dev_warn(&h->pdev->dev, "fifo full\n"); break; } -@@ -3444,7 +3444,7 @@ static void start_io(struct ctlr_info *h) +@@ -3466,7 +3466,7 @@ static void start_io(struct ctlr_info *h) /* Tell the controller execute command */ spin_unlock_irqrestore(&h->lock, flags); @@ -46197,7 +45916,7 @@ index 7f4f790..b75b92a 100644 spin_lock_irqsave(&h->lock, flags); } spin_unlock_irqrestore(&h->lock, flags); -@@ -3452,17 +3452,17 @@ static void start_io(struct ctlr_info *h) +@@ -3474,17 +3474,17 @@ static void start_io(struct ctlr_info *h) static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q) { @@ -46218,7 +45937,7 @@ index 7f4f790..b75b92a 100644 (h->interrupts_enabled == 0); } -@@ -4364,7 +4364,7 @@ static int hpsa_pci_init(struct ctlr_info *h) +@@ -4386,7 +4386,7 @@ static int hpsa_pci_init(struct ctlr_info *h) if (prod_index < 0) return -ENODEV; h->product_name = products[prod_index].product_name; @@ -46227,7 +45946,7 @@ index 7f4f790..b75b92a 100644 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM); -@@ -4646,7 +4646,7 @@ static void controller_lockup_detected(struct ctlr_info *h) +@@ -4668,7 +4668,7 @@ static void controller_lockup_detected(struct ctlr_info *h) assert_spin_locked(&lockup_detector_lock); remove_ctlr_from_lockup_detector_list(h); @@ -46236,7 +45955,7 @@ index 7f4f790..b75b92a 100644 spin_lock_irqsave(&h->lock, flags); h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET); spin_unlock_irqrestore(&h->lock, flags); -@@ -4823,7 +4823,7 @@ reinit_after_soft_reset: +@@ -4845,7 +4845,7 @@ reinit_after_soft_reset: } /* make sure the board interrupts are off */ @@ -46245,7 +45964,7 @@ index 7f4f790..b75b92a 100644 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx)) goto clean2; -@@ -4857,7 +4857,7 @@ reinit_after_soft_reset: +@@ -4879,7 +4879,7 @@ reinit_after_soft_reset: * fake ones to scoop up any residual completions. */ spin_lock_irqsave(&h->lock, flags); @@ -46254,7 +45973,7 @@ index 7f4f790..b75b92a 100644 spin_unlock_irqrestore(&h->lock, flags); free_irqs(h); rc = hpsa_request_irq(h, hpsa_msix_discard_completions, -@@ -4876,9 +4876,9 @@ reinit_after_soft_reset: +@@ -4898,9 +4898,9 @@ reinit_after_soft_reset: dev_info(&h->pdev->dev, "Board READY.\n"); dev_info(&h->pdev->dev, "Waiting for stale completions to drain.\n"); @@ -46266,7 +45985,7 @@ index 7f4f790..b75b92a 100644 rc = controller_reset_failed(h->cfgtable); if (rc) -@@ -4899,7 +4899,7 @@ reinit_after_soft_reset: +@@ -4921,7 +4921,7 @@ reinit_after_soft_reset: } /* Turn the interrupts on so we can service requests */ @@ -46275,7 +45994,7 @@ index 7f4f790..b75b92a 100644 hpsa_hba_inquiry(h); hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ -@@ -4954,7 +4954,7 @@ static void hpsa_shutdown(struct pci_dev *pdev) +@@ -4976,7 +4976,7 @@ static void hpsa_shutdown(struct pci_dev *pdev) * To write all data in the battery backed cache to disks */ hpsa_flush_cache(h); @@ -46284,7 +46003,7 @@ index 7f4f790..b75b92a 100644 hpsa_free_irqs_and_disable_msix(h); } -@@ -5122,7 +5122,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags) +@@ -5144,7 +5144,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags) return; } /* Change the access methods to the performant access methods */ @@ -46294,7 +46013,7 @@ index 7f4f790..b75b92a 100644 } diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h -index 9816479..c5d4e97 100644 +index bc85e72..ae04a39 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -79,7 +79,7 @@ struct ctlr_info { @@ -46465,10 +46184,10 @@ index 161c98e..6d563b3 100644 .qc_issue = sas_ata_qc_issue, .qc_fill_rtf = sas_ata_qc_fill_rtf, diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h -index 93f222d..73e977b 100644 +index 4e1b75c..0bbdfa9 100644 --- a/drivers/scsi/lpfc/lpfc.h +++ b/drivers/scsi/lpfc/lpfc.h -@@ -431,7 +431,7 @@ struct lpfc_vport { +@@ -432,7 +432,7 @@ struct lpfc_vport { struct dentry *debug_nodelist; struct dentry *vport_debugfs_root; struct lpfc_debugfs_trc *disc_trc; @@ -46581,10 +46300,10 @@ index 60084e6..0e2e700 100644 snprintf(name, sizeof(name), "discovery_trace"); vport->debug_disc_trc = diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c -index e0b20fa..30c2c0d 100644 +index 647f5bf..d0068b9 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c -@@ -10936,8 +10936,10 @@ lpfc_init(void) +@@ -10952,8 +10952,10 @@ lpfc_init(void) "misc_register returned with status %d", error); if (lpfc_enable_npiv) { @@ -46598,7 +46317,7 @@ index e0b20fa..30c2c0d 100644 lpfc_transport_template = fc_attach_transport(&lpfc_transport_functions); diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c -index 243de1d..f40e3e5 100644 +index c913e8c..d34a119 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba) @@ -46652,6 +46371,46 @@ index 243de1d..f40e3e5 100644 } /** +diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c +index 7f0af4f..193ac3e 100644 +--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c ++++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c +@@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev) + { + struct scsi_device *sdev = to_scsi_device(dev); + struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host); +- static struct _raid_device *raid_device; ++ struct _raid_device *raid_device; + unsigned long flags; + Mpi2RaidVolPage0_t vol_pg0; + Mpi2ConfigReply_t mpi_reply; +@@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev) + { + struct scsi_device *sdev = to_scsi_device(dev); + struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host); +- static struct _raid_device *raid_device; ++ struct _raid_device *raid_device; + unsigned long flags; + Mpi2RaidVolPage0_t vol_pg0; + Mpi2ConfigReply_t mpi_reply; +@@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc, + struct fw_event_work *fw_event) + { + Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data; +- static struct _raid_device *raid_device; ++ struct _raid_device *raid_device; + unsigned long flags; + u16 handle; + +@@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc) + u64 sas_address; + struct _sas_device *sas_device; + struct _sas_node *expander_device; +- static struct _raid_device *raid_device; ++ struct _raid_device *raid_device; + u8 retry_count; + unsigned long flags; + diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 1eb7b028..b2a6080 100644 --- a/drivers/scsi/pmcraid.c @@ -46760,10 +46519,10 @@ index e1d150f..6c6df44 100644 /* To indicate add/delete/modify during CCN */ u8 change_detected; diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c -index d7a99ae..801df70 100644 +index 5f174b8..98d32b0 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c -@@ -2004,7 +2004,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable) +@@ -2040,7 +2040,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable) return 0; } @@ -46772,7 +46531,7 @@ index d7a99ae..801df70 100644 .show_host_node_name = 1, .show_host_port_name = 1, -@@ -2051,7 +2051,7 @@ struct fc_function_template qla2xxx_transport_functions = { +@@ -2088,7 +2088,7 @@ struct fc_function_template qla2xxx_transport_functions = { .bsg_timeout = qla24xx_bsg_timeout, }; @@ -46782,10 +46541,10 @@ index d7a99ae..801df70 100644 .show_host_node_name = 1, .show_host_port_name = 1, diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h -index 2d98232..a84298e 100644 +index 4446bf5..9a3574d 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h -@@ -528,8 +528,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *); +@@ -538,8 +538,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *); struct device_attribute; extern struct device_attribute *qla2x00_host_attrs[]; struct fc_function_template; @@ -46797,10 +46556,10 @@ index 2d98232..a84298e 100644 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *); extern void qla2x00_init_host_attr(scsi_qla_host_t *); diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index 3e21e9f..426ba79 100644 +index 9f01bbb..5e1dcee 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -1570,8 +1570,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha) +@@ -1572,8 +1572,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha) !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) { /* Ok, a 64bit DMA mask is applicable. */ ha->flags.enable_64bit_addressing = 1; @@ -46814,10 +46573,10 @@ index 3e21e9f..426ba79 100644 } } diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h -index ddf16a8..80f4dd0 100644 +index 41327d4..feb03d479 100644 --- a/drivers/scsi/qla4xxx/ql4_def.h +++ b/drivers/scsi/qla4xxx/ql4_def.h -@@ -291,7 +291,7 @@ struct ddb_entry { +@@ -296,7 +296,7 @@ struct ddb_entry { * (4000 only) */ atomic_t relogin_timer; /* Max Time to wait for * relogin to complete */ @@ -46827,10 +46586,10 @@ index ddf16a8..80f4dd0 100644 uint32_t default_time2wait; /* Default Min time between * relogins (+aens) */ diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c -index b246b3c..897004d 100644 +index f8a0a26..ec03cee 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c -@@ -2971,12 +2971,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess) +@@ -3066,12 +3066,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess) */ if (!iscsi_is_session_online(cls_sess)) { /* Reset retry relogin timer */ @@ -46845,7 +46604,7 @@ index b246b3c..897004d 100644 ddb_entry->default_time2wait + 4)); set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags); atomic_set(&ddb_entry->retry_relogin_timer, -@@ -5081,7 +5081,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha, +@@ -5209,7 +5209,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha, atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); atomic_set(&ddb_entry->relogin_timer, 0); @@ -46868,7 +46627,7 @@ index eaa808e..95f8841 100644 /* check if the device is still usable */ if (unlikely(cmd->device->sdev_state == SDEV_DEL)) { diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c -index 124392f..75eb43e 100644 +index d1549b7..2f60767 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1474,7 +1474,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q) @@ -46893,7 +46652,7 @@ index 124392f..75eb43e 100644 disposition = scsi_decide_disposition(cmd); if (disposition != SUCCESS && diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c -index 7e50061..71db7a6 100644 +index 40c6394..62356c2 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -687,7 +687,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \ @@ -46959,10 +46718,10 @@ index 4628fd5..a94a1c2 100644 /* * Check for overflow; dev_loss_tmo is u32 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c -index abf7c40..c3240ed 100644 +index e4a989f..293090c 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c -@@ -80,7 +80,7 @@ struct iscsi_internal { +@@ -79,7 +79,7 @@ struct iscsi_internal { struct transport_container session_cont; }; @@ -46971,7 +46730,7 @@ index abf7c40..c3240ed 100644 static struct workqueue_struct *iscsi_eh_timer_workq; static DEFINE_IDA(iscsi_sess_ida); -@@ -1738,7 +1738,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id) +@@ -1737,7 +1737,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id) int err; ihost = shost->shost_data; @@ -46980,7 +46739,7 @@ index abf7c40..c3240ed 100644 if (target_id == ISCSI_MAX_TARGET) { id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL); -@@ -3956,7 +3956,7 @@ static __init int iscsi_transport_init(void) +@@ -4077,7 +4077,7 @@ static __init int iscsi_transport_init(void) printk(KERN_INFO "Loading iSCSI transport class v%s.\n", ISCSI_TRANSPORT_VERSION); @@ -47021,10 +46780,10 @@ index f379c7f..e8fc69c 100644 transport_setup_device(&rport->dev); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 2783dd7..d20395b 100644 +index 5693f6d7..b0bf05a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -2933,7 +2933,7 @@ static int sd_probe(struct device *dev) +@@ -2934,7 +2934,7 @@ static int sd_probe(struct device *dev) sdkp->disk = gd; sdkp->index = index; atomic_set(&sdkp->openers, 0); @@ -47047,10 +46806,10 @@ index df5e961..df6b97f 100644 return blk_trace_startstop(sdp->device->request_queue, 1); case BLKTRACESTOP: diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 978dda2..cb19aa0 100644 +index 9e039c6..ae9e800 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -1631,7 +1631,7 @@ int spi_bus_unlock(struct spi_master *master) +@@ -1762,7 +1762,7 @@ int spi_bus_unlock(struct spi_master *master) EXPORT_SYMBOL_GPL(spi_bus_unlock); /* portable code must never pass more than 32 bytes */ @@ -47060,7 +46819,7 @@ index 978dda2..cb19aa0 100644 static u8 *buf; diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c -index ee3a57f..18368c1 100644 +index 2c61783..4d49e4e 100644 --- a/drivers/staging/android/timed_output.c +++ b/drivers/staging/android/timed_output.c @@ -25,7 +25,7 @@ @@ -47071,17 +46830,17 @@ index ee3a57f..18368c1 100644 +static atomic_unchecked_t device_count; static ssize_t enable_show(struct device *dev, struct device_attribute *attr, - char *buf) -@@ -59,7 +59,7 @@ static int create_timed_output_class(void) + char *buf) +@@ -63,7 +63,7 @@ static int create_timed_output_class(void) timed_output_class = class_create(THIS_MODULE, "timed_output"); if (IS_ERR(timed_output_class)) return PTR_ERR(timed_output_class); - atomic_set(&device_count, 0); + atomic_set_unchecked(&device_count, 0); + timed_output_class->dev_groups = timed_output_groups; } - return 0; -@@ -76,7 +76,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev) +@@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev) if (ret < 0) return ret; @@ -47090,6 +46849,154 @@ index ee3a57f..18368c1 100644 tdev->dev = device_create(timed_output_class, NULL, MKDEV(0, tdev->index), NULL, "%s", tdev->name); if (IS_ERR(tdev->dev)) +diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c +index 0247a20..cb9595c 100644 +--- a/drivers/staging/gdm724x/gdm_tty.c ++++ b/drivers/staging/gdm724x/gdm_tty.c +@@ -45,7 +45,7 @@ + #define gdm_tty_send_control(n, r, v, d, l) (\ + n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l)) + +-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count) ++#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count)) + + static struct tty_driver *gdm_driver[TTY_MAX_COUNT]; + static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR]; +diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c +index ef5064e..fce01db 100644 +--- a/drivers/staging/lustre/lnet/selftest/brw_test.c ++++ b/drivers/staging/lustre/lnet/selftest/brw_test.c +@@ -478,13 +478,11 @@ brw_server_handle(struct srpc_server_rpc *rpc) + return 0; + } + +-sfw_test_client_ops_t brw_test_client; +-void brw_init_test_client(void) +-{ +- brw_test_client.tso_init = brw_client_init; +- brw_test_client.tso_fini = brw_client_fini; +- brw_test_client.tso_prep_rpc = brw_client_prep_rpc; +- brw_test_client.tso_done_rpc = brw_client_done_rpc; ++sfw_test_client_ops_t brw_test_client = { ++ .tso_init = brw_client_init, ++ .tso_fini = brw_client_fini, ++ .tso_prep_rpc = brw_client_prep_rpc, ++ .tso_done_rpc = brw_client_done_rpc, + }; + + srpc_service_t brw_test_service; +diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c +index 483c785..e1a2a7b 100644 +--- a/drivers/staging/lustre/lnet/selftest/framework.c ++++ b/drivers/staging/lustre/lnet/selftest/framework.c +@@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] = + + extern sfw_test_client_ops_t ping_test_client; + extern srpc_service_t ping_test_service; +-extern void ping_init_test_client(void); + extern void ping_init_test_service(void); + + extern sfw_test_client_ops_t brw_test_client; + extern srpc_service_t brw_test_service; +-extern void brw_init_test_client(void); + extern void brw_init_test_service(void); + + +@@ -1684,12 +1682,10 @@ sfw_startup (void) + INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs); + INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions); + +- brw_init_test_client(); + brw_init_test_service(); + rc = sfw_register_test(&brw_test_service, &brw_test_client); + LASSERT (rc == 0); + +- ping_init_test_client(); + ping_init_test_service(); + rc = sfw_register_test(&ping_test_service, &ping_test_client); + LASSERT (rc == 0); +diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c +index f0f9194..b589047 100644 +--- a/drivers/staging/lustre/lnet/selftest/ping_test.c ++++ b/drivers/staging/lustre/lnet/selftest/ping_test.c +@@ -210,14 +210,12 @@ ping_server_handle(struct srpc_server_rpc *rpc) + return 0; + } + +-sfw_test_client_ops_t ping_test_client; +-void ping_init_test_client(void) +-{ +- ping_test_client.tso_init = ping_client_init; +- ping_test_client.tso_fini = ping_client_fini; +- ping_test_client.tso_prep_rpc = ping_client_prep_rpc; +- ping_test_client.tso_done_rpc = ping_client_done_rpc; +-} ++sfw_test_client_ops_t ping_test_client = { ++ .tso_init = ping_client_init, ++ .tso_fini = ping_client_fini, ++ .tso_prep_rpc = ping_client_prep_rpc, ++ .tso_done_rpc = ping_client_done_rpc, ++}; + + srpc_service_t ping_test_service; + void ping_init_test_service(void) +diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h +index 7020d9c..0d3b580 100644 +--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h ++++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h +@@ -1141,7 +1141,7 @@ struct ldlm_callback_suite { + ldlm_completion_callback lcs_completion; + ldlm_blocking_callback lcs_blocking; + ldlm_glimpse_callback lcs_glimpse; +-}; ++} __no_const; + + /* ldlm_lockd.c */ + int ldlm_del_waiting_lock(struct ldlm_lock *lock); +diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h +index a612255..9a9e2dd 100644 +--- a/drivers/staging/lustre/lustre/include/obd.h ++++ b/drivers/staging/lustre/lustre/include/obd.h +@@ -1417,7 +1417,7 @@ struct md_ops { + * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a + * wrapper function in include/linux/obd_class.h. + */ +-}; ++} __no_const; + + struct lsm_operations { + void (*lsm_free)(struct lov_stripe_md *); +diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c +index fc6c977..df1f956 100644 +--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c ++++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c +@@ -219,7 +219,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb) + int LL_PROC_PROTO(proc_console_max_delay_cs) + { + int rc, max_delay_cs; +- ctl_table_t dummy = *table; ++ ctl_table_no_const dummy = *table; + cfs_duration_t d; + + dummy.data = &max_delay_cs; +@@ -250,7 +250,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs) + int LL_PROC_PROTO(proc_console_min_delay_cs) + { + int rc, min_delay_cs; +- ctl_table_t dummy = *table; ++ ctl_table_no_const dummy = *table; + cfs_duration_t d; + + dummy.data = &min_delay_cs; +@@ -281,7 +281,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs) + int LL_PROC_PROTO(proc_console_backoff) + { + int rc, backoff; +- ctl_table_t dummy = *table; ++ ctl_table_no_const dummy = *table; + + dummy.data = &backoff; + dummy.proc_handler = &proc_dointvec; diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c index 3675020..e80d92c 100644 --- a/drivers/staging/media/solo6x10/solo6x10-core.c @@ -47130,10 +47037,10 @@ index 6f91d2e..3f011d2 100644 unsigned int p2m_timeouts; diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c -index 34afc16..ffe44dd 100644 +index e14a1bb..9cb9bbe 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c -@@ -421,11 +421,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) +@@ -419,11 +419,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) /* Increment RX stats for virtual ports */ if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) { #ifdef CONFIG_64BIT @@ -47149,7 +47056,7 @@ index 34afc16..ffe44dd 100644 #endif } netif_receive_skb(skb); -@@ -437,9 +437,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) +@@ -434,9 +434,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget) dev->name); */ #ifdef CONFIG_64BIT @@ -47181,6 +47088,32 @@ index c3a90e7..023619a 100644 #endif } +diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h +index 439c3c9..2d74293 100644 +--- a/drivers/staging/rtl8188eu/include/hal_intf.h ++++ b/drivers/staging/rtl8188eu/include/hal_intf.h +@@ -271,7 +271,7 @@ struct hal_ops { + s32 (*c2h_handler)(struct adapter *padapter, + struct c2h_evt_hdr *c2h_evt); + c2h_id_filter c2h_id_filter_ccx; +-}; ++} __no_const; + + enum rt_eeprom_type { + EEPROM_93C46, +diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h +index eb6f0e5..e6a0958 100644 +--- a/drivers/staging/rtl8188eu/include/rtw_io.h ++++ b/drivers/staging/rtl8188eu/include/rtw_io.h +@@ -126,7 +126,7 @@ struct _io_ops { + u32 (*_write_scsi)(struct intf_hdl *pintfhdl,u32 cnt, u8 *pmem); + void (*_read_port_cancel)(struct intf_hdl *pintfhdl); + void (*_write_port_cancel)(struct intf_hdl *pintfhdl); +-}; ++} __no_const; + + struct io_req { + struct list_head list; diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h index dc23395..cf7e9b1 100644 --- a/drivers/staging/rtl8712/rtl871x_io.h @@ -47265,7 +47198,7 @@ index d07fcb5..358e1e1 100644 return; } diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c -index 57a08c5..5b4bb7c 100644 +index 8acff44..bdb2fca 100644 --- a/drivers/staging/vt6655/hostap.c +++ b/drivers/staging/vt6655/hostap.c @@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO; @@ -47287,7 +47220,7 @@ index 57a08c5..5b4bb7c 100644 @@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked) *apdev_priv = *pDevice; - memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN); + eth_hw_addr_inherit(pDevice->apdev, dev); + /* only half broken now */ + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211; @@ -47324,28 +47257,6 @@ index c699a30..b90a5fd 100644 pDevice->apdev->netdev_ops = &apdev_netdev_ops; pDevice->apdev->type = ARPHRD_IEEE80211; -diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h -index d128ce2..fc1f9a1 100644 ---- a/drivers/staging/zcache/tmem.h -+++ b/drivers/staging/zcache/tmem.h -@@ -225,7 +225,7 @@ struct tmem_pamops { - bool (*is_remote)(void *); - int (*replace_in_obj)(void *, struct tmem_obj *); - #endif --}; -+} __no_const; - extern void tmem_register_pamops(struct tmem_pamops *m); - - /* memory allocation methods provided by the host implementation */ -@@ -234,7 +234,7 @@ struct tmem_hostops { - void (*obj_free)(struct tmem_obj *, struct tmem_pool *); - struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *); - void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *); --}; -+} __no_const; - extern void tmem_register_hostops(struct tmem_hostops *m); - - /* core tmem accessor functions */ diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c index e51b09a..5ebac31 100644 --- a/drivers/target/sbp/sbp_target.c @@ -47369,23 +47280,23 @@ index e51b09a..5ebac31 100644 login->tgt_agt = sbp_target_agent_register(login); if (IS_ERR(login->tgt_agt)) { diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c -index 8f4142f..b127f7d 100644 +index d90dbb0..6cbe585 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c -@@ -1400,7 +1400,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) - spin_lock_init(&dev->se_port_lock); +@@ -1431,7 +1431,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) spin_lock_init(&dev->se_tmr_lock); spin_lock_init(&dev->qf_cmd_lock); + sema_init(&dev->caw_sem, 1); - atomic_set(&dev->dev_ordered_id, 0); + atomic_set_unchecked(&dev->dev_ordered_id, 0); INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list); spin_lock_init(&dev->t10_wwn.t10_vpd_lock); INIT_LIST_HEAD(&dev->t10_pr.registration_list); diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c -index d8e49d7..6fcfdec 100644 +index 0b0009b..215e88e 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c -@@ -1080,7 +1080,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd) +@@ -1137,7 +1137,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd) * Used to determine when ORDERED commands should go from * Dormant to Active status. */ @@ -47421,7 +47332,7 @@ index 33f83fe..d80f8e1 100644 struct tty_struct *tty; struct tty_ldisc *ld; diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c -index eb255e8..f637a57 100644 +index 9eba119..5070303 100644 --- a/drivers/tty/hvc/hvc_console.c +++ b/drivers/tty/hvc/hvc_console.c @@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp) @@ -47433,7 +47344,7 @@ index eb255e8..f637a57 100644 spin_unlock_irqrestore(&hp->port.lock, flags); hvc_kick(); return 0; -@@ -388,7 +388,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp) +@@ -393,7 +393,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp) spin_lock_irqsave(&hp->port.lock, flags); @@ -47442,7 +47353,7 @@ index eb255e8..f637a57 100644 spin_unlock_irqrestore(&hp->port.lock, flags); /* We are done with the tty pointer now. */ tty_port_tty_set(&hp->port, NULL); -@@ -406,9 +406,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp) +@@ -415,9 +415,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp) */ tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT); } else { @@ -47454,7 +47365,7 @@ index eb255e8..f637a57 100644 spin_unlock_irqrestore(&hp->port.lock, flags); } } -@@ -438,12 +438,12 @@ static void hvc_hangup(struct tty_struct *tty) +@@ -447,12 +447,12 @@ static void hvc_hangup(struct tty_struct *tty) * open->hangup case this can be called after the final close so prevent * that from happening for now. */ @@ -47469,7 +47380,7 @@ index eb255e8..f637a57 100644 spin_unlock_irqrestore(&hp->port.lock, flags); tty_port_tty_set(&hp->port, NULL); -@@ -491,7 +491,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count +@@ -500,7 +500,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count return -EPIPE; /* FIXME what's this (unprotected) check for? */ @@ -47795,7 +47706,7 @@ index 1deaca4..c8582d4 100644 tty_port_tty_set(&ch->port, tty); mutex_lock(&ch->port.mutex); diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c -index 6422390..49003ac8 100644 +index c0f76da..d974c32 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -1632,7 +1632,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr) @@ -47807,7 +47718,7 @@ index 6422390..49003ac8 100644 kfree(dlci); return NULL; } -@@ -2932,7 +2932,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp) +@@ -2935,7 +2935,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp) struct gsm_dlci *dlci = tty->driver_data; struct tty_port *port = &dlci->port; @@ -47817,10 +47728,10 @@ index 6422390..49003ac8 100644 dlci_get(dlci->gsm->dlci[0]); mux_get(dlci->gsm); diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c -index 4bf0fc0..433bd58 100644 +index ff58293..71c87bc 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c -@@ -2217,6 +2217,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops) +@@ -2502,6 +2502,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops) { *ops = tty_ldisc_N_TTY; ops->owner = NULL; @@ -47830,10 +47741,10 @@ index 4bf0fc0..433bd58 100644 } EXPORT_SYMBOL_GPL(n_tty_inherit_ops); diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c -index abfd990..5ab5da9 100644 +index 25c9bc7..24077b7 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c -@@ -796,8 +796,10 @@ static void __init unix98_pty_init(void) +@@ -790,8 +790,10 @@ static void __init unix98_pty_init(void) panic("Couldn't register Unix98 pts driver"); /* Now create the /dev/ptmx special device */ @@ -47877,7 +47788,7 @@ index 354564e..fe50d9a 100644 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]); spin_unlock_irqrestore(&info->port.lock, flags); diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c -index e2520ab..034e20b 100644 +index 1274499..f541382 100644 --- a/drivers/tty/serial/ioc4_serial.c +++ b/drivers/tty/serial/ioc4_serial.c @@ -437,7 +437,7 @@ struct ioc4_soft { @@ -47908,7 +47819,7 @@ index e2520ab..034e20b 100644 this_mir = this_ir = pending_intrs(soft, intr_type); diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c -index 1002054..dd644a8 100644 +index a260cde..6b2b5ce 100644 --- a/drivers/tty/serial/kgdboc.c +++ b/drivers/tty/serial/kgdboc.c @@ -24,8 +24,9 @@ @@ -48014,19 +47925,19 @@ index 1002054..dd644a8 100644 /* This is only available if kgdboc is a built in for early debugging */ static int __init kgdboc_early_init(char *opt) diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c -index 2c6cfb3..048274e 100644 +index b5d779c..3622cfe 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c -@@ -857,7 +857,7 @@ static struct uart_driver msm_uart_driver = { +@@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = { .cons = MSM_CONSOLE, }; -static atomic_t msm_uart_next_id = ATOMIC_INIT(0); +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0); - static int __init msm_serial_probe(struct platform_device *pdev) - { -@@ -867,7 +867,7 @@ static int __init msm_serial_probe(struct platform_device *pdev) + static const struct of_device_id msm_uartdm_table[] = { + { .compatible = "qcom,msm-uartdm" }, +@@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev) int irq; if (pdev->id == -1) @@ -48036,10 +47947,10 @@ index 2c6cfb3..048274e 100644 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR)) return -ENXIO; diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c -index 376079b..d8de7aa 100644 +index f3dfa19..342f2ff 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c -@@ -453,11 +453,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port) +@@ -456,11 +456,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port) } } @@ -48056,7 +47967,7 @@ index 376079b..d8de7aa 100644 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n", port->mapbase, port->membase); -@@ -1124,10 +1129,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, +@@ -1127,10 +1132,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, /* setup info for port */ port->dev = &platdev->dev; @@ -48068,7 +47979,7 @@ index 376079b..d8de7aa 100644 if (cfg->uart_flags & UPF_CONS_FLOW) { diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c -index 28cdd28..56f1d60 100644 +index 0f02351..07c59c5 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty) @@ -48108,7 +48019,7 @@ index 28cdd28..56f1d60 100644 goto end; } diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c -index 8eaf1ab..85c030d 100644 +index e1ce141..6d4ed80 100644 --- a/drivers/tty/synclink.c +++ b/drivers/tty/synclink.c @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp) @@ -48118,7 +48029,7 @@ index 8eaf1ab..85c030d 100644 - __FILE__,__LINE__, info->device_name, info->port.count); + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count)); - if (tty_port_close_start(&info->port, tty, filp) == 0) + if (tty_port_close_start(&info->port, tty, filp) == 0) goto cleanup; @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp) cleanup: @@ -48497,10 +48408,10 @@ index dc6e969..5dc8786 100644 if (!retval) port->flags |= ASYNC_NORMAL_ACTIVE; diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c -index d5cc3ac..3263411 100644 +index 40a9fe9..a3f10cc 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c -@@ -1033,7 +1033,7 @@ EXPORT_SYMBOL(unregister_sysrq_key); +@@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key); static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { @@ -48510,10 +48421,10 @@ index d5cc3ac..3263411 100644 if (get_user(c, buf)) diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c -index 20689b9..7fd3a31 100644 +index c74a00a..02cf211a 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c -@@ -3468,7 +3468,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); +@@ -3474,7 +3474,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); void tty_default_fops(struct file_operations *fops) { @@ -48523,28 +48434,28 @@ index 20689b9..7fd3a31 100644 /* diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c -index 1afe192..73d2c20 100644 +index 6458e11..6cfc218 100644 --- a/drivers/tty/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c -@@ -66,7 +66,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc) - raw_spin_lock_irqsave(&tty_ldisc_lock, flags); +@@ -72,7 +72,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc) + raw_spin_lock_irqsave(&tty_ldiscs_lock, flags); tty_ldiscs[disc] = new_ldisc; new_ldisc->num = disc; - new_ldisc->refcount = 0; + atomic_set(&new_ldisc->refcount, 0); - raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags); + raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags); return ret; -@@ -94,7 +94,7 @@ int tty_unregister_ldisc(int disc) +@@ -100,7 +100,7 @@ int tty_unregister_ldisc(int disc) return -EINVAL; - raw_spin_lock_irqsave(&tty_ldisc_lock, flags); + raw_spin_lock_irqsave(&tty_ldiscs_lock, flags); - if (tty_ldiscs[disc]->refcount) + if (atomic_read(&tty_ldiscs[disc]->refcount)) ret = -EBUSY; else tty_ldiscs[disc] = NULL; -@@ -115,7 +115,7 @@ static struct tty_ldisc_ops *get_ldops(int disc) +@@ -121,7 +121,7 @@ static struct tty_ldisc_ops *get_ldops(int disc) if (ldops) { ret = ERR_PTR(-EAGAIN); if (try_module_get(ldops->owner)) { @@ -48553,24 +48464,15 @@ index 1afe192..73d2c20 100644 ret = ldops; } } -@@ -128,7 +128,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops) +@@ -134,7 +134,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops) unsigned long flags; - raw_spin_lock_irqsave(&tty_ldisc_lock, flags); + raw_spin_lock_irqsave(&tty_ldiscs_lock, flags); - ldops->refcount--; + atomic_dec(&ldops->refcount); module_put(ldops->owner); - raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags); + raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags); } -@@ -196,7 +196,7 @@ static inline void tty_ldisc_put(struct tty_ldisc *ld) - /* unreleased reader reference(s) will cause this WARN */ - WARN_ON(!atomic_dec_and_test(&ld->users)); - -- ld->ops->refcount--; -+ atomic_dec(&ld->ops->refcount); - module_put(ld->ops->owner); - kfree(ld); - raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags); diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index f597e88..b7f68ed 100644 --- a/drivers/tty/tty_port.c @@ -48639,10 +48541,10 @@ index f597e88..b7f68ed 100644 tty_port_tty_set(port, tty); diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c -index a9af1b9a..1e08e7f 100644 +index d0e3a44..5f8b754 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c -@@ -647,6 +647,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag) +@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag) kbd->kbdmode == VC_OFF) && value != KVAL(K_SAK)) return; /* SAK is allowed even in raw mode */ @@ -48659,7 +48561,7 @@ index a9af1b9a..1e08e7f 100644 fn_handler[value](vc); } -@@ -1795,9 +1805,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, +@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) return -EFAULT; @@ -48669,7 +48571,7 @@ index a9af1b9a..1e08e7f 100644 switch (cmd) { case KDGKBENT: /* Ensure another thread doesn't free it under us */ -@@ -1812,6 +1819,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, +@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, spin_unlock_irqrestore(&kbd_event_lock, flags); return put_user(val, &user_kbe->kb_value); case KDSKBENT: @@ -48679,7 +48581,7 @@ index a9af1b9a..1e08e7f 100644 if (!perm) return -EPERM; if (!i && v == K_NOSUCHMAP) { -@@ -1902,9 +1912,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm) +@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm) int i, j, k; int ret; @@ -48689,7 +48591,7 @@ index a9af1b9a..1e08e7f 100644 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL); if (!kbs) { ret = -ENOMEM; -@@ -1938,6 +1945,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm) +@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm) kfree(kbs); return ((p && *p) ? -EOVERFLOW : 0); case KDSKBSENT: @@ -48700,7 +48602,7 @@ index a9af1b9a..1e08e7f 100644 ret = -EPERM; goto reterr; diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c -index 3b96f18..026a9bf 100644 +index 0e808cf..d7d274b 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -25,6 +25,7 @@ @@ -48711,7 +48613,7 @@ index 3b96f18..026a9bf 100644 #define UIO_MAX_DEVICES (1U << MINORBITS) -@@ -32,10 +33,10 @@ struct uio_device { +@@ -32,7 +33,7 @@ struct uio_device { struct module *owner; struct device *dev; int minor; @@ -48719,21 +48621,17 @@ index 3b96f18..026a9bf 100644 + atomic_unchecked_t event; struct fasync_struct *async_queue; wait_queue_head_t wait; -- int vma_count; -+ local_t vma_count; struct uio_info *info; - struct kobject *map_dir; - struct kobject *portio_dir; -@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev, +@@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev, struct device_attribute *attr, char *buf) { struct uio_device *idev = dev_get_drvdata(dev); - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event)); + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event)); } + static DEVICE_ATTR_RO(event); - static struct device_attribute uio_class_attributes[] = { -@@ -398,7 +399,7 @@ void uio_event_notify(struct uio_info *info) +@@ -401,7 +402,7 @@ void uio_event_notify(struct uio_info *info) { struct uio_device *idev = info->uio_dev; @@ -48742,7 +48640,7 @@ index 3b96f18..026a9bf 100644 wake_up_interruptible(&idev->wait); kill_fasync(&idev->async_queue, SIGIO, POLL_IN); } -@@ -451,7 +452,7 @@ static int uio_open(struct inode *inode, struct file *filep) +@@ -454,7 +455,7 @@ static int uio_open(struct inode *inode, struct file *filep) } listener->dev = idev; @@ -48751,7 +48649,7 @@ index 3b96f18..026a9bf 100644 filep->private_data = listener; if (idev->info->open) { -@@ -502,7 +503,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait) +@@ -505,7 +506,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait) return -EIO; poll_wait(filep, &idev->wait, wait); @@ -48760,7 +48658,7 @@ index 3b96f18..026a9bf 100644 return POLLIN | POLLRDNORM; return 0; } -@@ -527,7 +528,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf, +@@ -530,7 +531,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf, do { set_current_state(TASK_INTERRUPTIBLE); @@ -48769,23 +48667,31 @@ index 3b96f18..026a9bf 100644 if (event_count != listener->event_count) { if (copy_to_user(buf, &event_count, count)) retval = -EFAULT; -@@ -596,13 +597,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma) - static void uio_vma_open(struct vm_area_struct *vma) +@@ -587,9 +588,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf, + static int uio_find_mem_index(struct vm_area_struct *vma) { struct uio_device *idev = vma->vm_private_data; -- idev->vma_count++; -+ local_inc(&idev->vma_count); - } ++ unsigned long size; + + if (vma->vm_pgoff < MAX_UIO_MAPS) { +- if (idev->info->mem[vma->vm_pgoff].size == 0) ++ size = idev->info->mem[vma->vm_pgoff].size; ++ if (size == 0) ++ return -1; ++ if (vma->vm_end - vma->vm_start > size) + return -1; + return (int)vma->vm_pgoff; + } +@@ -647,6 +652,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma) + return -EINVAL; + mem = idev->info->mem + mi; - static void uio_vma_close(struct vm_area_struct *vma) - { - struct uio_device *idev = vma->vm_private_data; -- idev->vma_count--; -+ local_dec(&idev->vma_count); - } ++ if (mem->addr & ~PAGE_MASK) ++ return -ENODEV; + if (vma->vm_end - vma->vm_start > mem->size) + return -EINVAL; - static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -@@ -809,7 +810,7 @@ int __uio_register_device(struct module *owner, +@@ -818,7 +825,7 @@ int __uio_register_device(struct module *owner, idev->owner = owner; idev->info = info; init_waitqueue_head(&idev->wait); @@ -48808,10 +48714,10 @@ index 8a7eb77..c00402f 100644 pos += tmp; diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c -index 5e0d33a..cc10579 100644 +index 25a7bfc..57f3cf5 100644 --- a/drivers/usb/atm/usbatm.c +++ b/drivers/usb/atm/usbatm.c -@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char +@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", __func__, vpi, vci); @@ -48820,7 +48726,7 @@ index 5e0d33a..cc10579 100644 return; } -@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char +@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (length > ATM_MAX_AAL5_PDU) { atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n", __func__, length, vcc); @@ -48829,7 +48735,7 @@ index 5e0d33a..cc10579 100644 goto out; } -@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char +@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (sarb->len < pdu_length) { atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n", __func__, pdu_length, sarb->len, vcc); @@ -48846,7 +48752,7 @@ index 5e0d33a..cc10579 100644 goto out; } -@@ -389,7 +389,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char +@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char if (printk_ratelimit()) atm_err(instance, "%s: no memory for skb (length: %u)!\n", __func__, length); @@ -48855,7 +48761,7 @@ index 5e0d33a..cc10579 100644 goto out; } -@@ -417,7 +417,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char +@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char vcc->push(vcc, skb); @@ -48864,7 +48770,7 @@ index 5e0d33a..cc10579 100644 out: skb_trim(sarb, 0); } -@@ -623,7 +623,7 @@ static void usbatm_tx_process(unsigned long data) +@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data) struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc; usbatm_pop(vcc, skb); @@ -48873,7 +48779,7 @@ index 5e0d33a..cc10579 100644 skb = skb_dequeue(&instance->sndqueue); } -@@ -779,11 +779,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag +@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag if (!left--) return sprintf(page, "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n", @@ -48921,11 +48827,40 @@ index 2a3bbdf..91d72cf 100644 if (file->f_version != event_count) { file->f_version = event_count; return POLLIN | POLLRDNORM; +diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c +index 71dc5d7..6135ff2 100644 +--- a/drivers/usb/core/devio.c ++++ b/drivers/usb/core/devio.c +@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes, + struct dev_state *ps = file->private_data; + struct usb_device *dev = ps->dev; + ssize_t ret = 0; +- unsigned len; ++ size_t len; + loff_t pos; + int i; + +@@ -229,13 +229,13 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes, + for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) { + struct usb_config_descriptor *config = + (struct usb_config_descriptor *)dev->rawdescriptors[i]; +- unsigned int length = le16_to_cpu(config->wTotalLength); ++ size_t length = le16_to_cpu(config->wTotalLength); + + if (*ppos < pos + length) { + + /* The descriptor may claim to be longer than it + * really is. Here is the actual allocated length. */ +- unsigned alloclen = ++ size_t alloclen = + le16_to_cpu(dev->config[i].desc.wTotalLength); + + len = length - (*ppos - pos); diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index 014dc99..4d25fd7 100644 +index f20a044..d1059aa 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) +@@ -1552,7 +1552,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) */ usb_get_urb(urb); atomic_inc(&urb->use_count); @@ -48934,7 +48869,7 @@ index 014dc99..4d25fd7 100644 usbmon_urb_submit(&hcd->self, urb); /* NOTE requirements on root-hub callers (usbfs and the hub -@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) +@@ -1579,7 +1579,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags) urb->hcpriv = NULL; INIT_LIST_HEAD(&urb->urb_list); atomic_dec(&urb->use_count); @@ -48944,7 +48879,7 @@ index 014dc99..4d25fd7 100644 wake_up(&usb_kill_urb_queue); usb_put_urb(urb); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 17c3785..deffb11 100644 +index 243c672..8b66fbb 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -27,6 +27,7 @@ @@ -48955,7 +48890,7 @@ index 17c3785..deffb11 100644 #include #include -@@ -4421,6 +4422,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, +@@ -4467,6 +4468,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, goto done; return; } @@ -48967,36 +48902,54 @@ index 17c3785..deffb11 100644 unit_load = 150; else diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index e7ee1e4..1dfc9ea4 100644 +index 82927e1..4993dbf 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev, - * method can wait for it to complete. Since you don't have a handle on the - * URB used, you can't cancel the request. + * Return: If successful, the number of bytes transferred. Otherwise, a negative + * error number. */ -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request, +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, void *data, __u16 size, int timeout) { +@@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg); + * If successful, 0. Otherwise a negative error number. The number of actual + * bytes transferred will be stored in the @actual_length paramater. + */ +-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe, ++int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe, + void *data, int len, int *actual_length, int timeout) + { + return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout); +@@ -221,7 +221,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg); + * bytes transferred will be stored in the @actual_length paramater. + * + */ +-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe, ++int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe, + void *data, int len, int *actual_length, int timeout) + { + struct urb *urb; diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c -index d9284b9..17023c7 100644 +index ca516ac..6c36ee4 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c -@@ -239,7 +239,7 @@ show_urbnum(struct device *dev, struct device_attribute *attr, char *buf) +@@ -236,7 +236,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr, struct usb_device *udev; udev = to_usb_device(dev); - return sprintf(buf, "%d\n", atomic_read(&udev->urbnum)); + return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum)); } - static DEVICE_ATTR(urbnum, S_IRUGO, show_urbnum, NULL); + static DEVICE_ATTR_RO(urbnum); diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c -index 7dad603..350f7a9 100644 +index 0a6ee2e..6f8d7e8 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c -@@ -422,7 +422,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, +@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, set_dev_node(&dev->dev, dev_to_node(bus->controller)); dev->state = USB_STATE_ATTACHED; dev->lpm_disable_count = 1; @@ -49006,10 +48959,10 @@ index 7dad603..350f7a9 100644 INIT_LIST_HEAD(&dev->ep0.urb_list); dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE; diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c -index 14d28d6..5f511ac 100644 +index 5452c0f..34c9145 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -550,8 +550,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, +@@ -532,8 +532,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, if (!usb_endpoint_xfer_isoc(desc)) return 0; @@ -49144,6 +49097,28 @@ index b369292..9f3ba40 100644 gs_buf_free(&port->port_write_buf); gs_free_requests(gser->out, &port->read_pool, NULL); gs_free_requests(gser->out, &port->read_queue, NULL); +diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c +index 835fc08..f8b22bf 100644 +--- a/drivers/usb/host/ehci-hub.c ++++ b/drivers/usb/host/ehci-hub.c +@@ -762,7 +762,7 @@ static struct urb *request_single_step_set_feature_urb( + urb->transfer_flags = URB_DIR_IN; + usb_get_urb(urb); + atomic_inc(&urb->use_count); +- atomic_inc(&urb->dev->urbnum); ++ atomic_inc_unchecked(&urb->dev->urbnum); + urb->setup_dma = dma_map_single( + hcd->self.controller, + urb->setup_packet, +@@ -829,7 +829,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port) + urb->status = -EINPROGRESS; + usb_get_urb(urb); + atomic_inc(&urb->use_count); +- atomic_inc(&urb->dev->urbnum); ++ atomic_inc_unchecked(&urb->dev->urbnum); + retval = submit_single_step_set_feature(hcd, urb, 0); + if (!retval && !wait_for_completion_timeout(&done, + msecs_to_jiffies(2000))) { diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index ba6a5d6..f88f7f3 100644 --- a/drivers/usb/misc/appledisplay.c @@ -49167,7 +49142,7 @@ index ba6a5d6..f88f7f3 100644 props.type = BACKLIGHT_RAW; props.max_brightness = 0xff; diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c -index afb50ea..7b0b1cf 100644 +index c69bb50..215ef37 100644 --- a/drivers/usb/serial/console.c +++ b/drivers/usb/serial/console.c @@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options) @@ -49179,7 +49154,7 @@ index afb50ea..7b0b1cf 100644 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) { if (serial->type->set_termios) { /* -@@ -174,7 +174,7 @@ static int usb_console_setup(struct console *co, char *options) +@@ -170,7 +170,7 @@ static int usb_console_setup(struct console *co, char *options) } /* Now that any required fake tty operations are completed restore * the tty port count */ @@ -49188,7 +49163,7 @@ index afb50ea..7b0b1cf 100644 /* The console is special in terms of closing the device so * indicate this port is now acting as a system console. */ port->port.console = 1; -@@ -187,7 +187,7 @@ static int usb_console_setup(struct console *co, char *options) +@@ -183,7 +183,7 @@ static int usb_console_setup(struct console *co, char *options) free_tty: kfree(tty); reset_open_count: @@ -49197,6 +49172,15 @@ index afb50ea..7b0b1cf 100644 usb_autopm_put_interface(serial->interface); error_get_interface: usb_serial_put(serial); +@@ -194,7 +194,7 @@ static int usb_console_setup(struct console *co, char *options) + static void usb_console_write(struct console *co, + const char *buf, unsigned count) + { +- static struct usbcons_info *info = &usbcons_info; ++ struct usbcons_info *info = &usbcons_info; + struct usb_serial_port *port = info->port; + struct usb_serial *serial; + int retval = -ENODEV; diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h index 75f70f0..d467e1a 100644 --- a/drivers/usb/storage/usb.h @@ -49211,32 +49195,32 @@ index 75f70f0..d467e1a 100644 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */ diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h -index d6bea3e..60b250e 100644 +index cf250c2..ad9d904 100644 --- a/drivers/usb/wusbcore/wa-hc.h +++ b/drivers/usb/wusbcore/wa-hc.h -@@ -192,7 +192,7 @@ struct wahc { - struct list_head xfer_delayed_list; +@@ -199,7 +199,7 @@ struct wahc { spinlock_t xfer_list_lock; - struct work_struct xfer_work; + struct work_struct xfer_enqueue_work; + struct work_struct xfer_error_work; - atomic_t xfer_id_count; + atomic_unchecked_t xfer_id_count; }; -@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa) - INIT_LIST_HEAD(&wa->xfer_delayed_list); +@@ -255,7 +255,7 @@ static inline void wa_init(struct wahc *wa) spin_lock_init(&wa->xfer_list_lock); - INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run); + INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run); + INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run); - atomic_set(&wa->xfer_id_count, 1); + atomic_set_unchecked(&wa->xfer_id_count, 1); } /** diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c -index d3493ca..0c33b7e 100644 +index 3dcf66f..8faaf6e 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c -@@ -297,7 +297,7 @@ out: +@@ -300,7 +300,7 @@ out: */ static void wa_xfer_id_init(struct wa_xfer *xfer) { @@ -49246,7 +49230,7 @@ index d3493ca..0c33b7e 100644 /* diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c -index 842f450..d1d7409 100644 +index 1eab4ac..e21efc9 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -488,7 +488,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev) @@ -49271,6 +49255,19 @@ index 5174eba..86e764a 100644 return 0; } +diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c +index e43401a..dd49b3f 100644 +--- a/drivers/video/arcfb.c ++++ b/drivers/video/arcfb.c +@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf, + return -ENOSPC; + + err = 0; +- if ((count + p) > fbmemlength) { ++ if (count > (fbmemlength - p)) { + count = fbmemlength - p; + err = -ENOSPC; + } diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index a4dfe8c..297ddd9 100644 --- a/drivers/video/aty/aty128fb.c @@ -49365,25 +49362,11 @@ index 900aa4e..6d49418 100644 mutex_destroy(&fbdefio->lock); } EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup); -diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c -index 5c3960d..15cf8fc 100644 ---- a/drivers/video/fbcmap.c -+++ b/drivers/video/fbcmap.c -@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info) - rc = -ENODEV; - goto out; - } -- if (cmap->start < 0 || (!info->fbops->fb_setcolreg && -- !info->fbops->fb_setcmap)) { -+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) { - rc = -EINVAL; - goto out1; - } diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c -index 36e1fe2..c744820 100644 +index dacaf74..8478a46 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c -@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, +@@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dx += image->width + 8; } } else if (rotate == FB_ROTATE_UD) { @@ -49392,7 +49375,7 @@ index 36e1fe2..c744820 100644 info->fbops->fb_imageblit(info, image); image->dx -= image->width + 8; } -@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, +@@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dy += image->height + 8; } } else if (rotate == FB_ROTATE_CCW) { @@ -49401,7 +49384,7 @@ index 36e1fe2..c744820 100644 info->fbops->fb_imageblit(info, image); image->dy -= image->height + 8; } -@@ -1166,7 +1166,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, +@@ -1175,7 +1175,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, return -EFAULT; if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) return -EINVAL; @@ -49411,7 +49394,7 @@ index 36e1fe2..c744820 100644 if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c -index d4d2c5f..ebbd113 100644 +index 8d456dc..b4fa44b 100644 --- a/drivers/video/hyperv_fb.c +++ b/drivers/video/hyperv_fb.c @@ -233,7 +233,7 @@ static uint screen_fb_size; @@ -49445,893 +49428,1613 @@ index 7672d2e..b56437f 100644 par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm -index 285d552..eafa544 100644 +index 3c14e43..2630570 100644 --- a/drivers/video/logo/logo_linux_clut224.ppm +++ b/drivers/video/logo/logo_linux_clut224.ppm -@@ -1,883 +1,1123 @@ - P3 +@@ -2,1603 +2,1123 @@ P3 + # Standard 224-color Linux logo 80 80 255 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 --83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 10 10 10 --10 10 10 6 6 6 6 6 6 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 --105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 26 26 26 30 30 30 34 34 34 --30 30 30 30 30 30 26 26 26 18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 1 0 0 0 --0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 --108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --6 6 6 14 14 14 26 26 26 42 42 42 54 54 54 66 66 66 78 78 78 78 78 78 --78 78 78 74 74 74 66 66 66 54 54 54 42 42 42 26 26 26 18 18 18 10 10 10 --6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 0 0 0 0 0 0 0 0 0 --11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 --108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 --22 22 22 42 42 42 66 66 66 86 86 86 66 66 66 38 38 38 38 38 38 22 22 22 --26 26 26 34 34 34 54 54 54 66 66 66 86 86 86 70 70 70 46 46 46 26 26 26 --14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 7 12 13 21 31 35 42 59 64 --53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 --132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 --1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 --50 50 50 82 82 82 58 58 58 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 54 54 54 86 86 86 66 66 66 --38 38 38 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 --59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 --117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 --7 12 13 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 --78 78 78 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 --78 78 78 46 46 46 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 --6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 --108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 --36 50 56 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 42 42 42 82 82 82 --26 26 26 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 14 14 14 46 46 46 34 34 34 6 6 6 2 2 6 --42 42 42 78 78 78 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 --12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 --117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 --68 78 128 15 22 25 0 0 0 0 0 0 10 10 10 30 30 30 66 66 66 58 58 58 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 26 26 26 86 86 86 101 101 101 46 46 46 10 10 10 --2 2 6 58 58 58 70 70 70 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 --57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 --152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 --95 131 149 53 75 83 11 15 17 0 0 0 14 14 14 42 42 42 86 86 86 10 10 10 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 30 30 30 94 94 94 94 94 94 58 58 58 26 26 26 --2 2 6 6 6 6 78 78 78 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 --86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 --137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 --95 131 149 83 116 129 40 48 73 6 6 6 22 22 22 62 62 62 62 62 62 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 26 26 26 54 54 54 38 38 38 18 18 18 10 10 10 --2 2 6 2 2 6 34 34 34 82 82 82 38 38 38 14 14 14 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 --152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 --94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 --95 131 149 91 118 149 78 102 129 27 40 45 30 30 30 78 78 78 30 30 30 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 10 10 10 10 10 10 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 78 78 78 50 50 50 18 18 18 6 6 6 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 --174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 --79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 --91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 86 86 86 14 14 14 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 54 54 54 66 66 66 26 26 26 6 6 6 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 --174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 --21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 --91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 2 2 6 2 2 6 --2 2 6 6 6 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 6 6 6 14 14 14 10 10 10 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 18 18 18 82 82 82 34 34 34 10 10 10 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 --174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 --12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 --93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 86 86 86 2 2 6 2 2 6 --6 6 6 6 6 6 22 22 22 34 34 34 6 6 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 18 18 18 34 34 34 10 10 10 50 50 50 22 22 22 2 2 6 --2 2 6 2 2 6 2 2 6 10 10 10 86 86 86 42 42 42 14 14 14 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 --123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 --60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 --91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 86 86 86 2 2 6 2 2 6 --38 38 38 116 116 116 94 94 94 22 22 22 22 22 22 2 2 6 2 2 6 2 2 6 --14 14 14 86 86 86 124 131 137 170 170 170 151 151 151 38 38 38 26 26 26 6 6 6 --2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 46 46 46 14 14 14 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 --48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 --68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 --91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 --124 131 137 198 198 198 195 195 195 116 116 116 10 10 10 2 2 6 2 2 6 6 6 6 --101 98 89 187 187 187 210 210 210 218 218 218 214 214 214 124 131 137 14 14 14 6 6 6 --2 2 6 2 2 6 2 2 6 2 2 6 86 86 86 50 50 50 18 18 18 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 --6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 --34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 --73 97 106 36 50 56 33 49 54 18 18 18 46 46 46 86 86 86 2 2 6 54 54 54 --218 218 218 195 195 195 226 226 226 246 246 246 58 58 58 2 2 6 2 2 6 30 30 30 --210 210 210 253 253 253 170 170 170 124 127 131 221 221 221 234 234 234 74 74 74 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 --13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 --26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 --53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 --170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 10 10 10 14 14 14 46 46 46 --231 231 231 190 190 190 6 6 6 70 70 70 90 90 90 238 238 238 151 151 151 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 58 58 58 22 22 22 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 --18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 --17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 --42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 --106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 18 18 18 38 38 38 54 54 54 --221 221 221 106 106 106 2 2 6 14 14 14 46 46 46 190 190 190 198 198 198 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 --63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 --24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 --29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 --124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 --170 170 170 106 106 106 2 2 6 2 2 6 2 2 6 195 195 195 195 195 195 6 6 6 --2 2 6 2 2 6 2 2 6 2 2 6 74 74 74 62 62 62 22 22 22 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 --133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 --51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 --18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 --210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 --220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 70 70 70 66 66 66 26 26 26 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 --175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 --20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 --6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 --195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 --237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 42 42 42 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 74 74 74 30 30 30 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 --175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 --1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 --0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 86 86 86 14 14 14 2 2 6 --121 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 --237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 50 50 50 82 82 82 34 34 34 10 10 10 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 --175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 --21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 82 82 82 30 30 30 62 42 6 --180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 --239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 6 6 6 --2 2 6 2 2 6 2 2 6 2 2 6 26 26 26 94 94 94 42 42 42 14 14 14 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 --175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 --17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 50 50 50 104 69 6 --192 133 9 216 158 10 236 178 12 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 --241 208 19 241 208 19 241 208 19 204 160 10 200 144 11 216 158 10 156 118 10 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 90 90 90 54 54 54 18 18 18 --6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 --149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 --3 5 6 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 --137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 --241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 2 2 6 --6 6 6 54 54 54 14 14 14 2 2 6 2 2 6 62 62 62 74 74 74 30 30 30 --10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 --56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 1 1 1 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 --88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 --171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 101 98 89 2 2 6 --2 2 6 78 78 78 116 116 116 58 58 58 2 2 6 22 22 22 90 90 90 46 46 46 --18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 --8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 50 50 50 6 6 6 --124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 --206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 14 14 14 --2 2 6 22 22 22 116 116 116 116 116 116 22 22 22 2 2 6 74 74 74 70 70 70 --30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 31 45 49 26 35 39 3 5 6 --0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 6 6 6 18 18 18 50 50 50 101 101 101 26 26 26 10 10 10 --124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 --180 123 7 185 146 40 198 179 130 187 187 187 202 202 202 221 221 221 214 214 214 66 66 66 --2 2 6 2 2 6 50 50 50 62 62 62 6 6 6 2 2 6 10 10 10 90 90 90 --50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 15 22 25 36 54 60 18 25 28 --0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 10 10 10 34 34 34 74 74 74 74 74 74 2 2 6 6 6 6 --151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 --168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 --6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 --74 74 74 34 34 34 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 1 1 27 40 45 35 52 58 --18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 10 10 10 22 22 22 54 54 54 94 94 94 18 18 18 2 2 6 46 46 46 --234 234 234 221 221 221 190 190 190 190 190 190 190 190 190 187 187 187 187 187 187 190 190 190 --190 190 190 195 195 195 214 214 214 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 --82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 14 14 14 --86 86 86 54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 12 13 33 49 54 --52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --6 6 6 18 18 18 46 46 46 90 90 90 46 46 46 18 18 18 6 6 6 180 180 180 --253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 --202 202 202 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --202 202 202 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --42 42 42 86 86 86 42 42 42 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 --36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --14 14 14 38 38 38 74 74 74 66 66 66 2 2 6 6 6 6 90 90 90 250 250 250 --253 253 253 253 253 253 238 238 238 198 198 198 190 190 190 190 190 190 195 195 195 221 221 221 --246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 82 82 82 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 78 78 78 70 70 70 34 34 34 14 14 14 6 6 6 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 --34 34 34 66 66 66 78 78 78 6 6 6 2 2 6 18 18 18 218 218 218 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 226 226 226 231 231 231 246 246 246 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 180 180 180 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 18 18 18 90 90 90 62 62 62 30 30 30 10 10 10 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 --58 58 58 90 90 90 18 18 18 2 2 6 2 2 6 106 106 106 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 231 231 231 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 18 18 18 94 94 94 54 54 54 26 26 26 10 10 10 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 50 50 50 --90 90 90 26 26 26 2 2 6 2 2 6 14 14 14 195 195 195 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 242 242 242 54 54 54 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 38 38 38 86 86 86 50 50 50 22 22 22 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 38 38 38 82 82 82 --34 34 34 2 2 6 2 2 6 2 2 6 42 42 42 195 195 195 246 246 246 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 242 242 242 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 246 246 246 238 238 238 --226 226 226 231 231 231 101 101 101 6 6 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 82 82 82 42 42 42 14 14 14 --6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 26 26 26 62 62 62 66 66 66 --2 2 6 2 2 6 2 2 6 6 6 6 70 70 70 170 170 170 202 202 202 234 234 234 --246 246 246 250 250 250 250 250 250 238 238 238 226 226 226 231 231 231 238 238 238 250 250 250 --250 250 250 250 250 250 246 246 246 231 231 231 214 214 214 202 202 202 202 202 202 202 202 202 --198 198 198 202 202 202 180 180 180 18 18 18 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 30 30 30 --10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 82 82 82 18 18 18 --2 2 6 2 2 6 2 2 6 10 10 10 94 94 94 180 180 180 218 218 218 242 242 242 --250 250 250 253 253 253 253 253 253 250 250 250 234 234 234 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 246 246 238 238 238 226 226 226 210 210 210 202 202 202 --195 195 195 195 195 195 210 210 210 151 151 151 6 6 6 14 14 14 50 50 50 14 14 14 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 86 86 86 46 46 46 --18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 35 52 58 6 8 12 0 0 0 --0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 54 54 54 70 70 70 2 2 6 --2 2 6 10 10 10 2 2 6 22 22 22 170 170 170 231 231 231 250 250 250 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 242 242 242 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 --231 231 231 202 202 202 198 198 198 226 226 226 94 94 94 2 2 6 6 6 6 38 38 38 --30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 62 62 66 66 66 --26 26 26 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 6 8 8 33 49 54 29 43 47 6 8 12 --0 0 0 0 0 0 0 0 0 10 10 10 30 30 30 74 74 74 50 50 50 2 2 6 --26 26 26 26 26 26 2 2 6 106 106 106 238 238 238 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 246 246 246 218 218 218 202 202 202 210 210 210 14 14 14 2 2 6 2 2 6 --30 30 30 22 22 22 2 2 6 2 2 6 2 2 6 2 2 6 18 18 18 86 86 86 --42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 12 17 20 33 49 54 17 23 26 --0 0 0 0 0 0 0 0 0 14 14 14 42 42 42 90 90 90 22 22 22 2 2 6 --42 42 42 2 2 6 18 18 18 218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 250 250 250 221 221 221 218 218 218 101 101 101 2 2 6 14 14 14 --18 18 18 38 38 38 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 78 78 78 --58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 15 22 25 36 54 60 --0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 --22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 238 238 238 198 198 198 6 6 6 38 38 38 --58 58 58 26 26 26 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 46 46 46 --78 78 78 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21 30 33 --36 54 60 0 0 0 0 0 0 30 30 30 74 74 74 58 58 58 2 2 6 42 42 42 --2 2 6 22 22 22 231 231 231 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 246 246 246 46 46 46 38 38 38 --42 42 42 14 14 14 38 38 38 14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 --86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --36 54 60 0 0 0 0 0 0 42 42 42 90 90 90 18 18 18 18 18 18 26 26 26 --2 2 6 116 116 116 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 250 250 250 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 94 94 94 6 6 6 --2 2 6 2 2 6 10 10 10 34 34 34 2 2 6 2 2 6 2 2 6 2 2 6 --74 74 74 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 36 54 60 26 26 26 66 66 66 82 82 82 2 2 6 38 38 38 6 6 6 --14 14 14 210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 246 246 246 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 2 2 6 --2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 --42 42 42 74 74 74 30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --6 6 6 36 54 60 21 30 33 90 90 90 26 26 26 6 6 6 42 42 42 2 2 6 --74 74 74 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 242 242 242 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 180 180 180 2 2 6 --2 2 6 2 2 6 2 2 6 46 46 46 2 2 6 2 2 6 2 2 6 2 2 6 --10 10 10 86 86 86 38 38 38 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --10 10 10 26 26 26 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 --151 151 151 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 --2 2 6 2 2 6 2 2 6 38 38 38 2 2 6 2 2 6 2 2 6 2 2 6 --6 6 6 86 86 86 46 46 46 14 14 14 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --18 18 18 46 46 46 86 86 86 36 54 60 2 2 6 34 34 34 10 10 10 6 6 6 --210 210 210 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 221 221 221 6 6 6 --2 2 6 2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 --26 26 26 66 66 66 62 62 62 2 2 6 2 2 6 38 38 38 10 10 10 26 26 26 --238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 231 231 231 6 6 6 --2 2 6 2 2 6 10 10 10 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 --38 38 38 78 78 78 6 6 6 2 2 6 2 2 6 46 46 46 14 14 14 42 42 42 --246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 10 10 10 --2 2 6 2 2 6 22 22 22 14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 --50 50 50 74 74 74 2 2 6 2 2 6 14 14 14 70 70 70 34 34 34 62 62 62 --250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 234 234 234 14 14 14 --2 2 6 2 2 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 66 66 66 62 62 62 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 --54 54 54 62 62 62 2 2 6 2 2 6 2 2 6 30 30 30 46 46 46 70 70 70 --250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 226 226 226 10 10 10 --2 2 6 6 6 6 30 30 30 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 66 66 66 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 --58 58 58 62 62 62 2 2 6 2 2 6 2 2 6 2 2 6 30 30 30 78 78 78 --250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 202 202 202 2 2 6 --22 22 22 34 34 34 20 16 6 22 22 22 26 26 26 18 18 18 6 6 6 2 2 6 --2 2 6 82 82 82 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 26 26 26 --62 62 62 106 106 106 63 55 20 184 138 11 204 160 10 121 92 8 6 6 6 62 62 62 --238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 151 151 151 18 18 18 --14 14 14 2 2 6 2 2 6 2 2 6 6 6 6 18 18 18 66 66 66 38 38 38 --6 6 6 94 94 94 50 50 50 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 6 6 6 10 10 10 10 10 10 18 18 18 38 38 38 --78 78 78 138 132 106 216 158 10 242 186 14 246 190 14 246 190 14 156 118 10 10 10 10 --90 90 90 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 246 230 190 214 187 87 214 187 87 185 146 40 35 31 12 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 38 38 38 46 46 46 --26 26 26 106 106 106 54 54 54 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 6 6 6 14 14 14 22 22 22 30 30 30 38 38 38 50 50 50 70 70 70 --106 106 106 185 146 40 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 154 114 10 --6 6 6 74 74 74 226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 231 231 231 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 --204 160 10 165 152 80 66 66 66 26 26 26 6 6 6 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --6 6 6 18 18 18 38 38 38 58 58 58 78 78 78 86 86 86 101 101 101 124 127 131 --174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 --98 70 6 2 2 6 46 46 46 198 198 198 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 234 234 234 242 242 242 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 214 187 87 242 186 14 241 196 14 204 160 10 20 16 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 121 92 8 --238 202 15 232 195 16 82 82 82 34 34 34 10 10 10 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --14 14 14 38 38 38 70 70 70 148 132 55 185 146 40 200 144 11 197 138 11 197 138 11 --213 154 11 226 170 11 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 250 250 250 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 250 250 250 242 242 242 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 --237 188 10 237 188 10 113 101 86 42 42 42 14 14 14 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --22 22 22 54 54 54 148 132 55 213 154 11 226 170 11 230 174 11 226 170 11 226 170 11 --236 178 12 242 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --241 196 14 184 138 11 10 10 10 2 2 6 6 6 6 116 116 116 242 242 242 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 231 231 231 198 198 198 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 --20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 6 200 144 11 236 178 12 --239 182 13 239 182 13 124 112 88 58 58 58 22 22 22 6 6 6 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 --30 30 30 70 70 70 169 125 40 226 170 11 239 182 13 242 186 14 242 186 14 246 186 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 232 195 16 98 70 6 2 2 6 2 2 6 2 2 6 66 66 66 221 221 221 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 --163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 --242 186 14 242 186 14 165 152 80 78 78 78 34 34 34 14 14 14 6 6 6 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --30 30 30 78 78 78 185 146 40 226 170 11 239 182 13 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 241 196 14 204 160 10 20 16 6 2 2 6 2 2 6 2 2 6 38 38 38 --218 218 218 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 202 202 202 198 198 198 213 164 39 226 170 11 236 178 12 224 166 10 210 150 10 --200 144 11 197 138 11 192 133 9 197 138 11 210 150 10 226 170 11 242 186 14 246 190 14 --246 190 14 246 186 14 220 174 15 124 112 88 62 62 62 30 30 30 14 14 14 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 --30 30 30 78 78 78 174 140 55 224 166 10 239 182 13 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 241 196 14 139 102 15 2 2 6 2 2 6 2 2 6 2 2 6 --78 78 78 250 250 250 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --250 250 250 214 214 214 198 198 198 185 146 40 219 162 10 236 178 12 234 174 13 224 166 10 --216 158 10 213 154 11 213 154 11 216 158 10 226 170 11 239 182 13 246 190 14 246 190 14 --246 190 14 246 190 14 242 186 14 213 164 39 101 101 101 58 58 58 30 30 30 14 14 14 --6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 --30 30 30 74 74 74 174 140 55 216 158 10 236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 241 196 14 230 187 11 62 42 6 2 2 6 2 2 6 2 2 6 --22 22 22 238 238 238 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 226 226 226 187 187 187 169 125 40 216 158 10 236 178 12 239 182 13 236 178 12 --230 174 11 226 170 11 226 170 11 230 174 11 236 178 12 242 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 186 14 239 182 13 213 164 39 106 106 106 66 66 66 34 34 34 --14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --26 26 26 70 70 70 149 139 69 213 154 11 236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 241 196 14 190 146 13 20 16 6 2 2 6 2 2 6 --46 46 46 246 246 246 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 221 221 221 86 86 86 156 107 11 216 158 10 236 178 12 242 186 14 246 186 14 --242 186 14 239 182 13 239 182 13 242 186 14 242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 220 174 15 149 139 69 66 66 66 --30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --26 26 26 70 70 70 149 139 69 210 150 10 236 178 12 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 121 92 8 34 34 34 106 106 106 --221 221 221 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --242 242 242 82 82 82 20 16 6 163 110 8 216 158 10 236 178 12 242 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 149 139 69 --46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 --30 30 30 78 78 78 149 139 69 210 150 10 236 178 12 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 241 196 14 220 174 15 198 179 130 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 218 218 218 --58 58 58 2 2 6 20 16 6 167 114 7 216 158 10 236 178 12 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 242 186 14 185 146 40 --54 54 54 22 22 22 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 --38 38 38 86 86 86 169 125 40 213 154 11 236 178 12 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 232 195 16 190 146 13 214 214 214 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 250 250 250 170 170 170 26 26 26 --2 2 6 2 2 6 35 31 12 163 110 8 219 162 10 239 182 13 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 224 166 10 149 139 69 --46 46 46 18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 --50 50 50 113 101 86 192 133 9 224 166 10 242 186 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 230 187 11 204 160 10 133 118 54 --226 226 226 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 --253 253 253 253 253 253 253 253 253 253 253 253 198 198 198 66 66 66 2 2 6 2 2 6 --2 2 6 2 2 6 62 42 6 156 107 11 219 162 10 239 182 13 246 186 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 242 186 14 234 174 13 213 154 11 148 132 55 66 66 66 --30 30 30 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 --58 58 58 148 132 55 206 145 10 234 174 13 242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 236 178 12 204 160 10 163 110 8 --62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 --242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 62 42 6 163 110 8 216 158 10 236 178 12 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 239 182 13 230 174 11 216 158 10 185 146 40 124 112 88 70 70 70 38 38 38 --18 18 18 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 22 22 22 --62 62 62 169 125 40 206 145 10 224 166 10 236 178 12 239 182 13 242 186 14 242 186 14 --246 186 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 236 178 12 216 158 10 171 120 8 --85 57 6 2 2 6 6 6 6 30 30 30 54 54 54 62 62 62 50 50 50 38 38 38 --14 14 14 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 6 6 6 85 57 6 167 114 7 213 154 11 236 178 12 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 190 14 242 186 14 239 182 13 239 182 13 --230 174 11 210 150 10 174 140 55 124 112 88 82 82 82 54 54 54 34 34 34 18 18 18 --6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 18 18 18 --50 50 50 169 125 40 192 133 9 200 144 11 216 158 10 219 162 10 224 166 10 226 170 11 --230 174 11 236 178 12 239 182 13 239 182 13 242 186 14 246 186 14 246 190 14 246 190 14 --246 190 14 246 190 14 246 190 14 246 190 14 246 186 14 230 174 11 210 150 10 163 110 8 --104 69 6 10 10 10 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 6 6 6 85 57 6 167 114 7 206 145 10 230 174 11 242 186 14 246 190 14 --246 190 14 246 190 14 246 186 14 242 186 14 239 182 13 230 174 11 224 166 10 213 154 11 --169 125 40 124 112 88 86 86 86 58 58 58 38 38 38 22 22 22 10 10 10 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 14 14 --34 34 34 70 70 70 133 118 54 169 125 40 167 114 7 180 123 7 192 133 9 197 138 11 --200 144 11 206 145 10 213 154 11 219 162 10 224 166 10 230 174 11 239 182 13 242 186 14 --246 186 14 246 186 14 246 186 14 246 186 14 239 182 13 216 158 10 184 138 11 152 99 6 --104 69 6 20 16 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 --2 2 6 6 6 6 85 57 6 152 99 6 192 133 9 219 162 10 236 178 12 239 182 13 --246 186 14 242 186 14 239 182 13 236 178 12 224 166 10 206 145 10 192 133 9 148 132 55 --94 94 94 62 62 62 42 42 42 22 22 22 14 14 14 6 6 6 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --18 18 18 34 34 34 58 58 58 78 78 78 101 98 89 124 112 88 133 118 54 156 107 11 --163 110 8 167 114 7 171 120 8 180 123 7 184 138 11 197 138 11 210 150 10 219 162 10 --226 170 11 236 178 12 236 178 12 234 174 13 219 162 10 197 138 11 163 110 8 134 84 6 --85 57 6 10 10 10 2 2 6 2 2 6 18 18 18 38 38 38 38 38 38 38 38 38 --38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 38 26 26 26 2 2 6 --2 2 6 6 6 6 62 42 6 137 92 6 171 120 8 200 144 11 219 162 10 230 174 11 --234 174 13 230 174 11 219 162 10 210 150 10 192 133 9 163 110 8 124 112 88 82 82 82 --50 50 50 30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --6 6 6 14 14 14 22 22 22 34 34 34 42 42 42 58 58 58 74 74 74 86 86 86 --101 98 89 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 --184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 --62 42 6 54 54 54 106 106 106 101 98 89 86 86 86 82 82 82 78 78 78 78 78 78 --78 78 78 78 78 78 78 78 78 78 78 78 78 78 78 82 82 82 86 86 86 94 94 94 --106 106 106 101 101 101 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 --206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 70 70 70 42 42 42 --22 22 22 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 6 6 6 10 10 10 14 14 14 22 22 22 30 30 30 38 38 38 --50 50 50 62 62 62 74 74 74 90 90 90 101 98 89 113 101 86 121 92 8 120 80 7 --137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 --101 98 89 82 82 82 58 58 58 46 46 46 38 38 38 34 34 34 34 34 34 34 34 34 --34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 34 38 38 38 42 42 42 --54 54 54 82 82 82 94 86 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 --171 120 8 167 114 7 152 99 6 121 92 8 101 98 89 62 62 62 34 34 34 18 18 18 --6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 10 10 10 --18 18 18 22 22 22 30 30 30 42 42 42 50 50 50 66 66 66 86 86 86 101 98 89 --94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 90 90 90 --62 62 62 38 38 38 22 22 22 14 14 14 10 10 10 10 10 10 10 10 10 10 10 10 --10 10 10 10 10 10 6 6 6 10 10 10 10 10 10 10 10 10 10 10 10 14 14 14 --22 22 22 42 42 42 70 70 70 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 --134 84 6 120 80 7 94 86 71 86 86 86 58 58 58 30 30 30 14 14 14 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 6 6 6 10 10 10 14 14 14 18 18 18 26 26 26 38 38 38 54 54 54 --70 70 70 86 86 86 94 86 71 94 86 71 94 86 71 86 86 86 74 74 74 50 50 50 --30 30 30 14 14 14 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --6 6 6 18 18 18 34 34 34 58 58 58 82 82 82 94 86 71 94 86 71 94 86 71 --94 86 71 94 86 71 74 74 74 50 50 50 26 26 26 14 14 14 6 6 6 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 6 6 6 14 14 14 18 18 18 --30 30 30 38 38 38 46 46 46 54 54 54 50 50 50 42 42 42 30 30 30 18 18 18 --10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 6 6 6 14 14 14 26 26 26 38 38 38 50 50 50 58 58 58 58 58 58 --54 54 54 42 42 42 30 30 30 18 18 18 10 10 10 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 6 6 --6 6 6 10 10 10 14 14 14 18 18 18 18 18 18 14 14 14 10 10 10 6 6 6 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 6 6 6 14 14 14 18 18 18 22 22 22 22 22 22 --18 18 18 14 14 14 10 10 10 6 6 6 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 --0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 6 6 6 10 10 10 10 10 10 +- 10 10 10 6 6 6 6 6 6 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 10 10 10 14 14 14 +- 22 22 22 26 26 26 30 30 30 34 34 34 +- 30 30 30 30 30 30 26 26 26 18 18 18 +- 14 14 14 10 10 10 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 26 26 26 42 42 42 +- 54 54 54 66 66 66 78 78 78 78 78 78 +- 78 78 78 74 74 74 66 66 66 54 54 54 +- 42 42 42 26 26 26 18 18 18 10 10 10 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 22 22 22 42 42 42 66 66 66 86 86 86 +- 66 66 66 38 38 38 38 38 38 22 22 22 +- 26 26 26 34 34 34 54 54 54 66 66 66 +- 86 86 86 70 70 70 46 46 46 26 26 26 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 26 26 26 +- 50 50 50 82 82 82 58 58 58 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 54 54 54 86 86 86 66 66 66 +- 38 38 38 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 22 22 22 50 50 50 +- 78 78 78 34 34 34 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 6 6 6 70 70 70 +- 78 78 78 46 46 46 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 42 42 42 82 82 82 +- 26 26 26 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 14 14 14 +- 46 46 46 34 34 34 6 6 6 2 2 6 +- 42 42 42 78 78 78 42 42 42 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 10 10 10 30 30 30 66 66 66 58 58 58 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 26 26 26 +- 86 86 86 101 101 101 46 46 46 10 10 10 +- 2 2 6 58 58 58 70 70 70 34 34 34 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 14 14 14 42 42 42 86 86 86 10 10 10 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 30 30 30 +- 94 94 94 94 94 94 58 58 58 26 26 26 +- 2 2 6 6 6 6 78 78 78 54 54 54 +- 22 22 22 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 22 22 22 62 62 62 62 62 62 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 26 26 26 +- 54 54 54 38 38 38 18 18 18 10 10 10 +- 2 2 6 2 2 6 34 34 34 82 82 82 +- 38 38 38 14 14 14 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 30 30 30 78 78 78 30 30 30 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 10 10 10 +- 10 10 10 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 78 78 78 +- 50 50 50 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 86 86 86 14 14 14 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 54 54 54 +- 66 66 66 26 26 26 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 82 82 82 2 2 6 2 2 6 +- 2 2 6 6 6 6 10 10 10 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 6 6 6 +- 14 14 14 10 10 10 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 18 18 18 +- 82 82 82 34 34 34 10 10 10 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 2 2 6 +- 6 6 6 6 6 6 22 22 22 34 34 34 +- 6 6 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 18 18 18 34 34 34 +- 10 10 10 50 50 50 22 22 22 2 2 6 +- 2 2 6 2 2 6 2 2 6 10 10 10 +- 86 86 86 42 42 42 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 2 2 6 +- 38 38 38 116 116 116 94 94 94 22 22 22 +- 22 22 22 2 2 6 2 2 6 2 2 6 +- 14 14 14 86 86 86 138 138 138 162 162 162 +-154 154 154 38 38 38 26 26 26 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 86 86 86 46 46 46 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 14 14 14 +-134 134 134 198 198 198 195 195 195 116 116 116 +- 10 10 10 2 2 6 2 2 6 6 6 6 +-101 98 89 187 187 187 210 210 210 218 218 218 +-214 214 214 134 134 134 14 14 14 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 86 86 86 50 50 50 18 18 18 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 86 86 86 2 2 6 54 54 54 +-218 218 218 195 195 195 226 226 226 246 246 246 +- 58 58 58 2 2 6 2 2 6 30 30 30 +-210 210 210 253 253 253 174 174 174 123 123 123 +-221 221 221 234 234 234 74 74 74 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 70 70 70 58 58 58 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 46 46 46 82 82 82 2 2 6 106 106 106 +-170 170 170 26 26 26 86 86 86 226 226 226 +-123 123 123 10 10 10 14 14 14 46 46 46 +-231 231 231 190 190 190 6 6 6 70 70 70 +- 90 90 90 238 238 238 158 158 158 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 70 70 70 58 58 58 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 0 +- 0 0 1 0 0 1 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 86 86 86 6 6 6 116 116 116 +-106 106 106 6 6 6 70 70 70 149 149 149 +-128 128 128 18 18 18 38 38 38 54 54 54 +-221 221 221 106 106 106 2 2 6 14 14 14 +- 46 46 46 190 190 190 198 198 198 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 74 74 74 62 62 62 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 0 +- 0 0 1 0 0 0 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 94 94 94 14 14 14 101 101 101 +-128 128 128 2 2 6 18 18 18 116 116 116 +-118 98 46 121 92 8 121 92 8 98 78 10 +-162 162 162 106 106 106 2 2 6 2 2 6 +- 2 2 6 195 195 195 195 195 195 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 74 74 74 62 62 62 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 1 0 0 1 +- 0 0 1 0 0 0 0 0 1 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 90 90 90 14 14 14 58 58 58 +-210 210 210 26 26 26 54 38 6 154 114 10 +-226 170 11 236 186 11 225 175 15 184 144 12 +-215 174 15 175 146 61 37 26 9 2 2 6 +- 70 70 70 246 246 246 138 138 138 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 70 70 70 66 66 66 26 26 26 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 86 86 86 14 14 14 10 10 10 +-195 195 195 188 164 115 192 133 9 225 175 15 +-239 182 13 234 190 10 232 195 16 232 200 30 +-245 207 45 241 208 19 232 195 16 184 144 12 +-218 194 134 211 206 186 42 42 42 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 50 50 50 74 74 74 30 30 30 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 34 34 34 86 86 86 14 14 14 2 2 6 +-121 87 25 192 133 9 219 162 10 239 182 13 +-236 186 11 232 195 16 241 208 19 244 214 54 +-246 218 60 246 218 38 246 215 20 241 208 19 +-241 208 19 226 184 13 121 87 25 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 50 50 50 82 82 82 34 34 34 10 10 10 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 34 34 34 82 82 82 30 30 30 61 42 6 +-180 123 7 206 145 10 230 174 11 239 182 13 +-234 190 10 238 202 15 241 208 19 246 218 74 +-246 218 38 246 215 20 246 215 20 246 215 20 +-226 184 13 215 174 15 184 144 12 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 26 26 26 94 94 94 42 42 42 14 14 14 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 50 50 50 104 69 6 +-192 133 9 216 158 10 236 178 12 236 186 11 +-232 195 16 241 208 19 244 214 54 245 215 43 +-246 215 20 246 215 20 241 208 19 198 155 10 +-200 144 11 216 158 10 156 118 10 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 90 90 90 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 46 46 46 22 22 22 +-137 92 6 210 162 10 239 182 13 238 190 10 +-238 202 15 241 208 19 246 215 20 246 215 20 +-241 208 19 203 166 17 185 133 11 210 150 10 +-216 158 10 210 150 10 102 78 10 2 2 6 +- 6 6 6 54 54 54 14 14 14 2 2 6 +- 2 2 6 62 62 62 74 74 74 30 30 30 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 34 34 34 78 78 78 50 50 50 6 6 6 +- 94 70 30 139 102 15 190 146 13 226 184 13 +-232 200 30 232 195 16 215 174 15 190 146 13 +-168 122 10 192 133 9 210 150 10 213 154 11 +-202 150 34 182 157 106 101 98 89 2 2 6 +- 2 2 6 78 78 78 116 116 116 58 58 58 +- 2 2 6 22 22 22 90 90 90 46 46 46 +- 18 18 18 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 86 86 86 50 50 50 6 6 6 +-128 128 128 174 154 114 156 107 11 168 122 10 +-198 155 10 184 144 12 197 138 11 200 144 11 +-206 145 10 206 145 10 197 138 11 188 164 115 +-195 195 195 198 198 198 174 174 174 14 14 14 +- 2 2 6 22 22 22 116 116 116 116 116 116 +- 22 22 22 2 2 6 74 74 74 70 70 70 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 101 101 101 26 26 26 10 10 10 +-138 138 138 190 190 190 174 154 114 156 107 11 +-197 138 11 200 144 11 197 138 11 192 133 9 +-180 123 7 190 142 34 190 178 144 187 187 187 +-202 202 202 221 221 221 214 214 214 66 66 66 +- 2 2 6 2 2 6 50 50 50 62 62 62 +- 6 6 6 2 2 6 10 10 10 90 90 90 +- 50 50 50 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 34 34 34 +- 74 74 74 74 74 74 2 2 6 6 6 6 +-144 144 144 198 198 198 190 190 190 178 166 146 +-154 121 60 156 107 11 156 107 11 168 124 44 +-174 154 114 187 187 187 190 190 190 210 210 210 +-246 246 246 253 253 253 253 253 253 182 182 182 +- 6 6 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 62 62 62 +- 74 74 74 34 34 34 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 10 10 10 22 22 22 54 54 54 +- 94 94 94 18 18 18 2 2 6 46 46 46 +-234 234 234 221 221 221 190 190 190 190 190 190 +-190 190 190 187 187 187 187 187 187 190 190 190 +-190 190 190 195 195 195 214 214 214 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +- 82 82 82 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 14 14 14 +- 86 86 86 54 54 54 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 46 46 46 90 90 90 +- 46 46 46 18 18 18 6 6 6 182 182 182 +-253 253 253 246 246 246 206 206 206 190 190 190 +-190 190 190 190 190 190 190 190 190 190 190 190 +-206 206 206 231 231 231 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-202 202 202 14 14 14 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 42 42 42 86 86 86 42 42 42 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 14 14 14 38 38 38 74 74 74 66 66 66 +- 2 2 6 6 6 6 90 90 90 250 250 250 +-253 253 253 253 253 253 238 238 238 198 198 198 +-190 190 190 190 190 190 195 195 195 221 221 221 +-246 246 246 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 82 82 82 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 78 78 78 70 70 70 34 34 34 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 34 34 34 66 66 66 78 78 78 6 6 6 +- 2 2 6 18 18 18 218 218 218 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 +-226 226 226 231 231 231 246 246 246 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 178 178 178 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 18 18 18 90 90 90 62 62 62 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 26 26 26 +- 58 58 58 90 90 90 18 18 18 2 2 6 +- 2 2 6 110 110 110 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 231 231 231 18 18 18 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 18 18 18 94 94 94 +- 54 54 54 26 26 26 10 10 10 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 22 22 22 50 50 50 +- 90 90 90 26 26 26 2 2 6 2 2 6 +- 14 14 14 195 195 195 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 242 242 242 54 54 54 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 38 38 38 +- 86 86 86 50 50 50 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 38 38 38 82 82 82 +- 34 34 34 2 2 6 2 2 6 2 2 6 +- 42 42 42 195 195 195 246 246 246 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-242 242 242 242 242 242 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 250 250 250 246 246 246 238 238 238 +-226 226 226 231 231 231 101 101 101 6 6 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 38 38 38 82 82 82 42 42 42 14 14 14 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 10 10 10 26 26 26 62 62 62 66 66 66 +- 2 2 6 2 2 6 2 2 6 6 6 6 +- 70 70 70 170 170 170 206 206 206 234 234 234 +-246 246 246 250 250 250 250 250 250 238 238 238 +-226 226 226 231 231 231 238 238 238 250 250 250 +-250 250 250 250 250 250 246 246 246 231 231 231 +-214 214 214 206 206 206 202 202 202 202 202 202 +-198 198 198 202 202 202 182 182 182 18 18 18 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 62 62 62 66 66 66 30 30 30 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 14 14 14 42 42 42 82 82 82 18 18 18 +- 2 2 6 2 2 6 2 2 6 10 10 10 +- 94 94 94 182 182 182 218 218 218 242 242 242 +-250 250 250 253 253 253 253 253 253 250 250 250 +-234 234 234 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 +-238 238 238 226 226 226 210 210 210 202 202 202 +-195 195 195 195 195 195 210 210 210 158 158 158 +- 6 6 6 14 14 14 50 50 50 14 14 14 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 86 86 86 46 46 46 +- 18 18 18 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 22 22 22 54 54 54 70 70 70 2 2 6 +- 2 2 6 10 10 10 2 2 6 22 22 22 +-166 166 166 231 231 231 250 250 250 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-242 242 242 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 246 246 +-231 231 231 206 206 206 198 198 198 226 226 226 +- 94 94 94 2 2 6 6 6 6 38 38 38 +- 30 30 30 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 62 62 62 66 66 66 +- 26 26 26 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 74 74 74 50 50 50 2 2 6 +- 26 26 26 26 26 26 2 2 6 106 106 106 +-238 238 238 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 246 246 246 218 218 218 202 202 202 +-210 210 210 14 14 14 2 2 6 2 2 6 +- 30 30 30 22 22 22 2 2 6 2 2 6 +- 2 2 6 2 2 6 18 18 18 86 86 86 +- 42 42 42 14 14 14 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 42 42 42 90 90 90 22 22 22 2 2 6 +- 42 42 42 2 2 6 18 18 18 218 218 218 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 250 250 250 221 221 221 +-218 218 218 101 101 101 2 2 6 14 14 14 +- 18 18 18 38 38 38 10 10 10 2 2 6 +- 2 2 6 2 2 6 2 2 6 78 78 78 +- 58 58 58 22 22 22 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 54 54 54 82 82 82 2 2 6 26 26 26 +- 22 22 22 2 2 6 123 123 123 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-238 238 238 198 198 198 6 6 6 38 38 38 +- 58 58 58 26 26 26 38 38 38 2 2 6 +- 2 2 6 2 2 6 2 2 6 46 46 46 +- 78 78 78 30 30 30 10 10 10 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 10 10 10 30 30 30 +- 74 74 74 58 58 58 2 2 6 42 42 42 +- 2 2 6 22 22 22 231 231 231 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 250 250 250 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 246 246 246 46 46 46 38 38 38 +- 42 42 42 14 14 14 38 38 38 14 14 14 +- 2 2 6 2 2 6 2 2 6 6 6 6 +- 86 86 86 46 46 46 14 14 14 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 14 14 14 42 42 42 +- 90 90 90 18 18 18 18 18 18 26 26 26 +- 2 2 6 116 116 116 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 250 250 250 238 238 238 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 94 94 94 6 6 6 +- 2 2 6 2 2 6 10 10 10 34 34 34 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 74 74 74 58 58 58 22 22 22 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 10 10 10 26 26 26 66 66 66 +- 82 82 82 2 2 6 38 38 38 6 6 6 +- 14 14 14 210 210 210 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 246 246 246 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 144 144 144 2 2 6 +- 2 2 6 2 2 6 2 2 6 46 46 46 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 42 42 42 74 74 74 30 30 30 10 10 10 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 42 42 42 90 90 90 +- 26 26 26 6 6 6 42 42 42 2 2 6 +- 74 74 74 250 250 250 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 242 242 242 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 182 182 182 2 2 6 +- 2 2 6 2 2 6 2 2 6 46 46 46 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 10 10 10 86 86 86 38 38 38 10 10 10 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 10 10 10 26 26 26 66 66 66 82 82 82 +- 2 2 6 22 22 22 18 18 18 2 2 6 +-149 149 149 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 206 206 206 2 2 6 +- 2 2 6 2 2 6 2 2 6 38 38 38 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 86 86 86 46 46 46 14 14 14 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 18 18 18 46 46 46 86 86 86 18 18 18 +- 2 2 6 34 34 34 10 10 10 6 6 6 +-210 210 210 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 221 221 221 6 6 6 +- 2 2 6 2 2 6 6 6 6 30 30 30 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 82 82 82 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 26 26 26 66 66 66 62 62 62 2 2 6 +- 2 2 6 38 38 38 10 10 10 26 26 26 +-238 238 238 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 238 238 238 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 6 6 6 +- 2 2 6 2 2 6 10 10 10 30 30 30 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 58 58 58 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 38 38 38 78 78 78 6 6 6 2 2 6 +- 2 2 6 46 46 46 14 14 14 42 42 42 +-246 246 246 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 10 10 10 +- 2 2 6 2 2 6 22 22 22 14 14 14 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 62 62 62 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 74 74 74 2 2 6 2 2 6 +- 14 14 14 70 70 70 34 34 34 62 62 62 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 14 14 14 +- 2 2 6 2 2 6 30 30 30 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 62 62 62 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 54 54 54 62 62 62 2 2 6 2 2 6 +- 2 2 6 30 30 30 46 46 46 70 70 70 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 226 226 226 10 10 10 +- 2 2 6 6 6 6 30 30 30 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 66 66 66 58 58 58 22 22 22 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 22 22 22 +- 58 58 58 62 62 62 2 2 6 2 2 6 +- 2 2 6 2 2 6 30 30 30 78 78 78 +-250 250 250 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 206 206 206 2 2 6 +- 22 22 22 34 34 34 18 14 6 22 22 22 +- 26 26 26 18 18 18 6 6 6 2 2 6 +- 2 2 6 82 82 82 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 26 26 26 +- 62 62 62 106 106 106 74 54 14 185 133 11 +-210 162 10 121 92 8 6 6 6 62 62 62 +-238 238 238 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 246 246 246 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 158 158 158 18 18 18 +- 14 14 14 2 2 6 2 2 6 2 2 6 +- 6 6 6 18 18 18 66 66 66 38 38 38 +- 6 6 6 94 94 94 50 50 50 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 10 10 10 10 10 10 18 18 18 38 38 38 +- 78 78 78 142 134 106 216 158 10 242 186 14 +-246 190 14 246 190 14 156 118 10 10 10 10 +- 90 90 90 238 238 238 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 250 250 250 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 246 230 190 +-238 204 91 238 204 91 181 142 44 37 26 9 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 38 38 38 46 46 46 +- 26 26 26 106 106 106 54 54 54 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 14 14 14 22 22 22 +- 30 30 30 38 38 38 50 50 50 70 70 70 +-106 106 106 190 142 34 226 170 11 242 186 14 +-246 190 14 246 190 14 246 190 14 154 114 10 +- 6 6 6 74 74 74 226 226 226 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 231 231 231 250 250 250 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 228 184 62 +-241 196 14 241 208 19 232 195 16 38 30 10 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 30 30 30 26 26 26 +-203 166 17 154 142 90 66 66 66 26 26 26 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 38 38 38 58 58 58 +- 78 78 78 86 86 86 101 101 101 123 123 123 +-175 146 61 210 150 10 234 174 13 246 186 14 +-246 190 14 246 190 14 246 190 14 238 190 10 +-102 78 10 2 2 6 46 46 46 198 198 198 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 234 234 234 242 242 242 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 224 178 62 +-242 186 14 241 196 14 210 166 10 22 18 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 6 6 6 121 92 8 +-238 202 15 232 195 16 82 82 82 34 34 34 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 14 14 14 38 38 38 70 70 70 154 122 46 +-190 142 34 200 144 11 197 138 11 197 138 11 +-213 154 11 226 170 11 242 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-225 175 15 46 32 6 2 2 6 22 22 22 +-158 158 158 250 250 250 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 250 250 250 242 242 242 224 178 62 +-239 182 13 236 186 11 213 154 11 46 32 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 61 42 6 225 175 15 +-238 190 10 236 186 11 112 100 78 42 42 42 +- 14 14 14 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 22 22 22 54 54 54 154 122 46 213 154 11 +-226 170 11 230 174 11 226 170 11 226 170 11 +-236 178 12 242 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-241 196 14 184 144 12 10 10 10 2 2 6 +- 6 6 6 116 116 116 242 242 242 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 231 231 231 198 198 198 214 170 54 +-236 178 12 236 178 12 210 150 10 137 92 6 +- 18 14 6 2 2 6 2 2 6 2 2 6 +- 6 6 6 70 47 6 200 144 11 236 178 12 +-239 182 13 239 182 13 124 112 88 58 58 58 +- 22 22 22 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 70 70 70 180 133 36 226 170 11 +-239 182 13 242 186 14 242 186 14 246 186 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 232 195 16 98 70 6 2 2 6 +- 2 2 6 2 2 6 66 66 66 221 221 221 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 206 206 206 198 198 198 214 166 58 +-230 174 11 230 174 11 216 158 10 192 133 9 +-163 110 8 116 81 8 102 78 10 116 81 8 +-167 114 7 197 138 11 226 170 11 239 182 13 +-242 186 14 242 186 14 162 146 94 78 78 78 +- 34 34 34 14 14 14 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 30 30 30 78 78 78 190 142 34 226 170 11 +-239 182 13 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 241 196 14 203 166 17 22 18 6 +- 2 2 6 2 2 6 2 2 6 38 38 38 +-218 218 218 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 206 206 206 198 198 198 202 162 69 +-226 170 11 236 178 12 224 166 10 210 150 10 +-200 144 11 197 138 11 192 133 9 197 138 11 +-210 150 10 226 170 11 242 186 14 246 190 14 +-246 190 14 246 186 14 225 175 15 124 112 88 +- 62 62 62 30 30 30 14 14 14 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 174 135 50 224 166 10 +-239 182 13 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 241 196 14 139 102 15 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 78 78 78 250 250 250 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-250 250 250 214 214 214 198 198 198 190 150 46 +-219 162 10 236 178 12 234 174 13 224 166 10 +-216 158 10 213 154 11 213 154 11 216 158 10 +-226 170 11 239 182 13 246 190 14 246 190 14 +-246 190 14 246 190 14 242 186 14 206 162 42 +-101 101 101 58 58 58 30 30 30 14 14 14 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 74 74 74 174 135 50 216 158 10 +-236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 241 196 14 226 184 13 +- 61 42 6 2 2 6 2 2 6 2 2 6 +- 22 22 22 238 238 238 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 226 226 226 187 187 187 180 133 36 +-216 158 10 236 178 12 239 182 13 236 178 12 +-230 174 11 226 170 11 226 170 11 230 174 11 +-236 178 12 242 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 186 14 239 182 13 +-206 162 42 106 106 106 66 66 66 34 34 34 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 26 26 26 70 70 70 163 133 67 213 154 11 +-236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 241 196 14 +-190 146 13 18 14 6 2 2 6 2 2 6 +- 46 46 46 246 246 246 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 221 221 221 86 86 86 156 107 11 +-216 158 10 236 178 12 242 186 14 246 186 14 +-242 186 14 239 182 13 239 182 13 242 186 14 +-242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-242 186 14 225 175 15 142 122 72 66 66 66 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 26 26 26 70 70 70 163 133 67 210 150 10 +-236 178 12 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-232 195 16 121 92 8 34 34 34 106 106 106 +-221 221 221 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-242 242 242 82 82 82 18 14 6 163 110 8 +-216 158 10 236 178 12 242 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 242 186 14 163 133 67 +- 46 46 46 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 10 10 10 +- 30 30 30 78 78 78 163 133 67 210 150 10 +-236 178 12 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-241 196 14 215 174 15 190 178 144 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 218 218 218 +- 58 58 58 2 2 6 22 18 6 167 114 7 +-216 158 10 236 178 12 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 186 14 242 186 14 190 150 46 +- 54 54 54 22 22 22 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 38 38 38 86 86 86 180 133 36 213 154 11 +-236 178 12 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 232 195 16 190 146 13 214 214 214 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 250 250 250 170 170 170 26 26 26 +- 2 2 6 2 2 6 37 26 9 163 110 8 +-219 162 10 239 182 13 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 186 14 236 178 12 224 166 10 142 122 72 +- 46 46 46 18 18 18 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 109 106 95 192 133 9 224 166 10 +-242 186 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-242 186 14 226 184 13 210 162 10 142 110 46 +-226 226 226 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-253 253 253 253 253 253 253 253 253 253 253 253 +-198 198 198 66 66 66 2 2 6 2 2 6 +- 2 2 6 2 2 6 50 34 6 156 107 11 +-219 162 10 239 182 13 246 186 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 242 186 14 +-234 174 13 213 154 11 154 122 46 66 66 66 +- 30 30 30 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 22 22 22 +- 58 58 58 154 121 60 206 145 10 234 174 13 +-242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 186 14 236 178 12 210 162 10 163 110 8 +- 61 42 6 138 138 138 218 218 218 250 250 250 +-253 253 253 253 253 253 253 253 253 250 250 250 +-242 242 242 210 210 210 144 144 144 66 66 66 +- 6 6 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 61 42 6 163 110 8 +-216 158 10 236 178 12 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 239 182 13 230 174 11 216 158 10 +-190 142 34 124 112 88 70 70 70 38 38 38 +- 18 18 18 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 22 22 22 +- 62 62 62 168 124 44 206 145 10 224 166 10 +-236 178 12 239 182 13 242 186 14 242 186 14 +-246 186 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 236 178 12 216 158 10 175 118 6 +- 80 54 7 2 2 6 6 6 6 30 30 30 +- 54 54 54 62 62 62 50 50 50 38 38 38 +- 14 14 14 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 80 54 7 167 114 7 +-213 154 11 236 178 12 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 190 14 242 186 14 239 182 13 239 182 13 +-230 174 11 210 150 10 174 135 50 124 112 88 +- 82 82 82 54 54 54 34 34 34 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 18 18 18 +- 50 50 50 158 118 36 192 133 9 200 144 11 +-216 158 10 219 162 10 224 166 10 226 170 11 +-230 174 11 236 178 12 239 182 13 239 182 13 +-242 186 14 246 186 14 246 190 14 246 190 14 +-246 190 14 246 190 14 246 190 14 246 190 14 +-246 186 14 230 174 11 210 150 10 163 110 8 +-104 69 6 10 10 10 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 91 60 6 167 114 7 +-206 145 10 230 174 11 242 186 14 246 190 14 +-246 190 14 246 190 14 246 186 14 242 186 14 +-239 182 13 230 174 11 224 166 10 213 154 11 +-180 133 36 124 112 88 86 86 86 58 58 58 +- 38 38 38 22 22 22 10 10 10 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 14 14 14 +- 34 34 34 70 70 70 138 110 50 158 118 36 +-167 114 7 180 123 7 192 133 9 197 138 11 +-200 144 11 206 145 10 213 154 11 219 162 10 +-224 166 10 230 174 11 239 182 13 242 186 14 +-246 186 14 246 186 14 246 186 14 246 186 14 +-239 182 13 216 158 10 185 133 11 152 99 6 +-104 69 6 18 14 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 2 2 6 2 2 6 2 2 6 +- 2 2 6 6 6 6 80 54 7 152 99 6 +-192 133 9 219 162 10 236 178 12 239 182 13 +-246 186 14 242 186 14 239 182 13 236 178 12 +-224 166 10 206 145 10 192 133 9 154 121 60 +- 94 94 94 62 62 62 42 42 42 22 22 22 +- 14 14 14 6 6 6 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 18 18 18 34 34 34 58 58 58 78 78 78 +-101 98 89 124 112 88 142 110 46 156 107 11 +-163 110 8 167 114 7 175 118 6 180 123 7 +-185 133 11 197 138 11 210 150 10 219 162 10 +-226 170 11 236 178 12 236 178 12 234 174 13 +-219 162 10 197 138 11 163 110 8 130 83 6 +- 91 60 6 10 10 10 2 2 6 2 2 6 +- 18 18 18 38 38 38 38 38 38 38 38 38 +- 38 38 38 38 38 38 38 38 38 38 38 38 +- 38 38 38 38 38 38 26 26 26 2 2 6 +- 2 2 6 6 6 6 70 47 6 137 92 6 +-175 118 6 200 144 11 219 162 10 230 174 11 +-234 174 13 230 174 11 219 162 10 210 150 10 +-192 133 9 163 110 8 124 112 88 82 82 82 +- 50 50 50 30 30 30 14 14 14 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 14 14 14 22 22 22 34 34 34 +- 42 42 42 58 58 58 74 74 74 86 86 86 +-101 98 89 122 102 70 130 98 46 121 87 25 +-137 92 6 152 99 6 163 110 8 180 123 7 +-185 133 11 197 138 11 206 145 10 200 144 11 +-180 123 7 156 107 11 130 83 6 104 69 6 +- 50 34 6 54 54 54 110 110 110 101 98 89 +- 86 86 86 82 82 82 78 78 78 78 78 78 +- 78 78 78 78 78 78 78 78 78 78 78 78 +- 78 78 78 82 82 82 86 86 86 94 94 94 +-106 106 106 101 101 101 86 66 34 124 80 6 +-156 107 11 180 123 7 192 133 9 200 144 11 +-206 145 10 200 144 11 192 133 9 175 118 6 +-139 102 15 109 106 95 70 70 70 42 42 42 +- 22 22 22 10 10 10 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 6 6 6 10 10 10 +- 14 14 14 22 22 22 30 30 30 38 38 38 +- 50 50 50 62 62 62 74 74 74 90 90 90 +-101 98 89 112 100 78 121 87 25 124 80 6 +-137 92 6 152 99 6 152 99 6 152 99 6 +-138 86 6 124 80 6 98 70 6 86 66 30 +-101 98 89 82 82 82 58 58 58 46 46 46 +- 38 38 38 34 34 34 34 34 34 34 34 34 +- 34 34 34 34 34 34 34 34 34 34 34 34 +- 34 34 34 34 34 34 38 38 38 42 42 42 +- 54 54 54 82 82 82 94 86 76 91 60 6 +-134 86 6 156 107 11 167 114 7 175 118 6 +-175 118 6 167 114 7 152 99 6 121 87 25 +-101 98 89 62 62 62 34 34 34 18 18 18 +- 6 6 6 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 6 6 6 10 10 10 +- 18 18 18 22 22 22 30 30 30 42 42 42 +- 50 50 50 66 66 66 86 86 86 101 98 89 +-106 86 58 98 70 6 104 69 6 104 69 6 +-104 69 6 91 60 6 82 62 34 90 90 90 +- 62 62 62 38 38 38 22 22 22 14 14 14 +- 10 10 10 10 10 10 10 10 10 10 10 10 +- 10 10 10 10 10 10 6 6 6 10 10 10 +- 10 10 10 10 10 10 10 10 10 14 14 14 +- 22 22 22 42 42 42 70 70 70 89 81 66 +- 80 54 7 104 69 6 124 80 6 137 92 6 +-134 86 6 116 81 8 100 82 52 86 86 86 +- 58 58 58 30 30 30 14 14 14 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 10 10 10 14 14 14 +- 18 18 18 26 26 26 38 38 38 54 54 54 +- 70 70 70 86 86 86 94 86 76 89 81 66 +- 89 81 66 86 86 86 74 74 74 50 50 50 +- 30 30 30 14 14 14 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 18 18 18 34 34 34 58 58 58 +- 82 82 82 89 81 66 89 81 66 89 81 66 +- 94 86 66 94 86 76 74 74 74 50 50 50 +- 26 26 26 14 14 14 6 6 6 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 6 6 6 6 6 6 14 14 14 18 18 18 +- 30 30 30 38 38 38 46 46 46 54 54 54 +- 50 50 50 42 42 42 30 30 30 18 18 18 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 6 6 6 14 14 14 26 26 26 +- 38 38 38 50 50 50 58 58 58 58 58 58 +- 54 54 54 42 42 42 30 30 30 18 18 18 +- 10 10 10 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 6 6 6 10 10 10 14 14 14 18 18 18 +- 18 18 18 14 14 14 10 10 10 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 6 6 6 +- 14 14 14 18 18 18 22 22 22 22 22 22 +- 18 18 18 14 14 14 10 10 10 6 6 6 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +- 0 0 0 0 0 0 0 0 0 0 0 0 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 @@ -51531,6 +52234,28 @@ index ff22871..b129bed 100644 info->var.accel_flags = (!noaccel); +diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c +index fafe7c9..93197b9 100644 +--- a/drivers/video/omap2/dss/display.c ++++ b/drivers/video/omap2/dss/display.c +@@ -137,12 +137,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev) + snprintf(dssdev->alias, sizeof(dssdev->alias), + "display%d", disp_num_counter++); + ++ pax_open_kernel(); + if (drv && drv->get_resolution == NULL) +- drv->get_resolution = omapdss_default_get_resolution; ++ *(void **)&drv->get_resolution = omapdss_default_get_resolution; + if (drv && drv->get_recommended_bpp == NULL) +- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp; ++ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp; + if (drv && drv->get_timings == NULL) +- drv->get_timings = omapdss_default_get_timings; ++ *(void **)&drv->get_timings = omapdss_default_get_timings; ++ pax_close_kernel(); + + mutex_lock(&panel_list_mutex); + list_add_tail(&dssdev->panel_list, &panel_list); diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index 05c2dc3..ea1f391 100644 --- a/drivers/video/s1d13xxxfb.c @@ -51777,7 +52502,7 @@ index 7aec6f3..e3b2d55 100644 framebuffer_release(info); diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c -index 501b340..d80aa17 100644 +index bd83233..7d8a5aa 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -9,6 +9,7 @@ @@ -51788,8 +52513,8 @@ index 501b340..d80aa17 100644 #include #include #include -@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */ - static int vram_total __initdata; /* Set total amount of memory */ +@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */ + static int vram_total; /* Set total amount of memory */ static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */ static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */ -static void (*pmi_start)(void) __read_mostly; @@ -51799,15 +52524,15 @@ index 501b340..d80aa17 100644 static int depth __read_mostly; static int vga_compat __read_mostly; /* --------------------------------------------------------------------- */ -@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev) - unsigned int size_vmode; +@@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev) unsigned int size_remap; unsigned int size_total; + char *option = NULL; + void *pmi_code = NULL; - if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB) - return -ENODEV; -@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev) + /* ignore error return of fb_get_options */ + fb_get_options("vesafb", &option); +@@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev) size_remap = size_total; vesafb_fix.smem_len = size_remap; @@ -51818,7 +52543,7 @@ index 501b340..d80aa17 100644 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) { printk(KERN_WARNING "vesafb: cannot reserve video memory at 0x%lx\n", -@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev) +@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev) printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n", vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages); @@ -51842,7 +52567,7 @@ index 501b340..d80aa17 100644 } if (screen_info.vesapm_seg < 0xc000) -@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev) +@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev) if (ypan || pmi_setpal) { unsigned short *pmi_base; @@ -51870,7 +52595,7 @@ index 501b340..d80aa17 100644 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal); if (pmi_base[3]) { printk(KERN_INFO "vesafb: pmi: ports = "); -@@ -472,8 +498,11 @@ static int __init vesafb_probe(struct platform_device *dev) +@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev) info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE | (ypan ? FBINFO_HWACCEL_YPAN : 0); @@ -51884,7 +52609,7 @@ index 501b340..d80aa17 100644 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) { err = -ENOMEM; -@@ -488,6 +517,11 @@ static int __init vesafb_probe(struct platform_device *dev) +@@ -493,6 +522,11 @@ static int vesafb_probe(struct platform_device *dev) info->node, info->fix.id); return 0; err: @@ -51940,7 +52665,7 @@ index 9ff073f..05cef23 100644 if (retval > 0) retval = 0; diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c -index 25b018e..b941525 100644 +index 94de6d1..8d81256 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd) @@ -51988,51 +52713,18 @@ index 789bc25..fafaeea 100644 &data); if (!inode) { diff --git a/fs/aio.c b/fs/aio.c -index 9b5ca11..c530886 100644 +index 6efb7f6..37da952 100644 --- a/fs/aio.c +++ b/fs/aio.c -@@ -162,7 +162,7 @@ static int aio_setup_ring(struct kioctx *ctx) +@@ -338,7 +338,7 @@ static int aio_setup_ring(struct kioctx *ctx) size += sizeof(struct io_event) * nr_events; - nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; + nr_pages = PFN_UP(size); - if (nr_pages < 0) + if (nr_pages <= 0) return -EINVAL; - nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -@@ -952,6 +952,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) - static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat) - { - ssize_t ret; -+ struct iovec iovstack; - - kiocb->ki_nr_segs = kiocb->ki_nbytes; - -@@ -959,17 +960,22 @@ static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat) - if (compat) - ret = compat_rw_copy_check_uvector(rw, - (struct compat_iovec __user *)kiocb->ki_buf, -- kiocb->ki_nr_segs, 1, &kiocb->ki_inline_vec, -+ kiocb->ki_nr_segs, 1, &iovstack, - &kiocb->ki_iovec); - else - #endif - ret = rw_copy_check_uvector(rw, - (struct iovec __user *)kiocb->ki_buf, -- kiocb->ki_nr_segs, 1, &kiocb->ki_inline_vec, -+ kiocb->ki_nr_segs, 1, &iovstack, - &kiocb->ki_iovec); - if (ret < 0) - return ret; - -+ if (kiocb->ki_iovec == &iovstack) { -+ kiocb->ki_inline_vec = iovstack; -+ kiocb->ki_iovec = &kiocb->ki_inline_vec; -+ } -+ - /* ki_nbytes now reflect bytes instead of segs */ - kiocb->ki_nbytes = ret; - return 0; + file = aio_private_file(ctx, nr_pages); diff --git a/fs/attr.c b/fs/attr.c index 1449adb..a2038c2 100644 --- a/fs/attr.c @@ -52046,7 +52738,7 @@ index 1449adb..a2038c2 100644 goto out_sig; if (offset > inode->i_sb->s_maxbytes) diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c -index 3db70da..7aeec5b 100644 +index 689e40d..515cac5 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi, @@ -52058,7 +52750,7 @@ index 3db70da..7aeec5b 100644 ssize_t wr = 0; sigpipe = sigismember(¤t->pending.signal, SIGPIPE); -@@ -346,6 +346,10 @@ static int validate_request(struct autofs_wait_queue **wait, +@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait, return 1; } @@ -52069,7 +52761,7 @@ index 3db70da..7aeec5b 100644 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry, enum autofs_notify notify) { -@@ -379,7 +383,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry, +@@ -373,7 +377,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry, /* If this is a direct mount request create a dummy name */ if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type)) @@ -52083,7 +52775,7 @@ index 3db70da..7aeec5b 100644 qstr.len = autofs4_getpath(sbi, dentry, &name); if (!qstr.len) { diff --git a/fs/befs/endian.h b/fs/befs/endian.h -index 2722387..c8dd2a7 100644 +index 2722387..56059b5 100644 --- a/fs/befs/endian.h +++ b/fs/befs/endian.h @@ -11,7 +11,7 @@ @@ -52104,6 +52796,15 @@ index 2722387..c8dd2a7 100644 fs32_to_cpu(const struct super_block *sb, fs32 n) { if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) +@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n) + return (__force fs32)cpu_to_be32(n); + } + +-static inline u16 ++static inline u16 __intentional_overflow(-1) + fs16_to_cpu(const struct super_block *sb, fs16 n) + { + if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE) diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index e9c75e2..1baece1 100644 --- a/fs/befs/linuxvfs.c @@ -53212,7 +53913,7 @@ index d50bbe5..af3b649 100644 goto err; } diff --git a/fs/bio.c b/fs/bio.c -index 5e7507d..418c639 100644 +index ea5035d..a2932eb 100644 --- a/fs/bio.c +++ b/fs/bio.c @@ -1106,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, @@ -53243,7 +53944,7 @@ index 5e7507d..418c639 100644 bio_for_each_segment_all(bvec, bio, i) { char *addr = page_address(bvec->bv_page); diff --git a/fs/block_dev.c b/fs/block_dev.c -index c7bda5c..2121e94 100644 +index 1e86823..8e34695 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole, @@ -53256,10 +53957,10 @@ index c7bda5c..2121e94 100644 else if (whole->bd_holder != NULL) return false; /* is a partition of a held device */ diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c -index ed50460..fe84385 100644 +index 61b5bcd..7eeede8 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c -@@ -1076,9 +1076,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, +@@ -1028,9 +1028,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, free_extent_buffer(buf); add_root_to_dirty_list(root); } else { @@ -53276,10 +53977,10 @@ index ed50460..fe84385 100644 WARN_ON(trans->transid != btrfs_header_generation(parent)); diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c -index 3755109..e3d457f 100644 +index cbd9523..5cca781 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c -@@ -458,7 +458,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node, +@@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node, static void finish_one_item(struct btrfs_delayed_root *delayed_root) { @@ -53288,7 +53989,7 @@ index 3755109..e3d457f 100644 if ((atomic_dec_return(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) && waitqueue_active(&delayed_root->wait)) -@@ -1377,7 +1377,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root) +@@ -1378,7 +1378,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root) static int refs_newer(struct btrfs_delayed_root *delayed_root, int seq, int count) { @@ -53297,7 +53998,7 @@ index 3755109..e3d457f 100644 if (val < seq || val >= seq + count) return 1; -@@ -1394,7 +1394,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root) +@@ -1395,7 +1395,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root) if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND) return; @@ -53329,10 +54030,10 @@ index a4b38f9..f86a509 100644 spin_lock_init(&delayed_root->lock); init_waitqueue_head(&delayed_root->wait); diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c -index 9877a2a..7ebf9ab 100644 +index 9d46f60..a8f09eb 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c -@@ -3097,9 +3097,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) +@@ -3464,9 +3464,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) for (i = 0; i < num_types; i++) { struct btrfs_space_info *tmp; @@ -53345,7 +54046,7 @@ index 9877a2a..7ebf9ab 100644 info = NULL; rcu_read_lock(); list_for_each_entry_rcu(tmp, &root->fs_info->space_info, -@@ -3121,10 +3124,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) +@@ -3488,10 +3491,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg) memcpy(dest, &space, sizeof(space)); dest++; space_args.total_spaces++; @@ -53357,10 +54058,10 @@ index 9877a2a..7ebf9ab 100644 up_read(&info->groups_sem); } diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c -index 8eb6191..eda91e2 100644 +index e913328..a34fb36 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -264,7 +264,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, +@@ -266,7 +266,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, function, line, errstr); return; } @@ -53370,32 +54071,10 @@ index 8eb6191..eda91e2 100644 wake_up(&root->fs_info->transaction_wait); wake_up(&root->fs_info->transaction_blocked_wait); diff --git a/fs/buffer.c b/fs/buffer.c -index 4d74335..7bd000a 100644 +index 6024877..7bd000a 100644 --- a/fs/buffer.c +++ b/fs/buffer.c -@@ -1005,9 +1005,19 @@ grow_dev_page(struct block_device *bdev, sector_t block, - struct buffer_head *bh; - sector_t end_block; - int ret = 0; /* Will call free_more_memory() */ -+ gfp_t gfp_mask; - -- page = find_or_create_page(inode->i_mapping, index, -- (mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS)|__GFP_MOVABLE); -+ gfp_mask = mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS; -+ gfp_mask |= __GFP_MOVABLE; -+ /* -+ * XXX: __getblk_slow() can not really deal with failure and -+ * will endlessly loop on improvised global reclaim. Prefer -+ * looping in the allocator rather than here, at least that -+ * code knows what it's doing. -+ */ -+ gfp_mask |= __GFP_NOFAIL; -+ -+ page = find_or_create_page(inode->i_mapping, index, gfp_mask); - if (!page) - return ret; - -@@ -3416,7 +3426,7 @@ void __init buffer_init(void) +@@ -3426,7 +3426,7 @@ void __init buffer_init(void) bh_cachep = kmem_cache_create("buffer_head", sizeof(struct buffer_head), 0, (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC| @@ -53465,7 +54144,7 @@ index 0a1467b..6a53245 100644 cache->bstop_percent = bstop; diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h -index 4938251..7e01445 100644 +index 5349473..d6c0b93 100644 --- a/fs/cachefiles/internal.h +++ b/fs/cachefiles/internal.h @@ -59,7 +59,7 @@ struct cachefiles_cache { @@ -53503,7 +54182,7 @@ index 4938251..7e01445 100644 #else diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c -index 25badd1..d70d918 100644 +index f4a08d7..5aa4599 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -317,7 +317,7 @@ try_again: @@ -53559,7 +54238,7 @@ index ebaff36..7e3ea26 100644 kunmap(page); file_end_write(file); diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c -index a40ceda..f43d17c 100644 +index 868b61d..58835a5 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -240,7 +240,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) @@ -53572,10 +54251,10 @@ index a40ceda..f43d17c 100644 u32 ftype; struct ceph_mds_reply_info_parsed *rinfo; diff --git a/fs/ceph/super.c b/fs/ceph/super.c -index 6627b26..634ec4b 100644 +index 6a0951e..03fac6d 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c -@@ -839,7 +839,7 @@ static int ceph_compare_super(struct super_block *sb, void *data) +@@ -870,7 +870,7 @@ static int ceph_compare_super(struct super_block *sb, void *data) /* * construct our own bdi so we can control readahead, etc. */ @@ -53584,7 +54263,7 @@ index 6627b26..634ec4b 100644 static int ceph_register_bdi(struct super_block *sb, struct ceph_fs_client *fsc) -@@ -856,7 +856,7 @@ static int ceph_register_bdi(struct super_block *sb, +@@ -887,7 +887,7 @@ static int ceph_register_bdi(struct super_block *sb, default_backing_dev_info.ra_pages; err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld", @@ -53638,37 +54317,10 @@ index f3ac415..3d2420c 100644 server->ops->print_stats(m, tcon); } diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c -index 85ea98d..1eee040 100644 +index 77fc5e1..e3d13e6 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c -@@ -120,14 +120,16 @@ cifs_read_super(struct super_block *sb) - { - struct inode *inode; - struct cifs_sb_info *cifs_sb; -+ struct cifs_tcon *tcon; - int rc = 0; - - cifs_sb = CIFS_SB(sb); -+ tcon = cifs_sb_master_tcon(cifs_sb); - - if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIXACL) - sb->s_flags |= MS_POSIXACL; - -- if (cifs_sb_master_tcon(cifs_sb)->ses->capabilities & CAP_LARGE_FILES) -+ if (tcon->ses->capabilities & tcon->ses->server->vals->cap_large_files) - sb->s_maxbytes = MAX_LFS_FILESIZE; - else - sb->s_maxbytes = MAX_NON_LFS; -@@ -147,7 +149,7 @@ cifs_read_super(struct super_block *sb) - goto out_no_root; - } - -- if (cifs_sb_master_tcon(cifs_sb)->nocase) -+ if (tcon->nocase) - sb->s_d_op = &cifs_ci_dentry_ops; - else - sb->s_d_op = &cifs_dentry_ops; -@@ -1037,7 +1039,7 @@ cifs_init_request_bufs(void) +@@ -1056,7 +1056,7 @@ cifs_init_request_bufs(void) */ cifs_req_cachep = kmem_cache_create("cifs_request", CIFSMaxBufSize + max_hdr_size, 0, @@ -53677,7 +54329,7 @@ index 85ea98d..1eee040 100644 if (cifs_req_cachep == NULL) return -ENOMEM; -@@ -1064,7 +1066,7 @@ cifs_init_request_bufs(void) +@@ -1083,7 +1083,7 @@ cifs_init_request_bufs(void) efficient to alloc 1 per page off the slab compared to 17K (5page) alloc of large cifs buffers even when page debugging is on */ cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq", @@ -53686,7 +54338,7 @@ index 85ea98d..1eee040 100644 NULL); if (cifs_sm_req_cachep == NULL) { mempool_destroy(cifs_req_poolp); -@@ -1149,8 +1151,8 @@ init_cifs(void) +@@ -1168,8 +1168,8 @@ init_cifs(void) atomic_set(&bufAllocCount, 0); atomic_set(&smBufAllocCount, 0); #ifdef CONFIG_CIFS_STATS2 @@ -53698,10 +54350,10 @@ index 85ea98d..1eee040 100644 atomic_set(&midCount, 0); diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h -index 52ca861..47f309c 100644 +index c8e03f8..75362f6 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h -@@ -756,35 +756,35 @@ struct cifs_tcon { +@@ -758,35 +758,35 @@ struct cifs_tcon { __u16 Flags; /* optional support bits */ enum statusEnum tidStatus; #ifdef CONFIG_CIFS_STATS @@ -53761,7 +54413,7 @@ index 52ca861..47f309c 100644 } smb2_stats; #endif /* CONFIG_CIFS_SMB2 */ } stats; -@@ -1096,7 +1096,7 @@ convert_delimiter(char *path, char delim) +@@ -1111,7 +1111,7 @@ convert_delimiter(char *path, char delim) } #ifdef CONFIG_CIFS_STATS @@ -53770,7 +54422,7 @@ index 52ca861..47f309c 100644 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon, unsigned int bytes) -@@ -1461,8 +1461,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount; +@@ -1477,8 +1477,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount; /* Various Debug counters */ GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */ #ifdef CONFIG_CIFS_STATS2 @@ -53782,10 +54434,10 @@ index 52ca861..47f309c 100644 GLOBAL_EXTERN atomic_t smBufAllocCount; GLOBAL_EXTERN atomic_t midCount; diff --git a/fs/cifs/link.c b/fs/cifs/link.c -index 562044f..4af6a17 100644 +index 7e36ceb..109252f 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c -@@ -638,7 +638,7 @@ symlink_exit: +@@ -624,7 +624,7 @@ symlink_exit: void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) { @@ -53795,10 +54447,10 @@ index 562044f..4af6a17 100644 kfree(p); } diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c -index f7d4b22..1254377 100644 +index 138a011..cf9e13a 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c -@@ -169,7 +169,7 @@ cifs_buf_get(void) +@@ -170,7 +170,7 @@ cifs_buf_get(void) memset(ret_buf, 0, buf_size + 3); atomic_inc(&bufAllocCount); #ifdef CONFIG_CIFS_STATS2 @@ -53807,7 +54459,7 @@ index f7d4b22..1254377 100644 #endif /* CONFIG_CIFS_STATS2 */ } -@@ -204,7 +204,7 @@ cifs_small_buf_get(void) +@@ -205,7 +205,7 @@ cifs_small_buf_get(void) /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/ atomic_inc(&smBufAllocCount); #ifdef CONFIG_CIFS_STATS2 @@ -53816,26 +54468,11 @@ index f7d4b22..1254377 100644 #endif /* CONFIG_CIFS_STATS2 */ } -diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c -index af847e1..651a527 100644 ---- a/fs/cifs/netmisc.c -+++ b/fs/cifs/netmisc.c -@@ -780,7 +780,9 @@ static const struct { - ERRDOS, ERRnoaccess, 0xc0000290}, { - ERRDOS, ERRbadfunc, 0xc000029c}, { - ERRDOS, ERRsymlink, NT_STATUS_STOPPED_ON_SYMLINK}, { -- ERRDOS, ERRinvlevel, 0x007c0001}, }; -+ ERRDOS, ERRinvlevel, 0x007c0001}, { -+ 0, 0, 0 } -+}; - - /***************************************************************************** - Print an error message from the status code diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c -index 6094397..51e576f 100644 +index e50554b..c011413 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c -@@ -590,27 +590,27 @@ static void +@@ -609,27 +609,27 @@ static void cifs_clear_stats(struct cifs_tcon *tcon) { #ifdef CONFIG_CIFS_STATS @@ -53884,7 +54521,7 @@ index 6094397..51e576f 100644 #endif } -@@ -619,36 +619,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon) +@@ -638,36 +638,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon) { #ifdef CONFIG_CIFS_STATS seq_printf(m, " Oplocks breaks: %d", @@ -53941,10 +54578,10 @@ index 6094397..51e576f 100644 } diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c -index f259e6c..ca948ff 100644 +index 861b332..5506392 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c -@@ -281,8 +281,8 @@ smb2_clear_stats(struct cifs_tcon *tcon) +@@ -282,8 +282,8 @@ smb2_clear_stats(struct cifs_tcon *tcon) #ifdef CONFIG_CIFS_STATS int i; for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) { @@ -53955,7 +54592,7 @@ index f259e6c..ca948ff 100644 } #endif } -@@ -310,65 +310,65 @@ static void +@@ -311,65 +311,65 @@ static void smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon) { #ifdef CONFIG_CIFS_STATS @@ -54062,10 +54699,10 @@ index f259e6c..ca948ff 100644 } diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c -index abc9c28..3fdae28 100644 +index edccb52..16bc6db 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c -@@ -1946,8 +1946,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, +@@ -1957,8 +1957,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, default: cifs_dbg(VFS, "info level %u isn't supported\n", srch_inf->info_level); @@ -54298,10 +54935,10 @@ index 5d19acf..9ab093b 100644 return 1; if (a < b) diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c -index 277bd1b..f312c9e 100644 +index 511d415..319d0e5 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c -@@ -1546,7 +1546,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx) +@@ -1558,7 +1558,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx) } for (p = q->next; p != &parent_sd->s_children; p = p->next) { struct configfs_dirent *next; @@ -54311,7 +54948,7 @@ index 277bd1b..f312c9e 100644 int len; struct inode *inode = NULL; -@@ -1555,7 +1556,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx) +@@ -1567,7 +1568,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx) continue; name = configfs_get_name(next); @@ -54326,10 +54963,10 @@ index 277bd1b..f312c9e 100644 /* * We'll have a dentry and an inode for diff --git a/fs/coredump.c b/fs/coredump.c -index 72f816d..1ba8eff 100644 +index 9bdeca1..2a9b08d 100644 --- a/fs/coredump.c +++ b/fs/coredump.c -@@ -433,8 +433,8 @@ static void wait_for_dump_helpers(struct file *file) +@@ -438,8 +438,8 @@ static void wait_for_dump_helpers(struct file *file) struct pipe_inode_info *pipe = file->private_data; pipe_lock(pipe); @@ -54340,7 +54977,7 @@ index 72f816d..1ba8eff 100644 wake_up_interruptible_sync(&pipe->wait); kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN); pipe_unlock(pipe); -@@ -443,11 +443,11 @@ static void wait_for_dump_helpers(struct file *file) +@@ -448,11 +448,11 @@ static void wait_for_dump_helpers(struct file *file) * We actually want wait_event_freezable() but then we need * to clear TIF_SIGPENDING and improve dump_interrupted(). */ @@ -54355,29 +54992,38 @@ index 72f816d..1ba8eff 100644 pipe_unlock(pipe); } -@@ -494,7 +494,8 @@ void do_coredump(siginfo_t *siginfo) +@@ -499,7 +499,9 @@ void do_coredump(siginfo_t *siginfo) struct files_struct *displaced; bool need_nonrelative = false; bool core_dumped = false; - static atomic_t core_dump_count = ATOMIC_INIT(0); + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0); + long signr = siginfo->si_signo; ++ int dumpable; struct coredump_params cprm = { .siginfo = siginfo, .regs = signal_pt_regs(), -@@ -507,7 +508,10 @@ void do_coredump(siginfo_t *siginfo) +@@ -512,12 +514,17 @@ void do_coredump(siginfo_t *siginfo) .mm_flags = mm->flags, }; - audit_core_dumps(siginfo->si_signo); + audit_core_dumps(signr); + ++ dumpable = __get_dumpable(cprm.mm_flags); ++ + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL) -+ gr_handle_brute_attach(cprm.mm_flags); ++ gr_handle_brute_attach(dumpable); binfmt = mm->binfmt; if (!binfmt || !binfmt->core_dump) -@@ -531,7 +535,7 @@ void do_coredump(siginfo_t *siginfo) + goto fail; +- if (!__get_dumpable(cprm.mm_flags)) ++ if (!dumpable) + goto fail; + + cred = prepare_creds(); +@@ -536,7 +543,7 @@ void do_coredump(siginfo_t *siginfo) need_nonrelative = true; } @@ -54386,7 +55032,7 @@ index 72f816d..1ba8eff 100644 if (retval < 0) goto fail_creds; -@@ -574,7 +578,7 @@ void do_coredump(siginfo_t *siginfo) +@@ -579,7 +586,7 @@ void do_coredump(siginfo_t *siginfo) } cprm.limit = RLIM_INFINITY; @@ -54395,7 +55041,7 @@ index 72f816d..1ba8eff 100644 if (core_pipe_limit && (core_pipe_limit < dump_count)) { printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n", task_tgid_vnr(current), current->comm); -@@ -606,6 +610,8 @@ void do_coredump(siginfo_t *siginfo) +@@ -611,6 +618,8 @@ void do_coredump(siginfo_t *siginfo) } else { struct inode *inode; @@ -54404,7 +55050,7 @@ index 72f816d..1ba8eff 100644 if (cprm.limit < binfmt->min_coredump) goto fail_unlock; -@@ -664,7 +670,7 @@ close_fail: +@@ -669,7 +678,7 @@ close_fail: filp_close(cprm.file, NULL); fail_dropcount: if (ispipe) @@ -54413,7 +55059,7 @@ index 72f816d..1ba8eff 100644 fail_unlock: kfree(cn.corename); coredump_finish(mm, core_dumped); -@@ -684,7 +690,7 @@ int dump_write(struct file *file, const void *addr, int nr) +@@ -689,7 +698,7 @@ int dump_write(struct file *file, const void *addr, int nr) { return !dump_interrupted() && access_ok(VERIFY_READ, addr, nr) && @@ -54423,10 +55069,18 @@ index 72f816d..1ba8eff 100644 EXPORT_SYMBOL(dump_write); diff --git a/fs/dcache.c b/fs/dcache.c -index b949af8..5978926 100644 +index 89f9671..5977a84 100644 --- a/fs/dcache.c +++ b/fs/dcache.c -@@ -3073,7 +3073,8 @@ void __init vfs_caches_init(unsigned long mempages) +@@ -2893,6 +2893,7 @@ static int prepend_path(const struct path *path, + restart: + bptr = *buffer; + blen = *buflen; ++ error = 0; + dentry = path->dentry; + vfsmnt = path->mnt; + mnt = real_mount(vfsmnt); +@@ -3432,7 +3433,8 @@ void __init vfs_caches_init(unsigned long mempages) mempages -= reserve; names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, @@ -54488,7 +55142,7 @@ index e4141f2..d8263e8 100644 i += packet_length_size; if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size)) diff --git a/fs/exec.c b/fs/exec.c -index fd774c7..1c6a7bf 100644 +index bb8afc1..2f5087e 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -55,8 +55,20 @@ @@ -54512,7 +55166,7 @@ index fd774c7..1c6a7bf 100644 #include #include -@@ -66,17 +78,32 @@ +@@ -66,19 +78,34 @@ #include @@ -54539,6 +55193,8 @@ index fd774c7..1c6a7bf 100644 void __register_binfmt(struct linux_binfmt * fmt, int insert) { BUG_ON(!fmt); + if (WARN_ON(!fmt->load_binary)) + return; write_lock(&binfmt_lock); - insert ? list_add(&fmt->lh, &formats) : - list_add_tail(&fmt->lh, &formats); @@ -54547,7 +55203,7 @@ index fd774c7..1c6a7bf 100644 write_unlock(&binfmt_lock); } -@@ -85,7 +112,7 @@ EXPORT_SYMBOL(__register_binfmt); +@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt); void unregister_binfmt(struct linux_binfmt * fmt) { write_lock(&binfmt_lock); @@ -54556,7 +55212,7 @@ index fd774c7..1c6a7bf 100644 write_unlock(&binfmt_lock); } -@@ -181,18 +208,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, +@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, int write) { struct page *page; @@ -54578,7 +55234,7 @@ index fd774c7..1c6a7bf 100644 return NULL; if (write) { -@@ -208,6 +227,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, +@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, if (size <= ARG_MAX) return page; @@ -54596,10 +55252,10 @@ index fd774c7..1c6a7bf 100644 /* * Limit to 1/4-th the stack size for the argv+env strings. * This ensures that: -@@ -267,6 +297,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm) +@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm) vma->vm_end = STACK_TOP_MAX; vma->vm_start = vma->vm_end - PAGE_SIZE; - vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP; + vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP; + +#ifdef CONFIG_PAX_SEGMEXEC + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC); @@ -54608,7 +55264,7 @@ index fd774c7..1c6a7bf 100644 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); INIT_LIST_HEAD(&vma->anon_vma_chain); -@@ -277,6 +312,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm) +@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm) mm->stack_vm = mm->total_vm = 1; up_write(&mm->mmap_sem); bprm->p = vma->vm_end - sizeof(void *); @@ -54621,7 +55277,7 @@ index fd774c7..1c6a7bf 100644 return 0; err: up_write(&mm->mmap_sem); -@@ -397,7 +438,7 @@ struct user_arg_ptr { +@@ -399,7 +440,7 @@ struct user_arg_ptr { } ptr; }; @@ -54630,7 +55286,7 @@ index fd774c7..1c6a7bf 100644 { const char __user *native; -@@ -406,14 +447,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr) +@@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr) compat_uptr_t compat; if (get_user(compat, argv.ptr.compat + nr)) @@ -54647,7 +55303,7 @@ index fd774c7..1c6a7bf 100644 return native; } -@@ -432,7 +473,7 @@ static int count(struct user_arg_ptr argv, int max) +@@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max) if (!p) break; @@ -54656,7 +55312,7 @@ index fd774c7..1c6a7bf 100644 return -EFAULT; if (i >= max) -@@ -467,7 +508,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv, +@@ -469,7 +510,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv, ret = -EFAULT; str = get_user_arg_ptr(argv, argc); @@ -54665,7 +55321,7 @@ index fd774c7..1c6a7bf 100644 goto out; len = strnlen_user(str, MAX_ARG_STRLEN); -@@ -549,7 +590,7 @@ int copy_strings_kernel(int argc, const char *const *__argv, +@@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv, int r; mm_segment_t oldfs = get_fs(); struct user_arg_ptr argv = { @@ -54674,7 +55330,7 @@ index fd774c7..1c6a7bf 100644 }; set_fs(KERNEL_DS); -@@ -584,7 +625,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) +@@ -586,7 +627,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) unsigned long new_end = old_end - shift; struct mmu_gather tlb; @@ -54684,7 +55340,7 @@ index fd774c7..1c6a7bf 100644 /* * ensure there are no vmas between where we want to go -@@ -593,6 +635,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) +@@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) if (vma != find_vma(mm, new_start)) return -EFAULT; @@ -54695,7 +55351,7 @@ index fd774c7..1c6a7bf 100644 /* * cover the whole range: [new_start, old_end) */ -@@ -673,10 +719,6 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm, stack_top = arch_align_stack(stack_top); stack_top = PAGE_ALIGN(stack_top); @@ -54706,7 +55362,7 @@ index fd774c7..1c6a7bf 100644 stack_shift = vma->vm_end - stack_top; bprm->p -= stack_shift; -@@ -688,8 +730,28 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm, bprm->exec -= stack_shift; down_write(&mm->mmap_sem); @@ -54735,7 +55391,7 @@ index fd774c7..1c6a7bf 100644 /* * Adjust stack execute permissions; explicitly enable for * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone -@@ -708,13 +770,6 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm, goto out_unlock; BUG_ON(prev != vma); @@ -54749,7 +55405,7 @@ index fd774c7..1c6a7bf 100644 /* mprotect_fixup is overkill to remove the temporary stack flags */ vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP; -@@ -738,6 +793,27 @@ int setup_arg_pages(struct linux_binprm *bprm, +@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm, #endif current->mm->start_stack = bprm->p; ret = expand_stack(vma, stack_base); @@ -54777,7 +55433,7 @@ index fd774c7..1c6a7bf 100644 if (ret) ret = -EFAULT; -@@ -774,6 +850,8 @@ struct file *open_exec(const char *name) +@@ -776,6 +852,8 @@ struct file *open_exec(const char *name) fsnotify_open(file); @@ -54786,7 +55442,7 @@ index fd774c7..1c6a7bf 100644 err = deny_write_access(file); if (err) goto exit; -@@ -797,7 +875,7 @@ int kernel_read(struct file *file, loff_t offset, +@@ -799,7 +877,7 @@ int kernel_read(struct file *file, loff_t offset, old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -54795,7 +55451,7 @@ index fd774c7..1c6a7bf 100644 set_fs(old_fs); return result; } -@@ -1253,7 +1331,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm) +@@ -1255,7 +1333,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm) } rcu_read_unlock(); @@ -54804,9 +55460,9 @@ index fd774c7..1c6a7bf 100644 bprm->unsafe |= LSM_UNSAFE_SHARE; } else { res = -EAGAIN; -@@ -1453,6 +1531,31 @@ int search_binary_handler(struct linux_binprm *bprm) - - EXPORT_SYMBOL(search_binary_handler); +@@ -1451,6 +1529,31 @@ static int exec_binprm(struct linux_binprm *bprm) + return ret; + } +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP +static DEFINE_PER_CPU(u64, exec_counter); @@ -54836,7 +55492,7 @@ index fd774c7..1c6a7bf 100644 /* * sys_execve() executes a new program. */ -@@ -1460,12 +1563,19 @@ static int do_execve_common(const char *filename, +@@ -1458,12 +1561,19 @@ static int do_execve_common(const char *filename, struct user_arg_ptr argv, struct user_arg_ptr envp) { @@ -54856,7 +55512,7 @@ index fd774c7..1c6a7bf 100644 /* * We move the actual failure in case of RLIMIT_NPROC excess from * set*uid() to execve() because too many poorly written programs -@@ -1506,12 +1616,22 @@ static int do_execve_common(const char *filename, +@@ -1504,12 +1614,22 @@ static int do_execve_common(const char *filename, if (IS_ERR(file)) goto out_unmark; @@ -54879,7 +55535,7 @@ index fd774c7..1c6a7bf 100644 retval = bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1528,24 +1648,70 @@ static int do_execve_common(const char *filename, +@@ -1526,24 +1646,70 @@ static int do_execve_common(const char *filename, if (retval < 0) goto out; @@ -54939,7 +55595,7 @@ index fd774c7..1c6a7bf 100644 + + gr_handle_exec_args(bprm, argv); - retval = search_binary_handler(bprm); + retval = exec_binprm(bprm); if (retval < 0) - goto out; + goto out_fail; @@ -54954,7 +55610,7 @@ index fd774c7..1c6a7bf 100644 current->fs->in_exec = 0; current->in_execve = 0; acct_update_integrals(current); -@@ -1554,6 +1720,14 @@ static int do_execve_common(const char *filename, +@@ -1552,6 +1718,14 @@ static int do_execve_common(const char *filename, put_files_struct(displaced); return retval; @@ -54969,7 +55625,7 @@ index fd774c7..1c6a7bf 100644 out: if (bprm->mm) { acct_arg_size(bprm, 0); -@@ -1702,3 +1876,287 @@ asmlinkage long compat_sys_execve(const char __user * filename, +@@ -1706,3 +1880,295 @@ asmlinkage long compat_sys_execve(const char __user * filename, return error; } #endif @@ -55199,6 +55855,14 @@ index fd774c7..1c6a7bf 100644 +#else + unsigned long textlow = (unsigned long)_stext; + unsigned long texthigh = (unsigned long)_etext; ++ ++#ifdef CONFIG_X86_64 ++ /* check against linear mapping as well */ ++ if (high > (unsigned long)__va(__pa(textlow)) && ++ low <= (unsigned long)__va(__pa(texthigh))) ++ return true; ++#endif ++ +#endif + + if (high <= textlow || low > texthigh) @@ -55274,6 +55938,31 @@ index 9f9992b..8b59411 100644 return 0; } return 1; +diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c +index 2d7557d..14e38f94 100644 +--- a/fs/ext2/xattr.c ++++ b/fs/ext2/xattr.c +@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) + struct buffer_head *bh = NULL; + struct ext2_xattr_entry *entry; + char *end; +- size_t rest = buffer_size; ++ size_t rest = buffer_size, total_size = 0; + int error; + + ea_idebug(inode, "buffer=%p, buffer_size=%ld", +@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list", + buffer += size; + } + rest -= size; ++ total_size += size; + } + } +- error = buffer_size - rest; /* total size */ ++ error = total_size; + + cleanup: + brelse(bh); diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c index 22548f5..41521d8 100644 --- a/fs/ext3/balloc.c @@ -55291,36 +55980,36 @@ index 22548f5..41521d8 100644 return 0; } return 1; -diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c -index 1194b1f..f8cde46 100644 ---- a/fs/ext3/namei.c -+++ b/fs/ext3/namei.c -@@ -1783,7 +1783,7 @@ retry: - d_tmpfile(dentry, inode); - err = ext3_orphan_add(handle, inode); - if (err) -- goto err_drop_inode; -+ goto err_unlock_inode; - mark_inode_dirty(inode); - unlock_new_inode(inode); - } -@@ -1791,10 +1791,9 @@ retry: - if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) - goto retry; - return err; --err_drop_inode: -+err_unlock_inode: - ext3_journal_stop(handle); - unlock_new_inode(inode); -- iput(inode); - return err; +diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c +index b1fc963..881228c 100644 +--- a/fs/ext3/xattr.c ++++ b/fs/ext3/xattr.c +@@ -330,7 +330,7 @@ static int + ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry, + char *buffer, size_t buffer_size) + { +- size_t rest = buffer_size; ++ size_t rest = buffer_size, total_size = 0; + + for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) { + const struct xattr_handler *handler = +@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry, + buffer += size; + } + rest -= size; ++ total_size += size; + } + } +- return buffer_size - rest; ++ return total_size; } + static int diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c -index ddd715e..c772f88 100644 +index dc5d572..4c21f8e 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c -@@ -528,8 +528,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, +@@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi, /* Hm, nope. Are (enough) root reserved clusters available? */ if (uid_eq(sbi->s_resuid, current_fsuid()) || (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) || @@ -55332,10 +56021,10 @@ index ddd715e..c772f88 100644 if (free_clusters >= (nclusters + dirty_clusters + resv_clusters)) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h -index 0ab26fb..b6ecb39 100644 +index af815ea..99294a6 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h -@@ -1247,19 +1247,19 @@ struct ext4_sb_info { +@@ -1256,19 +1256,19 @@ struct ext4_sb_info { unsigned long s_mb_last_start; /* stats for buddy allocator */ @@ -55366,10 +56055,10 @@ index 0ab26fb..b6ecb39 100644 /* locality groups */ diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c -index 4bbbf13b..dcceaeb 100644 +index a41e3ba..e574a00 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c -@@ -1865,7 +1865,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac, +@@ -1880,7 +1880,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac, BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len); if (EXT4_SB(sb)->s_mb_stats) @@ -55378,7 +56067,7 @@ index 4bbbf13b..dcceaeb 100644 break; } -@@ -2171,7 +2171,7 @@ repeat: +@@ -2189,7 +2189,7 @@ repeat: ac->ac_status = AC_STATUS_CONTINUE; ac->ac_flags |= EXT4_MB_HINT_FIRST; cr = 3; @@ -55387,7 +56076,7 @@ index 4bbbf13b..dcceaeb 100644 goto repeat; } } -@@ -2679,25 +2679,25 @@ int ext4_mb_release(struct super_block *sb) +@@ -2697,25 +2697,25 @@ int ext4_mb_release(struct super_block *sb) if (sbi->s_mb_stats) { ext4_msg(sb, KERN_INFO, "mballoc: %u blocks %u reqs (%u success)", @@ -55423,7 +56112,7 @@ index 4bbbf13b..dcceaeb 100644 } free_percpu(sbi->s_locality_groups); -@@ -3151,16 +3151,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac) +@@ -3169,16 +3169,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac) struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) { @@ -55446,7 +56135,7 @@ index 4bbbf13b..dcceaeb 100644 } if (ac->ac_op == EXT4_MB_HISTORY_ALLOC) -@@ -3560,7 +3560,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) +@@ -3578,7 +3578,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) trace_ext4_mb_new_inode_pa(ac, pa); ext4_mb_use_inode_pa(ac, pa); @@ -55455,7 +56144,7 @@ index 4bbbf13b..dcceaeb 100644 ei = EXT4_I(ac->ac_inode); grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); -@@ -3620,7 +3620,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac) +@@ -3638,7 +3638,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac) trace_ext4_mb_new_group_pa(ac, pa); ext4_mb_use_group_pa(ac, pa); @@ -55464,7 +56153,7 @@ index 4bbbf13b..dcceaeb 100644 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); lg = ac->ac_lg; -@@ -3709,7 +3709,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, +@@ -3727,7 +3727,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh, * from the bitmap and continue. */ } @@ -55473,7 +56162,7 @@ index 4bbbf13b..dcceaeb 100644 return err; } -@@ -3727,7 +3727,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b, +@@ -3745,7 +3745,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b, ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit); BUG_ON(group != e4b->bd_group && pa->pa_len != 0); mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len); @@ -55495,36 +56184,11 @@ index 214461e..3614c89 100644 __ext4_warning(sb, function, line, "MMP failure info: last update time: %llu, last update " "node: %s, last update device: %s\n", -diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c -index 35f55a0..b53cbc6 100644 ---- a/fs/ext4/namei.c -+++ b/fs/ext4/namei.c -@@ -2319,7 +2319,7 @@ retry: - d_tmpfile(dentry, inode); - err = ext4_orphan_add(handle, inode); - if (err) -- goto err_drop_inode; -+ goto err_unlock_inode; - mark_inode_dirty(inode); - unlock_new_inode(inode); - } -@@ -2328,10 +2328,9 @@ retry: - if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) - goto retry; - return err; --err_drop_inode: -+err_unlock_inode: - ext4_journal_stop(handle); - unlock_new_inode(inode); -- iput(inode); - return err; - } - diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index b59373b..f41c2b5 100644 +index 2c2e6cb..7c3ee62 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data) +@@ -1251,7 +1251,7 @@ static ext4_fsblk_t get_sb_block(void **data) } #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3)) @@ -55533,7 +56197,7 @@ index b59373b..f41c2b5 100644 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n"; #ifdef CONFIG_QUOTA -@@ -2394,7 +2394,7 @@ struct ext4_attr { +@@ -2431,7 +2431,7 @@ struct ext4_attr { int offset; int deprecated_val; } u; @@ -55542,6 +56206,31 @@ index b59373b..f41c2b5 100644 static int parse_strtoull(const char *buf, unsigned long long max, unsigned long long *value) +diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c +index 1423c48..9c0c6dc 100644 +--- a/fs/ext4/xattr.c ++++ b/fs/ext4/xattr.c +@@ -381,7 +381,7 @@ static int + ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry, + char *buffer, size_t buffer_size) + { +- size_t rest = buffer_size; ++ size_t rest = buffer_size, total_size = 0; + + for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) { + const struct xattr_handler *handler = +@@ -398,9 +398,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry, + buffer += size; + } + rest -= size; ++ total_size += size; + } + } +- return buffer_size - rest; ++ return total_size; + } + + static int diff --git a/fs/fcntl.c b/fs/fcntl.c index 65343c3..9969dcf 100644 --- a/fs/fcntl.c @@ -55712,7 +56401,7 @@ index d8ac61d..79a36f0 100644 .seq = SEQCNT_ZERO, .umask = 0022, diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c -index 0e91a3c..6c6d2e0 100644 +index b2a86e3..37f425a 100644 --- a/fs/fscache/cookie.c +++ b/fs/fscache/cookie.c @@ -19,7 +19,7 @@ @@ -55845,11 +56534,31 @@ index 0e91a3c..6c6d2e0 100644 _leave(" [no cookie]"); return; } +@@ -598,7 +598,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie) + if (test_bit(FSCACHE_IOERROR, &object->cache->flags)) + goto inconsistent; + +- op->debug_id = atomic_inc_return(&fscache_op_debug_id); ++ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id); + + atomic_inc(&cookie->n_active); + if (fscache_submit_op(object, op) < 0) diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h -index 12d505b..86473a3 100644 +index 4226f66..0fb3f45 100644 --- a/fs/fscache/internal.h +++ b/fs/fscache/internal.h -@@ -147,101 +147,101 @@ extern void fscache_proc_cleanup(void); +@@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *); + extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *); + extern int fscache_wait_for_operation_activation(struct fscache_object *, + struct fscache_operation *, +- atomic_t *, +- atomic_t *, ++ atomic_unchecked_t *, ++ atomic_unchecked_t *, + void (*)(struct fscache_operation *)); + extern void fscache_invalidate_writes(struct fscache_cookie *); + +@@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void); * stats.c */ #ifdef CONFIG_FSCACHE_STATS @@ -56032,7 +56741,7 @@ index 12d505b..86473a3 100644 extern atomic_t fscache_n_cop_alloc_object; extern atomic_t fscache_n_cop_lookup_object; -@@ -266,6 +266,11 @@ static inline void fscache_stat(atomic_t *stat) +@@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat) atomic_inc(stat); } @@ -56044,7 +56753,7 @@ index 12d505b..86473a3 100644 static inline void fscache_stat_d(atomic_t *stat) { atomic_dec(stat); -@@ -278,6 +283,7 @@ extern const struct file_operations fscache_stats_fops; +@@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops; #define __fscache_stat(stat) (NULL) #define fscache_stat(stat) do {} while (0) @@ -56294,7 +57003,7 @@ index 318071a..379938b 100644 ASSERTCMP(atomic_read(&op->usage), ==, 0); ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD); diff --git a/fs/fscache/page.c b/fs/fscache/page.c -index d479ab3..727a7f2 100644 +index 73899c1..ae40c58 100644 --- a/fs/fscache/page.c +++ b/fs/fscache/page.c @@ -61,7 +61,7 @@ try_again: @@ -56394,7 +57103,7 @@ index d479ab3..727a7f2 100644 return NULL; } -@@ -289,13 +289,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie) +@@ -289,13 +289,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie) return 0; } @@ -56412,42 +57121,43 @@ index d479ab3..727a7f2 100644 } @@ -324,8 +324,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op) */ - static int fscache_wait_for_retrieval_activation(struct fscache_object *object, - struct fscache_retrieval *op, -- atomic_t *stat_op_waits, -- atomic_t *stat_object_dead) -+ atomic_unchecked_t *stat_op_waits, -+ atomic_unchecked_t *stat_object_dead) + int fscache_wait_for_operation_activation(struct fscache_object *object, + struct fscache_operation *op, +- atomic_t *stat_op_waits, +- atomic_t *stat_object_dead, ++ atomic_unchecked_t *stat_op_waits, ++ atomic_unchecked_t *stat_object_dead, + void (*do_cancel)(struct fscache_operation *)) { int ret; - -@@ -333,7 +333,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, - goto check_if_dead; +@@ -335,7 +335,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object, _debug(">>> WT"); -- fscache_stat(stat_op_waits); -+ fscache_stat_unchecked(stat_op_waits); - if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING, + if (stat_op_waits) +- fscache_stat(stat_op_waits); ++ fscache_stat_unchecked(stat_op_waits); + if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING, fscache_wait_bit_interruptible, TASK_INTERRUPTIBLE) != 0) { -@@ -350,14 +350,14 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object, - +@@ -353,7 +353,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object, check_if_dead: - if (op->op.state == FSCACHE_OP_ST_CANCELLED) { -- fscache_stat(stat_object_dead); -+ fscache_stat_unchecked(stat_object_dead); + if (op->state == FSCACHE_OP_ST_CANCELLED) { + if (stat_object_dead) +- fscache_stat(stat_object_dead); ++ fscache_stat_unchecked(stat_object_dead); _leave(" = -ENOBUFS [cancelled]"); return -ENOBUFS; } - if (unlikely(fscache_object_is_dead(object))) { - pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->op.state); - fscache_cancel_op(&op->op, fscache_do_cancel_retrieval); -- fscache_stat(stat_object_dead); -+ fscache_stat_unchecked(stat_object_dead); +@@ -361,7 +361,7 @@ check_if_dead: + pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state); + fscache_cancel_op(op, do_cancel); + if (stat_object_dead) +- fscache_stat(stat_object_dead); ++ fscache_stat_unchecked(stat_object_dead); return -ENOBUFS; } return 0; -@@ -384,7 +384,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, +@@ -388,7 +388,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, _enter("%p,%p,,,", cookie, page); @@ -56456,7 +57166,7 @@ index d479ab3..727a7f2 100644 if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -424,7 +424,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, +@@ -428,7 +428,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, goto nobufs_unlock_dec; spin_unlock(&cookie->lock); @@ -56465,7 +57175,7 @@ index d479ab3..727a7f2 100644 /* pin the netfs read context in case we need to do the actual netfs * read because we've encountered a cache read failure */ -@@ -454,15 +454,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, +@@ -459,15 +459,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, error: if (ret == -ENOMEM) @@ -56486,7 +57196,7 @@ index d479ab3..727a7f2 100644 fscache_put_retrieval(op); _leave(" = %d", ret); -@@ -475,7 +475,7 @@ nobufs_unlock: +@@ -480,7 +480,7 @@ nobufs_unlock: atomic_dec(&cookie->n_active); kfree(op); nobufs: @@ -56495,7 +57205,7 @@ index d479ab3..727a7f2 100644 _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -513,7 +513,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, +@@ -518,7 +518,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, _enter("%p,,%d,,,", cookie, *nr_pages); @@ -56504,7 +57214,7 @@ index d479ab3..727a7f2 100644 if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -549,7 +549,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, +@@ -554,7 +554,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, goto nobufs_unlock_dec; spin_unlock(&cookie->lock); @@ -56513,7 +57223,7 @@ index d479ab3..727a7f2 100644 /* pin the netfs read context in case we need to do the actual netfs * read because we've encountered a cache read failure */ -@@ -579,15 +579,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, +@@ -585,15 +585,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, error: if (ret == -ENOMEM) @@ -56534,7 +57244,7 @@ index d479ab3..727a7f2 100644 fscache_put_retrieval(op); _leave(" = %d", ret); -@@ -600,7 +600,7 @@ nobufs_unlock: +@@ -606,7 +606,7 @@ nobufs_unlock: atomic_dec(&cookie->n_active); kfree(op); nobufs: @@ -56543,7 +57253,7 @@ index d479ab3..727a7f2 100644 _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -624,7 +624,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, +@@ -630,7 +630,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, _enter("%p,%p,,,", cookie, page); @@ -56552,16 +57262,16 @@ index d479ab3..727a7f2 100644 if (hlist_empty(&cookie->backing_objects)) goto nobufs; -@@ -656,7 +656,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, +@@ -662,7 +662,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, goto nobufs_unlock; spin_unlock(&cookie->lock); - fscache_stat(&fscache_n_alloc_ops); + fscache_stat_unchecked(&fscache_n_alloc_ops); - ret = fscache_wait_for_retrieval_activation( - object, op, -@@ -672,11 +672,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, + ret = fscache_wait_for_operation_activation( + object, &op->op, +@@ -679,11 +679,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, error: if (ret == -ERESTARTSYS) @@ -56576,7 +57286,7 @@ index d479ab3..727a7f2 100644 fscache_put_retrieval(op); _leave(" = %d", ret); -@@ -687,7 +687,7 @@ nobufs_unlock: +@@ -694,7 +694,7 @@ nobufs_unlock: atomic_dec(&cookie->n_active); kfree(op); nobufs: @@ -56585,7 +57295,7 @@ index d479ab3..727a7f2 100644 _leave(" = -ENOBUFS"); return -ENOBUFS; } -@@ -747,7 +747,7 @@ static void fscache_write_op(struct fscache_operation *_op) +@@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op) spin_lock(&cookie->stores_lock); @@ -56594,7 +57304,7 @@ index d479ab3..727a7f2 100644 /* find a page to store */ page = NULL; -@@ -758,7 +758,7 @@ static void fscache_write_op(struct fscache_operation *_op) +@@ -781,7 +781,7 @@ static void fscache_write_op(struct fscache_operation *_op) page = results[0]; _debug("gang %d [%lx]", n, page->index); if (page->index > op->store_limit) { @@ -56603,7 +57313,7 @@ index d479ab3..727a7f2 100644 goto superseded; } -@@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op) +@@ -793,7 +793,7 @@ static void fscache_write_op(struct fscache_operation *_op) spin_unlock(&cookie->stores_lock); spin_unlock(&object->lock); @@ -56612,7 +57322,7 @@ index d479ab3..727a7f2 100644 fscache_stat(&fscache_n_cop_write_page); ret = object->cache->ops->write_page(op, page); fscache_stat_d(&fscache_n_cop_write_page); -@@ -873,7 +873,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, +@@ -896,7 +896,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); ASSERT(PageFsCache(page)); @@ -56621,7 +57331,7 @@ index d479ab3..727a7f2 100644 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) { _leave(" = -ENOBUFS [invalidating]"); -@@ -931,7 +931,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, +@@ -954,7 +954,7 @@ int __fscache_write_page(struct fscache_cookie *cookie, spin_unlock(&cookie->stores_lock); spin_unlock(&object->lock); @@ -56630,7 +57340,7 @@ index d479ab3..727a7f2 100644 op->store_limit = object->store_limit; atomic_inc(&cookie->n_active); -@@ -940,8 +940,8 @@ int __fscache_write_page(struct fscache_cookie *cookie, +@@ -963,8 +963,8 @@ int __fscache_write_page(struct fscache_cookie *cookie, spin_unlock(&cookie->lock); radix_tree_preload_end(); @@ -56641,7 +57351,7 @@ index d479ab3..727a7f2 100644 /* the work queue now carries its own ref on the object */ fscache_put_operation(&op->op); -@@ -949,14 +949,14 @@ int __fscache_write_page(struct fscache_cookie *cookie, +@@ -972,14 +972,14 @@ int __fscache_write_page(struct fscache_cookie *cookie, return 0; already_queued: @@ -56658,7 +57368,7 @@ index d479ab3..727a7f2 100644 _leave(" = 0"); return 0; -@@ -976,14 +976,14 @@ nobufs: +@@ -999,14 +999,14 @@ nobufs: spin_unlock(&cookie->lock); radix_tree_preload_end(); kfree(op); @@ -56675,7 +57385,7 @@ index d479ab3..727a7f2 100644 _leave(" = -ENOMEM"); return -ENOMEM; } -@@ -1001,7 +1001,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page) +@@ -1024,7 +1024,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page) ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX); ASSERTCMP(page, !=, NULL); @@ -56684,7 +57394,7 @@ index d479ab3..727a7f2 100644 /* cache withdrawal may beat us to it */ if (!PageFsCache(page)) -@@ -1052,7 +1052,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page) +@@ -1075,7 +1075,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page) struct fscache_cookie *cookie = op->op.object->cookie; #ifdef CONFIG_FSCACHE_STATS @@ -57076,10 +57786,10 @@ index 40d13c7..ddf52b9 100644 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n", atomic_read(&fscache_n_cop_alloc_object), diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c -index aef34b1..59bfd7b 100644 +index adbfd66..4b25822 100644 --- a/fs/fuse/cuse.c +++ b/fs/fuse/cuse.c -@@ -600,10 +600,12 @@ static int __init cuse_init(void) +@@ -603,10 +603,12 @@ static int __init cuse_init(void) INIT_LIST_HEAD(&cuse_conntbl[i]); /* inherit and extend fuse_dev_operations */ @@ -57097,7 +57807,7 @@ index aef34b1..59bfd7b 100644 cuse_class = class_create(THIS_MODULE, "cuse"); if (IS_ERR(cuse_class)) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c -index 1d55f94..088da65 100644 +index ef74ad5..c9ac759e 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1339,7 +1339,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos, @@ -57119,10 +57829,10 @@ index 1d55f94..088da65 100644 } diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c -index 8fec28f..cd40dba 100644 +index b7989f2..1f72ec4 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c -@@ -1437,7 +1437,7 @@ static char *read_link(struct dentry *dentry) +@@ -1438,7 +1438,7 @@ static char *read_link(struct dentry *dentry) return link; } @@ -57132,10 +57842,10 @@ index 8fec28f..cd40dba 100644 if (!IS_ERR(link)) free_page((unsigned long) link); diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c -index 64915ee..6bed500 100644 +index 1298766..c964c60 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c -@@ -1506,7 +1506,7 @@ out: +@@ -1515,7 +1515,7 @@ out: static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p) { @@ -57144,6 +57854,19 @@ index 64915ee..6bed500 100644 if (!IS_ERR(s)) kfree(s); } +diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c +index 2543728..14d7bd4 100644 +--- a/fs/hostfs/hostfs_kern.c ++++ b/fs/hostfs/hostfs_kern.c +@@ -904,7 +904,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd) + + static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) + { +- char *s = nd_get_link(nd); ++ const char *s = nd_get_link(nd); + if (!IS_ERR(s)) + __putname(s); + } diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index d19b30a..ef89c36 100644 --- a/fs/hugetlbfs/inode.c @@ -57195,10 +57918,10 @@ index d19b30a..ef89c36 100644 static int can_do_hugetlb_shm(void) { diff --git a/fs/inode.c b/fs/inode.c -index d6dfb09..602e77e 100644 +index b33ba8e..3c79a47 100644 --- a/fs/inode.c +++ b/fs/inode.c -@@ -880,8 +880,8 @@ unsigned int get_next_ino(void) +@@ -849,8 +849,8 @@ unsigned int get_next_ino(void) #ifdef CONFIG_SMP if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { @@ -57251,7 +57974,7 @@ index 6669aa2..36b033d 100644 if (jfs_inode_cachep == NULL) return -ENOMEM; diff --git a/fs/libfs.c b/fs/libfs.c -index 3a3a9b5..3a9b074 100644 +index 193e0c2..7404665 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -150,6 +150,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx) @@ -57322,7 +58045,7 @@ index b27a300..4156d0b 100644 spin_lock(&inode->i_lock); diff --git a/fs/namei.c b/fs/namei.c -index 7720fbd..7934bb2 100644 +index 23ac50f..c6757a5 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask) @@ -57376,7 +58099,7 @@ index 7720fbd..7934bb2 100644 return -EACCES; } -@@ -820,7 +828,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p) +@@ -821,7 +829,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p) { struct dentry *dentry = link->dentry; int error; @@ -57385,7 +58108,7 @@ index 7720fbd..7934bb2 100644 BUG_ON(nd->flags & LOOKUP_RCU); -@@ -841,6 +849,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p) +@@ -842,6 +850,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p) if (error) goto out_put_nd_path; @@ -57398,7 +58121,7 @@ index 7720fbd..7934bb2 100644 nd->last_type = LAST_BIND; *p = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(*p); -@@ -1588,6 +1602,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd) +@@ -1602,6 +1616,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd) if (res) break; res = walk_component(nd, path, LOOKUP_FOLLOW); @@ -57407,7 +58130,7 @@ index 7720fbd..7934bb2 100644 put_link(nd, &link, cookie); } while (res > 0); -@@ -1686,7 +1702,7 @@ EXPORT_SYMBOL(full_name_hash); +@@ -1700,7 +1716,7 @@ EXPORT_SYMBOL(full_name_hash); static inline unsigned long hash_name(const char *name, unsigned int *hashp) { unsigned long a, b, adata, bdata, mask, hash, len; @@ -57416,7 +58139,7 @@ index 7720fbd..7934bb2 100644 hash = a = 0; len = -sizeof(unsigned long); -@@ -1967,6 +1983,8 @@ static int path_lookupat(int dfd, const char *name, +@@ -1981,6 +1997,8 @@ static int path_lookupat(int dfd, const char *name, if (err) break; err = lookup_last(nd, &path); @@ -57425,7 +58148,7 @@ index 7720fbd..7934bb2 100644 put_link(nd, &link, cookie); } } -@@ -1974,6 +1992,13 @@ static int path_lookupat(int dfd, const char *name, +@@ -1988,6 +2006,13 @@ static int path_lookupat(int dfd, const char *name, if (!err) err = complete_walk(nd); @@ -57439,7 +58162,7 @@ index 7720fbd..7934bb2 100644 if (!err && nd->flags & LOOKUP_DIRECTORY) { if (!can_lookup(nd->inode)) { path_put(&nd->path); -@@ -2001,8 +2026,15 @@ static int filename_lookup(int dfd, struct filename *name, +@@ -2015,8 +2040,15 @@ static int filename_lookup(int dfd, struct filename *name, retval = path_lookupat(dfd, name->name, flags | LOOKUP_REVAL, nd); @@ -57456,7 +58179,7 @@ index 7720fbd..7934bb2 100644 return retval; } -@@ -2380,6 +2412,13 @@ static int may_open(struct path *path, int acc_mode, int flag) +@@ -2587,6 +2619,13 @@ static int may_open(struct path *path, int acc_mode, int flag) if (flag & O_NOATIME && !inode_owner_or_capable(inode)) return -EPERM; @@ -57470,7 +58193,7 @@ index 7720fbd..7934bb2 100644 return 0; } -@@ -2601,7 +2640,7 @@ looked_up: +@@ -2818,7 +2857,7 @@ looked_up: * cleared otherwise prior to returning. */ static int lookup_open(struct nameidata *nd, struct path *path, @@ -57479,7 +58202,7 @@ index 7720fbd..7934bb2 100644 const struct open_flags *op, bool got_write, int *opened) { -@@ -2636,6 +2675,17 @@ static int lookup_open(struct nameidata *nd, struct path *path, +@@ -2853,6 +2892,17 @@ static int lookup_open(struct nameidata *nd, struct path *path, /* Negative dentry, just create the file */ if (!dentry->d_inode && (op->open_flag & O_CREAT)) { umode_t mode = op->mode; @@ -57497,7 +58220,7 @@ index 7720fbd..7934bb2 100644 if (!IS_POSIXACL(dir->d_inode)) mode &= ~current_umask(); /* -@@ -2657,6 +2707,8 @@ static int lookup_open(struct nameidata *nd, struct path *path, +@@ -2874,6 +2924,8 @@ static int lookup_open(struct nameidata *nd, struct path *path, nd->flags & LOOKUP_EXCL); if (error) goto out_dput; @@ -57506,7 +58229,7 @@ index 7720fbd..7934bb2 100644 } out_no_open: path->dentry = dentry; -@@ -2671,7 +2723,7 @@ out_dput: +@@ -2888,7 +2940,7 @@ out_dput: /* * Handle the last step of open() */ @@ -57515,7 +58238,7 @@ index 7720fbd..7934bb2 100644 struct file *file, const struct open_flags *op, int *opened, struct filename *name) { -@@ -2721,6 +2773,15 @@ static int do_last(struct nameidata *nd, struct path *path, +@@ -2938,6 +2990,15 @@ static int do_last(struct nameidata *nd, struct path *path, if (error) return error; @@ -57531,7 +58254,7 @@ index 7720fbd..7934bb2 100644 audit_inode(name, dir, LOOKUP_PARENT); error = -EISDIR; /* trailing slashes? */ -@@ -2740,7 +2801,7 @@ retry_lookup: +@@ -2957,7 +3018,7 @@ retry_lookup: */ } mutex_lock(&dir->d_inode->i_mutex); @@ -57540,7 +58263,7 @@ index 7720fbd..7934bb2 100644 mutex_unlock(&dir->d_inode->i_mutex); if (error <= 0) { -@@ -2764,11 +2825,28 @@ retry_lookup: +@@ -2981,11 +3042,28 @@ retry_lookup: goto finish_open_created; } @@ -57570,7 +58293,7 @@ index 7720fbd..7934bb2 100644 /* * If atomic_open() acquired write access it is dropped now due to -@@ -2809,6 +2887,11 @@ finish_lookup: +@@ -3026,6 +3104,11 @@ finish_lookup: } } BUG_ON(inode != path->dentry->d_inode); @@ -57582,7 +58305,7 @@ index 7720fbd..7934bb2 100644 return 1; } -@@ -2818,7 +2901,6 @@ finish_lookup: +@@ -3035,7 +3118,6 @@ finish_lookup: save_parent.dentry = nd->path.dentry; save_parent.mnt = mntget(path->mnt); nd->path.dentry = path->dentry; @@ -57590,7 +58313,7 @@ index 7720fbd..7934bb2 100644 } nd->inode = inode; /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */ -@@ -2828,7 +2910,18 @@ finish_open: +@@ -3045,7 +3127,18 @@ finish_open: path_put(&save_parent); return error; } @@ -57609,7 +58332,7 @@ index 7720fbd..7934bb2 100644 error = -EISDIR; if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode)) goto out; -@@ -2991,7 +3084,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, +@@ -3208,7 +3301,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, if (unlikely(error)) goto out; @@ -57618,7 +58341,7 @@ index 7720fbd..7934bb2 100644 while (unlikely(error > 0)) { /* trailing symlink */ struct path link = path; void *cookie; -@@ -3009,7 +3102,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, +@@ -3226,7 +3319,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, error = follow_link(&link, nd, &cookie); if (unlikely(error)) break; @@ -57627,7 +58350,7 @@ index 7720fbd..7934bb2 100644 put_link(nd, &link, cookie); } out: -@@ -3109,8 +3202,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, +@@ -3326,8 +3419,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, goto unlock; error = -EEXIST; @@ -57641,7 +58364,7 @@ index 7720fbd..7934bb2 100644 /* * Special case - lookup gave negative, but... we had foo/bar/ * From the vfs_mknod() POV we just have a negative dentry - -@@ -3162,6 +3259,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, +@@ -3379,6 +3476,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, } EXPORT_SYMBOL(user_path_create); @@ -57662,7 +58385,7 @@ index 7720fbd..7934bb2 100644 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) { int error = may_create(dir, dentry); -@@ -3224,6 +3335,17 @@ retry: +@@ -3441,6 +3552,17 @@ retry: if (!IS_POSIXACL(path.dentry->d_inode)) mode &= ~current_umask(); @@ -57680,7 +58403,7 @@ index 7720fbd..7934bb2 100644 error = security_path_mknod(&path, dentry, mode, dev); if (error) goto out; -@@ -3240,6 +3362,8 @@ retry: +@@ -3457,6 +3579,8 @@ retry: break; } out: @@ -57689,7 +58412,7 @@ index 7720fbd..7934bb2 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3292,9 +3416,16 @@ retry: +@@ -3509,9 +3633,16 @@ retry: if (!IS_POSIXACL(path.dentry->d_inode)) mode &= ~current_umask(); @@ -57706,7 +58429,7 @@ index 7720fbd..7934bb2 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3375,6 +3506,8 @@ static long do_rmdir(int dfd, const char __user *pathname) +@@ -3592,6 +3723,8 @@ static long do_rmdir(int dfd, const char __user *pathname) struct filename *name; struct dentry *dentry; struct nameidata nd; @@ -57715,7 +58438,7 @@ index 7720fbd..7934bb2 100644 unsigned int lookup_flags = 0; retry: name = user_path_parent(dfd, pathname, &nd, lookup_flags); -@@ -3407,10 +3540,21 @@ retry: +@@ -3624,10 +3757,21 @@ retry: error = -ENOENT; goto exit3; } @@ -57737,7 +58460,7 @@ index 7720fbd..7934bb2 100644 exit3: dput(dentry); exit2: -@@ -3476,6 +3620,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) +@@ -3693,6 +3837,8 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct dentry *dentry; struct nameidata nd; struct inode *inode = NULL; @@ -57746,7 +58469,7 @@ index 7720fbd..7934bb2 100644 unsigned int lookup_flags = 0; retry: name = user_path_parent(dfd, pathname, &nd, lookup_flags); -@@ -3502,10 +3648,22 @@ retry: +@@ -3719,10 +3865,22 @@ retry: if (!inode) goto slashes; ihold(inode); @@ -57769,7 +58492,7 @@ index 7720fbd..7934bb2 100644 exit2: dput(dentry); } -@@ -3583,9 +3741,17 @@ retry: +@@ -3800,9 +3958,17 @@ retry: if (IS_ERR(dentry)) goto out_putname; @@ -57787,7 +58510,7 @@ index 7720fbd..7934bb2 100644 done_path_create(&path, dentry); if (retry_estale(error, lookup_flags)) { lookup_flags |= LOOKUP_REVAL; -@@ -3665,6 +3831,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, +@@ -3882,6 +4048,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, { struct dentry *new_dentry; struct path old_path, new_path; @@ -57795,7 +58518,7 @@ index 7720fbd..7934bb2 100644 int how = 0; int error; -@@ -3688,7 +3855,7 @@ retry: +@@ -3905,7 +4072,7 @@ retry: if (error) return error; @@ -57804,7 +58527,7 @@ index 7720fbd..7934bb2 100644 (how & LOOKUP_REVAL)); error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) -@@ -3700,11 +3867,28 @@ retry: +@@ -3917,11 +4084,28 @@ retry: error = may_linkat(&old_path); if (unlikely(error)) goto out_dput; @@ -57833,7 +58556,7 @@ index 7720fbd..7934bb2 100644 done_path_create(&new_path, new_dentry); if (retry_estale(error, how)) { how |= LOOKUP_REVAL; -@@ -3950,12 +4134,21 @@ retry: +@@ -4167,12 +4351,21 @@ retry: if (new_dentry == trap) goto exit5; @@ -57855,7 +58578,7 @@ index 7720fbd..7934bb2 100644 exit5: dput(new_dentry); exit4: -@@ -3987,6 +4180,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna +@@ -4204,6 +4397,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link) { @@ -57864,7 +58587,7 @@ index 7720fbd..7934bb2 100644 int len; len = PTR_ERR(link); -@@ -3996,7 +4191,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c +@@ -4213,7 +4408,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c len = strlen(link); if (len > (unsigned) buflen) len = buflen; @@ -57881,10 +58604,10 @@ index 7720fbd..7934bb2 100644 out: return len; diff --git a/fs/namespace.c b/fs/namespace.c -index a45ba4f..b4c7d07 100644 +index da5c494..a755a54 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1265,6 +1265,9 @@ static int do_umount(struct mount *mnt, int flags) +@@ -1268,6 +1268,9 @@ static int do_umount(struct mount *mnt, int flags) if (!(sb->s_flags & MS_RDONLY)) retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); up_write(&sb->s_umount); @@ -57894,7 +58617,7 @@ index a45ba4f..b4c7d07 100644 return retval; } -@@ -1283,6 +1286,9 @@ static int do_umount(struct mount *mnt, int flags) +@@ -1286,6 +1289,9 @@ static int do_umount(struct mount *mnt, int flags) } br_write_unlock(&vfsmount_lock); namespace_unlock(); @@ -57904,7 +58627,7 @@ index a45ba4f..b4c7d07 100644 return retval; } -@@ -1302,7 +1308,7 @@ static inline bool may_mount(void) +@@ -1305,7 +1311,7 @@ static inline bool may_mount(void) * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD */ @@ -57913,7 +58636,7 @@ index a45ba4f..b4c7d07 100644 { struct path path; struct mount *mnt; -@@ -1342,7 +1348,7 @@ out: +@@ -1347,7 +1353,7 @@ out: /* * The 2.0 compatible umount. No flags. */ @@ -57922,7 +58645,7 @@ index a45ba4f..b4c7d07 100644 { return sys_umount(name, 0); } -@@ -2313,6 +2319,16 @@ long do_mount(const char *dev_name, const char *dir_name, +@@ -2358,6 +2364,16 @@ long do_mount(const char *dev_name, const char *dir_name, MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT | MS_STRICTATIME); @@ -57939,7 +58662,7 @@ index a45ba4f..b4c7d07 100644 if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -2327,6 +2343,9 @@ long do_mount(const char *dev_name, const char *dir_name, +@@ -2372,6 +2388,9 @@ long do_mount(const char *dev_name, const char *dir_name, dev_name, data_page); dput_out: path_put(&path); @@ -57949,7 +58672,7 @@ index a45ba4f..b4c7d07 100644 return retval; } -@@ -2344,7 +2363,7 @@ static void free_mnt_ns(struct mnt_namespace *ns) +@@ -2389,7 +2408,7 @@ static void free_mnt_ns(struct mnt_namespace *ns) * number incrementing at 10Ghz will take 12,427 years to wrap which * is effectively never, so we can ignore the possibility. */ @@ -57958,7 +58681,7 @@ index a45ba4f..b4c7d07 100644 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns) { -@@ -2359,7 +2378,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns) +@@ -2404,7 +2423,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns) kfree(new_ns); return ERR_PTR(ret); } @@ -57967,7 +58690,7 @@ index a45ba4f..b4c7d07 100644 atomic_set(&new_ns->count, 1); new_ns->root = NULL; INIT_LIST_HEAD(&new_ns->list); -@@ -2373,7 +2392,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns) +@@ -2418,7 +2437,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns) * Allocate a new namespace structure and populate it with contents * copied from the namespace of the passed in task structure. */ @@ -57976,7 +58699,7 @@ index a45ba4f..b4c7d07 100644 struct user_namespace *user_ns, struct fs_struct *fs) { struct mnt_namespace *new_ns; -@@ -2500,8 +2519,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name) +@@ -2549,8 +2568,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name) } EXPORT_SYMBOL(mount_subtree); @@ -57987,7 +58710,7 @@ index a45ba4f..b4c7d07 100644 { int ret; char *kernel_type; -@@ -2614,6 +2633,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, +@@ -2663,6 +2682,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, if (error) goto out2; @@ -57999,8 +58722,8 @@ index a45ba4f..b4c7d07 100644 get_fs_root(current->fs, &root); old_mp = lock_mount(&old); error = PTR_ERR(old_mp); -@@ -2864,7 +2888,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns) - !nsown_capable(CAP_SYS_ADMIN)) +@@ -2932,7 +2956,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns) + !ns_capable(current_user_ns(), CAP_SYS_ADMIN)) return -EPERM; - if (fs->users != 1) @@ -58022,10 +58745,10 @@ index f4ccfe6..a5cf064 100644 static struct callback_op callback_ops[]; diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c -index 941246f..17d8724 100644 +index eda8879..bfc6837 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c -@@ -1138,16 +1138,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt +@@ -1150,16 +1150,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); } @@ -58059,10 +58782,10 @@ index 419572f..5414a23 100644 static struct nfsd4_operation nfsd4_ops[]; diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c -index c2a4701..fd80e29 100644 +index ecc735e..79b2d31 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c -@@ -1498,7 +1498,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p) +@@ -1500,7 +1500,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p) typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *); @@ -58071,7 +58794,7 @@ index c2a4701..fd80e29 100644 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access, [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close, [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit, -@@ -1538,7 +1538,7 @@ static nfsd4_dec nfsd4_dec_ops[] = { +@@ -1540,7 +1540,7 @@ static nfsd4_dec nfsd4_dec_ops[] = { [OP_RELEASE_LOCKOWNER] = (nfsd4_dec)nfsd4_decode_release_lockowner, }; @@ -58080,7 +58803,7 @@ index c2a4701..fd80e29 100644 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access, [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close, [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit, -@@ -1600,7 +1600,7 @@ static nfsd4_dec nfsd41_dec_ops[] = { +@@ -1602,7 +1602,7 @@ static nfsd4_dec nfsd41_dec_ops[] = { }; struct nfsd4_minorversion_ops { @@ -58090,10 +58813,10 @@ index c2a4701..fd80e29 100644 }; diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c -index e76244e..9fe8f2f1 100644 +index 9186c7c..3fdde3e 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c -@@ -526,14 +526,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp) +@@ -540,14 +540,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp) { struct svc_cacherep *rp = rqstp->rq_cacherep; struct kvec *resv = &rqstp->rq_res.head[0], *cachv; @@ -58115,10 +58838,10 @@ index e76244e..9fe8f2f1 100644 /* Don't cache excessive amounts of data and XDR failures */ if (!statp || len > (256 >> 2)) { diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c -index c827acb..b253b77 100644 +index 72cb28e..5b5f87d 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c -@@ -968,7 +968,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, +@@ -993,7 +993,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, } else { oldfs = get_fs(); set_fs(KERNEL_DS); @@ -58127,7 +58850,7 @@ index c827acb..b253b77 100644 set_fs(oldfs); } -@@ -1055,7 +1055,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, +@@ -1080,7 +1080,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, /* Write the data. */ oldfs = get_fs(); set_fs(KERNEL_DS); @@ -58136,7 +58859,7 @@ index c827acb..b253b77 100644 set_fs(oldfs); if (host_err < 0) goto out_nfserr; -@@ -1601,7 +1601,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) +@@ -1626,7 +1626,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) */ oldfs = get_fs(); set_fs(KERNEL_DS); @@ -58279,7 +59002,7 @@ index 9e38daf..5727cae 100644 "inode 0x%lx or driver bug.", vdir->i_ino); goto err_out; diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c -index c5670b8..d590213 100644 +index ea4ba9d..1e13d34 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages, @@ -58323,7 +59046,7 @@ index 82650d5..db37dcf 100644 if (bh_primary) brelse(bh_primary); diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c -index aebeacd..0dcdd26 100644 +index cd5496b..26a1055 100644 --- a/fs/ocfs2/localalloc.c +++ b/fs/ocfs2/localalloc.c @@ -1278,7 +1278,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb, @@ -58415,7 +59138,7 @@ index 5397c07..54afc55 100644 } } diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c -index 121da2d..a0232bc 100644 +index d4e81e4..ad89f5f 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len) @@ -58453,7 +59176,7 @@ index 121da2d..a0232bc 100644 /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; diff --git a/fs/open.c b/fs/open.c -index 7931f76..7b03f3b 100644 +index d420331..2dbb3fd 100644 --- a/fs/open.c +++ b/fs/open.c @@ -32,6 +32,8 @@ @@ -58547,7 +59270,7 @@ index 7931f76..7b03f3b 100644 error = security_path_chmod(path, mode); if (error) goto out_unlock; -@@ -531,6 +565,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group) +@@ -530,6 +564,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group) uid = make_kuid(current_user_ns(), user); gid = make_kgid(current_user_ns(), group); @@ -58557,7 +59280,7 @@ index 7931f76..7b03f3b 100644 newattrs.ia_valid = ATTR_CTIME; if (user != (uid_t) -1) { if (!uid_valid(uid)) -@@ -960,6 +997,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode) +@@ -974,6 +1011,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode) } else { fsnotify_open(f); fd_install(fd, f); @@ -59409,7 +60132,7 @@ index b143471..bb105e5 100644 } module_init(proc_devices_init); diff --git a/fs/proc/fd.c b/fs/proc/fd.c -index 0ff80f9..a1d7500 100644 +index 985ea88..d118a0a 100644 --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v) @@ -59431,7 +60154,7 @@ index 0ff80f9..a1d7500 100644 - if (rv == 0) - return 0; + - if (task_pid(current) == proc_pid(inode)) + if (task_tgid(current) == proc_pid(inode)) rv = 0; + + task = get_proc_task(inode); @@ -59447,7 +60170,7 @@ index 0ff80f9..a1d7500 100644 } diff --git a/fs/proc/inode.c b/fs/proc/inode.c -index 073aea6..0630370 100644 +index 8eaa1ba..cc6ff42 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -23,11 +23,17 @@ @@ -59482,7 +60205,7 @@ index 073aea6..0630370 100644 } static struct kmem_cache * proc_inode_cachep; -@@ -385,7 +398,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) +@@ -405,7 +418,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) if (de->mode) { inode->i_mode = de->mode; inode->i_uid = de->uid; @@ -59571,10 +60294,10 @@ index 06ea155..9a798c7 100644 return -EPERM; if (kcore_need_update) diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c -index 5aa847a..f77c8d4 100644 +index 59d85d6..ac6fc05 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c -@@ -159,7 +159,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) +@@ -153,7 +153,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) vmi.used >> 10, vmi.largest_chunk >> 10 #ifdef CONFIG_MEMORY_FAILURE @@ -59627,11 +60350,17 @@ index 4677bb7..408e936 100644 rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c -index 7129046..f2779c6 100644 +index 7129046..6914844 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c -@@ -13,11 +13,15 @@ +@@ -11,13 +11,21 @@ + #include + #include #include ++#include ++#ifdef CONFIG_GRKERNSEC ++#include ++#endif #include "internal.h" +extern int gr_handle_chroot_sysctl(const int op); @@ -59648,7 +60377,7 @@ index 7129046..f2779c6 100644 void proc_sys_poll_notify(struct ctl_table_poll *poll) { -@@ -467,6 +471,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry, +@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry, err = NULL; d_set_d_op(dentry, &proc_sys_dentry_operations); @@ -59658,7 +60387,7 @@ index 7129046..f2779c6 100644 d_add(dentry, inode); out: -@@ -482,6 +489,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf, +@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf, struct inode *inode = file_inode(filp); struct ctl_table_header *head = grab_header(inode); struct ctl_table *table = PROC_I(inode)->sysctl_entry; @@ -59666,7 +60395,7 @@ index 7129046..f2779c6 100644 ssize_t error; size_t res; -@@ -493,7 +501,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf, +@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf, * and won't be until we finish. */ error = -EPERM; @@ -59675,7 +60404,7 @@ index 7129046..f2779c6 100644 goto out; /* if that can happen at all, it should be -EINVAL, not -EISDIR */ -@@ -501,6 +509,22 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf, +@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf, if (!table->proc_handler) goto out; @@ -59691,14 +60420,19 @@ index 7129046..f2779c6 100644 + dput(filp->f_path.dentry); + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op)) + goto out; -+ if (write && !capable(CAP_SYS_ADMIN)) -+ goto out; ++ if (write) { ++ if (current->nsproxy->net_ns != table->extra2) { ++ if (!capable(CAP_SYS_ADMIN)) ++ goto out; ++ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN)) ++ goto out; ++ } +#endif + /* careful: calling conventions are nasty here */ res = count; error = table->proc_handler(table, write, buf, &res, ppos); -@@ -598,6 +622,9 @@ static bool proc_sys_fill_cache(struct file *file, +@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file, return false; } else { d_set_d_op(child, &proc_sys_dentry_operations); @@ -59708,7 +60442,7 @@ index 7129046..f2779c6 100644 d_add(child, inode); } } else { -@@ -641,6 +668,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table, +@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table, if ((*pos)++ < ctx->pos) return true; @@ -59718,7 +60452,7 @@ index 7129046..f2779c6 100644 if (unlikely(S_ISLNK(table->mode))) res = proc_sys_link_fill_cache(file, ctx, head, table); else -@@ -734,6 +764,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct +@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct if (IS_ERR(head)) return PTR_ERR(head); @@ -59728,7 +60462,7 @@ index 7129046..f2779c6 100644 generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -@@ -756,13 +789,13 @@ static const struct file_operations proc_sys_dir_file_operations = { +@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = { .llseek = generic_file_llseek, }; @@ -59744,7 +60478,7 @@ index 7129046..f2779c6 100644 .lookup = proc_sys_lookup, .permission = proc_sys_permission, .setattr = proc_sys_setattr, -@@ -839,7 +872,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir, +@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir, static struct ctl_dir *new_dir(struct ctl_table_set *set, const char *name, int namelen) { @@ -59753,7 +60487,7 @@ index 7129046..f2779c6 100644 struct ctl_dir *new; struct ctl_node *node; char *new_name; -@@ -851,7 +884,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set, +@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set, return NULL; node = (struct ctl_node *)(new + 1); @@ -59762,7 +60496,7 @@ index 7129046..f2779c6 100644 new_name = (char *)(table + 2); memcpy(new_name, name, namelen); new_name[namelen] = '\0'; -@@ -1020,7 +1053,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table) +@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table) static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table, struct ctl_table_root *link_root) { @@ -59772,7 +60506,7 @@ index 7129046..f2779c6 100644 struct ctl_table_header *links; struct ctl_node *node; char *link_name; -@@ -1043,7 +1077,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table +@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table return NULL; node = (struct ctl_node *)(links + 1); @@ -59781,7 +60515,7 @@ index 7129046..f2779c6 100644 link_name = (char *)&link_table[nr_entries + 1]; for (link = link_table, entry = table; entry->procname; link++, entry++) { -@@ -1291,8 +1325,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, +@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, struct ctl_table_header ***subheader, struct ctl_table_set *set, struct ctl_table *table) { @@ -59792,7 +60526,7 @@ index 7129046..f2779c6 100644 int nr_files = 0; int nr_dirs = 0; int err = -ENOMEM; -@@ -1304,10 +1338,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, +@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, nr_files++; } @@ -59804,7 +60538,7 @@ index 7129046..f2779c6 100644 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1), GFP_KERNEL); if (!files) -@@ -1325,7 +1358,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, +@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos, /* Register everything except a directory full of subdirectories */ if (nr_files || !nr_dirs) { struct ctl_table_header *header; @@ -59814,10 +60548,10 @@ index 7129046..f2779c6 100644 kfree(ctl_table_arg); goto out; diff --git a/fs/proc/root.c b/fs/proc/root.c -index 0e0e83c..005ba6a 100644 +index 87dbcbe..55e1b4d 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c -@@ -183,7 +183,15 @@ void __init proc_root_init(void) +@@ -186,7 +186,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); #endif @@ -59847,7 +60581,7 @@ index 6b6a993..807cccc 100644 kfree(s); } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index 107d026..c715aeb 100644 +index 390bdab..83c1e8a 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -12,12 +12,19 @@ @@ -60014,7 +60748,7 @@ index 107d026..c715aeb 100644 mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -@@ -1362,6 +1413,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) +@@ -1390,6 +1441,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) int n; char buffer[50]; @@ -60028,9 +60762,9 @@ index 107d026..c715aeb 100644 if (!mm) return 0; -@@ -1379,11 +1437,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) - mpol_to_str(buffer, sizeof(buffer), pol); - mpol_cond_put(pol); +@@ -1409,11 +1467,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) + if (n < 0) + return n; +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer); @@ -60068,10 +60802,10 @@ index 56123a6..5a2f6ec 100644 pid_t tid = vm_is_stack(priv->task, vma, is_pid); diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c -index a1a16eb..6be46ed 100644 +index 9100d69..f1f9fc9 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c -@@ -104,9 +104,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count, +@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count, nr_bytes = count; /* If pfn is not ram, return zeros for sparse dump files */ @@ -60088,12 +60822,12 @@ index a1a16eb..6be46ed 100644 tmp = copy_oldmem_page(pfn, buf, nr_bytes, offset, userbuf); if (tmp < 0) -@@ -178,7 +182,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer, +@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos, if (*fpos < m->offset + m->size) { tsz = min_t(size_t, m->offset + m->size - *fpos, buflen); start = m->paddr + *fpos - m->offset; -- tmp = read_from_oldmem(buffer, tsz, &start, 1); -+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, 1); +- tmp = read_from_oldmem(buffer, tsz, &start, userbuf); ++ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf); if (tmp < 0) return tmp; buflen -= tsz; @@ -60142,10 +60876,10 @@ index 16e8abb..2dcf914 100644 if (!msg_head) { printk(KERN_ERR diff --git a/fs/read_write.c b/fs/read_write.c -index 122a384..0b7ecf2 100644 +index e3cd280..a378473 100644 --- a/fs/read_write.c +++ b/fs/read_write.c -@@ -440,7 +440,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t +@@ -438,7 +438,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t old_fs = get_fs(); set_fs(get_ds()); @@ -60274,7 +61008,7 @@ index a958444..42b2323 100644 SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h -index 3df5ce6..8c0f4b0 100644 +index f8adaee..0eeeeca 100644 --- a/fs/reiserfs/reiserfs.h +++ b/fs/reiserfs/reiserfs.h @@ -453,7 +453,7 @@ struct reiserfs_sb_info { @@ -60286,7 +61020,7 @@ index 3df5ce6..8c0f4b0 100644 // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -@@ -1978,7 +1978,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode) +@@ -1982,7 +1982,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode) #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter) @@ -60296,7 +61030,7 @@ index 3df5ce6..8c0f4b0 100644 #define __fs_changed(gen,s) (gen != get_generation (s)) #define fs_changed(gen,s) \ diff --git a/fs/select.c b/fs/select.c -index 35d4adc7..d6c60db 100644 +index dfd5cb1..1754d57 100644 --- a/fs/select.c +++ b/fs/select.c @@ -20,6 +20,7 @@ @@ -60307,7 +61041,7 @@ index 35d4adc7..d6c60db 100644 #include /* for STICKY_TIMEOUTS */ #include #include -@@ -881,6 +882,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, +@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, struct poll_list *walk = head; unsigned long todo = nfds; @@ -60316,7 +61050,7 @@ index 35d4adc7..d6c60db 100644 return -EINVAL; diff --git a/fs/seq_file.c b/fs/seq_file.c -index 3135c25..d0395dd 100644 +index a290157..ec3211a 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -10,6 +10,7 @@ @@ -60355,6 +61089,15 @@ index 3135c25..d0395dd 100644 return !m->buf ? -ENOMEM : -EAGAIN; } +@@ -152,7 +156,7 @@ Eoverflow: + ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) + { + struct seq_file *m = file->private_data; +- size_t copied = 0; ++ ssize_t copied = 0; + loff_t pos; + size_t n; + void *p; @@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) /* grab buffer if we didn't have one */ @@ -60373,7 +61116,7 @@ index 3135c25..d0395dd 100644 if (!m->buf) goto Enomem; m->count = 0; -@@ -581,7 +585,7 @@ static void single_stop(struct seq_file *p, void *v) +@@ -583,7 +587,7 @@ static void single_stop(struct seq_file *p, void *v) int single_open(struct file *file, int (*show)(struct seq_file *, void *), void *data) { @@ -60551,7 +61294,7 @@ index 3b7ee65..87fc2e4 100644 pipe_unlock(ipipe); diff --git a/fs/stat.c b/fs/stat.c -index 04ce1ac..a13dd1e 100644 +index d0ea7ef..f463f9d 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat) @@ -60588,10 +61331,10 @@ index 04ce1ac..a13dd1e 100644 generic_fillattr(inode, stat); return 0; diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c -index 15c68f9..36a8b3e 100644 +index c590cab..6dfd6fc 100644 --- a/fs/sysfs/bin.c +++ b/fs/sysfs/bin.c -@@ -235,13 +235,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) +@@ -234,13 +234,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) return ret; } @@ -60609,7 +61352,7 @@ index 15c68f9..36a8b3e 100644 if (!bb->vm_ops) return -EINVAL; diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c -index e068e74..92edeb8 100644 +index 4d83ced..049dc45 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida); @@ -60621,7 +61364,7 @@ index e068e74..92edeb8 100644 { unsigned long hash = init_name_hash(); unsigned int len = strlen(name); -@@ -679,6 +679,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd, +@@ -675,6 +675,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd, struct sysfs_dirent *sd; int rc; @@ -60641,7 +61384,7 @@ index e068e74..92edeb8 100644 sd = sysfs_new_dirent(name, mode, SYSFS_DIR); if (!sd) diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c -index d2bb7ed..fe8c331 100644 +index 15ef5eb..e474372 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock); @@ -60653,7 +61396,7 @@ index d2bb7ed..fe8c331 100644 wait_queue_head_t poll; struct list_head buffers; /* goes through sysfs_buffer.list */ }; -@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer +@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry *dentry, struct sysfs_buffer *buffer) if (!sysfs_get_active(attr_sd)) return -ENODEV; @@ -60662,7 +61405,7 @@ index d2bb7ed..fe8c331 100644 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page); sysfs_put_active(attr_sd); -@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd, +@@ -284,7 +284,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd, return -ENOMEM; atomic_set(&new_od->refcnt, 0); @@ -60671,7 +61414,7 @@ index d2bb7ed..fe8c331 100644 init_waitqueue_head(&new_od->poll); INIT_LIST_HEAD(&new_od->buffers); goto retry; -@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait) +@@ -430,7 +430,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait) sysfs_put_active(attr_sd); @@ -60680,7 +61423,7 @@ index d2bb7ed..fe8c331 100644 goto trigger; return DEFAULT_POLLMASK; -@@ -452,7 +452,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd) +@@ -450,7 +450,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd) if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) { od = sd->s_attr.open; if (od) { @@ -60690,12 +61433,12 @@ index d2bb7ed..fe8c331 100644 } } diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c -index 8c940df..25b733e 100644 +index 2dd4507..62a215a 100644 --- a/fs/sysfs/symlink.c +++ b/fs/sysfs/symlink.c -@@ -305,7 +305,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd) - - static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) +@@ -308,7 +308,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd) + static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, + void *cookie) { - char *page = nd_get_link(nd); + const char *page = nd_get_link(nd); @@ -60896,10 +61639,10 @@ index 9fbea87..6b19972 100644 struct posix_acl *acl; struct posix_acl_entry *acl_e; diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c -index 05c698c..6b918af 100644 +index f47e65c..e7125d9 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c -@@ -765,7 +765,7 @@ xfs_bmap_validate_ret( +@@ -586,7 +586,7 @@ xfs_bmap_validate_ret( #else #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0) @@ -60908,26 +61651,26 @@ index 05c698c..6b918af 100644 #endif /* DEBUG */ /* -diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c -index 97676a3..399a75d 100644 ---- a/fs/xfs/xfs_dir2_sf.c -+++ b/fs/xfs/xfs_dir2_sf.c -@@ -848,7 +848,12 @@ xfs_dir2_sf_getdents( - - ino = xfs_dir2_sfe_get_ino(sfp, sfep); +diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c +index 8f84153..7ce60d0 100644 +--- a/fs/xfs/xfs_dir2_readdir.c ++++ b/fs/xfs/xfs_dir2_readdir.c +@@ -160,7 +160,12 @@ xfs_dir2_sf_getdents( + ino = xfs_dir3_sfe_get_ino(mp, sfp, sfep); + filetype = xfs_dir3_sfe_get_ftype(mp, sfp, sfep); ctx->pos = off & 0x7fffffff; -- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, +- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino, + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) { + char name[sfep->namelen]; + memcpy(name, sfep->name, sfep->namelen); -+ if (!dir_emit(ctx, name, sfep->namelen, ino, DT_UNKNOWN)) ++ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype))) + return 0; -+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, - ino, DT_UNKNOWN)) ++ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino, + xfs_dir3_get_dtype(mp, filetype))) return 0; - sfep = xfs_dir2_sf_nextentry(sfp, sfep); + sfep = xfs_dir3_sf_nextentry(mp, sfp, sfep); diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c -index 6e2bca5..6ce80d3 100644 +index 2e1e6c3..689f742 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -127,7 +127,7 @@ xfs_find_handle( @@ -60939,11 +61682,35 @@ index 6e2bca5..6ce80d3 100644 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) goto out_put; +@@ -443,7 +443,8 @@ xfs_attrlist_by_handle( + return -XFS_ERROR(EPERM); + if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t))) + return -XFS_ERROR(EFAULT); +- if (al_hreq.buflen > XATTR_LIST_MAX) ++ if (al_hreq.buflen < sizeof(struct attrlist) || ++ al_hreq.buflen > XATTR_LIST_MAX) + return -XFS_ERROR(EINVAL); + + /* +diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c +index f671f7e..53365c6 100644 +--- a/fs/xfs/xfs_ioctl32.c ++++ b/fs/xfs/xfs_ioctl32.c +@@ -357,7 +357,8 @@ xfs_compat_attrlist_by_handle( + if (copy_from_user(&al_hreq, arg, + sizeof(compat_xfs_fsop_attrlist_handlereq_t))) + return -XFS_ERROR(EFAULT); +- if (al_hreq.buflen > XATTR_LIST_MAX) ++ if (al_hreq.buflen < sizeof(struct attrlist) || ++ al_hreq.buflen > XATTR_LIST_MAX) + return -XFS_ERROR(EINVAL); + + /* diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c -index 96dda62..d6c6a52 100644 +index 2b8952d..a60c6be 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c -@@ -395,7 +395,7 @@ xfs_vn_put_link( +@@ -401,7 +401,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) { @@ -60954,10 +61721,10 @@ index 96dda62..d6c6a52 100644 kfree(s); diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig new file mode 100644 -index 0000000..0fd7c82 +index 0000000..a78d810 --- /dev/null +++ b/grsecurity/Kconfig -@@ -0,0 +1,1080 @@ +@@ -0,0 +1,1107 @@ +# +# grecurity configuration +# @@ -60971,21 +61738,15 @@ index 0000000..0fd7c82 + help + If you say Y here, /dev/kmem and /dev/mem won't be allowed to + be written to or read from to modify or leak the contents of the running -+ kernel. /dev/port will also not be allowed to be opened and support -+ for /dev/cpu/*/msr will be removed. If you have module -+ support disabled, enabling this will close up five ways that are -+ currently used to insert malicious code into the running kernel. ++ kernel. /dev/port will also not be allowed to be opened, and support ++ for /dev/cpu/*/msr and kexec will be removed. If you have module ++ support disabled, enabling this will close up six ways that are ++ currently used to insert malicious code into the running kernel. + -+ Even with all these features enabled, we still highly recommend that ++ Even with this feature enabled, we still highly recommend that + you use the RBAC system, as it is still possible for an attacker to -+ modify the running kernel through privileged I/O granted by ioperm/iopl. -+ -+ If you are not using XFree86, you may be able to stop this additional -+ case by enabling the 'Disable privileged I/O' option. Though nothing -+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem, -+ but only to video memory, which is the only writing we allow in this -+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will -+ not be allowed to mprotect it with PROT_WRITE later. ++ modify the running kernel through other more obscure methods. ++ + Enabling this feature will prevent the "cpupower" and "powertop" tools + from working. + @@ -61021,10 +61782,11 @@ index 0000000..0fd7c82 + the most notable of which are XFree86 and hwclock. hwclock can be + remedied by having RTC support in the kernel, so real-time + clock support is enabled if this option is enabled, to ensure -+ that hwclock operates correctly. XFree86 still will not -+ operate correctly with this option enabled, so DO NOT CHOOSE Y -+ IF YOU USE XFree86. If you use XFree86 and you still want to -+ protect your kernel against modification, use the RBAC system. ++ that hwclock operates correctly. ++ ++ If you're using XFree86 or a version of Xorg from 2012 or earlier, ++ you may not be able to boot into a graphical environment with this ++ option enabled. In this case, you should use the RBAC system instead. + +config GRKERNSEC_JIT_HARDEN + bool "Harden BPF JIT against spray attacks" @@ -61194,6 +61956,20 @@ index 0000000..0fd7c82 + This deters repeated kernel exploitation/bruteforcing attempts + and is useful for later forensics. + ++config GRKERNSEC_OLD_ARM_USERLAND ++ bool "Old ARM userland compatibility" ++ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7) ++ help ++ If you say Y here, stubs of executable code to perform such operations ++ as "compare-exchange" will be placed at fixed locations in the ARM vector ++ table. This is unfortunately needed for old ARM userland meant to run ++ across a wide range of processors. Without this option enabled, ++ the get_tls and data memory barrier stubs will be emulated by the kernel, ++ which is enough for Linaro userlands or other userlands designed for v6 ++ and newer ARM CPUs. It's recommended that you try without this option enabled ++ first, and only enable it if your userland does not boot (it will likely fail ++ at init time). ++ +endmenu +menu "Role Based Access Control Options" +depends on GRKERNSEC @@ -61549,7 +62325,7 @@ index 0000000..0fd7c82 +config GRKERNSEC_CHROOT_INITRD + bool "Exempt initrd tasks from restrictions" + default y if GRKERNSEC_CONFIG_AUTO -+ depends on GRKERNSEC_CHROOT && BLK_DEV_RAM ++ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD + help + If you say Y here, tasks started prior to init will be exempted from + grsecurity's chroot restrictions. This option is mainly meant to @@ -61738,6 +62514,24 @@ index 0000000..0fd7c82 + running with root privileges. If the sysctl option is enabled, + a sysctl option with name "consistent_setxid" is created. + ++config GRKERNSEC_HARDEN_IPC ++ bool "Disallow access to world-accessible IPC objects" ++ default y if GRKERNSEC_CONFIG_AUTO ++ depends on SYSVIPC ++ help ++ If you say Y here, access to overly-permissive IPC (shared memory, ++ message queues, and semaphores) will be denied for processes whose ++ effective user or group would not grant them permission. It's a ++ common error to grant too much permission to these objects, with ++ impact ranging from denial of service and information leaking to ++ privilege escalation. This feature was developed in response to ++ research by Tim Brown: ++ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/ ++ who found hundreds of such insecure usages. Processes with ++ CAP_IPC_OWNER are still permitted to access these IPC objects. ++ If the sysctl option is enabled, a sysctl option with name ++ "harden_ipc" is created. ++ +config GRKERNSEC_TPE + bool "Trusted Path Execution (TPE)" + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER @@ -62040,7 +62834,7 @@ index 0000000..0fd7c82 +endmenu diff --git a/grsecurity/Makefile b/grsecurity/Makefile new file mode 100644 -index 0000000..b0b77d5 +index 0000000..85beb79 --- /dev/null +++ b/grsecurity/Makefile @@ -0,0 +1,43 @@ @@ -62057,11 +62851,11 @@ index 0000000..b0b77d5 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \ + grsec_mount.o grsec_sig.o grsec_sysctl.o \ + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \ -+ grsec_usb.o ++ grsec_usb.o grsec_ipc.o + +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \ + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \ -+ gracl_learn.o grsec_log.o ++ gracl_learn.o grsec_log.o gracl_policy.o +ifdef CONFIG_COMPAT +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o +endif @@ -62089,10 +62883,10 @@ index 0000000..b0b77d5 +endif diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c new file mode 100644 -index 0000000..c0793fd +index 0000000..6affeea --- /dev/null +++ b/grsecurity/gracl.c -@@ -0,0 +1,4178 @@ +@@ -0,0 +1,2679 @@ +#include +#include +#include @@ -62134,48 +62928,27 @@ index 0000000..c0793fd +#include +#include + -+extern struct lglock vfsmount_lock; -+ -+static struct acl_role_db acl_role_set; -+static struct name_db name_set; -+static struct inodev_db inodev_set; -+ -+/* for keeping track of userspace pointers used for subjects, so we -+ can share references in the kernel as well -+*/ -+ -+static struct path real_root; ++#define FOR_EACH_ROLE_START(role) \ ++ role = running_polstate.role_list; \ ++ while (role) { + -+static struct acl_subj_map_db subj_map_set; ++#define FOR_EACH_ROLE_END(role) \ ++ role = role->prev; \ ++ } + -+static struct acl_role_label *default_role; ++extern struct lglock vfsmount_lock; + -+static struct acl_role_label *role_list; ++extern struct path gr_real_root; + -+static u16 acl_sp_role_value; ++static struct gr_policy_state running_polstate; ++struct gr_policy_state *polstate = &running_polstate; ++extern struct gr_alloc_state *current_alloc_state; + +extern char *gr_shared_page[4]; -+static DEFINE_MUTEX(gr_dev_mutex); +DEFINE_RWLOCK(gr_inode_lock); + -+struct gr_arg *gr_usermode; -+ +static unsigned int gr_status __read_only = GR_STATUS_INIT; + -+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum); -+extern void gr_clear_learn_entries(void); -+ -+unsigned char *gr_system_salt; -+unsigned char *gr_system_sum; -+ -+static struct sprole_pw **acl_special_roles = NULL; -+static __u16 num_sprole_pws = 0; -+ -+static struct acl_role_label *kernel_role = NULL; -+ -+static unsigned int gr_auth_attempts = 0; -+static unsigned long gr_auth_expires = 0UL; -+ +#ifdef CONFIG_NET +extern struct vfsmount *sock_mnt; +#endif @@ -62187,156 +62960,29 @@ index 0000000..c0793fd +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE]; +#endif + -+static struct acl_object_label *fakefs_obj_rw; -+static struct acl_object_label *fakefs_obj_rwx; ++extern u16 acl_sp_role_value; ++extern struct acl_object_label *fakefs_obj_rw; ++extern struct acl_object_label *fakefs_obj_rwx; + -+extern int gr_init_uidset(void); -+extern void gr_free_uidset(void); -+extern void gr_remove_uid(uid_t uid); -+extern int gr_find_uid(uid_t uid); -+ -+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp) -+{ -+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp) ++int gr_acl_is_enabled(void) +{ -+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp) -+{ -+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp) -+{ -+ if (copy_from_user(role, userp, sizeof(struct acl_role_label))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) -+{ -+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) -+{ -+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) -+{ -+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp) -+{ -+ if (copy_from_user(trans, userp, sizeof(struct role_transition))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp) -+{ -+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *))) -+ return -EFAULT; -+ -+ return 0; -+} -+ -+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap) -+{ -+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper))) -+ return -EFAULT; -+ -+ if ((uwrap->version != GRSECURITY_VERSION) || (uwrap->size != sizeof(struct gr_arg))) -+ return -EINVAL; -+ -+ return 0; ++ return (gr_status & GR_READY); +} + -+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg) ++void gr_enable_rbac_system(void) +{ -+ if (copy_from_user(arg, buf, sizeof (struct gr_arg))) -+ return -EFAULT; -+ -+ return 0; ++ pax_open_kernel(); ++ gr_status |= GR_READY; ++ pax_close_kernel(); +} + -+static size_t get_gr_arg_wrapper_size_normal(void) ++int gr_rbac_disable(void *unused) +{ -+ return sizeof(struct gr_arg_wrapper); -+} -+ -+#ifdef CONFIG_COMPAT -+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap); -+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg); -+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp); -+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp); -+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp); -+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp); -+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp); -+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp); -+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp); -+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp); -+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp); -+extern size_t get_gr_arg_wrapper_size_compat(void); -+ -+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only; -+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only; -+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only; -+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only; -+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only; -+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only; -+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only; -+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only; -+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only; -+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only; -+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only; -+size_t (* get_gr_arg_wrapper_size)(void) __read_only; -+ -+#else -+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal -+#define copy_gr_arg copy_gr_arg_normal -+#define copy_gr_hash_struct copy_gr_hash_struct_normal -+#define copy_acl_object_label copy_acl_object_label_normal -+#define copy_acl_subject_label copy_acl_subject_label_normal -+#define copy_acl_role_label copy_acl_role_label_normal -+#define copy_acl_ip_label copy_acl_ip_label_normal -+#define copy_pointer_from_array copy_pointer_from_array_normal -+#define copy_sprole_pw copy_sprole_pw_normal -+#define copy_role_transition copy_role_transition_normal -+#define copy_role_allowed_ip copy_role_allowed_ip_normal -+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal -+#endif ++ pax_open_kernel(); ++ gr_status &= ~GR_READY; ++ pax_close_kernel(); + -+__inline__ int -+gr_acl_is_enabled(void) -+{ -+ return (gr_status & GR_READY); ++ return 0; +} + +static inline dev_t __get_dev(const struct dentry *dentry) @@ -62400,7 +63046,7 @@ index 0000000..c0793fd + return 0; +} + -+static int ++int +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb) +{ + if (likely(lena != lenb)) @@ -62507,9 +63153,9 @@ index 0000000..c0793fd + path.dentry = (struct dentry *)dentry; + path.mnt = (struct vfsmount *)vfsmnt; + -+ /* we can use real_root.dentry, real_root.mnt, because this is only called ++ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called + by the RBAC system */ -+ res = gen_full_path(&path, &real_root, buf, buflen); ++ res = gen_full_path(&path, &gr_real_root, buf, buflen); + + return res; +} @@ -62526,7 +63172,7 @@ index 0000000..c0793fd + path.dentry = (struct dentry *)dentry; + path.mnt = (struct vfsmount *)vfsmnt; + -+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */ ++ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */ + get_fs_root(reaper->fs, &root); + + br_read_lock(&vfsmount_lock); @@ -62539,7 +63185,7 @@ index 0000000..c0793fd + return res; +} + -+static char * ++char * +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt) +{ + char *ret; @@ -62617,54 +63263,17 @@ index 0000000..c0793fd + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0)); +} + -+struct acl_subject_label * -+lookup_subject_map(const struct acl_subject_label *userp) -+{ -+ unsigned int index = gr_shash(userp, subj_map_set.s_size); -+ struct subject_map *match; -+ -+ match = subj_map_set.s_hash[index]; -+ -+ while (match && match->user != userp) -+ match = match->next; -+ -+ if (match != NULL) -+ return match->kernel; -+ else -+ return NULL; -+} -+ -+static void -+insert_subj_map_entry(struct subject_map *subjmap) -+{ -+ unsigned int index = gr_shash(subjmap->user, subj_map_set.s_size); -+ struct subject_map **curr; -+ -+ subjmap->prev = NULL; -+ -+ curr = &subj_map_set.s_hash[index]; -+ if (*curr != NULL) -+ (*curr)->prev = subjmap; -+ -+ subjmap->next = *curr; -+ *curr = subjmap; -+ -+ return; -+} -+ -+static struct acl_role_label * -+lookup_acl_role_label(const struct task_struct *task, const uid_t uid, ++struct acl_role_label * ++__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid, + const gid_t gid) +{ -+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, acl_role_set.r_size); ++ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size); + struct acl_role_label *match; + struct role_allowed_ip *ipp; + unsigned int x; -+ u32 curr_ip = task->signal->curr_ip; -+ -+ task->signal->saved_ip = curr_ip; ++ u32 curr_ip = task->signal->saved_ip; + -+ match = acl_role_set.r_hash[index]; ++ match = state->acl_role_set.r_hash[index]; + + while (match) { + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) { @@ -62679,8 +63288,8 @@ index 0000000..c0793fd +found: + if (match == NULL) { + try_group: -+ index = gr_rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size); -+ match = acl_role_set.r_hash[index]; ++ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size); ++ match = state->acl_role_set.r_hash[index]; + + while (match) { + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) { @@ -62694,7 +63303,7 @@ index 0000000..c0793fd + } +found2: + if (match == NULL) -+ match = default_role; ++ match = state->default_role; + if (match->allowed_ips == NULL) + return match; + else { @@ -62704,7 +63313,7 @@ index 0000000..c0793fd + (ntohl(ipp->addr) & ipp->netmask))) + return match; + } -+ match = default_role; ++ match = state->default_role; + } + } else if (match->allowed_ips == NULL) { + return match; @@ -62721,6 +63330,13 @@ index 0000000..c0793fd + return match; +} + ++static struct acl_role_label * ++lookup_acl_role_label(const struct task_struct *task, const uid_t uid, ++ const gid_t gid) ++{ ++ return __lookup_acl_role_label(&running_polstate, task, uid, gid); ++} ++ +struct acl_subject_label * +lookup_acl_subj_label(const ino_t ino, const dev_t dev, + const struct acl_role_label *role) @@ -62811,15 +63427,15 @@ index 0000000..c0793fd + return NULL; +} + -+static struct name_entry * -+lookup_name_entry(const char *name) ++struct name_entry * ++__lookup_name_entry(const struct gr_policy_state *state, const char *name) +{ + unsigned int len = strlen(name); + unsigned int key = full_name_hash(name, len); -+ unsigned int index = key % name_set.n_size; ++ unsigned int index = key % state->name_set.n_size; + struct name_entry *match; + -+ match = name_set.n_hash[index]; ++ match = state->name_set.n_hash[index]; + + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len))) + match = match->next; @@ -62828,14 +63444,20 @@ index 0000000..c0793fd +} + +static struct name_entry * ++lookup_name_entry(const char *name) ++{ ++ return __lookup_name_entry(&running_polstate, name); ++} ++ ++static struct name_entry * +lookup_name_entry_create(const char *name) +{ + unsigned int len = strlen(name); + unsigned int key = full_name_hash(name, len); -+ unsigned int index = key % name_set.n_size; ++ unsigned int index = key % running_polstate.name_set.n_size; + struct name_entry *match; + -+ match = name_set.n_hash[index]; ++ match = running_polstate.name_set.n_hash[index]; + + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) || + !match->deleted)) @@ -62844,7 +63466,7 @@ index 0000000..c0793fd + if (match && match->deleted) + return match; + -+ match = name_set.n_hash[index]; ++ match = running_polstate.name_set.n_hash[index]; + + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) || + match->deleted)) @@ -62859,10 +63481,10 @@ index 0000000..c0793fd +static struct inodev_entry * +lookup_inodev_entry(const ino_t ino, const dev_t dev) +{ -+ unsigned int index = gr_fhash(ino, dev, inodev_set.i_size); ++ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size); + struct inodev_entry *match; + -+ match = inodev_set.i_hash[index]; ++ match = running_polstate.inodev_set.i_hash[index]; + + while (match && (match->nentry->inode != ino || match->nentry->device != dev)) + match = match->next; @@ -62870,16 +63492,16 @@ index 0000000..c0793fd + return match; +} + -+static void -+insert_inodev_entry(struct inodev_entry *entry) ++void ++__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry) +{ + unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device, -+ inodev_set.i_size); ++ state->inodev_set.i_size); + struct inodev_entry **curr; + + entry->prev = NULL; + -+ curr = &inodev_set.i_hash[index]; ++ curr = &state->inodev_set.i_hash[index]; + if (*curr != NULL) + (*curr)->prev = entry; + @@ -62890,138 +63512,12 @@ index 0000000..c0793fd +} + +static void -+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid) -+{ -+ unsigned int index = -+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size); -+ struct acl_role_label **curr; -+ struct acl_role_label *tmp, *tmp2; -+ -+ curr = &acl_role_set.r_hash[index]; -+ -+ /* simple case, slot is empty, just set it to our role */ -+ if (*curr == NULL) { -+ *curr = role; -+ } else { -+ /* example: -+ 1 -> 2 -> 3 (adding 2 -> 3 to here) -+ 2 -> 3 -+ */ -+ /* first check to see if we can already be reached via this slot */ -+ tmp = *curr; -+ while (tmp && tmp != role) -+ tmp = tmp->next; -+ if (tmp == role) { -+ /* we don't need to add ourselves to this slot's chain */ -+ return; -+ } -+ /* we need to add ourselves to this chain, two cases */ -+ if (role->next == NULL) { -+ /* simple case, append the current chain to our role */ -+ role->next = *curr; -+ *curr = role; -+ } else { -+ /* 1 -> 2 -> 3 -> 4 -+ 2 -> 3 -> 4 -+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here) -+ */ -+ /* trickier case: walk our role's chain until we find -+ the role for the start of the current slot's chain */ -+ tmp = role; -+ tmp2 = *curr; -+ while (tmp->next && tmp->next != tmp2) -+ tmp = tmp->next; -+ if (tmp->next == tmp2) { -+ /* from example above, we found 3, so just -+ replace this slot's chain with ours */ -+ *curr = role; -+ } else { -+ /* we didn't find a subset of our role's chain -+ in the current slot's chain, so append their -+ chain to ours, and set us as the first role in -+ the slot's chain -+ -+ we could fold this case with the case above, -+ but making it explicit for clarity -+ */ -+ tmp->next = tmp2; -+ *curr = role; -+ } -+ } -+ } -+ -+ return; -+} -+ -+static void -+insert_acl_role_label(struct acl_role_label *role) -+{ -+ int i; -+ -+ if (role_list == NULL) { -+ role_list = role; -+ role->prev = NULL; -+ } else { -+ role->prev = role_list; -+ role_list = role; -+ } -+ -+ /* used for hash chains */ -+ role->next = NULL; -+ -+ if (role->roletype & GR_ROLE_DOMAIN) { -+ for (i = 0; i < role->domain_child_num; i++) -+ __insert_acl_role_label(role, role->domain_children[i]); -+ } else -+ __insert_acl_role_label(role, role->uidgid); -+} -+ -+static int -+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted) ++insert_inodev_entry(struct inodev_entry *entry) +{ -+ struct name_entry **curr, *nentry; -+ struct inodev_entry *ientry; -+ unsigned int len = strlen(name); -+ unsigned int key = full_name_hash(name, len); -+ unsigned int index = key % name_set.n_size; -+ -+ curr = &name_set.n_hash[index]; -+ -+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len))) -+ curr = &((*curr)->next); -+ -+ if (*curr != NULL) -+ return 1; -+ -+ nentry = acl_alloc(sizeof (struct name_entry)); -+ if (nentry == NULL) -+ return 0; -+ ientry = acl_alloc(sizeof (struct inodev_entry)); -+ if (ientry == NULL) -+ return 0; -+ ientry->nentry = nentry; -+ -+ nentry->key = key; -+ nentry->name = name; -+ nentry->inode = inode; -+ nentry->device = device; -+ nentry->len = len; -+ nentry->deleted = deleted; -+ -+ nentry->prev = NULL; -+ curr = &name_set.n_hash[index]; -+ if (*curr != NULL) -+ (*curr)->prev = nentry; -+ nentry->next = *curr; -+ *curr = nentry; -+ -+ /* insert us into the table searchable by inode/dev */ -+ insert_inodev_entry(ientry); -+ -+ return 1; ++ __insert_inodev_entry(&running_polstate, entry); +} + -+static void ++void +insert_acl_obj_label(struct acl_object_label *obj, + struct acl_subject_label *subj) +{ @@ -63029,7 +63525,6 @@ index 0000000..c0793fd + gr_fhash(obj->inode, obj->device, subj->obj_hash_size); + struct acl_object_label **curr; + -+ + obj->prev = NULL; + + curr = &subj->obj_hash[index]; @@ -63042,7 +63537,7 @@ index 0000000..c0793fd + return; +} + -+static void ++void +insert_acl_subj_label(struct acl_subject_label *obj, + struct acl_role_label *role) +{ @@ -63061,6089 +63556,6674 @@ index 0000000..c0793fd + return; +} + -+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */ ++/* derived from glibc fnmatch() 0: match, 1: no match*/ + -+static void * -+create_table(__u32 * len, int elementsize) ++static int ++glob_match(const char *p, const char *n) +{ -+ unsigned int table_sizes[] = { -+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381, -+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143, -+ 4194301, 8388593, 16777213, 33554393, 67108859 -+ }; -+ void *newtable = NULL; -+ unsigned int pwr = 0; ++ char c; + -+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) && -+ table_sizes[pwr] <= *len) -+ pwr++; ++ while ((c = *p++) != '\0') { ++ switch (c) { ++ case '?': ++ if (*n == '\0') ++ return 1; ++ else if (*n == '/') ++ return 1; ++ break; ++ case '\\': ++ if (*n != c) ++ return 1; ++ break; ++ case '*': ++ for (c = *p++; c == '?' || c == '*'; c = *p++) { ++ if (*n == '/') ++ return 1; ++ else if (c == '?') { ++ if (*n == '\0') ++ return 1; ++ else ++ ++n; ++ } ++ } ++ if (c == '\0') { ++ return 0; ++ } else { ++ const char *endp; + -+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize)) -+ return newtable; ++ if ((endp = strchr(n, '/')) == NULL) ++ endp = n + strlen(n); + -+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE) -+ newtable = -+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL); -+ else -+ newtable = vmalloc(table_sizes[pwr] * elementsize); ++ if (c == '[') { ++ for (--p; n < endp; ++n) ++ if (!glob_match(p, n)) ++ return 0; ++ } else if (c == '/') { ++ while (*n != '\0' && *n != '/') ++ ++n; ++ if (*n == '/' && !glob_match(p, n + 1)) ++ return 0; ++ } else { ++ for (--p; n < endp; ++n) ++ if (*n == c && !glob_match(p, n)) ++ return 0; ++ } + -+ *len = table_sizes[pwr]; ++ return 1; ++ } ++ case '[': ++ { ++ int not; ++ char cold; + -+ return newtable; -+} ++ if (*n == '\0' || *n == '/') ++ return 1; + -+static int -+init_variables(const struct gr_arg *arg) -+{ -+ struct task_struct *reaper = init_pid_ns.child_reaper; -+ unsigned int stacksize; ++ not = (*p == '!' || *p == '^'); ++ if (not) ++ ++p; + -+ subj_map_set.s_size = arg->role_db.num_subjects; -+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children; -+ name_set.n_size = arg->role_db.num_objects; -+ inodev_set.i_size = arg->role_db.num_objects; ++ c = *p++; ++ for (;;) { ++ unsigned char fn = (unsigned char)*n; + -+ if (!subj_map_set.s_size || !acl_role_set.r_size || -+ !name_set.n_size || !inodev_set.i_size) -+ return 1; ++ if (c == '\0') ++ return 1; ++ else { ++ if (c == fn) ++ goto matched; ++ cold = c; ++ c = *p++; + -+ if (!gr_init_uidset()) -+ return 1; ++ if (c == '-' && *p != ']') { ++ unsigned char cend = *p++; + -+ /* set up the stack that holds allocation info */ ++ if (cend == '\0') ++ return 1; + -+ stacksize = arg->role_db.num_pointers + 5; ++ if (cold <= fn && fn <= cend) ++ goto matched; + -+ if (!acl_alloc_stack_init(stacksize)) -+ return 1; ++ c = *p++; ++ } ++ } + -+ /* grab reference for the real root dentry and vfsmount */ -+ get_fs_root(reaper->fs, &real_root); -+ -+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG -+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino); -+#endif ++ if (c == ']') ++ break; ++ } ++ if (!not) ++ return 1; ++ break; ++ matched: ++ while (c != ']') { ++ if (c == '\0') ++ return 1; + -+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label)); -+ if (fakefs_obj_rw == NULL) -+ return 1; -+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE; ++ c = *p++; ++ } ++ if (not) ++ return 1; ++ } ++ break; ++ default: ++ if (c != *n) ++ return 1; ++ } + -+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label)); -+ if (fakefs_obj_rwx == NULL) -+ return 1; -+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC; -+ -+ subj_map_set.s_hash = -+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *)); -+ acl_role_set.r_hash = -+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *)); -+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *)); -+ inodev_set.i_hash = -+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *)); -+ -+ if (!subj_map_set.s_hash || !acl_role_set.r_hash || -+ !name_set.n_hash || !inodev_set.i_hash) -+ return 1; ++ ++n; ++ } + -+ memset(subj_map_set.s_hash, 0, -+ sizeof(struct subject_map *) * subj_map_set.s_size); -+ memset(acl_role_set.r_hash, 0, -+ sizeof (struct acl_role_label *) * acl_role_set.r_size); -+ memset(name_set.n_hash, 0, -+ sizeof (struct name_entry *) * name_set.n_size); -+ memset(inodev_set.i_hash, 0, -+ sizeof (struct inodev_entry *) * inodev_set.i_size); ++ if (*n == '\0') ++ return 0; + -+ return 0; -+} ++ if (*n == '/') ++ return 0; + -+/* free information not needed after startup -+ currently contains user->kernel pointer mappings for subjects -+*/ ++ return 1; ++} + -+static void -+free_init_variables(void) ++static struct acl_object_label * ++chk_glob_label(struct acl_object_label *globbed, ++ const struct dentry *dentry, const struct vfsmount *mnt, char **path) +{ -+ __u32 i; ++ struct acl_object_label *tmp; + -+ if (subj_map_set.s_hash) { -+ for (i = 0; i < subj_map_set.s_size; i++) { -+ if (subj_map_set.s_hash[i]) { -+ kfree(subj_map_set.s_hash[i]); -+ subj_map_set.s_hash[i] = NULL; -+ } -+ } ++ if (*path == NULL) ++ *path = gr_to_filename_nolock(dentry, mnt); + -+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <= -+ PAGE_SIZE) -+ kfree(subj_map_set.s_hash); -+ else -+ vfree(subj_map_set.s_hash); ++ tmp = globbed; ++ ++ while (tmp) { ++ if (!glob_match(tmp->filename, *path)) ++ return tmp; ++ tmp = tmp->next; + } + -+ return; ++ return NULL; +} + -+static void -+free_variables(void) ++static struct acl_object_label * ++__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt, ++ const ino_t curr_ino, const dev_t curr_dev, ++ const struct acl_subject_label *subj, char **path, const int checkglob) +{ -+ struct acl_subject_label *s; -+ struct acl_role_label *r; -+ struct task_struct *task, *task2; -+ unsigned int x; -+ -+ gr_clear_learn_entries(); ++ struct acl_subject_label *tmpsubj; ++ struct acl_object_label *retval; ++ struct acl_object_label *retval2; + -+ read_lock(&tasklist_lock); -+ do_each_thread(task2, task) { -+ task->acl_sp_role = 0; -+ task->acl_role_id = 0; -+ task->acl = NULL; -+ task->role = NULL; -+ } while_each_thread(task2, task); -+ read_unlock(&tasklist_lock); ++ tmpsubj = (struct acl_subject_label *) subj; ++ read_lock(&gr_inode_lock); ++ do { ++ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj); ++ if (retval) { ++ if (checkglob && retval->globbed) { ++ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path); ++ if (retval2) ++ retval = retval2; ++ } ++ break; ++ } ++ } while ((tmpsubj = tmpsubj->parent_subject)); ++ read_unlock(&gr_inode_lock); + -+ /* release the reference to the real root dentry and vfsmount */ -+ path_put(&real_root); -+ memset(&real_root, 0, sizeof(real_root)); ++ return retval; ++} + -+ /* free all object hash tables */ ++static __inline__ struct acl_object_label * ++full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt, ++ struct dentry *curr_dentry, ++ const struct acl_subject_label *subj, char **path, const int checkglob) ++{ ++ int newglob = checkglob; ++ ino_t inode; ++ dev_t device; + -+ FOR_EACH_ROLE_START(r) -+ if (r->subj_hash == NULL) -+ goto next_role; -+ FOR_EACH_SUBJECT_START(r, s, x) -+ if (s->obj_hash == NULL) -+ break; -+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE) -+ kfree(s->obj_hash); -+ else -+ vfree(s->obj_hash); -+ FOR_EACH_SUBJECT_END(s, x) -+ FOR_EACH_NESTED_SUBJECT_START(r, s) -+ if (s->obj_hash == NULL) -+ break; -+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE) -+ kfree(s->obj_hash); -+ else -+ vfree(s->obj_hash); -+ FOR_EACH_NESTED_SUBJECT_END(s) -+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE) -+ kfree(r->subj_hash); -+ else -+ vfree(r->subj_hash); -+ r->subj_hash = NULL; -+next_role: -+ FOR_EACH_ROLE_END(r) ++ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking ++ as we don't want a / * rule to match instead of the / object ++ don't do this for create lookups that call this function though, since they're looking up ++ on the parent and thus need globbing checks on all paths ++ */ ++ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB) ++ newglob = GR_NO_GLOB; + -+ acl_free_all(); ++ spin_lock(&curr_dentry->d_lock); ++ inode = curr_dentry->d_inode->i_ino; ++ device = __get_dev(curr_dentry); ++ spin_unlock(&curr_dentry->d_lock); + -+ if (acl_role_set.r_hash) { -+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <= -+ PAGE_SIZE) -+ kfree(acl_role_set.r_hash); -+ else -+ vfree(acl_role_set.r_hash); -+ } -+ if (name_set.n_hash) { -+ if ((name_set.n_size * sizeof (struct name_entry *)) <= -+ PAGE_SIZE) -+ kfree(name_set.n_hash); -+ else -+ vfree(name_set.n_hash); -+ } ++ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob); ++} + -+ if (inodev_set.i_hash) { -+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <= -+ PAGE_SIZE) -+ kfree(inodev_set.i_hash); -+ else -+ vfree(inodev_set.i_hash); ++#ifdef CONFIG_HUGETLBFS ++static inline bool ++is_hugetlbfs_mnt(const struct vfsmount *mnt) ++{ ++ int i; ++ for (i = 0; i < HUGE_MAX_HSTATE; i++) { ++ if (unlikely(hugetlbfs_vfsmount[i] == mnt)) ++ return true; + } + -+ gr_free_uidset(); -+ -+ memset(&name_set, 0, sizeof (struct name_db)); -+ memset(&inodev_set, 0, sizeof (struct inodev_db)); -+ memset(&acl_role_set, 0, sizeof (struct acl_role_db)); -+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db)); -+ -+ default_role = NULL; -+ kernel_role = NULL; -+ role_list = NULL; -+ -+ return; ++ return false; +} ++#endif + -+static struct acl_subject_label * -+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied); -+ -+static int alloc_and_copy_string(char **name, unsigned int maxlen) ++static struct acl_object_label * ++__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, ++ const struct acl_subject_label *subj, char *path, const int checkglob) +{ -+ unsigned int len = strnlen_user(*name, maxlen); -+ char *tmp; ++ struct dentry *dentry = (struct dentry *) l_dentry; ++ struct vfsmount *mnt = (struct vfsmount *) l_mnt; ++ struct mount *real_mnt = real_mount(mnt); ++ struct acl_object_label *retval; ++ struct dentry *parent; + -+ if (!len || len >= maxlen) -+ return -EINVAL; ++ br_read_lock(&vfsmount_lock); ++ write_seqlock(&rename_lock); + -+ if ((tmp = (char *) acl_alloc(len)) == NULL) -+ return -ENOMEM; ++ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt || ++#ifdef CONFIG_NET ++ mnt == sock_mnt || ++#endif ++#ifdef CONFIG_HUGETLBFS ++ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) || ++#endif ++ /* ignore Eric Biederman */ ++ IS_PRIVATE(l_dentry->d_inode))) { ++ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw; ++ goto out; ++ } + -+ if (copy_from_user(tmp, *name, len)) -+ return -EFAULT; ++ for (;;) { ++ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt) ++ break; + -+ tmp[len-1] = '\0'; -+ *name = tmp; ++ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) { ++ if (!mnt_has_parent(real_mnt)) ++ break; + -+ return 0; -+} ++ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob); ++ if (retval != NULL) ++ goto out; + -+static int -+copy_user_glob(struct acl_object_label *obj) -+{ -+ struct acl_object_label *g_tmp, **guser; -+ int error; ++ dentry = real_mnt->mnt_mountpoint; ++ real_mnt = real_mnt->mnt_parent; ++ mnt = &real_mnt->mnt; ++ continue; ++ } + -+ if (obj->globbed == NULL) -+ return 0; ++ parent = dentry->d_parent; ++ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob); ++ if (retval != NULL) ++ goto out; + -+ guser = &obj->globbed; -+ while (*guser) { -+ g_tmp = (struct acl_object_label *) -+ acl_alloc(sizeof (struct acl_object_label)); -+ if (g_tmp == NULL) -+ return -ENOMEM; ++ dentry = parent; ++ } + -+ if (copy_acl_object_label(g_tmp, *guser)) -+ return -EFAULT; ++ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob); + -+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX); -+ if (error) -+ return error; ++ /* gr_real_root is pinned so we don't have to hold a reference */ ++ if (retval == NULL) ++ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob); ++out: ++ write_sequnlock(&rename_lock); ++ br_read_unlock(&vfsmount_lock); + -+ *guser = g_tmp; -+ guser = &(g_tmp->next); -+ } ++ BUG_ON(retval == NULL); + -+ return 0; ++ return retval; +} + -+static int -+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj, -+ struct acl_role_label *role) ++static __inline__ struct acl_object_label * ++chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, ++ const struct acl_subject_label *subj) +{ -+ struct acl_object_label *o_tmp; -+ int ret; -+ -+ while (userp) { -+ if ((o_tmp = (struct acl_object_label *) -+ acl_alloc(sizeof (struct acl_object_label))) == NULL) -+ return -ENOMEM; -+ -+ if (copy_acl_object_label(o_tmp, userp)) -+ return -EFAULT; ++ char *path = NULL; ++ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB); ++} + -+ userp = o_tmp->prev; ++static __inline__ struct acl_object_label * ++chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt, ++ const struct acl_subject_label *subj) ++{ ++ char *path = NULL; ++ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB); ++} + -+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX); -+ if (ret) -+ return ret; ++static __inline__ struct acl_object_label * ++chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, ++ const struct acl_subject_label *subj, char *path) ++{ ++ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB); ++} + -+ insert_acl_obj_label(o_tmp, subj); -+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode, -+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0)) -+ return -ENOMEM; ++struct acl_subject_label * ++chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, ++ const struct acl_role_label *role) ++{ ++ struct dentry *dentry = (struct dentry *) l_dentry; ++ struct vfsmount *mnt = (struct vfsmount *) l_mnt; ++ struct mount *real_mnt = real_mount(mnt); ++ struct acl_subject_label *retval; ++ struct dentry *parent; + -+ ret = copy_user_glob(o_tmp); -+ if (ret) -+ return ret; ++ br_read_lock(&vfsmount_lock); ++ write_seqlock(&rename_lock); + -+ if (o_tmp->nested) { -+ int already_copied; ++ for (;;) { ++ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt) ++ break; ++ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) { ++ if (!mnt_has_parent(real_mnt)) ++ break; + -+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied); -+ if (IS_ERR(o_tmp->nested)) -+ return PTR_ERR(o_tmp->nested); ++ spin_lock(&dentry->d_lock); ++ read_lock(&gr_inode_lock); ++ retval = ++ lookup_acl_subj_label(dentry->d_inode->i_ino, ++ __get_dev(dentry), role); ++ read_unlock(&gr_inode_lock); ++ spin_unlock(&dentry->d_lock); ++ if (retval != NULL) ++ goto out; + -+ /* insert into nested subject list if we haven't copied this one yet -+ to prevent duplicate entries */ -+ if (!already_copied) { -+ o_tmp->nested->next = role->hash->first; -+ role->hash->first = o_tmp->nested; -+ } ++ dentry = real_mnt->mnt_mountpoint; ++ real_mnt = real_mnt->mnt_parent; ++ mnt = &real_mnt->mnt; ++ continue; + } -+ } + -+ return 0; -+} ++ spin_lock(&dentry->d_lock); ++ read_lock(&gr_inode_lock); ++ retval = lookup_acl_subj_label(dentry->d_inode->i_ino, ++ __get_dev(dentry), role); ++ read_unlock(&gr_inode_lock); ++ parent = dentry->d_parent; ++ spin_unlock(&dentry->d_lock); + -+static __u32 -+count_user_subjs(struct acl_subject_label *userp) -+{ -+ struct acl_subject_label s_tmp; -+ __u32 num = 0; ++ if (retval != NULL) ++ goto out; + -+ while (userp) { -+ if (copy_acl_subject_label(&s_tmp, userp)) -+ break; ++ dentry = parent; ++ } + -+ userp = s_tmp.prev; ++ spin_lock(&dentry->d_lock); ++ read_lock(&gr_inode_lock); ++ retval = lookup_acl_subj_label(dentry->d_inode->i_ino, ++ __get_dev(dentry), role); ++ read_unlock(&gr_inode_lock); ++ spin_unlock(&dentry->d_lock); ++ ++ if (unlikely(retval == NULL)) { ++ /* gr_real_root is pinned, we don't need to hold a reference */ ++ read_lock(&gr_inode_lock); ++ retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino, ++ __get_dev(gr_real_root.dentry), role); ++ read_unlock(&gr_inode_lock); + } ++out: ++ write_sequnlock(&rename_lock); ++ br_read_unlock(&vfsmount_lock); + -+ return num; ++ BUG_ON(retval == NULL); ++ ++ return retval; +} + -+static int -+copy_user_allowedips(struct acl_role_label *rolep) ++void ++assign_special_role(const char *rolename) +{ -+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast; ++ struct acl_object_label *obj; ++ struct acl_role_label *r; ++ struct acl_role_label *assigned = NULL; ++ struct task_struct *tsk; ++ struct file *filp; + -+ ruserip = rolep->allowed_ips; ++ FOR_EACH_ROLE_START(r) ++ if (!strcmp(rolename, r->rolename) && ++ (r->roletype & GR_ROLE_SPECIAL)) { ++ assigned = r; ++ break; ++ } ++ FOR_EACH_ROLE_END(r) + -+ while (ruserip) { -+ rlast = rtmp; ++ if (!assigned) ++ return; + -+ if ((rtmp = (struct role_allowed_ip *) -+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL) -+ return -ENOMEM; ++ read_lock(&tasklist_lock); ++ read_lock(&grsec_exec_file_lock); + -+ if (copy_role_allowed_ip(rtmp, ruserip)) -+ return -EFAULT; ++ tsk = current->real_parent; ++ if (tsk == NULL) ++ goto out_unlock; + -+ ruserip = rtmp->prev; ++ filp = tsk->exec_file; ++ if (filp == NULL) ++ goto out_unlock; + -+ if (!rlast) { -+ rtmp->prev = NULL; -+ rolep->allowed_ips = rtmp; -+ } else { -+ rlast->next = rtmp; -+ rtmp->prev = rlast; -+ } ++ tsk->is_writable = 0; ++ tsk->inherited = 0; + -+ if (!ruserip) -+ rtmp->next = NULL; -+ } ++ tsk->acl_sp_role = 1; ++ tsk->acl_role_id = ++acl_sp_role_value; ++ tsk->role = assigned; ++ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role); + -+ return 0; ++ /* ignore additional mmap checks for processes that are writable ++ by the default ACL */ ++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ tsk->is_writable = 1; ++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ tsk->is_writable = 1; ++ ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG ++ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, ++ tsk->acl->filename, tsk->comm, task_pid_nr(tsk)); ++#endif ++ ++out_unlock: ++ read_unlock(&grsec_exec_file_lock); ++ read_unlock(&tasklist_lock); ++ return; +} + -+static int -+copy_user_transitions(struct acl_role_label *rolep) -+{ -+ struct role_transition *rusertp, *rtmp = NULL, *rlast; -+ int error; + -+ rusertp = rolep->transitions; ++static void ++gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode) ++{ ++ struct task_struct *task = current; ++ const struct cred *cred = current_cred(); + -+ while (rusertp) { -+ rlast = rtmp; ++ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype, ++ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, ++ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, ++ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip); + -+ if ((rtmp = (struct role_transition *) -+ acl_alloc(sizeof (struct role_transition))) == NULL) -+ return -ENOMEM; ++ return; ++} + -+ if (copy_role_transition(rtmp, rusertp)) -+ return -EFAULT; ++static void ++gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs) ++{ ++ struct task_struct *task = current; ++ const struct cred *cred = current_cred(); + -+ rusertp = rtmp->prev; ++ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype, ++ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, ++ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, ++ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip); + -+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN); -+ if (error) -+ return error; ++ return; ++} + -+ if (!rlast) { -+ rtmp->prev = NULL; -+ rolep->transitions = rtmp; -+ } else { -+ rlast->next = rtmp; -+ rtmp->prev = rlast; -+ } ++static void ++gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs) ++{ ++ struct task_struct *task = current; ++ const struct cred *cred = current_cred(); + -+ if (!rusertp) -+ rtmp->next = NULL; -+ } ++ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype, ++ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, ++ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, ++ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip); + -+ return 0; ++ return; +} + -+static __u32 count_user_objs(const struct acl_object_label __user *userp) ++static void ++gr_set_proc_res(struct task_struct *task) +{ -+ struct acl_object_label o_tmp; -+ __u32 num = 0; ++ struct acl_subject_label *proc; ++ unsigned short i; + -+ while (userp) { -+ if (copy_acl_object_label(&o_tmp, userp)) -+ break; ++ proc = task->acl; + -+ userp = o_tmp.prev; -+ num++; ++ if (proc->mode & (GR_LEARN | GR_INHERITLEARN)) ++ return; ++ ++ for (i = 0; i < RLIM_NLIMITS; i++) { ++ if (!(proc->resmask & (1U << i))) ++ continue; ++ ++ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur; ++ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max; ++ ++ if (i == RLIMIT_CPU) ++ update_rlimit_cpu(task, proc->res[i].rlim_cur); + } + -+ return num; ++ return; +} + -+static struct acl_subject_label * -+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied) -+{ -+ struct acl_subject_label *s_tmp = NULL, *s_tmp2; -+ __u32 num_objs; -+ struct acl_ip_label **i_tmp, *i_utmp2; -+ struct gr_hash_struct ghash; -+ struct subject_map *subjmap; -+ unsigned int i_num; -+ int err; ++/* both of the below must be called with ++ rcu_read_lock(); ++ read_lock(&tasklist_lock); ++ read_lock(&grsec_exec_file_lock); ++*/ + -+ if (already_copied != NULL) -+ *already_copied = 0; ++struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename) ++{ ++ char *tmpname; ++ struct acl_subject_label *tmpsubj; ++ struct file *filp; ++ struct name_entry *nmatch; + -+ s_tmp = lookup_subject_map(userp); ++ filp = task->exec_file; ++ if (filp == NULL) ++ return NULL; + -+ /* we've already copied this subject into the kernel, just return -+ the reference to it, and don't copy it over again ++ /* the following is to apply the correct subject ++ on binaries running when the RBAC system ++ is enabled, when the binaries have been ++ replaced or deleted since their execution ++ ----- ++ when the RBAC system starts, the inode/dev ++ from exec_file will be one the RBAC system ++ is unaware of. It only knows the inode/dev ++ of the present file on disk, or the absence ++ of it. + */ -+ if (s_tmp) { -+ if (already_copied != NULL) -+ *already_copied = 1; -+ return(s_tmp); -+ } + -+ if ((s_tmp = (struct acl_subject_label *) -+ acl_alloc(sizeof (struct acl_subject_label))) == NULL) -+ return ERR_PTR(-ENOMEM); -+ -+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL); -+ if (subjmap == NULL) -+ return ERR_PTR(-ENOMEM); ++ if (filename) ++ nmatch = __lookup_name_entry(state, filename); ++ else { ++ preempt_disable(); ++ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt); + -+ subjmap->user = userp; -+ subjmap->kernel = s_tmp; -+ insert_subj_map_entry(subjmap); ++ nmatch = __lookup_name_entry(state, tmpname); ++ preempt_enable(); ++ } ++ tmpsubj = NULL; ++ if (nmatch) { ++ if (nmatch->deleted) ++ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role); ++ else ++ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role); ++ } ++ /* this also works for the reload case -- if we don't match a potentially inherited subject ++ then we fall back to a normal lookup based on the binary's ino/dev ++ */ ++ if (tmpsubj == NULL) ++ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role); + -+ if (copy_acl_subject_label(s_tmp, userp)) -+ return ERR_PTR(-EFAULT); ++ return tmpsubj; ++} + -+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX); -+ if (err) -+ return ERR_PTR(err); ++static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename) ++{ ++ return __gr_get_subject_for_task(&running_polstate, task, filename); ++} + -+ if (!strcmp(s_tmp->filename, "/")) -+ role->root_label = s_tmp; ++void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj) ++{ ++ struct acl_object_label *obj; ++ struct file *filp; + -+ if (copy_gr_hash_struct(&ghash, s_tmp->hash)) -+ return ERR_PTR(-EFAULT); ++ filp = task->exec_file; + -+ /* copy user and group transition tables */ ++ task->acl = subj; ++ task->is_writable = 0; ++ /* ignore additional mmap checks for processes that are writable ++ by the default ACL */ ++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ task->is_writable = 1; ++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ task->is_writable = 1; + -+ if (s_tmp->user_trans_num) { -+ uid_t *uidlist; ++ gr_set_proc_res(task); + -+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t)); -+ if (uidlist == NULL) -+ return ERR_PTR(-ENOMEM); -+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t))) -+ return ERR_PTR(-EFAULT); ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG ++ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename); ++#endif ++} + -+ s_tmp->user_transitions = uidlist; -+ } ++static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj) ++{ ++ __gr_apply_subject_to_task(&running_polstate, task, subj); ++} + -+ if (s_tmp->group_trans_num) { -+ gid_t *gidlist; ++__u32 ++gr_search_file(const struct dentry * dentry, const __u32 mode, ++ const struct vfsmount * mnt) ++{ ++ __u32 retval = mode; ++ struct acl_subject_label *curracl; ++ struct acl_object_label *currobj; + -+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t)); -+ if (gidlist == NULL) -+ return ERR_PTR(-ENOMEM); -+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t))) -+ return ERR_PTR(-EFAULT); ++ if (unlikely(!(gr_status & GR_READY))) ++ return (mode & ~GR_AUDITS); + -+ s_tmp->group_transitions = gidlist; -+ } ++ curracl = current->acl; + -+ /* set up object hash table */ -+ num_objs = count_user_objs(ghash.first); ++ currobj = chk_obj_label(dentry, mnt, curracl); ++ retval = currobj->mode & mode; + -+ s_tmp->obj_hash_size = num_objs; -+ s_tmp->obj_hash = -+ (struct acl_object_label **) -+ create_table(&(s_tmp->obj_hash_size), sizeof(void *)); ++ /* if we're opening a specified transfer file for writing ++ (e.g. /dev/initctl), then transfer our role to init ++ */ ++ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE && ++ current->role->roletype & GR_ROLE_PERSIST)) { ++ struct task_struct *task = init_pid_ns.child_reaper; + -+ if (!s_tmp->obj_hash) -+ return ERR_PTR(-ENOMEM); ++ if (task->role != current->role) { ++ struct acl_subject_label *subj; + -+ memset(s_tmp->obj_hash, 0, -+ s_tmp->obj_hash_size * -+ sizeof (struct acl_object_label *)); ++ task->acl_sp_role = 0; ++ task->acl_role_id = current->acl_role_id; ++ task->role = current->role; ++ rcu_read_lock(); ++ read_lock(&grsec_exec_file_lock); ++ subj = gr_get_subject_for_task(task, NULL); ++ gr_apply_subject_to_task(task, subj); ++ read_unlock(&grsec_exec_file_lock); ++ rcu_read_unlock(); ++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG); ++ } ++ } + -+ /* add in objects */ -+ err = copy_user_objs(ghash.first, s_tmp, role); ++ if (unlikely ++ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE) ++ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) { ++ __u32 new_mode = mode; + -+ if (err) -+ return ERR_PTR(err); ++ new_mode &= ~(GR_AUDITS | GR_SUPPRESS); + -+ /* set pointer for parent subject */ -+ if (s_tmp->parent_subject) { -+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL); ++ retval = new_mode; + -+ if (IS_ERR(s_tmp2)) -+ return s_tmp2; ++ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN) ++ new_mode |= GR_INHERIT; + -+ s_tmp->parent_subject = s_tmp2; ++ if (!(mode & GR_NOLEARN)) ++ gr_log_learn(dentry, mnt, new_mode); + } + -+ /* add in ip acls */ -+ -+ if (!s_tmp->ip_num) { -+ s_tmp->ips = NULL; -+ goto insert; -+ } ++ return retval; ++} + -+ i_tmp = -+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num, -+ sizeof (struct acl_ip_label *)); ++struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry, ++ const struct dentry *parent, ++ const struct vfsmount *mnt) ++{ ++ struct name_entry *match; ++ struct acl_object_label *matchpo; ++ struct acl_subject_label *curracl; ++ char *path; + -+ if (!i_tmp) -+ return ERR_PTR(-ENOMEM); ++ if (unlikely(!(gr_status & GR_READY))) ++ return NULL; + -+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) { -+ *(i_tmp + i_num) = -+ (struct acl_ip_label *) -+ acl_alloc(sizeof (struct acl_ip_label)); -+ if (!*(i_tmp + i_num)) -+ return ERR_PTR(-ENOMEM); ++ preempt_disable(); ++ path = gr_to_filename_rbac(new_dentry, mnt); ++ match = lookup_name_entry_create(path); + -+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips)) -+ return ERR_PTR(-EFAULT); ++ curracl = current->acl; + -+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2)) -+ return ERR_PTR(-EFAULT); -+ -+ if ((*(i_tmp + i_num))->iface == NULL) -+ continue; ++ if (match) { ++ read_lock(&gr_inode_lock); ++ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl); ++ read_unlock(&gr_inode_lock); + -+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ); -+ if (err) -+ return ERR_PTR(err); ++ if (matchpo) { ++ preempt_enable(); ++ return matchpo; ++ } + } + -+ s_tmp->ips = i_tmp; ++ // lookup parent + -+insert: -+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode, -+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0)) -+ return ERR_PTR(-ENOMEM); ++ matchpo = chk_obj_create_label(parent, mnt, curracl, path); + -+ return s_tmp; ++ preempt_enable(); ++ return matchpo; +} + -+static int -+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role) ++__u32 ++gr_check_create(const struct dentry * new_dentry, const struct dentry * parent, ++ const struct vfsmount * mnt, const __u32 mode) +{ -+ struct acl_subject_label s_pre; -+ struct acl_subject_label * ret; -+ int err; ++ struct acl_object_label *matchpo; ++ __u32 retval; + -+ while (userp) { -+ if (copy_acl_subject_label(&s_pre, userp)) -+ return -EFAULT; -+ -+ ret = do_copy_user_subj(userp, role, NULL); ++ if (unlikely(!(gr_status & GR_READY))) ++ return (mode & ~GR_AUDITS); + -+ err = PTR_ERR(ret); -+ if (IS_ERR(ret)) -+ return err; ++ matchpo = gr_get_create_object(new_dentry, parent, mnt); + -+ insert_acl_subj_label(ret, role); ++ retval = matchpo->mode & mode; + -+ userp = s_pre.prev; ++ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))) ++ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) { ++ __u32 new_mode = mode; ++ ++ new_mode &= ~(GR_AUDITS | GR_SUPPRESS); ++ ++ gr_log_learn(new_dentry, mnt, new_mode); ++ return new_mode; + } + -+ return 0; ++ return retval; +} + -+static int -+copy_user_acl(struct gr_arg *arg) ++__u32 ++gr_check_link(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt, ++ const struct dentry * old_dentry, const struct vfsmount * old_mnt) +{ -+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2; -+ struct acl_subject_label *subj_list; -+ struct sprole_pw *sptmp; -+ struct gr_hash_struct *ghash; -+ uid_t *domainlist; -+ unsigned int r_num; -+ int err = 0; -+ __u16 i; -+ __u32 num_subjs; ++ struct acl_object_label *obj; ++ __u32 oldmode, newmode; ++ __u32 needmode; ++ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ | ++ GR_DELETE | GR_INHERIT; + -+ /* we need a default and kernel role */ -+ if (arg->role_db.num_roles < 2) -+ return -EINVAL; ++ if (unlikely(!(gr_status & GR_READY))) ++ return (GR_CREATE | GR_LINK); + -+ /* copy special role authentication info from userspace */ ++ obj = chk_obj_label(old_dentry, old_mnt, current->acl); ++ oldmode = obj->mode; + -+ num_sprole_pws = arg->num_sprole_pws; -+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *)); ++ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt); ++ newmode = obj->mode; + -+ if (!acl_special_roles && num_sprole_pws) -+ return -ENOMEM; ++ needmode = newmode & checkmodes; + -+ for (i = 0; i < num_sprole_pws; i++) { -+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw)); -+ if (!sptmp) -+ return -ENOMEM; -+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws)) -+ return -EFAULT; ++ // old name for hardlink must have at least the permissions of the new name ++ if ((oldmode & needmode) != needmode) ++ goto bad; + -+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN); -+ if (err) -+ return err; ++ // if old name had restrictions/auditing, make sure the new name does as well ++ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS); + -+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG -+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename); -+#endif ++ // don't allow hardlinking of suid/sgid/fcapped files without permission ++ if (is_privileged_binary(old_dentry)) ++ needmode |= GR_SETID; + -+ acl_special_roles[i] = sptmp; -+ } ++ if ((newmode & needmode) != needmode) ++ goto bad; + -+ r_utmp = (struct acl_role_label **) arg->role_db.r_table; ++ // enforce minimum permissions ++ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK)) ++ return newmode; ++bad: ++ needmode = oldmode; ++ if (is_privileged_binary(old_dentry)) ++ needmode |= GR_SETID; ++ ++ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) { ++ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK); ++ return (GR_CREATE | GR_LINK); ++ } else if (newmode & GR_SUPPRESS) ++ return GR_SUPPRESS; ++ else ++ return 0; ++} + -+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) { -+ r_tmp = acl_alloc(sizeof (struct acl_role_label)); ++int ++gr_check_hidden_task(const struct task_struct *task) ++{ ++ if (unlikely(!(gr_status & GR_READY))) ++ return 0; + -+ if (!r_tmp) -+ return -ENOMEM; ++ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW)) ++ return 1; + -+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp)) -+ return -EFAULT; ++ return 0; ++} + -+ if (copy_acl_role_label(r_tmp, r_utmp2)) -+ return -EFAULT; ++int ++gr_check_protected_task(const struct task_struct *task) ++{ ++ if (unlikely(!(gr_status & GR_READY) || !task)) ++ return 0; + -+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN); -+ if (err) -+ return err; ++ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) && ++ task->acl != current->acl) ++ return 1; + -+ if (!strcmp(r_tmp->rolename, "default") -+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) { -+ default_role = r_tmp; -+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) { -+ kernel_role = r_tmp; ++ return 0; ++} ++ ++int ++gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) ++{ ++ struct task_struct *p; ++ int ret = 0; ++ ++ if (unlikely(!(gr_status & GR_READY) || !pid)) ++ return ret; ++ ++ read_lock(&tasklist_lock); ++ do_each_pid_task(pid, type, p) { ++ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) && ++ p->acl != current->acl) { ++ ret = 1; ++ goto out; + } ++ } while_each_pid_task(pid, type, p); ++out: ++ read_unlock(&tasklist_lock); + -+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) -+ return -ENOMEM; ++ return ret; ++} + -+ if (copy_gr_hash_struct(ghash, r_tmp->hash)) -+ return -EFAULT; ++void ++gr_copy_label(struct task_struct *tsk) ++{ ++ struct task_struct *p = current; + -+ r_tmp->hash = ghash; ++ tsk->inherited = p->inherited; ++ tsk->acl_sp_role = 0; ++ tsk->acl_role_id = p->acl_role_id; ++ tsk->acl = p->acl; ++ tsk->role = p->role; ++ tsk->signal->used_accept = 0; ++ tsk->signal->curr_ip = p->signal->curr_ip; ++ tsk->signal->saved_ip = p->signal->saved_ip; ++ if (p->exec_file) ++ get_file(p->exec_file); ++ tsk->exec_file = p->exec_file; ++ tsk->is_writable = p->is_writable; ++ if (unlikely(p->signal->used_accept)) { ++ p->signal->curr_ip = 0; ++ p->signal->saved_ip = 0; ++ } + -+ num_subjs = count_user_subjs(r_tmp->hash->first); ++ return; ++} + -+ r_tmp->subj_hash_size = num_subjs; -+ r_tmp->subj_hash = -+ (struct acl_subject_label **) -+ create_table(&(r_tmp->subj_hash_size), sizeof(void *)); ++extern int gr_process_kernel_setuid_ban(struct user_struct *user); + -+ if (!r_tmp->subj_hash) -+ return -ENOMEM; ++int ++gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs) ++{ ++ unsigned int i; ++ __u16 num; ++ uid_t *uidlist; ++ uid_t curuid; ++ int realok = 0; ++ int effectiveok = 0; ++ int fsok = 0; ++ uid_t globalreal, globaleffective, globalfs; + -+ err = copy_user_allowedips(r_tmp); -+ if (err) -+ return err; ++#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) ++ struct user_struct *user; + -+ /* copy domain info */ -+ if (r_tmp->domain_children != NULL) { -+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t)); -+ if (domainlist == NULL) -+ return -ENOMEM; ++ if (!uid_valid(real)) ++ goto skipit; + -+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) -+ return -EFAULT; ++ /* find user based on global namespace */ + -+ r_tmp->domain_children = domainlist; -+ } ++ globalreal = GR_GLOBAL_UID(real); + -+ err = copy_user_transitions(r_tmp); -+ if (err) -+ return err; ++ user = find_user(make_kuid(&init_user_ns, globalreal)); ++ if (user == NULL) ++ goto skipit; + -+ memset(r_tmp->subj_hash, 0, -+ r_tmp->subj_hash_size * -+ sizeof (struct acl_subject_label *)); ++ if (gr_process_kernel_setuid_ban(user)) { ++ /* for find_user */ ++ free_uid(user); ++ return 1; ++ } + -+ /* acquire the list of subjects, then NULL out -+ the list prior to parsing the subjects for this role, -+ as during this parsing the list is replaced with a list -+ of *nested* subjects for the role -+ */ -+ subj_list = r_tmp->hash->first; ++ /* for find_user */ ++ free_uid(user); + -+ /* set nested subject list to null */ -+ r_tmp->hash->first = NULL; ++skipit: ++#endif + -+ err = copy_user_subjs(subj_list, r_tmp); ++ if (unlikely(!(gr_status & GR_READY))) ++ return 0; + -+ if (err) -+ return err; ++ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) ++ gr_log_learn_uid_change(real, effective, fs); + -+ insert_acl_role_label(r_tmp); ++ num = current->acl->user_trans_num; ++ uidlist = current->acl->user_transitions; ++ ++ if (uidlist == NULL) ++ return 0; ++ ++ if (!uid_valid(real)) { ++ realok = 1; ++ globalreal = (uid_t)-1; ++ } else { ++ globalreal = GR_GLOBAL_UID(real); ++ } ++ if (!uid_valid(effective)) { ++ effectiveok = 1; ++ globaleffective = (uid_t)-1; ++ } else { ++ globaleffective = GR_GLOBAL_UID(effective); ++ } ++ if (!uid_valid(fs)) { ++ fsok = 1; ++ globalfs = (uid_t)-1; ++ } else { ++ globalfs = GR_GLOBAL_UID(fs); + } + -+ if (default_role == NULL || kernel_role == NULL) -+ return -EINVAL; ++ if (current->acl->user_trans_type & GR_ID_ALLOW) { ++ for (i = 0; i < num; i++) { ++ curuid = uidlist[i]; ++ if (globalreal == curuid) ++ realok = 1; ++ if (globaleffective == curuid) ++ effectiveok = 1; ++ if (globalfs == curuid) ++ fsok = 1; ++ } ++ } else if (current->acl->user_trans_type & GR_ID_DENY) { ++ for (i = 0; i < num; i++) { ++ curuid = uidlist[i]; ++ if (globalreal == curuid) ++ break; ++ if (globaleffective == curuid) ++ break; ++ if (globalfs == curuid) ++ break; ++ } ++ /* not in deny list */ ++ if (i == num) { ++ realok = 1; ++ effectiveok = 1; ++ fsok = 1; ++ } ++ } + -+ return err; ++ if (realok && effectiveok && fsok) ++ return 0; ++ else { ++ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal); ++ return 1; ++ } +} + -+static int -+gracl_init(struct gr_arg *args) ++int ++gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs) +{ -+ int error = 0; ++ unsigned int i; ++ __u16 num; ++ gid_t *gidlist; ++ gid_t curgid; ++ int realok = 0; ++ int effectiveok = 0; ++ int fsok = 0; ++ gid_t globalreal, globaleffective, globalfs; + -+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN); -+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN); ++ if (unlikely(!(gr_status & GR_READY))) ++ return 0; + -+ if (init_variables(args)) { -+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION); -+ error = -ENOMEM; -+ free_variables(); -+ goto out; -+ } ++ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) ++ gr_log_learn_gid_change(real, effective, fs); + -+ error = copy_user_acl(args); -+ free_init_variables(); -+ if (error) { -+ free_variables(); -+ goto out; -+ } ++ num = current->acl->group_trans_num; ++ gidlist = current->acl->group_transitions; + -+ if ((error = gr_set_acls(0))) { -+ free_variables(); -+ goto out; ++ if (gidlist == NULL) ++ return 0; ++ ++ if (!gid_valid(real)) { ++ realok = 1; ++ globalreal = (gid_t)-1; ++ } else { ++ globalreal = GR_GLOBAL_GID(real); ++ } ++ if (!gid_valid(effective)) { ++ effectiveok = 1; ++ globaleffective = (gid_t)-1; ++ } else { ++ globaleffective = GR_GLOBAL_GID(effective); ++ } ++ if (!gid_valid(fs)) { ++ fsok = 1; ++ globalfs = (gid_t)-1; ++ } else { ++ globalfs = GR_GLOBAL_GID(fs); + } + -+ pax_open_kernel(); -+ gr_status |= GR_READY; -+ pax_close_kernel(); ++ if (current->acl->group_trans_type & GR_ID_ALLOW) { ++ for (i = 0; i < num; i++) { ++ curgid = gidlist[i]; ++ if (globalreal == curgid) ++ realok = 1; ++ if (globaleffective == curgid) ++ effectiveok = 1; ++ if (globalfs == curgid) ++ fsok = 1; ++ } ++ } else if (current->acl->group_trans_type & GR_ID_DENY) { ++ for (i = 0; i < num; i++) { ++ curgid = gidlist[i]; ++ if (globalreal == curgid) ++ break; ++ if (globaleffective == curgid) ++ break; ++ if (globalfs == curgid) ++ break; ++ } ++ /* not in deny list */ ++ if (i == num) { ++ realok = 1; ++ effectiveok = 1; ++ fsok = 1; ++ } ++ } + -+ out: -+ return error; ++ if (realok && effectiveok && fsok) ++ return 0; ++ else { ++ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal); ++ return 1; ++ } +} + -+/* derived from glibc fnmatch() 0: match, 1: no match*/ ++extern int gr_acl_is_capable(const int cap); + -+static int -+glob_match(const char *p, const char *n) ++void ++gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid) +{ -+ char c; ++ struct acl_role_label *role = task->role; ++ struct acl_subject_label *subj = NULL; ++ struct acl_object_label *obj; ++ struct file *filp; ++ uid_t uid; ++ gid_t gid; + -+ while ((c = *p++) != '\0') { -+ switch (c) { -+ case '?': -+ if (*n == '\0') -+ return 1; -+ else if (*n == '/') -+ return 1; -+ break; -+ case '\\': -+ if (*n != c) -+ return 1; -+ break; -+ case '*': -+ for (c = *p++; c == '?' || c == '*'; c = *p++) { -+ if (*n == '/') -+ return 1; -+ else if (c == '?') { -+ if (*n == '\0') -+ return 1; -+ else -+ ++n; -+ } -+ } -+ if (c == '\0') { -+ return 0; -+ } else { -+ const char *endp; ++ if (unlikely(!(gr_status & GR_READY))) ++ return; + -+ if ((endp = strchr(n, '/')) == NULL) -+ endp = n + strlen(n); ++ uid = GR_GLOBAL_UID(kuid); ++ gid = GR_GLOBAL_GID(kgid); + -+ if (c == '[') { -+ for (--p; n < endp; ++n) -+ if (!glob_match(p, n)) -+ return 0; -+ } else if (c == '/') { -+ while (*n != '\0' && *n != '/') -+ ++n; -+ if (*n == '/' && !glob_match(p, n + 1)) -+ return 0; -+ } else { -+ for (--p; n < endp; ++n) -+ if (*n == c && !glob_match(p, n)) -+ return 0; -+ } ++ filp = task->exec_file; + -+ return 1; -+ } -+ case '[': -+ { -+ int not; -+ char cold; ++ /* kernel process, we'll give them the kernel role */ ++ if (unlikely(!filp)) { ++ task->role = running_polstate.kernel_role; ++ task->acl = running_polstate.kernel_role->root_label; ++ return; ++ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) { ++ /* save the current ip at time of role lookup so that the proper ++ IP will be learned for role_allowed_ip */ ++ task->signal->saved_ip = task->signal->curr_ip; ++ role = lookup_acl_role_label(task, uid, gid); ++ } + -+ if (*n == '\0' || *n == '/') -+ return 1; ++ /* don't change the role if we're not a privileged process */ ++ if (role && task->role != role && ++ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) || ++ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID)))) ++ return; + -+ not = (*p == '!' || *p == '^'); -+ if (not) -+ ++p; ++ /* perform subject lookup in possibly new role ++ we can use this result below in the case where role == task->role ++ */ ++ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role); + -+ c = *p++; -+ for (;;) { -+ unsigned char fn = (unsigned char)*n; ++ /* if we changed uid/gid, but result in the same role ++ and are using inheritance, don't lose the inherited subject ++ if current subject is other than what normal lookup ++ would result in, we arrived via inheritance, don't ++ lose subject ++ */ ++ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) && ++ (subj == task->acl))) ++ task->acl = subj; + -+ if (c == '\0') -+ return 1; -+ else { -+ if (c == fn) -+ goto matched; -+ cold = c; -+ c = *p++; ++ /* leave task->inherited unaffected */ + -+ if (c == '-' && *p != ']') { -+ unsigned char cend = *p++; ++ task->role = role; + -+ if (cend == '\0') -+ return 1; ++ task->is_writable = 0; + -+ if (cold <= fn && fn <= cend) -+ goto matched; ++ /* ignore additional mmap checks for processes that are writable ++ by the default ACL */ ++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ task->is_writable = 1; ++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ task->is_writable = 1; + -+ c = *p++; -+ } -+ } ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG ++ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename); ++#endif + -+ if (c == ']') -+ break; -+ } -+ if (!not) -+ return 1; -+ break; -+ matched: -+ while (c != ']') { -+ if (c == '\0') -+ return 1; ++ gr_set_proc_res(task); + -+ c = *p++; -+ } -+ if (not) -+ return 1; -+ } -+ break; -+ default: -+ if (c != *n) -+ return 1; -+ } ++ return; ++} + -+ ++n; -+ } ++int ++gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt, ++ const int unsafe_flags) ++{ ++ struct task_struct *task = current; ++ struct acl_subject_label *newacl; ++ struct acl_object_label *obj; ++ __u32 retmode; + -+ if (*n == '\0') ++ if (unlikely(!(gr_status & GR_READY))) + return 0; + -+ if (*n == '/') -+ return 0; ++ newacl = chk_subj_label(dentry, mnt, task->role); + -+ return 1; -+} ++ /* special handling for if we did an strace -f -p from an admin role, where pid then ++ did an exec ++ */ ++ rcu_read_lock(); ++ read_lock(&tasklist_lock); ++ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) || ++ (task->parent->acl->mode & GR_POVERRIDE))) { ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); ++ goto skip_check; ++ } ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); + -+static struct acl_object_label * -+chk_glob_label(struct acl_object_label *globbed, -+ const struct dentry *dentry, const struct vfsmount *mnt, char **path) -+{ -+ struct acl_object_label *tmp; ++ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) && ++ !(task->role->roletype & GR_ROLE_GOD) && ++ !gr_search_file(dentry, GR_PTRACERD, mnt) && ++ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) { ++ if (unsafe_flags & LSM_UNSAFE_SHARE) ++ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt); ++ else ++ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt); ++ return -EACCES; ++ } + -+ if (*path == NULL) -+ *path = gr_to_filename_nolock(dentry, mnt); ++skip_check: + -+ tmp = globbed; ++ obj = chk_obj_label(dentry, mnt, task->acl); ++ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT); + -+ while (tmp) { -+ if (!glob_match(tmp->filename, *path)) -+ return tmp; -+ tmp = tmp->next; ++ if (!(task->acl->mode & GR_INHERITLEARN) && ++ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) { ++ if (obj->nested) ++ task->acl = obj->nested; ++ else ++ task->acl = newacl; ++ task->inherited = 0; ++ } else { ++ task->inherited = 1; ++ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT) ++ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt); + } + -+ return NULL; -+} ++ task->is_writable = 0; + -+static struct acl_object_label * -+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt, -+ const ino_t curr_ino, const dev_t curr_dev, -+ const struct acl_subject_label *subj, char **path, const int checkglob) -+{ -+ struct acl_subject_label *tmpsubj; -+ struct acl_object_label *retval; -+ struct acl_object_label *retval2; ++ /* ignore additional mmap checks for processes that are writable ++ by the default ACL */ ++ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ task->is_writable = 1; ++ obj = chk_obj_label(dentry, mnt, task->role->root_label); ++ if (unlikely(obj->mode & GR_WRITE)) ++ task->is_writable = 1; + -+ tmpsubj = (struct acl_subject_label *) subj; -+ read_lock(&gr_inode_lock); -+ do { -+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj); -+ if (retval) { -+ if (checkglob && retval->globbed) { -+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path); -+ if (retval2) -+ retval = retval2; -+ } -+ break; -+ } -+ } while ((tmpsubj = tmpsubj->parent_subject)); -+ read_unlock(&gr_inode_lock); ++ gr_set_proc_res(task); + -+ return retval; ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG ++ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename); ++#endif ++ return 0; +} + -+static __inline__ struct acl_object_label * -+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt, -+ struct dentry *curr_dentry, -+ const struct acl_subject_label *subj, char **path, const int checkglob) ++/* always called with valid inodev ptr */ ++static void ++do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev) +{ -+ int newglob = checkglob; -+ ino_t inode; -+ dev_t device; ++ struct acl_object_label *matchpo; ++ struct acl_subject_label *matchps; ++ struct acl_subject_label *subj; ++ struct acl_role_label *role; ++ unsigned int x; + -+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking -+ as we don't want a / * rule to match instead of the / object -+ don't do this for create lookups that call this function though, since they're looking up -+ on the parent and thus need globbing checks on all paths -+ */ -+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB) -+ newglob = GR_NO_GLOB; ++ FOR_EACH_ROLE_START(role) ++ FOR_EACH_SUBJECT_START(role, subj, x) ++ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL) ++ matchpo->mode |= GR_DELETED; ++ FOR_EACH_SUBJECT_END(subj,x) ++ FOR_EACH_NESTED_SUBJECT_START(role, subj) ++ /* nested subjects aren't in the role's subj_hash table */ ++ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL) ++ matchpo->mode |= GR_DELETED; ++ FOR_EACH_NESTED_SUBJECT_END(subj) ++ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL) ++ matchps->mode |= GR_DELETED; ++ FOR_EACH_ROLE_END(role) + -+ spin_lock(&curr_dentry->d_lock); -+ inode = curr_dentry->d_inode->i_ino; -+ device = __get_dev(curr_dentry); -+ spin_unlock(&curr_dentry->d_lock); ++ inodev->nentry->deleted = 1; + -+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob); ++ return; +} + -+#ifdef CONFIG_HUGETLBFS -+static inline bool -+is_hugetlbfs_mnt(const struct vfsmount *mnt) ++void ++gr_handle_delete(const ino_t ino, const dev_t dev) +{ -+ int i; -+ for (i = 0; i < HUGE_MAX_HSTATE; i++) { -+ if (unlikely(hugetlbfs_vfsmount[i] == mnt)) -+ return true; -+ } -+ -+ return false; -+} -+#endif ++ struct inodev_entry *inodev; + -+static struct acl_object_label * -+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, -+ const struct acl_subject_label *subj, char *path, const int checkglob) -+{ -+ struct dentry *dentry = (struct dentry *) l_dentry; -+ struct vfsmount *mnt = (struct vfsmount *) l_mnt; -+ struct mount *real_mnt = real_mount(mnt); -+ struct acl_object_label *retval; -+ struct dentry *parent; ++ if (unlikely(!(gr_status & GR_READY))) ++ return; + -+ br_read_lock(&vfsmount_lock); -+ write_seqlock(&rename_lock); ++ write_lock(&gr_inode_lock); ++ inodev = lookup_inodev_entry(ino, dev); ++ if (inodev != NULL) ++ do_handle_delete(inodev, ino, dev); ++ write_unlock(&gr_inode_lock); + -+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt || -+#ifdef CONFIG_NET -+ mnt == sock_mnt || -+#endif -+#ifdef CONFIG_HUGETLBFS -+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) || -+#endif -+ /* ignore Eric Biederman */ -+ IS_PRIVATE(l_dentry->d_inode))) { -+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw; -+ goto out; -+ } ++ return; ++} + -+ for (;;) { -+ if (dentry == real_root.dentry && mnt == real_root.mnt) -+ break; ++static void ++update_acl_obj_label(const ino_t oldinode, const dev_t olddevice, ++ const ino_t newinode, const dev_t newdevice, ++ struct acl_subject_label *subj) ++{ ++ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size); ++ struct acl_object_label *match; + -+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) { -+ if (!mnt_has_parent(real_mnt)) -+ break; ++ match = subj->obj_hash[index]; + -+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob); -+ if (retval != NULL) -+ goto out; ++ while (match && (match->inode != oldinode || ++ match->device != olddevice || ++ !(match->mode & GR_DELETED))) ++ match = match->next; + -+ dentry = real_mnt->mnt_mountpoint; -+ real_mnt = real_mnt->mnt_parent; -+ mnt = &real_mnt->mnt; -+ continue; ++ if (match && (match->inode == oldinode) ++ && (match->device == olddevice) ++ && (match->mode & GR_DELETED)) { ++ if (match->prev == NULL) { ++ subj->obj_hash[index] = match->next; ++ if (match->next != NULL) ++ match->next->prev = NULL; ++ } else { ++ match->prev->next = match->next; ++ if (match->next != NULL) ++ match->next->prev = match->prev; + } ++ match->prev = NULL; ++ match->next = NULL; ++ match->inode = newinode; ++ match->device = newdevice; ++ match->mode &= ~GR_DELETED; + -+ parent = dentry->d_parent; -+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob); -+ if (retval != NULL) -+ goto out; -+ -+ dentry = parent; ++ insert_acl_obj_label(match, subj); + } + -+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob); ++ return; ++} + -+ /* real_root is pinned so we don't have to hold a reference */ -+ if (retval == NULL) -+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob); -+out: -+ write_sequnlock(&rename_lock); -+ br_read_unlock(&vfsmount_lock); ++static void ++update_acl_subj_label(const ino_t oldinode, const dev_t olddevice, ++ const ino_t newinode, const dev_t newdevice, ++ struct acl_role_label *role) ++{ ++ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size); ++ struct acl_subject_label *match; + -+ BUG_ON(retval == NULL); ++ match = role->subj_hash[index]; + -+ return retval; -+} ++ while (match && (match->inode != oldinode || ++ match->device != olddevice || ++ !(match->mode & GR_DELETED))) ++ match = match->next; + -+static __inline__ struct acl_object_label * -+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, -+ const struct acl_subject_label *subj) -+{ -+ char *path = NULL; -+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB); -+} ++ if (match && (match->inode == oldinode) ++ && (match->device == olddevice) ++ && (match->mode & GR_DELETED)) { ++ if (match->prev == NULL) { ++ role->subj_hash[index] = match->next; ++ if (match->next != NULL) ++ match->next->prev = NULL; ++ } else { ++ match->prev->next = match->next; ++ if (match->next != NULL) ++ match->next->prev = match->prev; ++ } ++ match->prev = NULL; ++ match->next = NULL; ++ match->inode = newinode; ++ match->device = newdevice; ++ match->mode &= ~GR_DELETED; + -+static __inline__ struct acl_object_label * -+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt, -+ const struct acl_subject_label *subj) -+{ -+ char *path = NULL; -+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB); -+} ++ insert_acl_subj_label(match, role); ++ } + -+static __inline__ struct acl_object_label * -+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, -+ const struct acl_subject_label *subj, char *path) -+{ -+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB); ++ return; +} + -+static struct acl_subject_label * -+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, -+ const struct acl_role_label *role) ++static void ++update_inodev_entry(const ino_t oldinode, const dev_t olddevice, ++ const ino_t newinode, const dev_t newdevice) +{ -+ struct dentry *dentry = (struct dentry *) l_dentry; -+ struct vfsmount *mnt = (struct vfsmount *) l_mnt; -+ struct mount *real_mnt = real_mount(mnt); -+ struct acl_subject_label *retval; -+ struct dentry *parent; -+ -+ br_read_lock(&vfsmount_lock); -+ write_seqlock(&rename_lock); ++ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size); ++ struct inodev_entry *match; + -+ for (;;) { -+ if (dentry == real_root.dentry && mnt == real_root.mnt) -+ break; -+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) { -+ if (!mnt_has_parent(real_mnt)) -+ break; ++ match = running_polstate.inodev_set.i_hash[index]; + -+ spin_lock(&dentry->d_lock); -+ read_lock(&gr_inode_lock); -+ retval = -+ lookup_acl_subj_label(dentry->d_inode->i_ino, -+ __get_dev(dentry), role); -+ read_unlock(&gr_inode_lock); -+ spin_unlock(&dentry->d_lock); -+ if (retval != NULL) -+ goto out; ++ while (match && (match->nentry->inode != oldinode || ++ match->nentry->device != olddevice || !match->nentry->deleted)) ++ match = match->next; + -+ dentry = real_mnt->mnt_mountpoint; -+ real_mnt = real_mnt->mnt_parent; -+ mnt = &real_mnt->mnt; -+ continue; ++ if (match && (match->nentry->inode == oldinode) ++ && (match->nentry->device == olddevice) && ++ match->nentry->deleted) { ++ if (match->prev == NULL) { ++ running_polstate.inodev_set.i_hash[index] = match->next; ++ if (match->next != NULL) ++ match->next->prev = NULL; ++ } else { ++ match->prev->next = match->next; ++ if (match->next != NULL) ++ match->next->prev = match->prev; + } ++ match->prev = NULL; ++ match->next = NULL; ++ match->nentry->inode = newinode; ++ match->nentry->device = newdevice; ++ match->nentry->deleted = 0; + -+ spin_lock(&dentry->d_lock); -+ read_lock(&gr_inode_lock); -+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino, -+ __get_dev(dentry), role); -+ read_unlock(&gr_inode_lock); -+ parent = dentry->d_parent; -+ spin_unlock(&dentry->d_lock); -+ -+ if (retval != NULL) -+ goto out; -+ -+ dentry = parent; -+ } -+ -+ spin_lock(&dentry->d_lock); -+ read_lock(&gr_inode_lock); -+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino, -+ __get_dev(dentry), role); -+ read_unlock(&gr_inode_lock); -+ spin_unlock(&dentry->d_lock); -+ -+ if (unlikely(retval == NULL)) { -+ /* real_root is pinned, we don't need to hold a reference */ -+ read_lock(&gr_inode_lock); -+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino, -+ __get_dev(real_root.dentry), role); -+ read_unlock(&gr_inode_lock); ++ insert_inodev_entry(match); + } -+out: -+ write_sequnlock(&rename_lock); -+ br_read_unlock(&vfsmount_lock); -+ -+ BUG_ON(retval == NULL); + -+ return retval; ++ return; +} + +static void -+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode) ++__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev) +{ -+ struct task_struct *task = current; -+ const struct cred *cred = current_cred(); -+ -+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype, -+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, -+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, -+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip); ++ struct acl_subject_label *subj; ++ struct acl_role_label *role; ++ unsigned int x; + -+ return; -+} ++ FOR_EACH_ROLE_START(role) ++ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role); + -+static void -+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs) -+{ -+ struct task_struct *task = current; -+ const struct cred *cred = current_cred(); ++ FOR_EACH_NESTED_SUBJECT_START(role, subj) ++ if ((subj->inode == ino) && (subj->device == dev)) { ++ subj->inode = ino; ++ subj->device = dev; ++ } ++ /* nested subjects aren't in the role's subj_hash table */ ++ update_acl_obj_label(matchn->inode, matchn->device, ++ ino, dev, subj); ++ FOR_EACH_NESTED_SUBJECT_END(subj) ++ FOR_EACH_SUBJECT_START(role, subj, x) ++ update_acl_obj_label(matchn->inode, matchn->device, ++ ino, dev, subj); ++ FOR_EACH_SUBJECT_END(subj,x) ++ FOR_EACH_ROLE_END(role) + -+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype, -+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, -+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, -+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip); ++ update_inodev_entry(matchn->inode, matchn->device, ino, dev); + + return; +} + +static void -+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs) ++do_handle_create(const struct name_entry *matchn, const struct dentry *dentry, ++ const struct vfsmount *mnt) +{ -+ struct task_struct *task = current; -+ const struct cred *cred = current_cred(); ++ ino_t ino = dentry->d_inode->i_ino; ++ dev_t dev = __get_dev(dentry); + -+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype, -+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, -+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, -+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip); ++ __do_handle_create(matchn, ino, dev); + + return; +} + -+__u32 -+gr_search_file(const struct dentry * dentry, const __u32 mode, -+ const struct vfsmount * mnt) ++void ++gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+ __u32 retval = mode; -+ struct acl_subject_label *curracl; -+ struct acl_object_label *currobj; ++ struct name_entry *matchn; + + if (unlikely(!(gr_status & GR_READY))) -+ return (mode & ~GR_AUDITS); -+ -+ curracl = current->acl; -+ -+ currobj = chk_obj_label(dentry, mnt, curracl); -+ retval = currobj->mode & mode; ++ return; + -+ /* if we're opening a specified transfer file for writing -+ (e.g. /dev/initctl), then transfer our role to init -+ */ -+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE && -+ current->role->roletype & GR_ROLE_PERSIST)) { -+ struct task_struct *task = init_pid_ns.child_reaper; ++ preempt_disable(); ++ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt)); + -+ if (task->role != current->role) { -+ task->acl_sp_role = 0; -+ task->acl_role_id = current->acl_role_id; -+ task->role = current->role; -+ rcu_read_lock(); -+ read_lock(&grsec_exec_file_lock); -+ gr_apply_subject_to_task(task); -+ read_unlock(&grsec_exec_file_lock); -+ rcu_read_unlock(); -+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG); -+ } ++ if (unlikely((unsigned long)matchn)) { ++ write_lock(&gr_inode_lock); ++ do_handle_create(matchn, dentry, mnt); ++ write_unlock(&gr_inode_lock); + } ++ preempt_enable(); + -+ if (unlikely -+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE) -+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) { -+ __u32 new_mode = mode; ++ return; ++} + -+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS); ++void ++gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode) ++{ ++ struct name_entry *matchn; + -+ retval = new_mode; ++ if (unlikely(!(gr_status & GR_READY))) ++ return; + -+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN) -+ new_mode |= GR_INHERIT; ++ preempt_disable(); ++ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt)); + -+ if (!(mode & GR_NOLEARN)) -+ gr_log_learn(dentry, mnt, new_mode); ++ if (unlikely((unsigned long)matchn)) { ++ write_lock(&gr_inode_lock); ++ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev); ++ write_unlock(&gr_inode_lock); + } ++ preempt_enable(); + -+ return retval; ++ return; +} + -+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry, -+ const struct dentry *parent, -+ const struct vfsmount *mnt) -+{ -+ struct name_entry *match; -+ struct acl_object_label *matchpo; -+ struct acl_subject_label *curracl; -+ char *path; ++void ++gr_handle_rename(struct inode *old_dir, struct inode *new_dir, ++ struct dentry *old_dentry, ++ struct dentry *new_dentry, ++ struct vfsmount *mnt, const __u8 replace) ++{ ++ struct name_entry *matchn; ++ struct inodev_entry *inodev; ++ struct inode *inode = new_dentry->d_inode; ++ ino_t old_ino = old_dentry->d_inode->i_ino; ++ dev_t old_dev = __get_dev(old_dentry); ++ ++ /* vfs_rename swaps the name and parent link for old_dentry and ++ new_dentry ++ at this point, old_dentry has the new name, parent link, and inode ++ for the renamed file ++ if a file is being replaced by a rename, new_dentry has the inode ++ and name for the replaced file ++ */ + + if (unlikely(!(gr_status & GR_READY))) -+ return NULL; ++ return; + + preempt_disable(); -+ path = gr_to_filename_rbac(new_dentry, mnt); -+ match = lookup_name_entry_create(path); ++ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt)); + -+ curracl = current->acl; ++ /* we wouldn't have to check d_inode if it weren't for ++ NFS silly-renaming ++ */ + -+ if (match) { -+ read_lock(&gr_inode_lock); -+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl); -+ read_unlock(&gr_inode_lock); ++ write_lock(&gr_inode_lock); ++ if (unlikely(replace && inode)) { ++ ino_t new_ino = inode->i_ino; ++ dev_t new_dev = __get_dev(new_dentry); + -+ if (matchpo) { -+ preempt_enable(); -+ return matchpo; -+ } ++ inodev = lookup_inodev_entry(new_ino, new_dev); ++ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode))) ++ do_handle_delete(inodev, new_ino, new_dev); + } + -+ // lookup parent ++ inodev = lookup_inodev_entry(old_ino, old_dev); ++ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode))) ++ do_handle_delete(inodev, old_ino, old_dev); + -+ matchpo = chk_obj_create_label(parent, mnt, curracl, path); ++ if (unlikely((unsigned long)matchn)) ++ do_handle_create(matchn, old_dentry, mnt); + ++ write_unlock(&gr_inode_lock); + preempt_enable(); -+ return matchpo; ++ ++ return; +} + -+__u32 -+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent, -+ const struct vfsmount * mnt, const __u32 mode) ++#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC) ++static const unsigned long res_learn_bumps[GR_NLIMITS] = { ++ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP, ++ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP, ++ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP, ++ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP, ++ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP, ++ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP, ++ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP, ++ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP, ++ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP, ++ [RLIMIT_AS] = GR_RLIM_AS_BUMP, ++ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP, ++ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP, ++ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP, ++ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP, ++ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP, ++ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP ++}; ++ ++void ++gr_learn_resource(const struct task_struct *task, ++ const int res, const unsigned long wanted, const int gt) +{ -+ struct acl_object_label *matchpo; -+ __u32 retval; ++ struct acl_subject_label *acl; ++ const struct cred *cred; + -+ if (unlikely(!(gr_status & GR_READY))) -+ return (mode & ~GR_AUDITS); ++ if (unlikely((gr_status & GR_READY) && ++ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN)))) ++ goto skip_reslog; + -+ matchpo = gr_get_create_object(new_dentry, parent, mnt); ++ gr_log_resource(task, res, wanted, gt); ++skip_reslog: + -+ retval = matchpo->mode & mode; ++ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS)) ++ return; + -+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))) -+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) { -+ __u32 new_mode = mode; ++ acl = task->acl; + -+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS); ++ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) || ++ !(acl->resmask & (1U << (unsigned short) res)))) ++ return; + -+ gr_log_learn(new_dentry, mnt, new_mode); -+ return new_mode; ++ if (wanted >= acl->res[res].rlim_cur) { ++ unsigned long res_add; ++ ++ res_add = wanted + res_learn_bumps[res]; ++ ++ acl->res[res].rlim_cur = res_add; ++ ++ if (wanted > acl->res[res].rlim_max) ++ acl->res[res].rlim_max = res_add; ++ ++ /* only log the subject filename, since resource logging is supported for ++ single-subject learning only */ ++ rcu_read_lock(); ++ cred = __task_cred(task); ++ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, ++ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename, ++ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max, ++ "", (unsigned long) res, &task->signal->saved_ip); ++ rcu_read_unlock(); + } + -+ return retval; ++ return; +} ++EXPORT_SYMBOL(gr_learn_resource); ++#endif + -+__u32 -+gr_check_link(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt, -+ const struct dentry * old_dentry, const struct vfsmount * old_mnt) ++#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)) ++void ++pax_set_initial_flags(struct linux_binprm *bprm) +{ -+ struct acl_object_label *obj; -+ __u32 oldmode, newmode; -+ __u32 needmode; -+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ | -+ GR_DELETE | GR_INHERIT; -+ -+ if (unlikely(!(gr_status & GR_READY))) -+ return (GR_CREATE | GR_LINK); -+ -+ obj = chk_obj_label(old_dentry, old_mnt, current->acl); -+ oldmode = obj->mode; ++ struct task_struct *task = current; ++ struct acl_subject_label *proc; ++ unsigned long flags; + -+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt); -+ newmode = obj->mode; ++ if (unlikely(!(gr_status & GR_READY))) ++ return; + -+ needmode = newmode & checkmodes; ++ flags = pax_get_flags(task); + -+ // old name for hardlink must have at least the permissions of the new name -+ if ((oldmode & needmode) != needmode) -+ goto bad; ++ proc = task->acl; + -+ // if old name had restrictions/auditing, make sure the new name does as well -+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS); ++ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC) ++ flags &= ~MF_PAX_PAGEEXEC; ++ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC) ++ flags &= ~MF_PAX_SEGMEXEC; ++ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP) ++ flags &= ~MF_PAX_RANDMMAP; ++ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP) ++ flags &= ~MF_PAX_EMUTRAMP; ++ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT) ++ flags &= ~MF_PAX_MPROTECT; + -+ // don't allow hardlinking of suid/sgid/fcapped files without permission -+ if (is_privileged_binary(old_dentry)) -+ needmode |= GR_SETID; ++ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC) ++ flags |= MF_PAX_PAGEEXEC; ++ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC) ++ flags |= MF_PAX_SEGMEXEC; ++ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP) ++ flags |= MF_PAX_RANDMMAP; ++ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP) ++ flags |= MF_PAX_EMUTRAMP; ++ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT) ++ flags |= MF_PAX_MPROTECT; + -+ if ((newmode & needmode) != needmode) -+ goto bad; ++ pax_set_flags(task, flags); + -+ // enforce minimum permissions -+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK)) -+ return newmode; -+bad: -+ needmode = oldmode; -+ if (is_privileged_binary(old_dentry)) -+ needmode |= GR_SETID; -+ -+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) { -+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK); -+ return (GR_CREATE | GR_LINK); -+ } else if (newmode & GR_SUPPRESS) -+ return GR_SUPPRESS; -+ else -+ return 0; ++ return; +} ++#endif + +int -+gr_check_hidden_task(const struct task_struct *task) ++gr_handle_proc_ptrace(struct task_struct *task) +{ ++ struct file *filp; ++ struct task_struct *tmp = task; ++ struct task_struct *curtemp = current; ++ __u32 retmode; ++ ++#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE + if (unlikely(!(gr_status & GR_READY))) + return 0; ++#endif + -+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW)) ++ read_lock(&tasklist_lock); ++ read_lock(&grsec_exec_file_lock); ++ filp = task->exec_file; ++ ++ while (task_pid_nr(tmp) > 0) { ++ if (tmp == curtemp) ++ break; ++ tmp = tmp->real_parent; ++ } ++ ++ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) || ++ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) { ++ read_unlock(&grsec_exec_file_lock); ++ read_unlock(&tasklist_lock); ++ return 1; ++ } ++ ++#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE ++ if (!(gr_status & GR_READY)) { ++ read_unlock(&grsec_exec_file_lock); ++ read_unlock(&tasklist_lock); ++ return 0; ++ } ++#endif ++ ++ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt); ++ read_unlock(&grsec_exec_file_lock); ++ read_unlock(&tasklist_lock); ++ ++ if (retmode & GR_NOPTRACE) ++ return 1; ++ ++ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD) ++ && (current->acl != task->acl || (current->acl != current->role->root_label ++ && task_pid_nr(current) != task_pid_nr(task)))) + return 1; + + return 0; +} + -+int -+gr_check_protected_task(const struct task_struct *task) ++void task_grsec_rbac(struct seq_file *m, struct task_struct *p) +{ -+ if (unlikely(!(gr_status & GR_READY) || !task)) -+ return 0; ++ if (unlikely(!(gr_status & GR_READY))) ++ return; + -+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) && -+ task->acl != current->acl) -+ return 1; ++ if (!(current->role->roletype & GR_ROLE_GOD)) ++ return; + -+ return 0; ++ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n", ++ p->role->rolename, gr_task_roletype_to_char(p), ++ p->acl->filename); +} + +int -+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) ++gr_handle_ptrace(struct task_struct *task, const long request) +{ -+ struct task_struct *p; -+ int ret = 0; ++ struct task_struct *tmp = task; ++ struct task_struct *curtemp = current; ++ __u32 retmode; + -+ if (unlikely(!(gr_status & GR_READY) || !pid)) -+ return ret; ++#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE ++ if (unlikely(!(gr_status & GR_READY))) ++ return 0; ++#endif ++ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) { ++ read_lock(&tasklist_lock); ++ while (task_pid_nr(tmp) > 0) { ++ if (tmp == curtemp) ++ break; ++ tmp = tmp->real_parent; ++ } + -+ read_lock(&tasklist_lock); -+ do_each_pid_task(pid, type, p) { -+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) && -+ p->acl != current->acl) { -+ ret = 1; -+ goto out; ++ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) || ++ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) { ++ read_unlock(&tasklist_lock); ++ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task); ++ return 1; + } -+ } while_each_pid_task(pid, type, p); -+out: -+ read_unlock(&tasklist_lock); ++ read_unlock(&tasklist_lock); ++ } + -+ return ret; ++#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE ++ if (!(gr_status & GR_READY)) ++ return 0; ++#endif ++ ++ read_lock(&grsec_exec_file_lock); ++ if (unlikely(!task->exec_file)) { ++ read_unlock(&grsec_exec_file_lock); ++ return 0; ++ } ++ ++ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt); ++ read_unlock(&grsec_exec_file_lock); ++ ++ if (retmode & GR_NOPTRACE) { ++ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task); ++ return 1; ++ } ++ ++ if (retmode & GR_PTRACERD) { ++ switch (request) { ++ case PTRACE_SEIZE: ++ case PTRACE_POKETEXT: ++ case PTRACE_POKEDATA: ++ case PTRACE_POKEUSR: ++#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64) ++ case PTRACE_SETREGS: ++ case PTRACE_SETFPREGS: ++#endif ++#ifdef CONFIG_X86 ++ case PTRACE_SETFPXREGS: ++#endif ++#ifdef CONFIG_ALTIVEC ++ case PTRACE_SETVRREGS: ++#endif ++ return 1; ++ default: ++ return 0; ++ } ++ } else if (!(current->acl->mode & GR_POVERRIDE) && ++ !(current->role->roletype & GR_ROLE_GOD) && ++ (current->acl != task->acl)) { ++ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task); ++ return 1; ++ } ++ ++ return 0; +} + -+void -+gr_copy_label(struct task_struct *tsk) ++static int is_writable_mmap(const struct file *filp) +{ -+ tsk->signal->used_accept = 0; -+ tsk->acl_sp_role = 0; -+ tsk->acl_role_id = current->acl_role_id; -+ tsk->acl = current->acl; -+ tsk->role = current->role; -+ tsk->signal->curr_ip = current->signal->curr_ip; -+ tsk->signal->saved_ip = current->signal->saved_ip; -+ if (current->exec_file) -+ get_file(current->exec_file); -+ tsk->exec_file = current->exec_file; -+ tsk->is_writable = current->is_writable; -+ if (unlikely(current->signal->used_accept)) { -+ current->signal->curr_ip = 0; -+ current->signal->saved_ip = 0; -+ } ++ struct task_struct *task = current; ++ struct acl_object_label *obj, *obj2; + -+ return; ++ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) && ++ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && (filp->f_path.mnt != shm_mnt || (filp->f_path.dentry->d_inode->i_nlink > 0))) { ++ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label); ++ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, ++ task->role->root_label); ++ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) { ++ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt); ++ return 1; ++ } ++ } ++ return 0; +} + -+static void -+gr_set_proc_res(struct task_struct *task) ++int ++gr_acl_handle_mmap(const struct file *file, const unsigned long prot) +{ -+ struct acl_subject_label *proc; -+ unsigned short i; ++ __u32 mode; + -+ proc = task->acl; ++ if (unlikely(!file || !(prot & PROT_EXEC))) ++ return 1; + -+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN)) -+ return; ++ if (is_writable_mmap(file)) ++ return 0; + -+ for (i = 0; i < RLIM_NLIMITS; i++) { -+ if (!(proc->resmask & (1U << i))) -+ continue; ++ mode = ++ gr_search_file(file->f_path.dentry, ++ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS, ++ file->f_path.mnt); + -+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur; -+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max; ++ if (!gr_tpe_allow(file)) ++ return 0; + -+ if (i == RLIMIT_CPU) -+ update_rlimit_cpu(task, proc->res[i].rlim_cur); ++ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) { ++ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt); ++ return 0; ++ } else if (unlikely(!(mode & GR_EXEC))) { ++ return 0; ++ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) { ++ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt); ++ return 1; + } + -+ return; ++ return 1; +} + -+extern int gr_process_kernel_setuid_ban(struct user_struct *user); -+ +int -+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs) ++gr_acl_handle_mprotect(const struct file *file, const unsigned long prot) +{ -+ unsigned int i; -+ __u16 num; -+ uid_t *uidlist; -+ uid_t curuid; -+ int realok = 0; -+ int effectiveok = 0; -+ int fsok = 0; -+ uid_t globalreal, globaleffective, globalfs; -+ -+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) -+ struct user_struct *user; ++ __u32 mode; + -+ if (!uid_valid(real)) -+ goto skipit; ++ if (unlikely(!file || !(prot & PROT_EXEC))) ++ return 1; + -+ /* find user based on global namespace */ ++ if (is_writable_mmap(file)) ++ return 0; + -+ globalreal = GR_GLOBAL_UID(real); ++ mode = ++ gr_search_file(file->f_path.dentry, ++ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS, ++ file->f_path.mnt); + -+ user = find_user(make_kuid(&init_user_ns, globalreal)); -+ if (user == NULL) -+ goto skipit; ++ if (!gr_tpe_allow(file)) ++ return 0; + -+ if (gr_process_kernel_setuid_ban(user)) { -+ /* for find_user */ -+ free_uid(user); ++ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) { ++ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt); ++ return 0; ++ } else if (unlikely(!(mode & GR_EXEC))) { ++ return 0; ++ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) { ++ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt); + return 1; + } + -+ /* for find_user */ -+ free_uid(user); ++ return 1; ++} + -+skipit: -+#endif ++void ++gr_acl_handle_psacct(struct task_struct *task, const long code) ++{ ++ unsigned long runtime; ++ unsigned long cputime; ++ unsigned int wday, cday; ++ __u8 whr, chr; ++ __u8 wmin, cmin; ++ __u8 wsec, csec; ++ struct timespec timeval; + -+ if (unlikely(!(gr_status & GR_READY))) -+ return 0; ++ if (unlikely(!(gr_status & GR_READY) || !task->acl || ++ !(task->acl->mode & GR_PROCACCT))) ++ return; + -+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) -+ gr_log_learn_uid_change(real, effective, fs); ++ do_posix_clock_monotonic_gettime(&timeval); ++ runtime = timeval.tv_sec - task->start_time.tv_sec; ++ wday = runtime / (3600 * 24); ++ runtime -= wday * (3600 * 24); ++ whr = runtime / 3600; ++ runtime -= whr * 3600; ++ wmin = runtime / 60; ++ runtime -= wmin * 60; ++ wsec = runtime; + -+ num = current->acl->user_trans_num; -+ uidlist = current->acl->user_transitions; ++ cputime = (task->utime + task->stime) / HZ; ++ cday = cputime / (3600 * 24); ++ cputime -= cday * (3600 * 24); ++ chr = cputime / 3600; ++ cputime -= chr * 3600; ++ cmin = cputime / 60; ++ cputime -= cmin * 60; ++ csec = cputime; + -+ if (uidlist == NULL) -+ return 0; ++ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code); + -+ if (!uid_valid(real)) { -+ realok = 1; -+ globalreal = (uid_t)-1; -+ } else { -+ globalreal = GR_GLOBAL_UID(real); -+ } -+ if (!uid_valid(effective)) { -+ effectiveok = 1; -+ globaleffective = (uid_t)-1; -+ } else { -+ globaleffective = GR_GLOBAL_UID(effective); -+ } -+ if (!uid_valid(fs)) { -+ fsok = 1; -+ globalfs = (uid_t)-1; -+ } else { -+ globalfs = GR_GLOBAL_UID(fs); -+ } -+ -+ if (current->acl->user_trans_type & GR_ID_ALLOW) { -+ for (i = 0; i < num; i++) { -+ curuid = uidlist[i]; -+ if (globalreal == curuid) -+ realok = 1; -+ if (globaleffective == curuid) -+ effectiveok = 1; -+ if (globalfs == curuid) -+ fsok = 1; -+ } -+ } else if (current->acl->user_trans_type & GR_ID_DENY) { -+ for (i = 0; i < num; i++) { -+ curuid = uidlist[i]; -+ if (globalreal == curuid) -+ break; -+ if (globaleffective == curuid) -+ break; -+ if (globalfs == curuid) -+ break; -+ } -+ /* not in deny list */ -+ if (i == num) { -+ realok = 1; -+ effectiveok = 1; -+ fsok = 1; -+ } -+ } -+ -+ if (realok && effectiveok && fsok) -+ return 0; -+ else { -+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal); -+ return 1; -+ } ++ return; +} + -+int -+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs) ++#ifdef CONFIG_TASKSTATS ++int gr_is_taskstats_denied(int pid) +{ -+ unsigned int i; -+ __u16 num; -+ gid_t *gidlist; -+ gid_t curgid; -+ int realok = 0; -+ int effectiveok = 0; -+ int fsok = 0; -+ gid_t globalreal, globaleffective, globalfs; -+ -+ if (unlikely(!(gr_status & GR_READY))) -+ return 0; -+ -+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) -+ gr_log_learn_gid_change(real, effective, fs); -+ -+ num = current->acl->group_trans_num; -+ gidlist = current->acl->group_transitions; -+ -+ if (gidlist == NULL) -+ return 0; ++ struct task_struct *task; ++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ const struct cred *cred; ++#endif ++ int ret = 0; + -+ if (!gid_valid(real)) { -+ realok = 1; -+ globalreal = (gid_t)-1; -+ } else { -+ globalreal = GR_GLOBAL_GID(real); -+ } -+ if (!gid_valid(effective)) { -+ effectiveok = 1; -+ globaleffective = (gid_t)-1; -+ } else { -+ globaleffective = GR_GLOBAL_GID(effective); -+ } -+ if (!gid_valid(fs)) { -+ fsok = 1; -+ globalfs = (gid_t)-1; -+ } else { -+ globalfs = GR_GLOBAL_GID(fs); -+ } ++ /* restrict taskstats viewing to un-chrooted root users ++ who have the 'view' subject flag if the RBAC system is enabled ++ */ + -+ if (current->acl->group_trans_type & GR_ID_ALLOW) { -+ for (i = 0; i < num; i++) { -+ curgid = gidlist[i]; -+ if (globalreal == curgid) -+ realok = 1; -+ if (globaleffective == curgid) -+ effectiveok = 1; -+ if (globalfs == curgid) -+ fsok = 1; -+ } -+ } else if (current->acl->group_trans_type & GR_ID_DENY) { -+ for (i = 0; i < num; i++) { -+ curgid = gidlist[i]; -+ if (globalreal == curgid) -+ break; -+ if (globaleffective == curgid) -+ break; -+ if (globalfs == curgid) -+ break; -+ } -+ /* not in deny list */ -+ if (i == num) { -+ realok = 1; -+ effectiveok = 1; -+ fsok = 1; ++ rcu_read_lock(); ++ read_lock(&tasklist_lock); ++ task = find_task_by_vpid(pid); ++ if (task) { ++#ifdef CONFIG_GRKERNSEC_CHROOT ++ if (proc_is_chrooted(task)) ++ ret = -EACCES; ++#endif ++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ cred = __task_cred(task); ++#ifdef CONFIG_GRKERNSEC_PROC_USER ++ if (gr_is_global_nonroot(cred->uid)) ++ ret = -EACCES; ++#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid)) ++ ret = -EACCES; ++#endif ++#endif ++ if (gr_status & GR_READY) { ++ if (!(task->acl->mode & GR_VIEW)) ++ ret = -EACCES; + } -+ } ++ } else ++ ret = -ENOENT; + -+ if (realok && effectiveok && fsok) -+ return 0; -+ else { -+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal); -+ return 1; -+ } -+} ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); + -+extern int gr_acl_is_capable(const int cap); ++ return ret; ++} ++#endif + -+void -+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid) ++/* AUXV entries are filled via a descendant of search_binary_handler ++ after we've already applied the subject for the target ++*/ ++int gr_acl_enable_at_secure(void) +{ -+ struct acl_role_label *role = task->role; -+ struct acl_subject_label *subj = NULL; -+ struct acl_object_label *obj; -+ struct file *filp; -+ uid_t uid; -+ gid_t gid; -+ + if (unlikely(!(gr_status & GR_READY))) -+ return; ++ return 0; + -+ uid = GR_GLOBAL_UID(kuid); -+ gid = GR_GLOBAL_GID(kgid); ++ if (current->acl->mode & GR_ATSECURE) ++ return 1; + -+ filp = task->exec_file; ++ return 0; ++} ++ ++int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino) ++{ ++ struct task_struct *task = current; ++ struct dentry *dentry = file->f_path.dentry; ++ struct vfsmount *mnt = file->f_path.mnt; ++ struct acl_object_label *obj, *tmp; ++ struct acl_subject_label *subj; ++ unsigned int bufsize; ++ int is_not_root; ++ char *path; ++ dev_t dev = __get_dev(dentry); + -+ /* kernel process, we'll give them the kernel role */ -+ if (unlikely(!filp)) { -+ task->role = kernel_role; -+ task->acl = kernel_role->root_label; -+ return; -+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) -+ role = lookup_acl_role_label(task, uid, gid); ++ if (unlikely(!(gr_status & GR_READY))) ++ return 1; + -+ /* don't change the role if we're not a privileged process */ -+ if (role && task->role != role && -+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) || -+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID)))) -+ return; ++ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN)) ++ return 1; + -+ /* perform subject lookup in possibly new role -+ we can use this result below in the case where role == task->role -+ */ -+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role); ++ /* ignore Eric Biederman */ ++ if (IS_PRIVATE(dentry->d_inode)) ++ return 1; + -+ /* if we changed uid/gid, but result in the same role -+ and are using inheritance, don't lose the inherited subject -+ if current subject is other than what normal lookup -+ would result in, we arrived via inheritance, don't -+ lose subject ++ subj = task->acl; ++ read_lock(&gr_inode_lock); ++ do { ++ obj = lookup_acl_obj_label(ino, dev, subj); ++ if (obj != NULL) { ++ read_unlock(&gr_inode_lock); ++ return (obj->mode & GR_FIND) ? 1 : 0; ++ } ++ } while ((subj = subj->parent_subject)); ++ read_unlock(&gr_inode_lock); ++ ++ /* this is purely an optimization since we're looking for an object ++ for the directory we're doing a readdir on ++ if it's possible for any globbed object to match the entry we're ++ filling into the directory, then the object we find here will be ++ an anchor point with attached globbed objects + */ -+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) && -+ (subj == task->acl))) -+ task->acl = subj; ++ obj = chk_obj_label_noglob(dentry, mnt, task->acl); ++ if (obj->globbed == NULL) ++ return (obj->mode & GR_FIND) ? 1 : 0; + -+ task->role = role; ++ is_not_root = ((obj->filename[0] == '/') && ++ (obj->filename[1] == '\0')) ? 0 : 1; ++ bufsize = PAGE_SIZE - namelen - is_not_root; + -+ task->is_writable = 0; ++ /* check bufsize > PAGE_SIZE || bufsize == 0 */ ++ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1))) ++ return 1; + -+ /* ignore additional mmap checks for processes that are writable -+ by the default ACL */ -+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ task->is_writable = 1; -+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ task->is_writable = 1; ++ preempt_disable(); ++ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()), ++ bufsize); + -+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG -+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename); -+#endif ++ bufsize = strlen(path); + -+ gr_set_proc_res(task); ++ /* if base is "/", don't append an additional slash */ ++ if (is_not_root) ++ *(path + bufsize) = '/'; ++ memcpy(path + bufsize + is_not_root, name, namelen); ++ *(path + bufsize + namelen + is_not_root) = '\0'; + -+ return; ++ tmp = obj->globbed; ++ while (tmp) { ++ if (!glob_match(tmp->filename, path)) { ++ preempt_enable(); ++ return (tmp->mode & GR_FIND) ? 1 : 0; ++ } ++ tmp = tmp->next; ++ } ++ preempt_enable(); ++ return (obj->mode & GR_FIND) ? 1 : 0; +} + -+int -+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt, -+ const int unsafe_flags) ++void gr_put_exec_file(struct task_struct *task) +{ -+ struct task_struct *task = current; -+ struct acl_subject_label *newacl; -+ struct acl_object_label *obj; -+ __u32 retmode; -+ -+ if (unlikely(!(gr_status & GR_READY))) -+ return 0; -+ -+ newacl = chk_subj_label(dentry, mnt, task->role); -+ -+ /* special handling for if we did an strace -f -p from an admin role, where pid then -+ did an exec -+ */ -+ rcu_read_lock(); -+ read_lock(&tasklist_lock); -+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) || -+ (task->parent->acl->mode & GR_POVERRIDE))) { -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); -+ goto skip_check; -+ } -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); -+ -+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) && -+ !(task->role->roletype & GR_ROLE_GOD) && -+ !gr_search_file(dentry, GR_PTRACERD, mnt) && -+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) { -+ if (unsafe_flags & LSM_UNSAFE_SHARE) -+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt); -+ else -+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt); -+ return -EACCES; -+ } ++ struct file *filp; + -+skip_check: ++ write_lock(&grsec_exec_file_lock); ++ filp = task->exec_file; ++ task->exec_file = NULL; ++ write_unlock(&grsec_exec_file_lock); + -+ obj = chk_obj_label(dentry, mnt, task->acl); -+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT); ++ if (filp) ++ fput(filp); + -+ if (!(task->acl->mode & GR_INHERITLEARN) && -+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) { -+ if (obj->nested) -+ task->acl = obj->nested; -+ else -+ task->acl = newacl; -+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT) -+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt); ++ return; ++} + -+ task->is_writable = 0; + -+ /* ignore additional mmap checks for processes that are writable -+ by the default ACL */ -+ obj = chk_obj_label(dentry, mnt, default_role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ task->is_writable = 1; -+ obj = chk_obj_label(dentry, mnt, task->role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ task->is_writable = 1; ++#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE ++EXPORT_SYMBOL(gr_acl_is_enabled); ++#endif ++#ifdef CONFIG_SECURITY ++EXPORT_SYMBOL(gr_check_user_change); ++EXPORT_SYMBOL(gr_check_group_change); ++#endif + -+ gr_set_proc_res(task); +diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c +new file mode 100644 +index 0000000..18ffbbd +--- /dev/null ++++ b/grsecurity/gracl_alloc.c +@@ -0,0 +1,105 @@ ++#include ++#include ++#include ++#include ++#include ++#include + -+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG -+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename); -+#endif -+ return 0; -+} ++static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL }; ++struct gr_alloc_state *current_alloc_state = &__current_alloc_state; + -+/* always called with valid inodev ptr */ -+static void -+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev) ++static __inline__ int ++alloc_pop(void) +{ -+ struct acl_object_label *matchpo; -+ struct acl_subject_label *matchps; -+ struct acl_subject_label *subj; -+ struct acl_role_label *role; -+ unsigned int x; ++ if (current_alloc_state->alloc_stack_next == 1) ++ return 0; + -+ FOR_EACH_ROLE_START(role) -+ FOR_EACH_SUBJECT_START(role, subj, x) -+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL) -+ matchpo->mode |= GR_DELETED; -+ FOR_EACH_SUBJECT_END(subj,x) -+ FOR_EACH_NESTED_SUBJECT_START(role, subj) -+ /* nested subjects aren't in the role's subj_hash table */ -+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL) -+ matchpo->mode |= GR_DELETED; -+ FOR_EACH_NESTED_SUBJECT_END(subj) -+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL) -+ matchps->mode |= GR_DELETED; -+ FOR_EACH_ROLE_END(role) ++ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]); + -+ inodev->nentry->deleted = 1; ++ current_alloc_state->alloc_stack_next--; + -+ return; ++ return 1; +} + -+void -+gr_handle_delete(const ino_t ino, const dev_t dev) ++static __inline__ int ++alloc_push(void *buf) +{ -+ struct inodev_entry *inodev; ++ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size) ++ return 1; + -+ if (unlikely(!(gr_status & GR_READY))) -+ return; ++ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf; + -+ write_lock(&gr_inode_lock); -+ inodev = lookup_inodev_entry(ino, dev); -+ if (inodev != NULL) -+ do_handle_delete(inodev, ino, dev); -+ write_unlock(&gr_inode_lock); ++ current_alloc_state->alloc_stack_next++; + -+ return; ++ return 0; +} + -+static void -+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice, -+ const ino_t newinode, const dev_t newdevice, -+ struct acl_subject_label *subj) ++void * ++acl_alloc(unsigned long len) +{ -+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size); -+ struct acl_object_label *match; ++ void *ret = NULL; + -+ match = subj->obj_hash[index]; ++ if (!len || len > PAGE_SIZE) ++ goto out; + -+ while (match && (match->inode != oldinode || -+ match->device != olddevice || -+ !(match->mode & GR_DELETED))) -+ match = match->next; ++ ret = kmalloc(len, GFP_KERNEL); + -+ if (match && (match->inode == oldinode) -+ && (match->device == olddevice) -+ && (match->mode & GR_DELETED)) { -+ if (match->prev == NULL) { -+ subj->obj_hash[index] = match->next; -+ if (match->next != NULL) -+ match->next->prev = NULL; -+ } else { -+ match->prev->next = match->next; -+ if (match->next != NULL) -+ match->next->prev = match->prev; ++ if (ret) { ++ if (alloc_push(ret)) { ++ kfree(ret); ++ ret = NULL; + } -+ match->prev = NULL; -+ match->next = NULL; -+ match->inode = newinode; -+ match->device = newdevice; -+ match->mode &= ~GR_DELETED; -+ -+ insert_acl_obj_label(match, subj); + } + -+ return; ++out: ++ return ret; +} + -+static void -+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice, -+ const ino_t newinode, const dev_t newdevice, -+ struct acl_role_label *role) ++void * ++acl_alloc_num(unsigned long num, unsigned long len) +{ -+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size); -+ struct acl_subject_label *match; ++ if (!len || (num > (PAGE_SIZE / len))) ++ return NULL; + -+ match = role->subj_hash[index]; ++ return acl_alloc(num * len); ++} + -+ while (match && (match->inode != oldinode || -+ match->device != olddevice || -+ !(match->mode & GR_DELETED))) -+ match = match->next; ++void ++acl_free_all(void) ++{ ++ if (!current_alloc_state->alloc_stack) ++ return; + -+ if (match && (match->inode == oldinode) -+ && (match->device == olddevice) -+ && (match->mode & GR_DELETED)) { -+ if (match->prev == NULL) { -+ role->subj_hash[index] = match->next; -+ if (match->next != NULL) -+ match->next->prev = NULL; -+ } else { -+ match->prev->next = match->next; -+ if (match->next != NULL) -+ match->next->prev = match->prev; -+ } -+ match->prev = NULL; -+ match->next = NULL; -+ match->inode = newinode; -+ match->device = newdevice; -+ match->mode &= ~GR_DELETED; ++ while (alloc_pop()) ; + -+ insert_acl_subj_label(match, role); ++ if (current_alloc_state->alloc_stack) { ++ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE) ++ kfree(current_alloc_state->alloc_stack); ++ else ++ vfree(current_alloc_state->alloc_stack); + } + ++ current_alloc_state->alloc_stack = NULL; ++ current_alloc_state->alloc_stack_size = 1; ++ current_alloc_state->alloc_stack_next = 1; ++ + return; +} + -+static void -+update_inodev_entry(const ino_t oldinode, const dev_t olddevice, -+ const ino_t newinode, const dev_t newdevice) ++int ++acl_alloc_stack_init(unsigned long size) +{ -+ unsigned int index = gr_fhash(oldinode, olddevice, inodev_set.i_size); -+ struct inodev_entry *match; -+ -+ match = inodev_set.i_hash[index]; ++ if ((size * sizeof (void *)) <= PAGE_SIZE) ++ current_alloc_state->alloc_stack = ++ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL); ++ else ++ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *)); + -+ while (match && (match->nentry->inode != oldinode || -+ match->nentry->device != olddevice || !match->nentry->deleted)) -+ match = match->next; ++ current_alloc_state->alloc_stack_size = size; ++ current_alloc_state->alloc_stack_next = 1; + -+ if (match && (match->nentry->inode == oldinode) -+ && (match->nentry->device == olddevice) && -+ match->nentry->deleted) { -+ if (match->prev == NULL) { -+ inodev_set.i_hash[index] = match->next; -+ if (match->next != NULL) -+ match->next->prev = NULL; -+ } else { -+ match->prev->next = match->next; -+ if (match->next != NULL) -+ match->next->prev = match->prev; -+ } -+ match->prev = NULL; -+ match->next = NULL; -+ match->nentry->inode = newinode; -+ match->nentry->device = newdevice; -+ match->nentry->deleted = 0; -+ -+ insert_inodev_entry(match); -+ } -+ -+ return; ++ if (!current_alloc_state->alloc_stack) ++ return 0; ++ else ++ return 1; +} +diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c +new file mode 100644 +index 0000000..bdd51ea +--- /dev/null ++++ b/grsecurity/gracl_cap.c +@@ -0,0 +1,110 @@ ++#include ++#include ++#include ++#include ++#include ++#include + -+static void -+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev) ++extern const char *captab_log[]; ++extern int captab_log_entries; ++ ++int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap) +{ -+ struct acl_subject_label *subj; -+ struct acl_role_label *role; -+ unsigned int x; ++ struct acl_subject_label *curracl; ++ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set; ++ kernel_cap_t cap_audit = __cap_empty_set; + -+ FOR_EACH_ROLE_START(role) -+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role); ++ if (!gr_acl_is_enabled()) ++ return 1; + -+ FOR_EACH_NESTED_SUBJECT_START(role, subj) -+ if ((subj->inode == ino) && (subj->device == dev)) { -+ subj->inode = ino; -+ subj->device = dev; -+ } -+ /* nested subjects aren't in the role's subj_hash table */ -+ update_acl_obj_label(matchn->inode, matchn->device, -+ ino, dev, subj); -+ FOR_EACH_NESTED_SUBJECT_END(subj) -+ FOR_EACH_SUBJECT_START(role, subj, x) -+ update_acl_obj_label(matchn->inode, matchn->device, -+ ino, dev, subj); -+ FOR_EACH_SUBJECT_END(subj,x) -+ FOR_EACH_ROLE_END(role) ++ curracl = task->acl; + -+ update_inodev_entry(matchn->inode, matchn->device, ino, dev); ++ cap_drop = curracl->cap_lower; ++ cap_mask = curracl->cap_mask; ++ cap_audit = curracl->cap_invert_audit; + -+ return; -+} ++ while ((curracl = curracl->parent_subject)) { ++ /* if the cap isn't specified in the current computed mask but is specified in the ++ current level subject, and is lowered in the current level subject, then add ++ it to the set of dropped capabilities ++ otherwise, add the current level subject's mask to the current computed mask ++ */ ++ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) { ++ cap_raise(cap_mask, cap); ++ if (cap_raised(curracl->cap_lower, cap)) ++ cap_raise(cap_drop, cap); ++ if (cap_raised(curracl->cap_invert_audit, cap)) ++ cap_raise(cap_audit, cap); ++ } ++ } + -+static void -+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry, -+ const struct vfsmount *mnt) -+{ -+ ino_t ino = dentry->d_inode->i_ino; -+ dev_t dev = __get_dev(dentry); ++ if (!cap_raised(cap_drop, cap)) { ++ if (cap_raised(cap_audit, cap)) ++ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]); ++ return 1; ++ } + -+ __do_handle_create(matchn, ino, dev); ++ curracl = task->acl; + -+ return; ++ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) ++ && cap_raised(cred->cap_effective, cap)) { ++ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, ++ task->role->roletype, GR_GLOBAL_UID(cred->uid), ++ GR_GLOBAL_GID(cred->gid), task->exec_file ? ++ gr_to_filename(task->exec_file->f_path.dentry, ++ task->exec_file->f_path.mnt) : curracl->filename, ++ curracl->filename, 0UL, ++ 0UL, "", (unsigned long) cap, &task->signal->saved_ip); ++ return 1; ++ } ++ ++ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap)) ++ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]); ++ ++ return 0; +} + -+void -+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt) ++int ++gr_acl_is_capable(const int cap) +{ -+ struct name_entry *matchn; ++ return gr_task_acl_is_capable(current, current_cred(), cap); ++} + -+ if (unlikely(!(gr_status & GR_READY))) -+ return; ++int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap) ++{ ++ struct acl_subject_label *curracl; ++ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set; + -+ preempt_disable(); -+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt)); ++ if (!gr_acl_is_enabled()) ++ return 1; + -+ if (unlikely((unsigned long)matchn)) { -+ write_lock(&gr_inode_lock); -+ do_handle_create(matchn, dentry, mnt); -+ write_unlock(&gr_inode_lock); ++ curracl = task->acl; ++ ++ cap_drop = curracl->cap_lower; ++ cap_mask = curracl->cap_mask; ++ ++ while ((curracl = curracl->parent_subject)) { ++ /* if the cap isn't specified in the current computed mask but is specified in the ++ current level subject, and is lowered in the current level subject, then add ++ it to the set of dropped capabilities ++ otherwise, add the current level subject's mask to the current computed mask ++ */ ++ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) { ++ cap_raise(cap_mask, cap); ++ if (cap_raised(curracl->cap_lower, cap)) ++ cap_raise(cap_drop, cap); ++ } + } -+ preempt_enable(); + -+ return; ++ if (!cap_raised(cap_drop, cap)) ++ return 1; ++ ++ return 0; +} + -+void -+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode) ++int ++gr_acl_is_capable_nolog(const int cap) +{ -+ struct name_entry *matchn; ++ return gr_task_acl_is_capable_nolog(current, cap); ++} + -+ if (unlikely(!(gr_status & GR_READY))) -+ return; +diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c +new file mode 100644 +index 0000000..ca25605 +--- /dev/null ++++ b/grsecurity/gracl_compat.c +@@ -0,0 +1,270 @@ ++#include ++#include ++#include ++#include + -+ preempt_disable(); -+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt)); ++#include + -+ if (unlikely((unsigned long)matchn)) { -+ write_lock(&gr_inode_lock); -+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev); -+ write_unlock(&gr_inode_lock); -+ } -+ preempt_enable(); ++int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap) ++{ ++ struct gr_arg_wrapper_compat uwrapcompat; + -+ return; ++ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat))) ++ return -EFAULT; ++ ++ if (((uwrapcompat.version != GRSECURITY_VERSION) && ++ (uwrapcompat.version != 0x2901)) || ++ (uwrapcompat.size != sizeof(struct gr_arg_compat))) ++ return -EINVAL; ++ ++ uwrap->arg = compat_ptr(uwrapcompat.arg); ++ uwrap->version = uwrapcompat.version; ++ uwrap->size = sizeof(struct gr_arg); ++ ++ return 0; +} + -+void -+gr_handle_rename(struct inode *old_dir, struct inode *new_dir, -+ struct dentry *old_dentry, -+ struct dentry *new_dentry, -+ struct vfsmount *mnt, const __u8 replace) ++int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg) +{ -+ struct name_entry *matchn; -+ struct inodev_entry *inodev; -+ struct inode *inode = new_dentry->d_inode; -+ ino_t old_ino = old_dentry->d_inode->i_ino; -+ dev_t old_dev = __get_dev(old_dentry); ++ struct gr_arg_compat argcompat; + -+ /* vfs_rename swaps the name and parent link for old_dentry and -+ new_dentry -+ at this point, old_dentry has the new name, parent link, and inode -+ for the renamed file -+ if a file is being replaced by a rename, new_dentry has the inode -+ and name for the replaced file -+ */ ++ if (copy_from_user(&argcompat, buf, sizeof(argcompat))) ++ return -EFAULT; + -+ if (unlikely(!(gr_status & GR_READY))) -+ return; ++ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table); ++ arg->role_db.num_pointers = argcompat.role_db.num_pointers; ++ arg->role_db.num_roles = argcompat.role_db.num_roles; ++ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children; ++ arg->role_db.num_subjects = argcompat.role_db.num_subjects; ++ arg->role_db.num_objects = argcompat.role_db.num_objects; + -+ preempt_disable(); -+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt)); ++ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw)); ++ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt)); ++ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum)); ++ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role)); ++ arg->sprole_pws = compat_ptr(argcompat.sprole_pws); ++ arg->segv_device = argcompat.segv_device; ++ arg->segv_inode = argcompat.segv_inode; ++ arg->segv_uid = argcompat.segv_uid; ++ arg->num_sprole_pws = argcompat.num_sprole_pws; ++ arg->mode = argcompat.mode; + -+ /* we wouldn't have to check d_inode if it weren't for -+ NFS silly-renaming -+ */ ++ return 0; ++} + -+ write_lock(&gr_inode_lock); -+ if (unlikely(replace && inode)) { -+ ino_t new_ino = inode->i_ino; -+ dev_t new_dev = __get_dev(new_dentry); ++int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp) ++{ ++ struct acl_object_label_compat objcompat; + -+ inodev = lookup_inodev_entry(new_ino, new_dev); -+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode))) -+ do_handle_delete(inodev, new_ino, new_dev); -+ } ++ if (copy_from_user(&objcompat, userp, sizeof(objcompat))) ++ return -EFAULT; + -+ inodev = lookup_inodev_entry(old_ino, old_dev); -+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode))) -+ do_handle_delete(inodev, old_ino, old_dev); ++ obj->filename = compat_ptr(objcompat.filename); ++ obj->inode = objcompat.inode; ++ obj->device = objcompat.device; ++ obj->mode = objcompat.mode; + -+ if (unlikely((unsigned long)matchn)) -+ do_handle_create(matchn, old_dentry, mnt); ++ obj->nested = compat_ptr(objcompat.nested); ++ obj->globbed = compat_ptr(objcompat.globbed); + -+ write_unlock(&gr_inode_lock); -+ preempt_enable(); ++ obj->prev = compat_ptr(objcompat.prev); ++ obj->next = compat_ptr(objcompat.next); + -+ return; ++ return 0; +} + -+static int -+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt, -+ unsigned char **sum) ++int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp) +{ -+ struct acl_role_label *r; -+ struct role_allowed_ip *ipp; -+ struct role_transition *trans; + unsigned int i; -+ int found = 0; -+ u32 curr_ip = current->signal->curr_ip; ++ struct acl_subject_label_compat subjcompat; + -+ current->signal->saved_ip = curr_ip; ++ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat))) ++ return -EFAULT; + -+ /* check transition table */ ++ subj->filename = compat_ptr(subjcompat.filename); ++ subj->inode = subjcompat.inode; ++ subj->device = subjcompat.device; ++ subj->mode = subjcompat.mode; ++ subj->cap_mask = subjcompat.cap_mask; ++ subj->cap_lower = subjcompat.cap_lower; ++ subj->cap_invert_audit = subjcompat.cap_invert_audit; + -+ for (trans = current->role->transitions; trans; trans = trans->next) { -+ if (!strcmp(rolename, trans->rolename)) { -+ found = 1; -+ break; -+ } ++ for (i = 0; i < GR_NLIMITS; i++) { ++ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY) ++ subj->res[i].rlim_cur = RLIM_INFINITY; ++ else ++ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur; ++ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY) ++ subj->res[i].rlim_max = RLIM_INFINITY; ++ else ++ subj->res[i].rlim_max = subjcompat.res[i].rlim_max; + } ++ subj->resmask = subjcompat.resmask; + -+ if (!found) -+ return 0; ++ subj->user_trans_type = subjcompat.user_trans_type; ++ subj->group_trans_type = subjcompat.group_trans_type; ++ subj->user_transitions = compat_ptr(subjcompat.user_transitions); ++ subj->group_transitions = compat_ptr(subjcompat.group_transitions); ++ subj->user_trans_num = subjcompat.user_trans_num; ++ subj->group_trans_num = subjcompat.group_trans_num; + -+ /* handle special roles that do not require authentication -+ and check ip */ ++ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families)); ++ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto)); ++ subj->ip_type = subjcompat.ip_type; ++ subj->ips = compat_ptr(subjcompat.ips); ++ subj->ip_num = subjcompat.ip_num; ++ subj->inaddr_any_override = subjcompat.inaddr_any_override; + -+ FOR_EACH_ROLE_START(r) -+ if (!strcmp(rolename, r->rolename) && -+ (r->roletype & GR_ROLE_SPECIAL)) { -+ found = 0; -+ if (r->allowed_ips != NULL) { -+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) { -+ if ((ntohl(curr_ip) & ipp->netmask) == -+ (ntohl(ipp->addr) & ipp->netmask)) -+ found = 1; -+ } -+ } else -+ found = 2; -+ if (!found) -+ return 0; ++ subj->crashes = subjcompat.crashes; ++ subj->expires = subjcompat.expires; + -+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) || -+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) { -+ *salt = NULL; -+ *sum = NULL; -+ return 1; -+ } -+ } -+ FOR_EACH_ROLE_END(r) ++ subj->parent_subject = compat_ptr(subjcompat.parent_subject); ++ subj->hash = compat_ptr(subjcompat.hash); ++ subj->prev = compat_ptr(subjcompat.prev); ++ subj->next = compat_ptr(subjcompat.next); + -+ for (i = 0; i < num_sprole_pws; i++) { -+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) { -+ *salt = acl_special_roles[i]->salt; -+ *sum = acl_special_roles[i]->sum; -+ return 1; -+ } -+ } ++ subj->obj_hash = compat_ptr(subjcompat.obj_hash); ++ subj->obj_hash_size = subjcompat.obj_hash_size; ++ subj->pax_flags = subjcompat.pax_flags; + + return 0; +} + -+static void -+assign_special_role(char *rolename) ++int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp) +{ -+ struct acl_object_label *obj; -+ struct acl_role_label *r; -+ struct acl_role_label *assigned = NULL; -+ struct task_struct *tsk; -+ struct file *filp; -+ -+ FOR_EACH_ROLE_START(r) -+ if (!strcmp(rolename, r->rolename) && -+ (r->roletype & GR_ROLE_SPECIAL)) { -+ assigned = r; -+ break; -+ } -+ FOR_EACH_ROLE_END(r) ++ struct acl_role_label_compat rolecompat; + -+ if (!assigned) -+ return; ++ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat))) ++ return -EFAULT; + -+ read_lock(&tasklist_lock); -+ read_lock(&grsec_exec_file_lock); ++ role->rolename = compat_ptr(rolecompat.rolename); ++ role->uidgid = rolecompat.uidgid; ++ role->roletype = rolecompat.roletype; + -+ tsk = current->real_parent; -+ if (tsk == NULL) -+ goto out_unlock; ++ role->auth_attempts = rolecompat.auth_attempts; ++ role->expires = rolecompat.expires; + -+ filp = tsk->exec_file; -+ if (filp == NULL) -+ goto out_unlock; ++ role->root_label = compat_ptr(rolecompat.root_label); ++ role->hash = compat_ptr(rolecompat.hash); + -+ tsk->is_writable = 0; ++ role->prev = compat_ptr(rolecompat.prev); ++ role->next = compat_ptr(rolecompat.next); + -+ tsk->acl_sp_role = 1; -+ tsk->acl_role_id = ++acl_sp_role_value; -+ tsk->role = assigned; -+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role); ++ role->transitions = compat_ptr(rolecompat.transitions); ++ role->allowed_ips = compat_ptr(rolecompat.allowed_ips); ++ role->domain_children = compat_ptr(rolecompat.domain_children); ++ role->domain_child_num = rolecompat.domain_child_num; + -+ /* ignore additional mmap checks for processes that are writable -+ by the default ACL */ -+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ tsk->is_writable = 1; -+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ tsk->is_writable = 1; ++ role->umask = rolecompat.umask; + -+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG -+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, task_pid_nr(tsk)); -+#endif ++ role->subj_hash = compat_ptr(rolecompat.subj_hash); ++ role->subj_hash_size = rolecompat.subj_hash_size; + -+out_unlock: -+ read_unlock(&grsec_exec_file_lock); -+ read_unlock(&tasklist_lock); -+ return; ++ return 0; +} + -+int gr_check_secure_terminal(struct task_struct *task) ++int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) +{ -+ struct task_struct *p, *p2, *p3; -+ struct files_struct *files; -+ struct fdtable *fdt; -+ struct file *our_file = NULL, *file; -+ int i; -+ -+ if (task->signal->tty == NULL) -+ return 1; ++ struct role_allowed_ip_compat roleip_compat; + -+ files = get_files_struct(task); -+ if (files != NULL) { -+ rcu_read_lock(); -+ fdt = files_fdtable(files); -+ for (i=0; i < fdt->max_fds; i++) { -+ file = fcheck_files(files, i); -+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) { -+ get_file(file); -+ our_file = file; -+ } -+ } -+ rcu_read_unlock(); -+ put_files_struct(files); -+ } ++ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat))) ++ return -EFAULT; + -+ if (our_file == NULL) -+ return 1; ++ roleip->addr = roleip_compat.addr; ++ roleip->netmask = roleip_compat.netmask; + -+ read_lock(&tasklist_lock); -+ do_each_thread(p2, p) { -+ files = get_files_struct(p); -+ if (files == NULL || -+ (p->signal && p->signal->tty == task->signal->tty)) { -+ if (files != NULL) -+ put_files_struct(files); -+ continue; -+ } -+ rcu_read_lock(); -+ fdt = files_fdtable(files); -+ for (i=0; i < fdt->max_fds; i++) { -+ file = fcheck_files(files, i); -+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) && -+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) { -+ p3 = task; -+ while (task_pid_nr(p3) > 0) { -+ if (p3 == p) -+ break; -+ p3 = p3->real_parent; -+ } -+ if (p3 == p) -+ break; -+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p); -+ gr_handle_alertkill(p); -+ rcu_read_unlock(); -+ put_files_struct(files); -+ read_unlock(&tasklist_lock); -+ fput(our_file); -+ return 0; -+ } -+ } -+ rcu_read_unlock(); -+ put_files_struct(files); -+ } while_each_thread(p2, p); -+ read_unlock(&tasklist_lock); ++ roleip->prev = compat_ptr(roleip_compat.prev); ++ roleip->next = compat_ptr(roleip_compat.next); + -+ fput(our_file); -+ return 1; ++ return 0; +} + -+static int gr_rbac_disable(void *unused) ++int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp) +{ -+ pax_open_kernel(); -+ gr_status &= ~GR_READY; -+ pax_close_kernel(); ++ struct role_transition_compat trans_compat; ++ ++ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat))) ++ return -EFAULT; ++ ++ trans->rolename = compat_ptr(trans_compat.rolename); ++ ++ trans->prev = compat_ptr(trans_compat.prev); ++ trans->next = compat_ptr(trans_compat.next); + + return 0; ++ +} + -+ssize_t -+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos) ++int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) +{ -+ struct gr_arg_wrapper uwrap; -+ unsigned char *sprole_salt = NULL; -+ unsigned char *sprole_sum = NULL; -+ int error = 0; -+ int error2 = 0; -+ size_t req_count = 0; ++ struct gr_hash_struct_compat hash_compat; + -+ mutex_lock(&gr_dev_mutex); ++ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat))) ++ return -EFAULT; + -+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) { -+ error = -EPERM; -+ goto out; -+ } ++ hash->table = compat_ptr(hash_compat.table); ++ hash->nametable = compat_ptr(hash_compat.nametable); ++ hash->first = compat_ptr(hash_compat.first); + -+#ifdef CONFIG_COMPAT -+ pax_open_kernel(); -+ if (is_compat_task()) { -+ copy_gr_arg_wrapper = ©_gr_arg_wrapper_compat; -+ copy_gr_arg = ©_gr_arg_compat; -+ copy_acl_object_label = ©_acl_object_label_compat; -+ copy_acl_subject_label = ©_acl_subject_label_compat; -+ copy_acl_role_label = ©_acl_role_label_compat; -+ copy_acl_ip_label = ©_acl_ip_label_compat; -+ copy_role_allowed_ip = ©_role_allowed_ip_compat; -+ copy_role_transition = ©_role_transition_compat; -+ copy_sprole_pw = ©_sprole_pw_compat; -+ copy_gr_hash_struct = ©_gr_hash_struct_compat; -+ copy_pointer_from_array = ©_pointer_from_array_compat; -+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat; -+ } else { -+ copy_gr_arg_wrapper = ©_gr_arg_wrapper_normal; -+ copy_gr_arg = ©_gr_arg_normal; -+ copy_acl_object_label = ©_acl_object_label_normal; -+ copy_acl_subject_label = ©_acl_subject_label_normal; -+ copy_acl_role_label = ©_acl_role_label_normal; -+ copy_acl_ip_label = ©_acl_ip_label_normal; -+ copy_role_allowed_ip = ©_role_allowed_ip_normal; -+ copy_role_transition = ©_role_transition_normal; -+ copy_sprole_pw = ©_sprole_pw_normal; -+ copy_gr_hash_struct = ©_gr_hash_struct_normal; -+ copy_pointer_from_array = ©_pointer_from_array_normal; -+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal; -+ } -+ pax_close_kernel(); -+#endif ++ hash->table_size = hash_compat.table_size; ++ hash->used_size = hash_compat.used_size; + -+ req_count = get_gr_arg_wrapper_size(); ++ hash->type = hash_compat.type; + -+ if (count != req_count) { -+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count); -+ error = -EINVAL; -+ goto out; -+ } ++ return 0; ++} + -+ -+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) { -+ gr_auth_expires = 0; -+ gr_auth_attempts = 0; -+ } ++int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp) ++{ ++ compat_uptr_t ptrcompat; + -+ error = copy_gr_arg_wrapper(buf, &uwrap); -+ if (error) -+ goto out; ++ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat))) ++ return -EFAULT; + -+ error = copy_gr_arg(uwrap.arg, gr_usermode); -+ if (error) -+ goto out; ++ *(void **)ptr = compat_ptr(ptrcompat); + -+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM && -+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES && -+ time_after(gr_auth_expires, get_seconds())) { -+ error = -EBUSY; -+ goto out; -+ } ++ return 0; ++} + -+ /* if non-root trying to do anything other than use a special role, -+ do not attempt authentication, do not count towards authentication -+ locking -+ */ ++int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp) ++{ ++ struct acl_ip_label_compat ip_compat; + -+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS && -+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM && -+ gr_is_global_nonroot(current_uid())) { -+ error = -EPERM; -+ goto out; -+ } ++ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat))) ++ return -EFAULT; + -+ /* ensure pw and special role name are null terminated */ ++ ip->iface = compat_ptr(ip_compat.iface); ++ ip->addr = ip_compat.addr; ++ ip->netmask = ip_compat.netmask; ++ ip->low = ip_compat.low; ++ ip->high = ip_compat.high; ++ ip->mode = ip_compat.mode; ++ ip->type = ip_compat.type; + -+ gr_usermode->pw[GR_PW_LEN - 1] = '\0'; -+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0'; ++ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto)); + -+ /* Okay. -+ * We have our enough of the argument structure..(we have yet -+ * to copy_from_user the tables themselves) . Copy the tables -+ * only if we need them, i.e. for loading operations. */ ++ ip->prev = compat_ptr(ip_compat.prev); ++ ip->next = compat_ptr(ip_compat.next); + -+ switch (gr_usermode->mode) { -+ case GR_STATUS: -+ if (gr_status & GR_READY) { -+ error = 1; -+ if (!gr_check_secure_terminal(current)) -+ error = 3; -+ } else -+ error = 2; -+ goto out; -+ case GR_SHUTDOWN: -+ if ((gr_status & GR_READY) -+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) { -+ stop_machine(gr_rbac_disable, NULL, NULL); -+ free_variables(); -+ memset(gr_usermode, 0, sizeof (struct gr_arg)); -+ memset(gr_system_salt, 0, GR_SALT_LEN); -+ memset(gr_system_sum, 0, GR_SHA_LEN); -+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG); -+ } else if (gr_status & GR_READY) { -+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG); -+ error = -EPERM; -+ } else { -+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG); -+ error = -EAGAIN; -+ } -+ break; -+ case GR_ENABLE: -+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode))) -+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION); -+ else { -+ if (gr_status & GR_READY) -+ error = -EAGAIN; -+ else -+ error = error2; -+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION); -+ } -+ break; -+ case GR_RELOAD: -+ if (!(gr_status & GR_READY)) { -+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION); -+ error = -EAGAIN; -+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) { -+ stop_machine(gr_rbac_disable, NULL, NULL); -+ free_variables(); -+ error2 = gracl_init(gr_usermode); -+ if (!error2) -+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION); -+ else { -+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION); -+ error = error2; -+ } -+ } else { -+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION); -+ error = -EPERM; -+ } -+ break; -+ case GR_SEGVMOD: -+ if (unlikely(!(gr_status & GR_READY))) { -+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG); -+ error = -EAGAIN; -+ break; -+ } ++ return 0; ++} + -+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) { -+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG); -+ if (gr_usermode->segv_device && gr_usermode->segv_inode) { -+ struct acl_subject_label *segvacl; -+ segvacl = -+ lookup_acl_subj_label(gr_usermode->segv_inode, -+ gr_usermode->segv_device, -+ current->role); -+ if (segvacl) { -+ segvacl->crashes = 0; -+ segvacl->expires = 0; -+ } -+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) { -+ gr_remove_uid(gr_usermode->segv_uid); -+ } -+ } else { -+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG); -+ error = -EPERM; -+ } -+ break; -+ case GR_SPROLE: -+ case GR_SPROLEPAM: -+ if (unlikely(!(gr_status & GR_READY))) { -+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG); -+ error = -EAGAIN; -+ break; -+ } ++int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) ++{ ++ struct sprole_pw_compat pw_compat; + -+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) { -+ current->role->expires = 0; -+ current->role->auth_attempts = 0; -+ } ++ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat))) ++ return -EFAULT; + -+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES && -+ time_after(current->role->expires, get_seconds())) { -+ error = -EBUSY; -+ goto out; -+ } ++ pw->rolename = compat_ptr(pw_compat.rolename); ++ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt)); ++ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum)); + -+ if (lookup_special_role_auth -+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum) -+ && ((!sprole_salt && !sprole_sum) -+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) { -+ char *p = ""; -+ assign_special_role(gr_usermode->sp_role); -+ read_lock(&tasklist_lock); -+ if (current->real_parent) -+ p = current->real_parent->role->rolename; -+ read_unlock(&tasklist_lock); -+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG, -+ p, acl_sp_role_value); -+ } else { -+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role); -+ error = -EPERM; -+ if(!(current->role->auth_attempts++)) -+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT; ++ return 0; ++} + -+ goto out; -+ } -+ break; -+ case GR_UNSPROLE: -+ if (unlikely(!(gr_status & GR_READY))) { -+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG); -+ error = -EAGAIN; -+ break; -+ } ++size_t get_gr_arg_wrapper_size_compat(void) ++{ ++ return sizeof(struct gr_arg_wrapper_compat); ++} + -+ if (current->role->roletype & GR_ROLE_SPECIAL) { -+ char *p = ""; -+ int i = 0; +diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c +new file mode 100644 +index 0000000..a340c17 +--- /dev/null ++++ b/grsecurity/gracl_fs.c +@@ -0,0 +1,431 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ read_lock(&tasklist_lock); -+ if (current->real_parent) { -+ p = current->real_parent->role->rolename; -+ i = current->real_parent->acl_role_id; -+ } -+ read_unlock(&tasklist_lock); ++umode_t ++gr_acl_umask(void) ++{ ++ if (unlikely(!gr_acl_is_enabled())) ++ return 0; + -+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i); -+ gr_set_acls(1); -+ } else { -+ error = -EPERM; -+ goto out; -+ } -+ break; -+ default: -+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode); -+ error = -EINVAL; -+ break; -+ } ++ return current->role->umask; ++} + -+ if (error != -EPERM) -+ goto out; ++__u32 ++gr_acl_handle_hidden_file(const struct dentry * dentry, ++ const struct vfsmount * mnt) ++{ ++ __u32 mode; + -+ if(!(gr_auth_attempts++)) -+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT; ++ if (unlikely(!dentry->d_inode)) ++ return GR_FIND; + -+ out: -+ mutex_unlock(&gr_dev_mutex); ++ mode = ++ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt); + -+ if (!error) -+ error = req_count; ++ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) { ++ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt); ++ return mode; ++ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) { ++ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt); ++ return 0; ++ } else if (unlikely(!(mode & GR_FIND))) ++ return 0; + -+ return error; ++ return GR_FIND; +} + -+/* must be called with -+ rcu_read_lock(); -+ read_lock(&tasklist_lock); -+ read_lock(&grsec_exec_file_lock); -+*/ -+int gr_apply_subject_to_task(struct task_struct *task) ++__u32 ++gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt, ++ int acc_mode) +{ -+ struct acl_object_label *obj; -+ char *tmpname; -+ struct acl_subject_label *tmpsubj; -+ struct file *filp; -+ struct name_entry *nmatch; ++ __u32 reqmode = GR_FIND; ++ __u32 mode; + -+ filp = task->exec_file; -+ if (filp == NULL) -+ return 0; ++ if (unlikely(!dentry->d_inode)) ++ return reqmode; + -+ /* the following is to apply the correct subject -+ on binaries running when the RBAC system -+ is enabled, when the binaries have been -+ replaced or deleted since their execution -+ ----- -+ when the RBAC system starts, the inode/dev -+ from exec_file will be one the RBAC system -+ is unaware of. It only knows the inode/dev -+ of the present file on disk, or the absence -+ of it. -+ */ -+ preempt_disable(); -+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt); -+ -+ nmatch = lookup_name_entry(tmpname); -+ preempt_enable(); -+ tmpsubj = NULL; -+ if (nmatch) { -+ if (nmatch->deleted) -+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role); -+ else -+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role); -+ if (tmpsubj != NULL) -+ task->acl = tmpsubj; -+ } -+ if (tmpsubj == NULL) -+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, -+ task->role); -+ if (task->acl) { -+ task->is_writable = 0; -+ /* ignore additional mmap checks for processes that are writable -+ by the default ACL */ -+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ task->is_writable = 1; -+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label); -+ if (unlikely(obj->mode & GR_WRITE)) -+ task->is_writable = 1; -+ -+ gr_set_proc_res(task); ++ if (acc_mode & MAY_APPEND) ++ reqmode |= GR_APPEND; ++ else if (acc_mode & MAY_WRITE) ++ reqmode |= GR_WRITE; ++ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode)) ++ reqmode |= GR_READ; + -+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG -+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename); -+#endif -+ } else { -+ return 1; -+ } ++ mode = ++ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, ++ mnt); + -+ return 0; ++ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) { ++ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt, ++ reqmode & GR_READ ? " reading" : "", ++ reqmode & GR_WRITE ? " writing" : reqmode & ++ GR_APPEND ? " appending" : ""); ++ return reqmode; ++ } else ++ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS))) ++ { ++ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt, ++ reqmode & GR_READ ? " reading" : "", ++ reqmode & GR_WRITE ? " writing" : reqmode & ++ GR_APPEND ? " appending" : ""); ++ return 0; ++ } else if (unlikely((mode & reqmode) != reqmode)) ++ return 0; ++ ++ return reqmode; +} + -+int -+gr_set_acls(const int type) ++__u32 ++gr_acl_handle_creat(const struct dentry * dentry, ++ const struct dentry * p_dentry, ++ const struct vfsmount * p_mnt, int open_flags, int acc_mode, ++ const int imode) +{ -+ struct task_struct *task, *task2; -+ struct acl_role_label *role = current->role; -+ __u16 acl_role_id = current->acl_role_id; -+ const struct cred *cred; -+ int ret; -+ -+ rcu_read_lock(); -+ read_lock(&tasklist_lock); -+ read_lock(&grsec_exec_file_lock); -+ do_each_thread(task2, task) { -+ /* check to see if we're called from the exit handler, -+ if so, only replace ACLs that have inherited the admin -+ ACL */ ++ __u32 reqmode = GR_WRITE | GR_CREATE; ++ __u32 mode; + -+ if (type && (task->role != role || -+ task->acl_role_id != acl_role_id)) -+ continue; ++ if (acc_mode & MAY_APPEND) ++ reqmode |= GR_APPEND; ++ // if a directory was required or the directory already exists, then ++ // don't count this open as a read ++ if ((acc_mode & MAY_READ) && ++ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode)))) ++ reqmode |= GR_READ; ++ if ((open_flags & O_CREAT) && ++ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)))) ++ reqmode |= GR_SETID; + -+ task->acl_role_id = 0; -+ task->acl_sp_role = 0; ++ mode = ++ gr_check_create(dentry, p_dentry, p_mnt, ++ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS); + -+ if (task->exec_file) { -+ cred = __task_cred(task); -+ task->role = lookup_acl_role_label(task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid)); -+ ret = gr_apply_subject_to_task(task); -+ if (ret) { -+ read_unlock(&grsec_exec_file_lock); -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); -+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task)); -+ return ret; -+ } -+ } else { -+ // it's a kernel process -+ task->role = kernel_role; -+ task->acl = kernel_role->root_label; -+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN -+ task->acl->mode &= ~GR_PROCFIND; -+#endif -+ } -+ } while_each_thread(task2, task); -+ read_unlock(&grsec_exec_file_lock); -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); ++ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) { ++ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt, ++ reqmode & GR_READ ? " reading" : "", ++ reqmode & GR_WRITE ? " writing" : reqmode & ++ GR_APPEND ? " appending" : ""); ++ return reqmode; ++ } else ++ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS))) ++ { ++ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt, ++ reqmode & GR_READ ? " reading" : "", ++ reqmode & GR_WRITE ? " writing" : reqmode & ++ GR_APPEND ? " appending" : ""); ++ return 0; ++ } else if (unlikely((mode & reqmode) != reqmode)) ++ return 0; + -+ return 0; ++ return reqmode; +} + -+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC) -+static const unsigned long res_learn_bumps[GR_NLIMITS] = { -+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP, -+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP, -+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP, -+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP, -+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP, -+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP, -+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP, -+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP, -+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP, -+ [RLIMIT_AS] = GR_RLIM_AS_BUMP, -+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP, -+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP, -+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP, -+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP, -+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP, -+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP -+}; -+ -+void -+gr_learn_resource(const struct task_struct *task, -+ const int res, const unsigned long wanted, const int gt) ++__u32 ++gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt, ++ const int fmode) +{ -+ struct acl_subject_label *acl; -+ const struct cred *cred; -+ -+ if (unlikely((gr_status & GR_READY) && -+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN)))) -+ goto skip_reslog; ++ __u32 mode, reqmode = GR_FIND; + -+ gr_log_resource(task, res, wanted, gt); -+skip_reslog: ++ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode)) ++ reqmode |= GR_EXEC; ++ if (fmode & S_IWOTH) ++ reqmode |= GR_WRITE; ++ if (fmode & S_IROTH) ++ reqmode |= GR_READ; + -+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS)) -+ return; ++ mode = ++ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, ++ mnt); + -+ acl = task->acl; ++ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) { ++ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt, ++ reqmode & GR_READ ? " reading" : "", ++ reqmode & GR_WRITE ? " writing" : "", ++ reqmode & GR_EXEC ? " executing" : ""); ++ return reqmode; ++ } else ++ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS))) ++ { ++ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt, ++ reqmode & GR_READ ? " reading" : "", ++ reqmode & GR_WRITE ? " writing" : "", ++ reqmode & GR_EXEC ? " executing" : ""); ++ return 0; ++ } else if (unlikely((mode & reqmode) != reqmode)) ++ return 0; + -+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) || -+ !(acl->resmask & (1U << (unsigned short) res)))) -+ return; ++ return reqmode; ++} + -+ if (wanted >= acl->res[res].rlim_cur) { -+ unsigned long res_add; ++static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt) ++{ ++ __u32 mode; + -+ res_add = wanted + res_learn_bumps[res]; ++ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt); + -+ acl->res[res].rlim_cur = res_add; ++ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) { ++ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt); ++ return mode; ++ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) { ++ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt); ++ return 0; ++ } else if (unlikely((mode & (reqmode)) != (reqmode))) ++ return 0; + -+ if (wanted > acl->res[res].rlim_max) -+ acl->res[res].rlim_max = res_add; ++ return (reqmode); ++} + -+ /* only log the subject filename, since resource logging is supported for -+ single-subject learning only */ -+ rcu_read_lock(); -+ cred = __task_cred(task); -+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, -+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename, -+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max, -+ "", (unsigned long) res, &task->signal->saved_ip); -+ rcu_read_unlock(); -+ } -+ -+ return; ++__u32 ++gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG); +} -+EXPORT_SYMBOL(gr_learn_resource); -+#endif + -+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)) -+void -+pax_set_initial_flags(struct linux_binprm *bprm) ++__u32 ++gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+ struct task_struct *task = current; -+ struct acl_subject_label *proc; -+ unsigned long flags; -+ -+ if (unlikely(!(gr_status & GR_READY))) -+ return; -+ -+ flags = pax_get_flags(task); -+ -+ proc = task->acl; -+ -+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC) -+ flags &= ~MF_PAX_PAGEEXEC; -+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC) -+ flags &= ~MF_PAX_SEGMEXEC; -+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP) -+ flags &= ~MF_PAX_RANDMMAP; -+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP) -+ flags &= ~MF_PAX_EMUTRAMP; -+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT) -+ flags &= ~MF_PAX_MPROTECT; -+ -+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC) -+ flags |= MF_PAX_PAGEEXEC; -+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC) -+ flags |= MF_PAX_SEGMEXEC; -+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP) -+ flags |= MF_PAX_RANDMMAP; -+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP) -+ flags |= MF_PAX_EMUTRAMP; -+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT) -+ flags |= MF_PAX_MPROTECT; -+ -+ pax_set_flags(task, flags); -+ -+ return; ++ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG); +} -+#endif + -+int -+gr_handle_proc_ptrace(struct task_struct *task) ++__u32 ++gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+ struct file *filp; -+ struct task_struct *tmp = task; -+ struct task_struct *curtemp = current; -+ __u32 retmode; ++ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG); ++} + -+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE -+ if (unlikely(!(gr_status & GR_READY))) -+ return 0; -+#endif ++__u32 ++gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt) ++{ ++ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG); ++} + -+ read_lock(&tasklist_lock); -+ read_lock(&grsec_exec_file_lock); -+ filp = task->exec_file; ++__u32 ++gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt, ++ umode_t *modeptr) ++{ ++ umode_t mode; + -+ while (task_pid_nr(tmp) > 0) { -+ if (tmp == curtemp) -+ break; -+ tmp = tmp->real_parent; -+ } ++ *modeptr &= ~gr_acl_umask(); ++ mode = *modeptr; + -+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) || -+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) { -+ read_unlock(&grsec_exec_file_lock); -+ read_unlock(&tasklist_lock); ++ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode))) + return 1; -+ } + -+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE -+ if (!(gr_status & GR_READY)) { -+ read_unlock(&grsec_exec_file_lock); -+ read_unlock(&tasklist_lock); -+ return 0; ++ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) && ++ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) { ++ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID, ++ GR_CHMOD_ACL_MSG); ++ } else { ++ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG); + } -+#endif -+ -+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt); -+ read_unlock(&grsec_exec_file_lock); -+ read_unlock(&tasklist_lock); -+ -+ if (retmode & GR_NOPTRACE) -+ return 1; -+ -+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD) -+ && (current->acl != task->acl || (current->acl != current->role->root_label -+ && task_pid_nr(current) != task_pid_nr(task)))) -+ return 1; -+ -+ return 0; +} + -+void task_grsec_rbac(struct seq_file *m, struct task_struct *p) ++__u32 ++gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+ if (unlikely(!(gr_status & GR_READY))) -+ return; -+ -+ if (!(current->role->roletype & GR_ROLE_GOD)) -+ return; -+ -+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n", -+ p->role->rolename, gr_task_roletype_to_char(p), -+ p->acl->filename); ++ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG); +} + -+int -+gr_handle_ptrace(struct task_struct *task, const long request) ++__u32 ++gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+ struct task_struct *tmp = task; -+ struct task_struct *curtemp = current; -+ __u32 retmode; -+ -+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE -+ if (unlikely(!(gr_status & GR_READY))) -+ return 0; -+#endif -+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) { -+ read_lock(&tasklist_lock); -+ while (task_pid_nr(tmp) > 0) { -+ if (tmp == curtemp) -+ break; -+ tmp = tmp->real_parent; -+ } -+ -+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) || -+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) { -+ read_unlock(&tasklist_lock); -+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task); -+ return 1; -+ } -+ read_unlock(&tasklist_lock); -+ } -+ -+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE -+ if (!(gr_status & GR_READY)) -+ return 0; -+#endif -+ -+ read_lock(&grsec_exec_file_lock); -+ if (unlikely(!task->exec_file)) { -+ read_unlock(&grsec_exec_file_lock); -+ return 0; -+ } -+ -+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt); -+ read_unlock(&grsec_exec_file_lock); -+ -+ if (retmode & GR_NOPTRACE) { -+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task); -+ return 1; -+ } -+ -+ if (retmode & GR_PTRACERD) { -+ switch (request) { -+ case PTRACE_SEIZE: -+ case PTRACE_POKETEXT: -+ case PTRACE_POKEDATA: -+ case PTRACE_POKEUSR: -+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64) -+ case PTRACE_SETREGS: -+ case PTRACE_SETFPREGS: -+#endif -+#ifdef CONFIG_X86 -+ case PTRACE_SETFPXREGS: -+#endif -+#ifdef CONFIG_ALTIVEC -+ case PTRACE_SETVRREGS: -+#endif -+ return 1; -+ default: -+ return 0; -+ } -+ } else if (!(current->acl->mode & GR_POVERRIDE) && -+ !(current->role->roletype & GR_ROLE_GOD) && -+ (current->acl != task->acl)) { -+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task); -+ return 1; -+ } -+ -+ return 0; ++ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG); +} + -+static int is_writable_mmap(const struct file *filp) ++__u32 ++gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+ struct task_struct *task = current; -+ struct acl_object_label *obj, *obj2; ++ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG); ++} + -+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) && -+ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && (filp->f_path.mnt != shm_mnt || (filp->f_path.dentry->d_inode->i_nlink > 0))) { -+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label); -+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, -+ task->role->root_label); -+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) { -+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt); -+ return 1; -+ } -+ } -+ return 0; ++__u32 ++gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt) ++{ ++ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE, ++ GR_UNIXCONNECT_ACL_MSG); +} + -+int -+gr_acl_handle_mmap(const struct file *file, const unsigned long prot) ++/* hardlinks require at minimum create and link permission, ++ any additional privilege required is based on the ++ privilege of the file being linked to ++*/ ++__u32 ++gr_acl_handle_link(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt, ++ const struct dentry * old_dentry, ++ const struct vfsmount * old_mnt, const struct filename *to) +{ + __u32 mode; -+ -+ if (unlikely(!file || !(prot & PROT_EXEC))) -+ return 1; -+ -+ if (is_writable_mmap(file)) -+ return 0; ++ __u32 needmode = GR_CREATE | GR_LINK; ++ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK; + + mode = -+ gr_search_file(file->f_path.dentry, -+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS, -+ file->f_path.mnt); -+ -+ if (!gr_tpe_allow(file)) -+ return 0; ++ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry, ++ old_mnt); + -+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) { -+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt); ++ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) { ++ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name); ++ return mode; ++ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) { ++ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name); + return 0; -+ } else if (unlikely(!(mode & GR_EXEC))) { ++ } else if (unlikely((mode & needmode) != needmode)) + return 0; -+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) { -+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt); -+ return 1; -+ } + + return 1; +} + -+int -+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot) ++__u32 ++gr_acl_handle_symlink(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt, const struct filename *from) +{ ++ __u32 needmode = GR_WRITE | GR_CREATE; + __u32 mode; + -+ if (unlikely(!file || !(prot & PROT_EXEC))) -+ return 1; -+ -+ if (is_writable_mmap(file)) -+ return 0; -+ + mode = -+ gr_search_file(file->f_path.dentry, -+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS, -+ file->f_path.mnt); -+ -+ if (!gr_tpe_allow(file)) -+ return 0; ++ gr_check_create(new_dentry, parent_dentry, parent_mnt, ++ GR_CREATE | GR_AUDIT_CREATE | ++ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS); + -+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) { -+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt); ++ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) { ++ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt); ++ return mode; ++ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) { ++ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt); + return 0; -+ } else if (unlikely(!(mode & GR_EXEC))) { ++ } else if (unlikely((mode & needmode) != needmode)) + return 0; -+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) { -+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt); -+ return 1; -+ } + -+ return 1; ++ return (GR_WRITE | GR_CREATE); +} + -+void -+gr_acl_handle_psacct(struct task_struct *task, const long code) ++static __u32 generic_fs_create_handler(const struct dentry *new_dentry, const struct dentry *parent_dentry, const struct vfsmount *parent_mnt, __u32 reqmode, const char *fmt) +{ -+ unsigned long runtime; -+ unsigned long cputime; -+ unsigned int wday, cday; -+ __u8 whr, chr; -+ __u8 wmin, cmin; -+ __u8 wsec, csec; -+ struct timespec timeval; ++ __u32 mode; + -+ if (unlikely(!(gr_status & GR_READY) || !task->acl || -+ !(task->acl->mode & GR_PROCACCT))) -+ return; ++ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS); + -+ do_posix_clock_monotonic_gettime(&timeval); -+ runtime = timeval.tv_sec - task->start_time.tv_sec; -+ wday = runtime / (3600 * 24); -+ runtime -= wday * (3600 * 24); -+ whr = runtime / 3600; -+ runtime -= whr * 3600; -+ wmin = runtime / 60; -+ runtime -= wmin * 60; -+ wsec = runtime; ++ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) { ++ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt); ++ return mode; ++ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) { ++ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt); ++ return 0; ++ } else if (unlikely((mode & (reqmode)) != (reqmode))) ++ return 0; + -+ cputime = (task->utime + task->stime) / HZ; -+ cday = cputime / (3600 * 24); -+ cputime -= cday * (3600 * 24); -+ chr = cputime / 3600; -+ cputime -= chr * 3600; -+ cmin = cputime / 60; -+ cputime -= cmin * 60; -+ csec = cputime; ++ return (reqmode); ++} + -+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code); ++__u32 ++gr_acl_handle_mknod(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt, ++ const int mode) ++{ ++ __u32 reqmode = GR_WRITE | GR_CREATE; ++ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)))) ++ reqmode |= GR_SETID; + -+ return; ++ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt, ++ reqmode, GR_MKNOD_ACL_MSG); +} + -+void gr_set_kernel_label(struct task_struct *task) ++__u32 ++gr_acl_handle_mkdir(const struct dentry *new_dentry, ++ const struct dentry *parent_dentry, ++ const struct vfsmount *parent_mnt) +{ -+ if (gr_status & GR_READY) { -+ task->role = kernel_role; -+ task->acl = kernel_role->root_label; -+ } -+ return; ++ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt, ++ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG); +} + -+#ifdef CONFIG_TASKSTATS -+int gr_is_taskstats_denied(int pid) ++#define RENAME_CHECK_SUCCESS(old, new) \ ++ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \ ++ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ))) ++ ++int ++gr_acl_handle_rename(struct dentry *new_dentry, ++ struct dentry *parent_dentry, ++ const struct vfsmount *parent_mnt, ++ struct dentry *old_dentry, ++ struct inode *old_parent_inode, ++ struct vfsmount *old_mnt, const struct filename *newname) +{ -+ struct task_struct *task; -+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) -+ const struct cred *cred; -+#endif -+ int ret = 0; ++ __u32 comp1, comp2; ++ int error = 0; + -+ /* restrict taskstats viewing to un-chrooted root users -+ who have the 'view' subject flag if the RBAC system is enabled -+ */ ++ if (unlikely(!gr_acl_is_enabled())) ++ return 0; + -+ rcu_read_lock(); -+ read_lock(&tasklist_lock); -+ task = find_task_by_vpid(pid); -+ if (task) { -+#ifdef CONFIG_GRKERNSEC_CHROOT -+ if (proc_is_chrooted(task)) -+ ret = -EACCES; -+#endif -+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP) -+ cred = __task_cred(task); -+#ifdef CONFIG_GRKERNSEC_PROC_USER -+ if (gr_is_global_nonroot(cred->uid)) -+ ret = -EACCES; -+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP) -+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid)) -+ ret = -EACCES; -+#endif -+#endif -+ if (gr_status & GR_READY) { -+ if (!(task->acl->mode & GR_VIEW)) -+ ret = -EACCES; -+ } -+ } else -+ ret = -ENOENT; ++ if (!new_dentry->d_inode) { ++ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt, ++ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ | ++ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS); ++ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE | ++ GR_DELETE | GR_AUDIT_DELETE | ++ GR_AUDIT_READ | GR_AUDIT_WRITE | ++ GR_SUPPRESS, old_mnt); ++ } else { ++ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE | ++ GR_CREATE | GR_DELETE | ++ GR_AUDIT_CREATE | GR_AUDIT_DELETE | ++ GR_AUDIT_READ | GR_AUDIT_WRITE | ++ GR_SUPPRESS, parent_mnt); ++ comp2 = ++ gr_search_file(old_dentry, ++ GR_READ | GR_WRITE | GR_AUDIT_READ | ++ GR_DELETE | GR_AUDIT_DELETE | ++ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt); ++ } + -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); ++ if (RENAME_CHECK_SUCCESS(comp1, comp2) && ++ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS))) ++ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name); ++ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS) ++ && !(comp2 & GR_SUPPRESS)) { ++ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name); ++ error = -EACCES; ++ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2))) ++ error = -EACCES; + -+ return ret; ++ return error; +} -+#endif + -+/* AUXV entries are filled via a descendant of search_binary_handler -+ after we've already applied the subject for the target -+*/ -+int gr_acl_enable_at_secure(void) ++void ++gr_acl_handle_exit(void) +{ -+ if (unlikely(!(gr_status & GR_READY))) -+ return 0; ++ u16 id; ++ char *rolename; + -+ if (current->acl->mode & GR_ATSECURE) -+ return 1; ++ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() && ++ !(current->role->roletype & GR_ROLE_PERSIST))) { ++ id = current->acl_role_id; ++ rolename = current->role->rolename; ++ gr_set_acls(1); ++ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id); ++ } + -+ return 0; ++ gr_put_exec_file(current); ++ return; +} -+ -+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino) -+{ -+ struct task_struct *task = current; -+ struct dentry *dentry = file->f_path.dentry; -+ struct vfsmount *mnt = file->f_path.mnt; -+ struct acl_object_label *obj, *tmp; -+ struct acl_subject_label *subj; -+ unsigned int bufsize; -+ int is_not_root; -+ char *path; -+ dev_t dev = __get_dev(dentry); -+ -+ if (unlikely(!(gr_status & GR_READY))) -+ return 1; + -+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN)) -+ return 1; ++int ++gr_acl_handle_procpidmem(const struct task_struct *task) ++{ ++ if (unlikely(!gr_acl_is_enabled())) ++ return 0; + -+ /* ignore Eric Biederman */ -+ if (IS_PRIVATE(dentry->d_inode)) -+ return 1; ++ if (task != current && task->acl->mode & GR_PROTPROCFD) ++ return -EACCES; + -+ subj = task->acl; -+ read_lock(&gr_inode_lock); -+ do { -+ obj = lookup_acl_obj_label(ino, dev, subj); -+ if (obj != NULL) { -+ read_unlock(&gr_inode_lock); -+ return (obj->mode & GR_FIND) ? 1 : 0; -+ } -+ } while ((subj = subj->parent_subject)); -+ read_unlock(&gr_inode_lock); -+ -+ /* this is purely an optimization since we're looking for an object -+ for the directory we're doing a readdir on -+ if it's possible for any globbed object to match the entry we're -+ filling into the directory, then the object we find here will be -+ an anchor point with attached globbed objects -+ */ -+ obj = chk_obj_label_noglob(dentry, mnt, task->acl); -+ if (obj->globbed == NULL) -+ return (obj->mode & GR_FIND) ? 1 : 0; ++ return 0; ++} +diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c +new file mode 100644 +index 0000000..f056b81 +--- /dev/null ++++ b/grsecurity/gracl_ip.c +@@ -0,0 +1,386 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ is_not_root = ((obj->filename[0] == '/') && -+ (obj->filename[1] == '\0')) ? 0 : 1; -+ bufsize = PAGE_SIZE - namelen - is_not_root; ++#define GR_BIND 0x01 ++#define GR_CONNECT 0x02 ++#define GR_INVERT 0x04 ++#define GR_BINDOVERRIDE 0x08 ++#define GR_CONNECTOVERRIDE 0x10 ++#define GR_SOCK_FAMILY 0x20 + -+ /* check bufsize > PAGE_SIZE || bufsize == 0 */ -+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1))) -+ return 1; ++static const char * gr_protocols[IPPROTO_MAX] = { ++ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt", ++ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet", ++ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1", ++ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp", ++ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++", ++ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre", ++ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile", ++ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63", ++ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv", ++ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak", ++ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf", ++ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp", ++ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim", ++ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip", ++ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp", ++ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup", ++ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135", ++ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143", ++ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151", ++ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159", ++ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167", ++ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175", ++ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183", ++ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191", ++ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199", ++ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207", ++ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215", ++ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223", ++ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231", ++ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239", ++ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247", ++ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255", ++ }; + -+ preempt_disable(); -+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()), -+ bufsize); ++static const char * gr_socktypes[SOCK_MAX] = { ++ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6", ++ "unknown:7", "unknown:8", "unknown:9", "packet" ++ }; + -+ bufsize = strlen(path); ++static const char * gr_sockfamilies[AF_MAX+1] = { ++ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25", ++ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash", ++ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28", ++ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf" ++ }; + -+ /* if base is "/", don't append an additional slash */ -+ if (is_not_root) -+ *(path + bufsize) = '/'; -+ memcpy(path + bufsize + is_not_root, name, namelen); -+ *(path + bufsize + namelen + is_not_root) = '\0'; ++const char * ++gr_proto_to_name(unsigned char proto) ++{ ++ return gr_protocols[proto]; ++} + -+ tmp = obj->globbed; -+ while (tmp) { -+ if (!glob_match(tmp->filename, path)) { -+ preempt_enable(); -+ return (tmp->mode & GR_FIND) ? 1 : 0; -+ } -+ tmp = tmp->next; -+ } -+ preempt_enable(); -+ return (obj->mode & GR_FIND) ? 1 : 0; ++const char * ++gr_socktype_to_name(unsigned char type) ++{ ++ return gr_socktypes[type]; +} + -+void gr_put_exec_file(struct task_struct *task) ++const char * ++gr_sockfamily_to_name(unsigned char family) +{ -+ struct file *filp; ++ return gr_sockfamilies[family]; ++} + -+ write_lock(&grsec_exec_file_lock); -+ filp = task->exec_file; -+ task->exec_file = NULL; -+ write_unlock(&grsec_exec_file_lock); ++extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly; + -+ if (filp) -+ fput(filp); ++int ++gr_search_socket(const int domain, const int type, const int protocol) ++{ ++ struct acl_subject_label *curr; ++ const struct cred *cred = current_cred(); + -+ return; -+} ++ if (unlikely(!gr_acl_is_enabled())) ++ goto exit; + ++ if ((domain < 0) || (type < 0) || (protocol < 0) || ++ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX)) ++ goto exit; // let the kernel handle it + -+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE -+EXPORT_SYMBOL(gr_acl_is_enabled); -+#endif -+EXPORT_SYMBOL(gr_set_kernel_label); -+#ifdef CONFIG_SECURITY -+EXPORT_SYMBOL(gr_check_user_change); -+EXPORT_SYMBOL(gr_check_group_change); -+#endif ++ curr = current->acl; + -diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c -new file mode 100644 -index 0000000..34fefda ---- /dev/null -+++ b/grsecurity/gracl_alloc.c -@@ -0,0 +1,105 @@ -+#include -+#include -+#include -+#include -+#include -+#include ++ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) { ++ /* the family is allowed, if this is PF_INET allow it only if ++ the extra sock type/protocol checks pass */ ++ if (domain == PF_INET) ++ goto inet_check; ++ goto exit; ++ } else { ++ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) { ++ __u32 fakeip = 0; ++ security_learn(GR_IP_LEARN_MSG, current->role->rolename, ++ current->role->roletype, GR_GLOBAL_UID(cred->uid), ++ GR_GLOBAL_GID(cred->gid), current->exec_file ? ++ gr_to_filename(current->exec_file->f_path.dentry, ++ current->exec_file->f_path.mnt) : ++ curr->filename, curr->filename, ++ &fakeip, domain, 0, 0, GR_SOCK_FAMILY, ++ ¤t->signal->saved_ip); ++ goto exit; ++ } ++ goto exit_fail; ++ } + -+static unsigned long alloc_stack_next = 1; -+static unsigned long alloc_stack_size = 1; -+static void **alloc_stack; ++inet_check: ++ /* the rest of this checking is for IPv4 only */ ++ if (!curr->ips) ++ goto exit; + -+static __inline__ int -+alloc_pop(void) -+{ -+ if (alloc_stack_next == 1) -+ return 0; ++ if ((curr->ip_type & (1U << type)) && ++ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32)))) ++ goto exit; + -+ kfree(alloc_stack[alloc_stack_next - 2]); ++ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) { ++ /* we don't place acls on raw sockets , and sometimes ++ dgram/ip sockets are opened for ioctl and not ++ bind/connect, so we'll fake a bind learn log */ ++ if (type == SOCK_RAW || type == SOCK_PACKET) { ++ __u32 fakeip = 0; ++ security_learn(GR_IP_LEARN_MSG, current->role->rolename, ++ current->role->roletype, GR_GLOBAL_UID(cred->uid), ++ GR_GLOBAL_GID(cred->gid), current->exec_file ? ++ gr_to_filename(current->exec_file->f_path.dentry, ++ current->exec_file->f_path.mnt) : ++ curr->filename, curr->filename, ++ &fakeip, 0, type, ++ protocol, GR_CONNECT, ¤t->signal->saved_ip); ++ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) { ++ __u32 fakeip = 0; ++ security_learn(GR_IP_LEARN_MSG, current->role->rolename, ++ current->role->roletype, GR_GLOBAL_UID(cred->uid), ++ GR_GLOBAL_GID(cred->gid), current->exec_file ? ++ gr_to_filename(current->exec_file->f_path.dentry, ++ current->exec_file->f_path.mnt) : ++ curr->filename, curr->filename, ++ &fakeip, 0, type, ++ protocol, GR_BIND, ¤t->signal->saved_ip); ++ } ++ /* we'll log when they use connect or bind */ ++ goto exit; ++ } + -+ alloc_stack_next--; ++exit_fail: ++ if (domain == PF_INET) ++ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain), ++ gr_socktype_to_name(type), gr_proto_to_name(protocol)); ++ else if (rcu_access_pointer(net_families[domain]) != NULL) ++ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain), ++ gr_socktype_to_name(type), protocol); + ++ return 0; ++exit: + return 1; +} + -+static __inline__ int -+alloc_push(void *buf) ++int check_ip_policy(struct acl_ip_label *ip, __u32 ip_addr, __u16 ip_port, __u8 protocol, const int mode, const int type, __u32 our_addr, __u32 our_netmask) +{ -+ if (alloc_stack_next >= alloc_stack_size) -+ return 1; -+ -+ alloc_stack[alloc_stack_next - 1] = buf; -+ -+ alloc_stack_next++; ++ if ((ip->mode & mode) && ++ (ip_port >= ip->low) && ++ (ip_port <= ip->high) && ++ ((ntohl(ip_addr) & our_netmask) == ++ (ntohl(our_addr) & our_netmask)) ++ && (ip->proto[protocol / 32] & (1U << (protocol % 32))) ++ && (ip->type & (1U << type))) { ++ if (ip->mode & GR_INVERT) ++ return 2; // specifically denied ++ else ++ return 1; // allowed ++ } + -+ return 0; ++ return 0; // not specifically allowed, may continue parsing +} + -+void * -+acl_alloc(unsigned long len) ++static int ++gr_search_connectbind(const int full_mode, struct sock *sk, ++ struct sockaddr_in *addr, const int type) +{ -+ void *ret = NULL; ++ char iface[IFNAMSIZ] = {0}; ++ struct acl_subject_label *curr; ++ struct acl_ip_label *ip; ++ struct inet_sock *isk; ++ struct net_device *dev; ++ struct in_device *idev; ++ unsigned long i; ++ int ret; ++ int mode = full_mode & (GR_BIND | GR_CONNECT); ++ __u32 ip_addr = 0; ++ __u32 our_addr; ++ __u32 our_netmask; ++ char *p; ++ __u16 ip_port = 0; ++ const struct cred *cred = current_cred(); + -+ if (!len || len > PAGE_SIZE) -+ goto out; ++ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET)) ++ return 0; + -+ ret = kmalloc(len, GFP_KERNEL); ++ curr = current->acl; ++ isk = inet_sk(sk); + -+ if (ret) { -+ if (alloc_push(ret)) { -+ kfree(ret); -+ ret = NULL; -+ } -+ } ++ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */ ++ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) ++ addr->sin_addr.s_addr = curr->inaddr_any_override; ++ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) { ++ struct sockaddr_in saddr; ++ int err; + -+out: -+ return ret; -+} ++ saddr.sin_family = AF_INET; ++ saddr.sin_addr.s_addr = curr->inaddr_any_override; ++ saddr.sin_port = isk->inet_sport; + -+void * -+acl_alloc_num(unsigned long num, unsigned long len) -+{ -+ if (!len || (num > (PAGE_SIZE / len))) -+ return NULL; ++ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in)); ++ if (err) ++ return err; + -+ return acl_alloc(num * len); -+} ++ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in)); ++ if (err) ++ return err; ++ } + -+void -+acl_free_all(void) -+{ -+ if (gr_acl_is_enabled() || !alloc_stack) -+ return; ++ if (!curr->ips) ++ return 0; + -+ while (alloc_pop()) ; ++ ip_addr = addr->sin_addr.s_addr; ++ ip_port = ntohs(addr->sin_port); + -+ if (alloc_stack) { -+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE) -+ kfree(alloc_stack); -+ else -+ vfree(alloc_stack); ++ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) { ++ security_learn(GR_IP_LEARN_MSG, current->role->rolename, ++ current->role->roletype, GR_GLOBAL_UID(cred->uid), ++ GR_GLOBAL_GID(cred->gid), current->exec_file ? ++ gr_to_filename(current->exec_file->f_path.dentry, ++ current->exec_file->f_path.mnt) : ++ curr->filename, curr->filename, ++ &ip_addr, ip_port, type, ++ sk->sk_protocol, mode, ¤t->signal->saved_ip); ++ return 0; ++ } ++ ++ for (i = 0; i < curr->ip_num; i++) { ++ ip = *(curr->ips + i); ++ if (ip->iface != NULL) { ++ strncpy(iface, ip->iface, IFNAMSIZ - 1); ++ p = strchr(iface, ':'); ++ if (p != NULL) ++ *p = '\0'; ++ dev = dev_get_by_name(sock_net(sk), iface); ++ if (dev == NULL) ++ continue; ++ idev = in_dev_get(dev); ++ if (idev == NULL) { ++ dev_put(dev); ++ continue; ++ } ++ rcu_read_lock(); ++ for_ifa(idev) { ++ if (!strcmp(ip->iface, ifa->ifa_label)) { ++ our_addr = ifa->ifa_address; ++ our_netmask = 0xffffffff; ++ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask); ++ if (ret == 1) { ++ rcu_read_unlock(); ++ in_dev_put(idev); ++ dev_put(dev); ++ return 0; ++ } else if (ret == 2) { ++ rcu_read_unlock(); ++ in_dev_put(idev); ++ dev_put(dev); ++ goto denied; ++ } ++ } ++ } endfor_ifa(idev); ++ rcu_read_unlock(); ++ in_dev_put(idev); ++ dev_put(dev); ++ } else { ++ our_addr = ip->addr; ++ our_netmask = ip->netmask; ++ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask); ++ if (ret == 1) ++ return 0; ++ else if (ret == 2) ++ goto denied; ++ } + } + -+ alloc_stack = NULL; -+ alloc_stack_size = 1; -+ alloc_stack_next = 1; ++denied: ++ if (mode == GR_BIND) ++ gr_log_int5_str2(GR_DONT_AUDIT, GR_BIND_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); ++ else if (mode == GR_CONNECT) ++ gr_log_int5_str2(GR_DONT_AUDIT, GR_CONNECT_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); + -+ return; ++ return -EACCES; +} + +int -+acl_alloc_stack_init(unsigned long size) ++gr_search_connect(struct socket *sock, struct sockaddr_in *addr) +{ -+ if ((size * sizeof (void *)) <= PAGE_SIZE) -+ alloc_stack = -+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL); -+ else -+ alloc_stack = (void **) vmalloc(size * sizeof (void *)); -+ -+ alloc_stack_size = size; -+ -+ if (!alloc_stack) ++ /* always allow disconnection of dgram sockets with connect */ ++ if (addr->sin_family == AF_UNSPEC) + return 0; -+ else -+ return 1; ++ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type); +} -diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c -new file mode 100644 -index 0000000..bdd51ea ---- /dev/null -+++ b/grsecurity/gracl_cap.c -@@ -0,0 +1,110 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+extern const char *captab_log[]; -+extern int captab_log_entries; + -+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap) ++int ++gr_search_bind(struct socket *sock, struct sockaddr_in *addr) +{ -+ struct acl_subject_label *curracl; -+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set; -+ kernel_cap_t cap_audit = __cap_empty_set; ++ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type); ++} + -+ if (!gr_acl_is_enabled()) -+ return 1; ++int gr_search_listen(struct socket *sock) ++{ ++ struct sock *sk = sock->sk; ++ struct sockaddr_in addr; + -+ curracl = task->acl; ++ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr; ++ addr.sin_port = inet_sk(sk)->inet_sport; + -+ cap_drop = curracl->cap_lower; -+ cap_mask = curracl->cap_mask; -+ cap_audit = curracl->cap_invert_audit; ++ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type); ++} + -+ while ((curracl = curracl->parent_subject)) { -+ /* if the cap isn't specified in the current computed mask but is specified in the -+ current level subject, and is lowered in the current level subject, then add -+ it to the set of dropped capabilities -+ otherwise, add the current level subject's mask to the current computed mask -+ */ -+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) { -+ cap_raise(cap_mask, cap); -+ if (cap_raised(curracl->cap_lower, cap)) -+ cap_raise(cap_drop, cap); -+ if (cap_raised(curracl->cap_invert_audit, cap)) -+ cap_raise(cap_audit, cap); -+ } -+ } ++int gr_search_accept(struct socket *sock) ++{ ++ struct sock *sk = sock->sk; ++ struct sockaddr_in addr; + -+ if (!cap_raised(cap_drop, cap)) { -+ if (cap_raised(cap_audit, cap)) -+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]); -+ return 1; -+ } ++ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr; ++ addr.sin_port = inet_sk(sk)->inet_sport; + -+ curracl = task->acl; ++ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type); ++} + -+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) -+ && cap_raised(cred->cap_effective, cap)) { -+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, -+ task->role->roletype, GR_GLOBAL_UID(cred->uid), -+ GR_GLOBAL_GID(cred->gid), task->exec_file ? -+ gr_to_filename(task->exec_file->f_path.dentry, -+ task->exec_file->f_path.mnt) : curracl->filename, -+ curracl->filename, 0UL, -+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip); -+ return 1; -+ } ++int ++gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr) ++{ ++ if (addr) ++ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM); ++ else { ++ struct sockaddr_in sin; ++ const struct inet_sock *inet = inet_sk(sk); + -+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap)) -+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]); ++ sin.sin_addr.s_addr = inet->inet_daddr; ++ sin.sin_port = inet->inet_dport; + -+ return 0; ++ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); ++ } +} + +int -+gr_acl_is_capable(const int cap) ++gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb) +{ -+ return gr_task_acl_is_capable(current, current_cred(), cap); -+} ++ struct sockaddr_in sin; + -+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap) -+{ -+ struct acl_subject_label *curracl; -+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set; ++ if (unlikely(skb->len < sizeof (struct udphdr))) ++ return 0; // skip this packet + -+ if (!gr_acl_is_enabled()) -+ return 1; -+ -+ curracl = task->acl; -+ -+ cap_drop = curracl->cap_lower; -+ cap_mask = curracl->cap_mask; -+ -+ while ((curracl = curracl->parent_subject)) { -+ /* if the cap isn't specified in the current computed mask but is specified in the -+ current level subject, and is lowered in the current level subject, then add -+ it to the set of dropped capabilities -+ otherwise, add the current level subject's mask to the current computed mask -+ */ -+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) { -+ cap_raise(cap_mask, cap); -+ if (cap_raised(curracl->cap_lower, cap)) -+ cap_raise(cap_drop, cap); -+ } -+ } -+ -+ if (!cap_raised(cap_drop, cap)) -+ return 1; -+ -+ return 0; -+} ++ sin.sin_addr.s_addr = ip_hdr(skb)->saddr; ++ sin.sin_port = udp_hdr(skb)->source; + -+int -+gr_acl_is_capable_nolog(const int cap) -+{ -+ return gr_task_acl_is_capable_nolog(current, cap); ++ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -+ -diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c +diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c new file mode 100644 -index 0000000..a43dd06 +index 0000000..25f54ef --- /dev/null -+++ b/grsecurity/gracl_compat.c -@@ -0,0 +1,269 @@ ++++ b/grsecurity/gracl_learn.c +@@ -0,0 +1,207 @@ +#include -+#include -+#include -+#include -+ -+#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap) -+{ -+ struct gr_arg_wrapper_compat uwrapcompat; ++extern ssize_t write_grsec_handler(struct file * file, const char __user * buf, ++ size_t count, loff_t *ppos); ++extern int gr_acl_is_enabled(void); + -+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat))) -+ return -EFAULT; ++static DECLARE_WAIT_QUEUE_HEAD(learn_wait); ++static int gr_learn_attached; + -+ if ((uwrapcompat.version != GRSECURITY_VERSION) || -+ (uwrapcompat.size != sizeof(struct gr_arg_compat))) -+ return -EINVAL; ++/* use a 512k buffer */ ++#define LEARN_BUFFER_SIZE (512 * 1024) + -+ uwrap->arg = compat_ptr(uwrapcompat.arg); -+ uwrap->version = uwrapcompat.version; -+ uwrap->size = sizeof(struct gr_arg); ++static DEFINE_SPINLOCK(gr_learn_lock); ++static DEFINE_MUTEX(gr_learn_user_mutex); + -+ return 0; -+} ++/* we need to maintain two buffers, so that the kernel context of grlearn ++ uses a semaphore around the userspace copying, and the other kernel contexts ++ use a spinlock when copying into the buffer, since they cannot sleep ++*/ ++static char *learn_buffer; ++static char *learn_buffer_user; ++static int learn_buffer_len; ++static int learn_buffer_user_len; + -+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg) ++static ssize_t ++read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos) +{ -+ struct gr_arg_compat argcompat; ++ DECLARE_WAITQUEUE(wait, current); ++ ssize_t retval = 0; + -+ if (copy_from_user(&argcompat, buf, sizeof(argcompat))) -+ return -EFAULT; ++ add_wait_queue(&learn_wait, &wait); ++ set_current_state(TASK_INTERRUPTIBLE); ++ do { ++ mutex_lock(&gr_learn_user_mutex); ++ spin_lock(&gr_learn_lock); ++ if (learn_buffer_len) ++ break; ++ spin_unlock(&gr_learn_lock); ++ mutex_unlock(&gr_learn_user_mutex); ++ if (file->f_flags & O_NONBLOCK) { ++ retval = -EAGAIN; ++ goto out; ++ } ++ if (signal_pending(current)) { ++ retval = -ERESTARTSYS; ++ goto out; ++ } + -+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table); -+ arg->role_db.num_pointers = argcompat.role_db.num_pointers; -+ arg->role_db.num_roles = argcompat.role_db.num_roles; -+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children; -+ arg->role_db.num_subjects = argcompat.role_db.num_subjects; -+ arg->role_db.num_objects = argcompat.role_db.num_objects; ++ schedule(); ++ } while (1); + -+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw)); -+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt)); -+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum)); -+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role)); -+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws); -+ arg->segv_device = argcompat.segv_device; -+ arg->segv_inode = argcompat.segv_inode; -+ arg->segv_uid = argcompat.segv_uid; -+ arg->num_sprole_pws = argcompat.num_sprole_pws; -+ arg->mode = argcompat.mode; ++ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len); ++ learn_buffer_user_len = learn_buffer_len; ++ retval = learn_buffer_len; ++ learn_buffer_len = 0; + -+ return 0; ++ spin_unlock(&gr_learn_lock); ++ ++ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len)) ++ retval = -EFAULT; ++ ++ mutex_unlock(&gr_learn_user_mutex); ++out: ++ set_current_state(TASK_RUNNING); ++ remove_wait_queue(&learn_wait, &wait); ++ return retval; +} + -+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp) ++static unsigned int ++poll_learn(struct file * file, poll_table * wait) +{ -+ struct acl_object_label_compat objcompat; ++ poll_wait(file, &learn_wait, wait); + -+ if (copy_from_user(&objcompat, userp, sizeof(objcompat))) -+ return -EFAULT; ++ if (learn_buffer_len) ++ return (POLLIN | POLLRDNORM); + -+ obj->filename = compat_ptr(objcompat.filename); -+ obj->inode = objcompat.inode; -+ obj->device = objcompat.device; -+ obj->mode = objcompat.mode; ++ return 0; ++} + -+ obj->nested = compat_ptr(objcompat.nested); -+ obj->globbed = compat_ptr(objcompat.globbed); ++void ++gr_clear_learn_entries(void) ++{ ++ char *tmp; + -+ obj->prev = compat_ptr(objcompat.prev); -+ obj->next = compat_ptr(objcompat.next); ++ mutex_lock(&gr_learn_user_mutex); ++ spin_lock(&gr_learn_lock); ++ tmp = learn_buffer; ++ learn_buffer = NULL; ++ spin_unlock(&gr_learn_lock); ++ if (tmp) ++ vfree(tmp); ++ if (learn_buffer_user != NULL) { ++ vfree(learn_buffer_user); ++ learn_buffer_user = NULL; ++ } ++ learn_buffer_len = 0; ++ mutex_unlock(&gr_learn_user_mutex); + -+ return 0; ++ return; +} + -+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp) ++void ++gr_add_learn_entry(const char *fmt, ...) +{ -+ unsigned int i; -+ struct acl_subject_label_compat subjcompat; ++ va_list args; ++ unsigned int len; + -+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat))) -+ return -EFAULT; ++ if (!gr_learn_attached) ++ return; + -+ subj->filename = compat_ptr(subjcompat.filename); -+ subj->inode = subjcompat.inode; -+ subj->device = subjcompat.device; -+ subj->mode = subjcompat.mode; -+ subj->cap_mask = subjcompat.cap_mask; -+ subj->cap_lower = subjcompat.cap_lower; -+ subj->cap_invert_audit = subjcompat.cap_invert_audit; ++ spin_lock(&gr_learn_lock); + -+ for (i = 0; i < GR_NLIMITS; i++) { -+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY) -+ subj->res[i].rlim_cur = RLIM_INFINITY; -+ else -+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur; -+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY) -+ subj->res[i].rlim_max = RLIM_INFINITY; -+ else -+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max; ++ /* leave a gap at the end so we know when it's "full" but don't have to ++ compute the exact length of the string we're trying to append ++ */ ++ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) { ++ spin_unlock(&gr_learn_lock); ++ wake_up_interruptible(&learn_wait); ++ return; ++ } ++ if (learn_buffer == NULL) { ++ spin_unlock(&gr_learn_lock); ++ return; + } -+ subj->resmask = subjcompat.resmask; -+ -+ subj->user_trans_type = subjcompat.user_trans_type; -+ subj->group_trans_type = subjcompat.group_trans_type; -+ subj->user_transitions = compat_ptr(subjcompat.user_transitions); -+ subj->group_transitions = compat_ptr(subjcompat.group_transitions); -+ subj->user_trans_num = subjcompat.user_trans_num; -+ subj->group_trans_num = subjcompat.group_trans_num; + -+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families)); -+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto)); -+ subj->ip_type = subjcompat.ip_type; -+ subj->ips = compat_ptr(subjcompat.ips); -+ subj->ip_num = subjcompat.ip_num; -+ subj->inaddr_any_override = subjcompat.inaddr_any_override; ++ va_start(args, fmt); ++ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args); ++ va_end(args); + -+ subj->crashes = subjcompat.crashes; -+ subj->expires = subjcompat.expires; ++ learn_buffer_len += len + 1; + -+ subj->parent_subject = compat_ptr(subjcompat.parent_subject); -+ subj->hash = compat_ptr(subjcompat.hash); -+ subj->prev = compat_ptr(subjcompat.prev); -+ subj->next = compat_ptr(subjcompat.next); ++ spin_unlock(&gr_learn_lock); ++ wake_up_interruptible(&learn_wait); + -+ subj->obj_hash = compat_ptr(subjcompat.obj_hash); -+ subj->obj_hash_size = subjcompat.obj_hash_size; -+ subj->pax_flags = subjcompat.pax_flags; ++ return; ++} + ++static int ++open_learn(struct inode *inode, struct file *file) ++{ ++ if (file->f_mode & FMODE_READ && gr_learn_attached) ++ return -EBUSY; ++ if (file->f_mode & FMODE_READ) { ++ int retval = 0; ++ mutex_lock(&gr_learn_user_mutex); ++ if (learn_buffer == NULL) ++ learn_buffer = vmalloc(LEARN_BUFFER_SIZE); ++ if (learn_buffer_user == NULL) ++ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE); ++ if (learn_buffer == NULL) { ++ retval = -ENOMEM; ++ goto out_error; ++ } ++ if (learn_buffer_user == NULL) { ++ retval = -ENOMEM; ++ goto out_error; ++ } ++ learn_buffer_len = 0; ++ learn_buffer_user_len = 0; ++ gr_learn_attached = 1; ++out_error: ++ mutex_unlock(&gr_learn_user_mutex); ++ return retval; ++ } + return 0; +} + -+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp) ++static int ++close_learn(struct inode *inode, struct file *file) +{ -+ struct acl_role_label_compat rolecompat; -+ -+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat))) -+ return -EFAULT; -+ -+ role->rolename = compat_ptr(rolecompat.rolename); -+ role->uidgid = rolecompat.uidgid; -+ role->roletype = rolecompat.roletype; ++ if (file->f_mode & FMODE_READ) { ++ char *tmp = NULL; ++ mutex_lock(&gr_learn_user_mutex); ++ spin_lock(&gr_learn_lock); ++ tmp = learn_buffer; ++ learn_buffer = NULL; ++ spin_unlock(&gr_learn_lock); ++ if (tmp) ++ vfree(tmp); ++ if (learn_buffer_user != NULL) { ++ vfree(learn_buffer_user); ++ learn_buffer_user = NULL; ++ } ++ learn_buffer_len = 0; ++ learn_buffer_user_len = 0; ++ gr_learn_attached = 0; ++ mutex_unlock(&gr_learn_user_mutex); ++ } + -+ role->auth_attempts = rolecompat.auth_attempts; -+ role->expires = rolecompat.expires; ++ return 0; ++} ++ ++const struct file_operations grsec_fops = { ++ .read = read_learn, ++ .write = write_grsec_handler, ++ .open = open_learn, ++ .release = close_learn, ++ .poll = poll_learn, ++}; +diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c +new file mode 100644 +index 0000000..36e293f +--- /dev/null ++++ b/grsecurity/gracl_policy.c +@@ -0,0 +1,1777 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../fs/mount.h" + -+ role->root_label = compat_ptr(rolecompat.root_label); -+ role->hash = compat_ptr(rolecompat.hash); ++#include ++#include ++#include + -+ role->prev = compat_ptr(rolecompat.prev); -+ role->next = compat_ptr(rolecompat.next); ++extern struct gr_policy_state *polstate; + -+ role->transitions = compat_ptr(rolecompat.transitions); -+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips); -+ role->domain_children = compat_ptr(rolecompat.domain_children); -+ role->domain_child_num = rolecompat.domain_child_num; ++#define FOR_EACH_ROLE_START(role) \ ++ role = polstate->role_list; \ ++ while (role) { + -+ role->umask = rolecompat.umask; ++#define FOR_EACH_ROLE_END(role) \ ++ role = role->prev; \ ++ } + -+ role->subj_hash = compat_ptr(rolecompat.subj_hash); -+ role->subj_hash_size = rolecompat.subj_hash_size; ++struct path gr_real_root; + -+ return 0; -+} ++extern struct gr_alloc_state *current_alloc_state; + -+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) -+{ -+ struct role_allowed_ip_compat roleip_compat; ++u16 acl_sp_role_value; + -+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat))) -+ return -EFAULT; ++static DEFINE_MUTEX(gr_dev_mutex); + -+ roleip->addr = roleip_compat.addr; -+ roleip->netmask = roleip_compat.netmask; ++extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum); ++extern void gr_clear_learn_entries(void); + -+ roleip->prev = compat_ptr(roleip_compat.prev); -+ roleip->next = compat_ptr(roleip_compat.next); ++static struct gr_arg gr_usermode; ++static unsigned char gr_system_salt[GR_SALT_LEN]; ++static unsigned char gr_system_sum[GR_SHA_LEN]; + -+ return 0; -+} ++static unsigned int gr_auth_attempts = 0; ++static unsigned long gr_auth_expires = 0UL; + -+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp) -+{ -+ struct role_transition_compat trans_compat; ++struct acl_object_label *fakefs_obj_rw; ++struct acl_object_label *fakefs_obj_rwx; + -+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat))) -+ return -EFAULT; ++extern int gr_init_uidset(void); ++extern void gr_free_uidset(void); ++extern void gr_remove_uid(uid_t uid); ++extern int gr_find_uid(uid_t uid); + -+ trans->rolename = compat_ptr(trans_compat.rolename); ++extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename); ++extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj); ++extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb); ++extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry); ++extern struct acl_role_label *__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid, const gid_t gid); ++extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj); ++extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role); ++extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name); ++extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt); ++extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role); ++extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role); ++extern void assign_special_role(const char *rolename); ++extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role); ++extern int gr_rbac_disable(void *unused); ++extern void gr_enable_rbac_system(void); + -+ trans->prev = compat_ptr(trans_compat.prev); -+ trans->next = compat_ptr(trans_compat.next); ++static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp) ++{ ++ if (copy_from_user(obj, userp, sizeof(struct acl_object_label))) ++ return -EFAULT; + + return 0; -+ +} + -+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) ++static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp) +{ -+ struct gr_hash_struct_compat hash_compat; ++ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label))) ++ return -EFAULT; + -+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat))) -+ return -EFAULT; ++ return 0; ++} + -+ hash->table = compat_ptr(hash_compat.table); -+ hash->nametable = compat_ptr(hash_compat.nametable); -+ hash->first = compat_ptr(hash_compat.first); ++static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp) ++{ ++ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label))) ++ return -EFAULT; + -+ hash->table_size = hash_compat.table_size; -+ hash->used_size = hash_compat.used_size; ++ return 0; ++} + -+ hash->type = hash_compat.type; ++static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp) ++{ ++ if (copy_from_user(role, userp, sizeof(struct acl_role_label))) ++ return -EFAULT; + + return 0; +} + -+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp) ++static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) +{ -+ compat_uptr_t ptrcompat; ++ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip))) ++ return -EFAULT; + -+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat))) -+ return -EFAULT; ++ return 0; ++} + -+ *(void **)ptr = compat_ptr(ptrcompat); ++static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) ++{ ++ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw))) ++ return -EFAULT; + + return 0; +} + -+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp) ++static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) +{ -+ struct acl_ip_label_compat ip_compat; ++ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct))) ++ return -EFAULT; + -+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat))) -+ return -EFAULT; ++ return 0; ++} + -+ ip->iface = compat_ptr(ip_compat.iface); -+ ip->addr = ip_compat.addr; -+ ip->netmask = ip_compat.netmask; -+ ip->low = ip_compat.low; -+ ip->high = ip_compat.high; -+ ip->mode = ip_compat.mode; -+ ip->type = ip_compat.type; ++static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp) ++{ ++ if (copy_from_user(trans, userp, sizeof(struct role_transition))) ++ return -EFAULT; + -+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto)); ++ return 0; ++} + -+ ip->prev = compat_ptr(ip_compat.prev); -+ ip->next = compat_ptr(ip_compat.next); ++int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp) ++{ ++ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *))) ++ return -EFAULT; + + return 0; +} + -+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) ++static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap) +{ -+ struct sprole_pw_compat pw_compat; -+ -+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat))) -+ return -EFAULT; ++ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper))) ++ return -EFAULT; + -+ pw->rolename = compat_ptr(pw_compat.rolename); -+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt)); -+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum)); ++ if (((uwrap->version != GRSECURITY_VERSION) && ++ (uwrap->version != 0x2901)) || ++ (uwrap->size != sizeof(struct gr_arg))) ++ return -EINVAL; + + return 0; +} + -+size_t get_gr_arg_wrapper_size_compat(void) ++static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg) +{ -+ return sizeof(struct gr_arg_wrapper_compat); -+} ++ if (copy_from_user(arg, buf, sizeof (struct gr_arg))) ++ return -EFAULT; + -diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c -new file mode 100644 -index 0000000..a340c17 ---- /dev/null -+++ b/grsecurity/gracl_fs.c -@@ -0,0 +1,431 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++ return 0; ++} + -+umode_t -+gr_acl_umask(void) ++static size_t get_gr_arg_wrapper_size_normal(void) +{ -+ if (unlikely(!gr_acl_is_enabled())) -+ return 0; -+ -+ return current->role->umask; ++ return sizeof(struct gr_arg_wrapper); +} + -+__u32 -+gr_acl_handle_hidden_file(const struct dentry * dentry, -+ const struct vfsmount * mnt) -+{ -+ __u32 mode; ++#ifdef CONFIG_COMPAT ++extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap); ++extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg); ++extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp); ++extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp); ++extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp); ++extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp); ++extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp); ++extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp); ++extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp); ++extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp); ++extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp); ++extern size_t get_gr_arg_wrapper_size_compat(void); + -+ if (unlikely(!dentry->d_inode)) -+ return GR_FIND; ++int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only; ++int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only; ++int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only; ++int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only; ++int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only; ++int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only; ++int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only; ++int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only; ++int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only; ++int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only; ++int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only; ++size_t (* get_gr_arg_wrapper_size)(void) __read_only; + -+ mode = -+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt); ++#else ++#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal ++#define copy_gr_arg copy_gr_arg_normal ++#define copy_gr_hash_struct copy_gr_hash_struct_normal ++#define copy_acl_object_label copy_acl_object_label_normal ++#define copy_acl_subject_label copy_acl_subject_label_normal ++#define copy_acl_role_label copy_acl_role_label_normal ++#define copy_acl_ip_label copy_acl_ip_label_normal ++#define copy_pointer_from_array copy_pointer_from_array_normal ++#define copy_sprole_pw copy_sprole_pw_normal ++#define copy_role_transition copy_role_transition_normal ++#define copy_role_allowed_ip copy_role_allowed_ip_normal ++#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal ++#endif + -+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) { -+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt); -+ return mode; -+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) { -+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt); -+ return 0; -+ } else if (unlikely(!(mode & GR_FIND))) -+ return 0; ++static struct acl_subject_label * ++lookup_subject_map(const struct acl_subject_label *userp) ++{ ++ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size); ++ struct subject_map *match; + -+ return GR_FIND; ++ match = polstate->subj_map_set.s_hash[index]; ++ ++ while (match && match->user != userp) ++ match = match->next; ++ ++ if (match != NULL) ++ return match->kernel; ++ else ++ return NULL; +} + -+__u32 -+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt, -+ int acc_mode) ++static void ++insert_subj_map_entry(struct subject_map *subjmap) +{ -+ __u32 reqmode = GR_FIND; -+ __u32 mode; -+ -+ if (unlikely(!dentry->d_inode)) -+ return reqmode; ++ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size); ++ struct subject_map **curr; + -+ if (acc_mode & MAY_APPEND) -+ reqmode |= GR_APPEND; -+ else if (acc_mode & MAY_WRITE) -+ reqmode |= GR_WRITE; -+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode)) -+ reqmode |= GR_READ; ++ subjmap->prev = NULL; + -+ mode = -+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, -+ mnt); ++ curr = &polstate->subj_map_set.s_hash[index]; ++ if (*curr != NULL) ++ (*curr)->prev = subjmap; + -+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) { -+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt, -+ reqmode & GR_READ ? " reading" : "", -+ reqmode & GR_WRITE ? " writing" : reqmode & -+ GR_APPEND ? " appending" : ""); -+ return reqmode; -+ } else -+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS))) -+ { -+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt, -+ reqmode & GR_READ ? " reading" : "", -+ reqmode & GR_WRITE ? " writing" : reqmode & -+ GR_APPEND ? " appending" : ""); -+ return 0; -+ } else if (unlikely((mode & reqmode) != reqmode)) -+ return 0; ++ subjmap->next = *curr; ++ *curr = subjmap; + -+ return reqmode; ++ return; +} + -+__u32 -+gr_acl_handle_creat(const struct dentry * dentry, -+ const struct dentry * p_dentry, -+ const struct vfsmount * p_mnt, int open_flags, int acc_mode, -+ const int imode) ++static void ++__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid) +{ -+ __u32 reqmode = GR_WRITE | GR_CREATE; -+ __u32 mode; ++ unsigned int index = ++ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size); ++ struct acl_role_label **curr; ++ struct acl_role_label *tmp, *tmp2; + -+ if (acc_mode & MAY_APPEND) -+ reqmode |= GR_APPEND; -+ // if a directory was required or the directory already exists, then -+ // don't count this open as a read -+ if ((acc_mode & MAY_READ) && -+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode)))) -+ reqmode |= GR_READ; -+ if ((open_flags & O_CREAT) && -+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)))) -+ reqmode |= GR_SETID; ++ curr = &polstate->acl_role_set.r_hash[index]; + -+ mode = -+ gr_check_create(dentry, p_dentry, p_mnt, -+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS); ++ /* simple case, slot is empty, just set it to our role */ ++ if (*curr == NULL) { ++ *curr = role; ++ } else { ++ /* example: ++ 1 -> 2 -> 3 (adding 2 -> 3 to here) ++ 2 -> 3 ++ */ ++ /* first check to see if we can already be reached via this slot */ ++ tmp = *curr; ++ while (tmp && tmp != role) ++ tmp = tmp->next; ++ if (tmp == role) { ++ /* we don't need to add ourselves to this slot's chain */ ++ return; ++ } ++ /* we need to add ourselves to this chain, two cases */ ++ if (role->next == NULL) { ++ /* simple case, append the current chain to our role */ ++ role->next = *curr; ++ *curr = role; ++ } else { ++ /* 1 -> 2 -> 3 -> 4 ++ 2 -> 3 -> 4 ++ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here) ++ */ ++ /* trickier case: walk our role's chain until we find ++ the role for the start of the current slot's chain */ ++ tmp = role; ++ tmp2 = *curr; ++ while (tmp->next && tmp->next != tmp2) ++ tmp = tmp->next; ++ if (tmp->next == tmp2) { ++ /* from example above, we found 3, so just ++ replace this slot's chain with ours */ ++ *curr = role; ++ } else { ++ /* we didn't find a subset of our role's chain ++ in the current slot's chain, so append their ++ chain to ours, and set us as the first role in ++ the slot's chain + -+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) { -+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt, -+ reqmode & GR_READ ? " reading" : "", -+ reqmode & GR_WRITE ? " writing" : reqmode & -+ GR_APPEND ? " appending" : ""); -+ return reqmode; -+ } else -+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS))) -+ { -+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt, -+ reqmode & GR_READ ? " reading" : "", -+ reqmode & GR_WRITE ? " writing" : reqmode & -+ GR_APPEND ? " appending" : ""); -+ return 0; -+ } else if (unlikely((mode & reqmode) != reqmode)) -+ return 0; ++ we could fold this case with the case above, ++ but making it explicit for clarity ++ */ ++ tmp->next = tmp2; ++ *curr = role; ++ } ++ } ++ } + -+ return reqmode; ++ return; +} + -+__u32 -+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt, -+ const int fmode) ++static void ++insert_acl_role_label(struct acl_role_label *role) +{ -+ __u32 mode, reqmode = GR_FIND; -+ -+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode)) -+ reqmode |= GR_EXEC; -+ if (fmode & S_IWOTH) -+ reqmode |= GR_WRITE; -+ if (fmode & S_IROTH) -+ reqmode |= GR_READ; ++ int i; + -+ mode = -+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, -+ mnt); ++ if (polstate->role_list == NULL) { ++ polstate->role_list = role; ++ role->prev = NULL; ++ } else { ++ role->prev = polstate->role_list; ++ polstate->role_list = role; ++ } ++ ++ /* used for hash chains */ ++ role->next = NULL; + -+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) { -+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt, -+ reqmode & GR_READ ? " reading" : "", -+ reqmode & GR_WRITE ? " writing" : "", -+ reqmode & GR_EXEC ? " executing" : ""); -+ return reqmode; ++ if (role->roletype & GR_ROLE_DOMAIN) { ++ for (i = 0; i < role->domain_child_num; i++) ++ __insert_acl_role_label(role, role->domain_children[i]); + } else -+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS))) -+ { -+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt, -+ reqmode & GR_READ ? " reading" : "", -+ reqmode & GR_WRITE ? " writing" : "", -+ reqmode & GR_EXEC ? " executing" : ""); -+ return 0; -+ } else if (unlikely((mode & reqmode) != reqmode)) -+ return 0; -+ -+ return reqmode; ++ __insert_acl_role_label(role, role->uidgid); +} -+ -+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt) ++ ++static int ++insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted) +{ -+ __u32 mode; ++ struct name_entry **curr, *nentry; ++ struct inodev_entry *ientry; ++ unsigned int len = strlen(name); ++ unsigned int key = full_name_hash(name, len); ++ unsigned int index = key % polstate->name_set.n_size; + -+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt); ++ curr = &polstate->name_set.n_hash[index]; + -+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) { -+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt); -+ return mode; -+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) { -+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt); ++ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len))) ++ curr = &((*curr)->next); ++ ++ if (*curr != NULL) ++ return 1; ++ ++ nentry = acl_alloc(sizeof (struct name_entry)); ++ if (nentry == NULL) + return 0; -+ } else if (unlikely((mode & (reqmode)) != (reqmode))) ++ ientry = acl_alloc(sizeof (struct inodev_entry)); ++ if (ientry == NULL) + return 0; ++ ientry->nentry = nentry; + -+ return (reqmode); -+} ++ nentry->key = key; ++ nentry->name = name; ++ nentry->inode = inode; ++ nentry->device = device; ++ nentry->len = len; ++ nentry->deleted = deleted; + -+__u32 -+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt) -+{ -+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG); -+} ++ nentry->prev = NULL; ++ curr = &polstate->name_set.n_hash[index]; ++ if (*curr != NULL) ++ (*curr)->prev = nentry; ++ nentry->next = *curr; ++ *curr = nentry; + -+__u32 -+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt) -+{ -+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG); -+} ++ /* insert us into the table searchable by inode/dev */ ++ __insert_inodev_entry(polstate, ientry); + -+__u32 -+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt) -+{ -+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG); ++ return 1; +} + -+__u32 -+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt) -+{ -+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG); -+} ++/* allocating chained hash tables, so optimal size is where lambda ~ 1 */ + -+__u32 -+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt, -+ umode_t *modeptr) ++static void * ++create_table(__u32 * len, int elementsize) +{ -+ umode_t mode; -+ -+ *modeptr &= ~gr_acl_umask(); -+ mode = *modeptr; ++ unsigned int table_sizes[] = { ++ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381, ++ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143, ++ 4194301, 8388593, 16777213, 33554393, 67108859 ++ }; ++ void *newtable = NULL; ++ unsigned int pwr = 0; + -+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode))) -+ return 1; ++ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) && ++ table_sizes[pwr] <= *len) ++ pwr++; + -+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) && -+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) { -+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID, -+ GR_CHMOD_ACL_MSG); -+ } else { -+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG); -+ } -+} ++ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize)) ++ return newtable; + -+__u32 -+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt) -+{ -+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG); -+} ++ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE) ++ newtable = ++ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL); ++ else ++ newtable = vmalloc(table_sizes[pwr] * elementsize); + -+__u32 -+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt) -+{ -+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG); -+} ++ *len = table_sizes[pwr]; + -+__u32 -+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt) -+{ -+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG); ++ return newtable; +} + -+__u32 -+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt) ++static int ++init_variables(const struct gr_arg *arg, bool reload) +{ -+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE, -+ GR_UNIXCONNECT_ACL_MSG); -+} ++ struct task_struct *reaper = init_pid_ns.child_reaper; ++ unsigned int stacksize; + -+/* hardlinks require at minimum create and link permission, -+ any additional privilege required is based on the -+ privilege of the file being linked to -+*/ -+__u32 -+gr_acl_handle_link(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt, -+ const struct dentry * old_dentry, -+ const struct vfsmount * old_mnt, const struct filename *to) -+{ -+ __u32 mode; -+ __u32 needmode = GR_CREATE | GR_LINK; -+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK; ++ polstate->subj_map_set.s_size = arg->role_db.num_subjects; ++ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children; ++ polstate->name_set.n_size = arg->role_db.num_objects; ++ polstate->inodev_set.i_size = arg->role_db.num_objects; + -+ mode = -+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry, -+ old_mnt); ++ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size || ++ !polstate->name_set.n_size || !polstate->inodev_set.i_size) ++ return 1; + -+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) { -+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name); -+ return mode; -+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) { -+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name); -+ return 0; -+ } else if (unlikely((mode & needmode) != needmode)) -+ return 0; ++ if (!reload) { ++ if (!gr_init_uidset()) ++ return 1; ++ } + -+ return 1; -+} ++ /* set up the stack that holds allocation info */ + -+__u32 -+gr_acl_handle_symlink(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt, const struct filename *from) -+{ -+ __u32 needmode = GR_WRITE | GR_CREATE; -+ __u32 mode; ++ stacksize = arg->role_db.num_pointers + 5; + -+ mode = -+ gr_check_create(new_dentry, parent_dentry, parent_mnt, -+ GR_CREATE | GR_AUDIT_CREATE | -+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS); ++ if (!acl_alloc_stack_init(stacksize)) ++ return 1; + -+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) { -+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt); -+ return mode; -+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) { -+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt); -+ return 0; -+ } else if (unlikely((mode & needmode) != needmode)) -+ return 0; ++ if (!reload) { ++ /* grab reference for the real root dentry and vfsmount */ ++ get_fs_root(reaper->fs, &gr_real_root); ++ ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG ++ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(gr_real_root.dentry), gr_real_root.dentry->d_inode->i_ino); ++#endif + -+ return (GR_WRITE | GR_CREATE); -+} ++ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label)); ++ if (fakefs_obj_rw == NULL) ++ return 1; ++ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE; ++ ++ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label)); ++ if (fakefs_obj_rwx == NULL) ++ return 1; ++ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC; ++ } + -+static __u32 generic_fs_create_handler(const struct dentry *new_dentry, const struct dentry *parent_dentry, const struct vfsmount *parent_mnt, __u32 reqmode, const char *fmt) -+{ -+ __u32 mode; ++ polstate->subj_map_set.s_hash = ++ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *)); ++ polstate->acl_role_set.r_hash = ++ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *)); ++ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *)); ++ polstate->inodev_set.i_hash = ++ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *)); + -+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS); ++ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash || ++ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash) ++ return 1; + -+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) { -+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt); -+ return mode; -+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) { -+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt); -+ return 0; -+ } else if (unlikely((mode & (reqmode)) != (reqmode))) -+ return 0; ++ memset(polstate->subj_map_set.s_hash, 0, ++ sizeof(struct subject_map *) * polstate->subj_map_set.s_size); ++ memset(polstate->acl_role_set.r_hash, 0, ++ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size); ++ memset(polstate->name_set.n_hash, 0, ++ sizeof (struct name_entry *) * polstate->name_set.n_size); ++ memset(polstate->inodev_set.i_hash, 0, ++ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size); + -+ return (reqmode); ++ return 0; +} + -+__u32 -+gr_acl_handle_mknod(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt, -+ const int mode) ++/* free information not needed after startup ++ currently contains user->kernel pointer mappings for subjects ++*/ ++ ++static void ++free_init_variables(void) +{ -+ __u32 reqmode = GR_WRITE | GR_CREATE; -+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)))) -+ reqmode |= GR_SETID; ++ __u32 i; + -+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt, -+ reqmode, GR_MKNOD_ACL_MSG); ++ if (polstate->subj_map_set.s_hash) { ++ for (i = 0; i < polstate->subj_map_set.s_size; i++) { ++ if (polstate->subj_map_set.s_hash[i]) { ++ kfree(polstate->subj_map_set.s_hash[i]); ++ polstate->subj_map_set.s_hash[i] = NULL; ++ } ++ } ++ ++ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <= ++ PAGE_SIZE) ++ kfree(polstate->subj_map_set.s_hash); ++ else ++ vfree(polstate->subj_map_set.s_hash); ++ } ++ ++ return; +} + -+__u32 -+gr_acl_handle_mkdir(const struct dentry *new_dentry, -+ const struct dentry *parent_dentry, -+ const struct vfsmount *parent_mnt) ++static void ++free_variables(bool reload) +{ -+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt, -+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG); -+} ++ struct acl_subject_label *s; ++ struct acl_role_label *r; ++ struct task_struct *task, *task2; ++ unsigned int x; + -+#define RENAME_CHECK_SUCCESS(old, new) \ -+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \ -+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ))) ++ if (!reload) { ++ gr_clear_learn_entries(); + -+int -+gr_acl_handle_rename(struct dentry *new_dentry, -+ struct dentry *parent_dentry, -+ const struct vfsmount *parent_mnt, -+ struct dentry *old_dentry, -+ struct inode *old_parent_inode, -+ struct vfsmount *old_mnt, const struct filename *newname) -+{ -+ __u32 comp1, comp2; -+ int error = 0; ++ read_lock(&tasklist_lock); ++ do_each_thread(task2, task) { ++ task->acl_sp_role = 0; ++ task->acl_role_id = 0; ++ task->inherited = 0; ++ task->acl = NULL; ++ task->role = NULL; ++ } while_each_thread(task2, task); ++ read_unlock(&tasklist_lock); + -+ if (unlikely(!gr_acl_is_enabled())) -+ return 0; ++ /* release the reference to the real root dentry and vfsmount */ ++ path_put(&gr_real_root); ++ memset(&gr_real_root, 0, sizeof(gr_real_root)); ++ } + -+ if (!new_dentry->d_inode) { -+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt, -+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ | -+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS); -+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE | -+ GR_DELETE | GR_AUDIT_DELETE | -+ GR_AUDIT_READ | GR_AUDIT_WRITE | -+ GR_SUPPRESS, old_mnt); -+ } else { -+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE | -+ GR_CREATE | GR_DELETE | -+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | -+ GR_AUDIT_READ | GR_AUDIT_WRITE | -+ GR_SUPPRESS, parent_mnt); -+ comp2 = -+ gr_search_file(old_dentry, -+ GR_READ | GR_WRITE | GR_AUDIT_READ | -+ GR_DELETE | GR_AUDIT_DELETE | -+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt); -+ } ++ /* free all object hash tables */ + -+ if (RENAME_CHECK_SUCCESS(comp1, comp2) && -+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS))) -+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name); -+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS) -+ && !(comp2 & GR_SUPPRESS)) { -+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name); -+ error = -EACCES; -+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2))) -+ error = -EACCES; ++ FOR_EACH_ROLE_START(r) ++ if (r->subj_hash == NULL) ++ goto next_role; ++ FOR_EACH_SUBJECT_START(r, s, x) ++ if (s->obj_hash == NULL) ++ break; ++ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE) ++ kfree(s->obj_hash); ++ else ++ vfree(s->obj_hash); ++ FOR_EACH_SUBJECT_END(s, x) ++ FOR_EACH_NESTED_SUBJECT_START(r, s) ++ if (s->obj_hash == NULL) ++ break; ++ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE) ++ kfree(s->obj_hash); ++ else ++ vfree(s->obj_hash); ++ FOR_EACH_NESTED_SUBJECT_END(s) ++ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE) ++ kfree(r->subj_hash); ++ else ++ vfree(r->subj_hash); ++ r->subj_hash = NULL; ++next_role: ++ FOR_EACH_ROLE_END(r) + -+ return error; -+} ++ acl_free_all(); + -+void -+gr_acl_handle_exit(void) -+{ -+ u16 id; -+ char *rolename; ++ if (polstate->acl_role_set.r_hash) { ++ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <= ++ PAGE_SIZE) ++ kfree(polstate->acl_role_set.r_hash); ++ else ++ vfree(polstate->acl_role_set.r_hash); ++ } ++ if (polstate->name_set.n_hash) { ++ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <= ++ PAGE_SIZE) ++ kfree(polstate->name_set.n_hash); ++ else ++ vfree(polstate->name_set.n_hash); ++ } + -+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() && -+ !(current->role->roletype & GR_ROLE_PERSIST))) { -+ id = current->acl_role_id; -+ rolename = current->role->rolename; -+ gr_set_acls(1); -+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id); ++ if (polstate->inodev_set.i_hash) { ++ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <= ++ PAGE_SIZE) ++ kfree(polstate->inodev_set.i_hash); ++ else ++ vfree(polstate->inodev_set.i_hash); + } + -+ gr_put_exec_file(current); ++ if (!reload) ++ gr_free_uidset(); ++ ++ memset(&polstate->name_set, 0, sizeof (struct name_db)); ++ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db)); ++ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db)); ++ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db)); ++ ++ polstate->default_role = NULL; ++ polstate->kernel_role = NULL; ++ polstate->role_list = NULL; ++ + return; +} + -+int -+gr_acl_handle_procpidmem(const struct task_struct *task) ++static struct acl_subject_label * ++do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied); ++ ++static int alloc_and_copy_string(char **name, unsigned int maxlen) +{ -+ if (unlikely(!gr_acl_is_enabled())) -+ return 0; ++ unsigned int len = strnlen_user(*name, maxlen); ++ char *tmp; + -+ if (task != current && task->acl->mode & GR_PROTPROCFD) -+ return -EACCES; ++ if (!len || len >= maxlen) ++ return -EINVAL; ++ ++ if ((tmp = (char *) acl_alloc(len)) == NULL) ++ return -ENOMEM; ++ ++ if (copy_from_user(tmp, *name, len)) ++ return -EFAULT; ++ ++ tmp[len-1] = '\0'; ++ *name = tmp; + + return 0; +} -diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c -new file mode 100644 -index 0000000..f056b81 ---- /dev/null -+++ b/grsecurity/gracl_ip.c -@@ -0,0 +1,386 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include + -+#define GR_BIND 0x01 -+#define GR_CONNECT 0x02 -+#define GR_INVERT 0x04 -+#define GR_BINDOVERRIDE 0x08 -+#define GR_CONNECTOVERRIDE 0x10 -+#define GR_SOCK_FAMILY 0x20 ++static int ++copy_user_glob(struct acl_object_label *obj) ++{ ++ struct acl_object_label *g_tmp, **guser; ++ int error; + -+static const char * gr_protocols[IPPROTO_MAX] = { -+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt", -+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet", -+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1", -+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp", -+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++", -+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre", -+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile", -+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63", -+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv", -+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak", -+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf", -+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp", -+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim", -+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip", -+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp", -+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup", -+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135", -+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143", -+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151", -+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159", -+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167", -+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175", -+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183", -+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191", -+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199", -+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207", -+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215", -+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223", -+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231", -+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239", -+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247", -+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255", -+ }; ++ if (obj->globbed == NULL) ++ return 0; + -+static const char * gr_socktypes[SOCK_MAX] = { -+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6", -+ "unknown:7", "unknown:8", "unknown:9", "packet" -+ }; ++ guser = &obj->globbed; ++ while (*guser) { ++ g_tmp = (struct acl_object_label *) ++ acl_alloc(sizeof (struct acl_object_label)); ++ if (g_tmp == NULL) ++ return -ENOMEM; + -+static const char * gr_sockfamilies[AF_MAX+1] = { -+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25", -+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash", -+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28", -+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf" -+ }; ++ if (copy_acl_object_label(g_tmp, *guser)) ++ return -EFAULT; + -+const char * -+gr_proto_to_name(unsigned char proto) -+{ -+ return gr_protocols[proto]; -+} ++ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX); ++ if (error) ++ return error; + -+const char * -+gr_socktype_to_name(unsigned char type) -+{ -+ return gr_socktypes[type]; ++ *guser = g_tmp; ++ guser = &(g_tmp->next); ++ } ++ ++ return 0; +} + -+const char * -+gr_sockfamily_to_name(unsigned char family) ++static int ++copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj, ++ struct acl_role_label *role) +{ -+ return gr_sockfamilies[family]; -+} ++ struct acl_object_label *o_tmp; ++ int ret; + -+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly; ++ while (userp) { ++ if ((o_tmp = (struct acl_object_label *) ++ acl_alloc(sizeof (struct acl_object_label))) == NULL) ++ return -ENOMEM; + -+int -+gr_search_socket(const int domain, const int type, const int protocol) -+{ -+ struct acl_subject_label *curr; -+ const struct cred *cred = current_cred(); ++ if (copy_acl_object_label(o_tmp, userp)) ++ return -EFAULT; + -+ if (unlikely(!gr_acl_is_enabled())) -+ goto exit; ++ userp = o_tmp->prev; + -+ if ((domain < 0) || (type < 0) || (protocol < 0) || -+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX)) -+ goto exit; // let the kernel handle it ++ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX); ++ if (ret) ++ return ret; + -+ curr = current->acl; ++ insert_acl_obj_label(o_tmp, subj); ++ if (!insert_name_entry(o_tmp->filename, o_tmp->inode, ++ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0)) ++ return -ENOMEM; + -+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) { -+ /* the family is allowed, if this is PF_INET allow it only if -+ the extra sock type/protocol checks pass */ -+ if (domain == PF_INET) -+ goto inet_check; -+ goto exit; -+ } else { -+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) { -+ __u32 fakeip = 0; -+ security_learn(GR_IP_LEARN_MSG, current->role->rolename, -+ current->role->roletype, GR_GLOBAL_UID(cred->uid), -+ GR_GLOBAL_GID(cred->gid), current->exec_file ? -+ gr_to_filename(current->exec_file->f_path.dentry, -+ current->exec_file->f_path.mnt) : -+ curr->filename, curr->filename, -+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY, -+ ¤t->signal->saved_ip); -+ goto exit; -+ } -+ goto exit_fail; -+ } ++ ret = copy_user_glob(o_tmp); ++ if (ret) ++ return ret; + -+inet_check: -+ /* the rest of this checking is for IPv4 only */ -+ if (!curr->ips) -+ goto exit; ++ if (o_tmp->nested) { ++ int already_copied; + -+ if ((curr->ip_type & (1U << type)) && -+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32)))) -+ goto exit; ++ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied); ++ if (IS_ERR(o_tmp->nested)) ++ return PTR_ERR(o_tmp->nested); + -+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) { -+ /* we don't place acls on raw sockets , and sometimes -+ dgram/ip sockets are opened for ioctl and not -+ bind/connect, so we'll fake a bind learn log */ -+ if (type == SOCK_RAW || type == SOCK_PACKET) { -+ __u32 fakeip = 0; -+ security_learn(GR_IP_LEARN_MSG, current->role->rolename, -+ current->role->roletype, GR_GLOBAL_UID(cred->uid), -+ GR_GLOBAL_GID(cred->gid), current->exec_file ? -+ gr_to_filename(current->exec_file->f_path.dentry, -+ current->exec_file->f_path.mnt) : -+ curr->filename, curr->filename, -+ &fakeip, 0, type, -+ protocol, GR_CONNECT, ¤t->signal->saved_ip); -+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) { -+ __u32 fakeip = 0; -+ security_learn(GR_IP_LEARN_MSG, current->role->rolename, -+ current->role->roletype, GR_GLOBAL_UID(cred->uid), -+ GR_GLOBAL_GID(cred->gid), current->exec_file ? -+ gr_to_filename(current->exec_file->f_path.dentry, -+ current->exec_file->f_path.mnt) : -+ curr->filename, curr->filename, -+ &fakeip, 0, type, -+ protocol, GR_BIND, ¤t->signal->saved_ip); ++ /* insert into nested subject list if we haven't copied this one yet ++ to prevent duplicate entries */ ++ if (!already_copied) { ++ o_tmp->nested->next = role->hash->first; ++ role->hash->first = o_tmp->nested; ++ } + } -+ /* we'll log when they use connect or bind */ -+ goto exit; + } + -+exit_fail: -+ if (domain == PF_INET) -+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain), -+ gr_socktype_to_name(type), gr_proto_to_name(protocol)); -+ else if (rcu_access_pointer(net_families[domain]) != NULL) -+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain), -+ gr_socktype_to_name(type), protocol); -+ + return 0; -+exit: -+ return 1; +} + -+int check_ip_policy(struct acl_ip_label *ip, __u32 ip_addr, __u16 ip_port, __u8 protocol, const int mode, const int type, __u32 our_addr, __u32 our_netmask) ++static __u32 ++count_user_subjs(struct acl_subject_label *userp) +{ -+ if ((ip->mode & mode) && -+ (ip_port >= ip->low) && -+ (ip_port <= ip->high) && -+ ((ntohl(ip_addr) & our_netmask) == -+ (ntohl(our_addr) & our_netmask)) -+ && (ip->proto[protocol / 32] & (1U << (protocol % 32))) -+ && (ip->type & (1U << type))) { -+ if (ip->mode & GR_INVERT) -+ return 2; // specifically denied -+ else -+ return 1; // allowed ++ struct acl_subject_label s_tmp; ++ __u32 num = 0; ++ ++ while (userp) { ++ if (copy_acl_subject_label(&s_tmp, userp)) ++ break; ++ ++ userp = s_tmp.prev; + } + -+ return 0; // not specifically allowed, may continue parsing ++ return num; +} + +static int -+gr_search_connectbind(const int full_mode, struct sock *sk, -+ struct sockaddr_in *addr, const int type) ++copy_user_allowedips(struct acl_role_label *rolep) +{ -+ char iface[IFNAMSIZ] = {0}; -+ struct acl_subject_label *curr; -+ struct acl_ip_label *ip; -+ struct inet_sock *isk; -+ struct net_device *dev; -+ struct in_device *idev; -+ unsigned long i; -+ int ret; -+ int mode = full_mode & (GR_BIND | GR_CONNECT); -+ __u32 ip_addr = 0; -+ __u32 our_addr; -+ __u32 our_netmask; -+ char *p; -+ __u16 ip_port = 0; -+ const struct cred *cred = current_cred(); -+ -+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET)) -+ return 0; -+ -+ curr = current->acl; -+ isk = inet_sk(sk); -+ -+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */ -+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) -+ addr->sin_addr.s_addr = curr->inaddr_any_override; -+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) { -+ struct sockaddr_in saddr; -+ int err; -+ -+ saddr.sin_family = AF_INET; -+ saddr.sin_addr.s_addr = curr->inaddr_any_override; -+ saddr.sin_port = isk->inet_sport; ++ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast; + -+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in)); -+ if (err) -+ return err; ++ ruserip = rolep->allowed_ips; + -+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in)); -+ if (err) -+ return err; -+ } ++ while (ruserip) { ++ rlast = rtmp; + -+ if (!curr->ips) -+ return 0; ++ if ((rtmp = (struct role_allowed_ip *) ++ acl_alloc(sizeof (struct role_allowed_ip))) == NULL) ++ return -ENOMEM; + -+ ip_addr = addr->sin_addr.s_addr; -+ ip_port = ntohs(addr->sin_port); ++ if (copy_role_allowed_ip(rtmp, ruserip)) ++ return -EFAULT; + -+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) { -+ security_learn(GR_IP_LEARN_MSG, current->role->rolename, -+ current->role->roletype, GR_GLOBAL_UID(cred->uid), -+ GR_GLOBAL_GID(cred->gid), current->exec_file ? -+ gr_to_filename(current->exec_file->f_path.dentry, -+ current->exec_file->f_path.mnt) : -+ curr->filename, curr->filename, -+ &ip_addr, ip_port, type, -+ sk->sk_protocol, mode, ¤t->signal->saved_ip); -+ return 0; -+ } ++ ruserip = rtmp->prev; + -+ for (i = 0; i < curr->ip_num; i++) { -+ ip = *(curr->ips + i); -+ if (ip->iface != NULL) { -+ strncpy(iface, ip->iface, IFNAMSIZ - 1); -+ p = strchr(iface, ':'); -+ if (p != NULL) -+ *p = '\0'; -+ dev = dev_get_by_name(sock_net(sk), iface); -+ if (dev == NULL) -+ continue; -+ idev = in_dev_get(dev); -+ if (idev == NULL) { -+ dev_put(dev); -+ continue; -+ } -+ rcu_read_lock(); -+ for_ifa(idev) { -+ if (!strcmp(ip->iface, ifa->ifa_label)) { -+ our_addr = ifa->ifa_address; -+ our_netmask = 0xffffffff; -+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask); -+ if (ret == 1) { -+ rcu_read_unlock(); -+ in_dev_put(idev); -+ dev_put(dev); -+ return 0; -+ } else if (ret == 2) { -+ rcu_read_unlock(); -+ in_dev_put(idev); -+ dev_put(dev); -+ goto denied; -+ } -+ } -+ } endfor_ifa(idev); -+ rcu_read_unlock(); -+ in_dev_put(idev); -+ dev_put(dev); ++ if (!rlast) { ++ rtmp->prev = NULL; ++ rolep->allowed_ips = rtmp; + } else { -+ our_addr = ip->addr; -+ our_netmask = ip->netmask; -+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask); -+ if (ret == 1) -+ return 0; -+ else if (ret == 2) -+ goto denied; ++ rlast->next = rtmp; ++ rtmp->prev = rlast; + } -+ } -+ -+denied: -+ if (mode == GR_BIND) -+ gr_log_int5_str2(GR_DONT_AUDIT, GR_BIND_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); -+ else if (mode == GR_CONNECT) -+ gr_log_int5_str2(GR_DONT_AUDIT, GR_CONNECT_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); + -+ return -EACCES; -+} ++ if (!ruserip) ++ rtmp->next = NULL; ++ } + -+int -+gr_search_connect(struct socket *sock, struct sockaddr_in *addr) -+{ -+ /* always allow disconnection of dgram sockets with connect */ -+ if (addr->sin_family == AF_UNSPEC) -+ return 0; -+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type); ++ return 0; +} + -+int -+gr_search_bind(struct socket *sock, struct sockaddr_in *addr) ++static int ++copy_user_transitions(struct acl_role_label *rolep) +{ -+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type); -+} ++ struct role_transition *rusertp, *rtmp = NULL, *rlast; ++ int error; + -+int gr_search_listen(struct socket *sock) -+{ -+ struct sock *sk = sock->sk; -+ struct sockaddr_in addr; ++ rusertp = rolep->transitions; + -+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr; -+ addr.sin_port = inet_sk(sk)->inet_sport; ++ while (rusertp) { ++ rlast = rtmp; + -+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type); -+} ++ if ((rtmp = (struct role_transition *) ++ acl_alloc(sizeof (struct role_transition))) == NULL) ++ return -ENOMEM; + -+int gr_search_accept(struct socket *sock) -+{ -+ struct sock *sk = sock->sk; -+ struct sockaddr_in addr; ++ if (copy_role_transition(rtmp, rusertp)) ++ return -EFAULT; + -+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr; -+ addr.sin_port = inet_sk(sk)->inet_sport; ++ rusertp = rtmp->prev; + -+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type); -+} ++ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN); ++ if (error) ++ return error; + -+int -+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr) -+{ -+ if (addr) -+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM); -+ else { -+ struct sockaddr_in sin; -+ const struct inet_sock *inet = inet_sk(sk); -+ -+ sin.sin_addr.s_addr = inet->inet_daddr; -+ sin.sin_port = inet->inet_dport; ++ if (!rlast) { ++ rtmp->prev = NULL; ++ rolep->transitions = rtmp; ++ } else { ++ rlast->next = rtmp; ++ rtmp->prev = rlast; ++ } + -+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); ++ if (!rusertp) ++ rtmp->next = NULL; + } ++ ++ return 0; +} + -+int -+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb) ++static __u32 count_user_objs(const struct acl_object_label __user *userp) +{ -+ struct sockaddr_in sin; ++ struct acl_object_label o_tmp; ++ __u32 num = 0; + -+ if (unlikely(skb->len < sizeof (struct udphdr))) -+ return 0; // skip this packet ++ while (userp) { ++ if (copy_acl_object_label(&o_tmp, userp)) ++ break; + -+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr; -+ sin.sin_port = udp_hdr(skb)->source; ++ userp = o_tmp.prev; ++ num++; ++ } + -+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); ++ return num; +} -diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c -new file mode 100644 -index 0000000..25f54ef ---- /dev/null -+++ b/grsecurity/gracl_learn.c -@@ -0,0 +1,207 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include + -+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf, -+ size_t count, loff_t *ppos); -+extern int gr_acl_is_enabled(void); ++static struct acl_subject_label * ++do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied) ++{ ++ struct acl_subject_label *s_tmp = NULL, *s_tmp2; ++ __u32 num_objs; ++ struct acl_ip_label **i_tmp, *i_utmp2; ++ struct gr_hash_struct ghash; ++ struct subject_map *subjmap; ++ unsigned int i_num; ++ int err; + -+static DECLARE_WAIT_QUEUE_HEAD(learn_wait); -+static int gr_learn_attached; ++ if (already_copied != NULL) ++ *already_copied = 0; + -+/* use a 512k buffer */ -+#define LEARN_BUFFER_SIZE (512 * 1024) ++ s_tmp = lookup_subject_map(userp); + -+static DEFINE_SPINLOCK(gr_learn_lock); -+static DEFINE_MUTEX(gr_learn_user_mutex); ++ /* we've already copied this subject into the kernel, just return ++ the reference to it, and don't copy it over again ++ */ ++ if (s_tmp) { ++ if (already_copied != NULL) ++ *already_copied = 1; ++ return(s_tmp); ++ } + -+/* we need to maintain two buffers, so that the kernel context of grlearn -+ uses a semaphore around the userspace copying, and the other kernel contexts -+ use a spinlock when copying into the buffer, since they cannot sleep -+*/ -+static char *learn_buffer; -+static char *learn_buffer_user; -+static int learn_buffer_len; -+static int learn_buffer_user_len; ++ if ((s_tmp = (struct acl_subject_label *) ++ acl_alloc(sizeof (struct acl_subject_label))) == NULL) ++ return ERR_PTR(-ENOMEM); + -+static ssize_t -+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos) -+{ -+ DECLARE_WAITQUEUE(wait, current); -+ ssize_t retval = 0; ++ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL); ++ if (subjmap == NULL) ++ return ERR_PTR(-ENOMEM); + -+ add_wait_queue(&learn_wait, &wait); -+ set_current_state(TASK_INTERRUPTIBLE); -+ do { -+ mutex_lock(&gr_learn_user_mutex); -+ spin_lock(&gr_learn_lock); -+ if (learn_buffer_len) -+ break; -+ spin_unlock(&gr_learn_lock); -+ mutex_unlock(&gr_learn_user_mutex); -+ if (file->f_flags & O_NONBLOCK) { -+ retval = -EAGAIN; -+ goto out; -+ } -+ if (signal_pending(current)) { -+ retval = -ERESTARTSYS; -+ goto out; -+ } ++ subjmap->user = userp; ++ subjmap->kernel = s_tmp; ++ insert_subj_map_entry(subjmap); + -+ schedule(); -+ } while (1); ++ if (copy_acl_subject_label(s_tmp, userp)) ++ return ERR_PTR(-EFAULT); + -+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len); -+ learn_buffer_user_len = learn_buffer_len; -+ retval = learn_buffer_len; -+ learn_buffer_len = 0; ++ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX); ++ if (err) ++ return ERR_PTR(err); + -+ spin_unlock(&gr_learn_lock); ++ if (!strcmp(s_tmp->filename, "/")) ++ role->root_label = s_tmp; + -+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len)) -+ retval = -EFAULT; ++ if (copy_gr_hash_struct(&ghash, s_tmp->hash)) ++ return ERR_PTR(-EFAULT); + -+ mutex_unlock(&gr_learn_user_mutex); -+out: -+ set_current_state(TASK_RUNNING); -+ remove_wait_queue(&learn_wait, &wait); -+ return retval; -+} ++ /* copy user and group transition tables */ + -+static unsigned int -+poll_learn(struct file * file, poll_table * wait) -+{ -+ poll_wait(file, &learn_wait, wait); ++ if (s_tmp->user_trans_num) { ++ uid_t *uidlist; + -+ if (learn_buffer_len) -+ return (POLLIN | POLLRDNORM); ++ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t)); ++ if (uidlist == NULL) ++ return ERR_PTR(-ENOMEM); ++ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t))) ++ return ERR_PTR(-EFAULT); + -+ return 0; -+} ++ s_tmp->user_transitions = uidlist; ++ } + -+void -+gr_clear_learn_entries(void) -+{ -+ char *tmp; ++ if (s_tmp->group_trans_num) { ++ gid_t *gidlist; + -+ mutex_lock(&gr_learn_user_mutex); -+ spin_lock(&gr_learn_lock); -+ tmp = learn_buffer; -+ learn_buffer = NULL; -+ spin_unlock(&gr_learn_lock); -+ if (tmp) -+ vfree(tmp); -+ if (learn_buffer_user != NULL) { -+ vfree(learn_buffer_user); -+ learn_buffer_user = NULL; ++ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t)); ++ if (gidlist == NULL) ++ return ERR_PTR(-ENOMEM); ++ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t))) ++ return ERR_PTR(-EFAULT); ++ ++ s_tmp->group_transitions = gidlist; + } -+ learn_buffer_len = 0; -+ mutex_unlock(&gr_learn_user_mutex); + -+ return; -+} ++ /* set up object hash table */ ++ num_objs = count_user_objs(ghash.first); + -+void -+gr_add_learn_entry(const char *fmt, ...) -+{ -+ va_list args; -+ unsigned int len; ++ s_tmp->obj_hash_size = num_objs; ++ s_tmp->obj_hash = ++ (struct acl_object_label **) ++ create_table(&(s_tmp->obj_hash_size), sizeof(void *)); + -+ if (!gr_learn_attached) -+ return; ++ if (!s_tmp->obj_hash) ++ return ERR_PTR(-ENOMEM); + -+ spin_lock(&gr_learn_lock); ++ memset(s_tmp->obj_hash, 0, ++ s_tmp->obj_hash_size * ++ sizeof (struct acl_object_label *)); + -+ /* leave a gap at the end so we know when it's "full" but don't have to -+ compute the exact length of the string we're trying to append -+ */ -+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) { -+ spin_unlock(&gr_learn_lock); -+ wake_up_interruptible(&learn_wait); -+ return; ++ /* add in objects */ ++ err = copy_user_objs(ghash.first, s_tmp, role); ++ ++ if (err) ++ return ERR_PTR(err); ++ ++ /* set pointer for parent subject */ ++ if (s_tmp->parent_subject) { ++ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL); ++ ++ if (IS_ERR(s_tmp2)) ++ return s_tmp2; ++ ++ s_tmp->parent_subject = s_tmp2; + } -+ if (learn_buffer == NULL) { -+ spin_unlock(&gr_learn_lock); -+ return; ++ ++ /* add in ip acls */ ++ ++ if (!s_tmp->ip_num) { ++ s_tmp->ips = NULL; ++ goto insert; + } + -+ va_start(args, fmt); -+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args); -+ va_end(args); ++ i_tmp = ++ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num, ++ sizeof (struct acl_ip_label *)); + -+ learn_buffer_len += len + 1; ++ if (!i_tmp) ++ return ERR_PTR(-ENOMEM); + -+ spin_unlock(&gr_learn_lock); -+ wake_up_interruptible(&learn_wait); ++ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) { ++ *(i_tmp + i_num) = ++ (struct acl_ip_label *) ++ acl_alloc(sizeof (struct acl_ip_label)); ++ if (!*(i_tmp + i_num)) ++ return ERR_PTR(-ENOMEM); + -+ return; -+} ++ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips)) ++ return ERR_PTR(-EFAULT); + -+static int -+open_learn(struct inode *inode, struct file *file) -+{ -+ if (file->f_mode & FMODE_READ && gr_learn_attached) -+ return -EBUSY; -+ if (file->f_mode & FMODE_READ) { -+ int retval = 0; -+ mutex_lock(&gr_learn_user_mutex); -+ if (learn_buffer == NULL) -+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE); -+ if (learn_buffer_user == NULL) -+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE); -+ if (learn_buffer == NULL) { -+ retval = -ENOMEM; -+ goto out_error; -+ } -+ if (learn_buffer_user == NULL) { -+ retval = -ENOMEM; -+ goto out_error; -+ } -+ learn_buffer_len = 0; -+ learn_buffer_user_len = 0; -+ gr_learn_attached = 1; -+out_error: -+ mutex_unlock(&gr_learn_user_mutex); -+ return retval; ++ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2)) ++ return ERR_PTR(-EFAULT); ++ ++ if ((*(i_tmp + i_num))->iface == NULL) ++ continue; ++ ++ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ); ++ if (err) ++ return ERR_PTR(err); + } -+ return 0; ++ ++ s_tmp->ips = i_tmp; ++ ++insert: ++ if (!insert_name_entry(s_tmp->filename, s_tmp->inode, ++ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0)) ++ return ERR_PTR(-ENOMEM); ++ ++ return s_tmp; +} + +static int -+close_learn(struct inode *inode, struct file *file) ++copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role) +{ -+ if (file->f_mode & FMODE_READ) { -+ char *tmp = NULL; -+ mutex_lock(&gr_learn_user_mutex); -+ spin_lock(&gr_learn_lock); -+ tmp = learn_buffer; -+ learn_buffer = NULL; -+ spin_unlock(&gr_learn_lock); -+ if (tmp) -+ vfree(tmp); -+ if (learn_buffer_user != NULL) { -+ vfree(learn_buffer_user); -+ learn_buffer_user = NULL; -+ } -+ learn_buffer_len = 0; -+ learn_buffer_user_len = 0; -+ gr_learn_attached = 0; -+ mutex_unlock(&gr_learn_user_mutex); ++ struct acl_subject_label s_pre; ++ struct acl_subject_label * ret; ++ int err; ++ ++ while (userp) { ++ if (copy_acl_subject_label(&s_pre, userp)) ++ return -EFAULT; ++ ++ ret = do_copy_user_subj(userp, role, NULL); ++ ++ err = PTR_ERR(ret); ++ if (IS_ERR(ret)) ++ return err; ++ ++ insert_acl_subj_label(ret, role); ++ ++ userp = s_pre.prev; + } + + return 0; +} -+ -+const struct file_operations grsec_fops = { -+ .read = read_learn, -+ .write = write_grsec_handler, -+ .open = open_learn, -+ .release = close_learn, -+ .poll = poll_learn, -+}; -diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c -new file mode 100644 -index 0000000..39645c9 ---- /dev/null -+++ b/grsecurity/gracl_res.c -@@ -0,0 +1,68 @@ -+#include -+#include -+#include -+#include -+ -+static const char *restab_log[] = { -+ [RLIMIT_CPU] = "RLIMIT_CPU", -+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE", -+ [RLIMIT_DATA] = "RLIMIT_DATA", -+ [RLIMIT_STACK] = "RLIMIT_STACK", -+ [RLIMIT_CORE] = "RLIMIT_CORE", -+ [RLIMIT_RSS] = "RLIMIT_RSS", -+ [RLIMIT_NPROC] = "RLIMIT_NPROC", -+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE", -+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK", -+ [RLIMIT_AS] = "RLIMIT_AS", -+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS", -+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING", -+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE", -+ [RLIMIT_NICE] = "RLIMIT_NICE", -+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO", -+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME", -+ [GR_CRASH_RES] = "RLIMIT_CRASH" -+}; + -+void -+gr_log_resource(const struct task_struct *task, -+ const int res, const unsigned long wanted, const int gt) ++static int ++copy_user_acl(struct gr_arg *arg) +{ -+ const struct cred *cred; -+ unsigned long rlim; -+ -+ if (!gr_acl_is_enabled() && !grsec_resource_logging) -+ return; ++ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2; ++ struct acl_subject_label *subj_list; ++ struct sprole_pw *sptmp; ++ struct gr_hash_struct *ghash; ++ uid_t *domainlist; ++ unsigned int r_num; ++ int err = 0; ++ __u16 i; ++ __u32 num_subjs; + -+ // not yet supported resource -+ if (unlikely(!restab_log[res])) -+ return; ++ /* we need a default and kernel role */ ++ if (arg->role_db.num_roles < 2) ++ return -EINVAL; + -+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME) -+ rlim = task_rlimit_max(task, res); -+ else -+ rlim = task_rlimit(task, res); ++ /* copy special role authentication info from userspace */ + -+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim))) -+ return; ++ polstate->num_sprole_pws = arg->num_sprole_pws; ++ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *)); + -+ rcu_read_lock(); -+ cred = __task_cred(task); ++ if (!polstate->acl_special_roles && polstate->num_sprole_pws) ++ return -ENOMEM; + -+ if (res == RLIMIT_NPROC && -+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) || -+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE))) -+ goto out_rcu_unlock; -+ else if (res == RLIMIT_MEMLOCK && -+ cap_raised(cred->cap_effective, CAP_IPC_LOCK)) -+ goto out_rcu_unlock; -+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE)) -+ goto out_rcu_unlock; -+ rcu_read_unlock(); ++ for (i = 0; i < polstate->num_sprole_pws; i++) { ++ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw)); ++ if (!sptmp) ++ return -ENOMEM; ++ if (copy_sprole_pw(sptmp, i, arg->sprole_pws)) ++ return -EFAULT; + -+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim); ++ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN); ++ if (err) ++ return err; + -+ return; -+out_rcu_unlock: -+ rcu_read_unlock(); -+ return; -+} -diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c -new file mode 100644 -index 0000000..3c38bfe ---- /dev/null -+++ b/grsecurity/gracl_segv.c -@@ -0,0 +1,305 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE) -+#include -+#include -+#include "../fs/btrfs/async-thread.h" -+#include "../fs/btrfs/ctree.h" -+#include "../fs/btrfs/btrfs_inode.h" ++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG ++ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename); +#endif + -+static struct crash_uid *uid_set; -+static unsigned short uid_used; -+static DEFINE_SPINLOCK(gr_uid_lock); -+extern rwlock_t gr_inode_lock; -+extern struct acl_subject_label * -+ lookup_acl_subj_label(const ino_t inode, const dev_t dev, -+ struct acl_role_label *role); ++ polstate->acl_special_roles[i] = sptmp; ++ } + -+static inline dev_t __get_dev(const struct dentry *dentry) -+{ -+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE) -+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC) -+ return BTRFS_I(dentry->d_inode)->root->anon_dev; -+ else -+#endif -+ return dentry->d_sb->s_dev; -+} ++ r_utmp = (struct acl_role_label **) arg->role_db.r_table; + -+int -+gr_init_uidset(void) -+{ -+ uid_set = -+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL); -+ uid_used = 0; ++ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) { ++ r_tmp = acl_alloc(sizeof (struct acl_role_label)); + -+ return uid_set ? 1 : 0; -+} ++ if (!r_tmp) ++ return -ENOMEM; + -+void -+gr_free_uidset(void) -+{ -+ if (uid_set) -+ kfree(uid_set); ++ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp)) ++ return -EFAULT; + -+ return; -+} ++ if (copy_acl_role_label(r_tmp, r_utmp2)) ++ return -EFAULT; + -+int -+gr_find_uid(const uid_t uid) -+{ -+ struct crash_uid *tmp = uid_set; -+ uid_t buid; -+ int low = 0, high = uid_used - 1, mid; ++ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN); ++ if (err) ++ return err; + -+ while (high >= low) { -+ mid = (low + high) >> 1; -+ buid = tmp[mid].uid; -+ if (buid == uid) -+ return mid; -+ if (buid > uid) -+ high = mid - 1; -+ if (buid < uid) -+ low = mid + 1; -+ } ++ if (!strcmp(r_tmp->rolename, "default") ++ && (r_tmp->roletype & GR_ROLE_DEFAULT)) { ++ polstate->default_role = r_tmp; ++ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) { ++ polstate->kernel_role = r_tmp; ++ } + -+ return -1; -+} ++ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) ++ return -ENOMEM; + -+static __inline__ void -+gr_insertsort(void) -+{ -+ unsigned short i, j; -+ struct crash_uid index; ++ if (copy_gr_hash_struct(ghash, r_tmp->hash)) ++ return -EFAULT; + -+ for (i = 1; i < uid_used; i++) { -+ index = uid_set[i]; -+ j = i; -+ while ((j > 0) && uid_set[j - 1].uid > index.uid) { -+ uid_set[j] = uid_set[j - 1]; -+ j--; -+ } -+ uid_set[j] = index; -+ } ++ r_tmp->hash = ghash; + -+ return; -+} ++ num_subjs = count_user_subjs(r_tmp->hash->first); + -+static __inline__ void -+gr_insert_uid(const kuid_t kuid, const unsigned long expires) -+{ -+ int loc; -+ uid_t uid = GR_GLOBAL_UID(kuid); ++ r_tmp->subj_hash_size = num_subjs; ++ r_tmp->subj_hash = ++ (struct acl_subject_label **) ++ create_table(&(r_tmp->subj_hash_size), sizeof(void *)); + -+ if (uid_used == GR_UIDTABLE_MAX) -+ return; ++ if (!r_tmp->subj_hash) ++ return -ENOMEM; + -+ loc = gr_find_uid(uid); ++ err = copy_user_allowedips(r_tmp); ++ if (err) ++ return err; + -+ if (loc >= 0) { -+ uid_set[loc].expires = expires; -+ return; -+ } ++ /* copy domain info */ ++ if (r_tmp->domain_children != NULL) { ++ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t)); ++ if (domainlist == NULL) ++ return -ENOMEM; + -+ uid_set[uid_used].uid = uid; -+ uid_set[uid_used].expires = expires; -+ uid_used++; ++ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) ++ return -EFAULT; + -+ gr_insertsort(); ++ r_tmp->domain_children = domainlist; ++ } + -+ return; -+} ++ err = copy_user_transitions(r_tmp); ++ if (err) ++ return err; + -+void -+gr_remove_uid(const unsigned short loc) -+{ -+ unsigned short i; ++ memset(r_tmp->subj_hash, 0, ++ r_tmp->subj_hash_size * ++ sizeof (struct acl_subject_label *)); + -+ for (i = loc + 1; i < uid_used; i++) -+ uid_set[i - 1] = uid_set[i]; ++ /* acquire the list of subjects, then NULL out ++ the list prior to parsing the subjects for this role, ++ as during this parsing the list is replaced with a list ++ of *nested* subjects for the role ++ */ ++ subj_list = r_tmp->hash->first; + -+ uid_used--; ++ /* set nested subject list to null */ ++ r_tmp->hash->first = NULL; + -+ return; ++ err = copy_user_subjs(subj_list, r_tmp); ++ ++ if (err) ++ return err; ++ ++ insert_acl_role_label(r_tmp); ++ } ++ ++ if (polstate->default_role == NULL || polstate->kernel_role == NULL) ++ return -EINVAL; ++ ++ return err; +} + -+int -+gr_check_crash_uid(const kuid_t kuid) ++static int gracl_reload_apply_policies(void *reload) +{ -+ int loc; ++ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload; ++ struct task_struct *task, *task2; ++ struct acl_role_label *role, *rtmp; ++ struct acl_subject_label *subj; ++ const struct cred *cred; ++ int role_applied; + int ret = 0; -+ uid_t uid; + -+ if (unlikely(!gr_acl_is_enabled())) -+ return 0; ++ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state)); ++ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state)); + -+ uid = GR_GLOBAL_UID(kuid); ++ /* first make sure we'll be able to apply the new policy cleanly */ ++ do_each_thread(task2, task) { ++ if (task->exec_file == NULL) ++ continue; ++ role_applied = 0; ++ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) { ++ /* preserve special roles */ ++ FOR_EACH_ROLE_START(role) ++ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) { ++ rtmp = task->role; ++ task->role = role; ++ role_applied = 1; ++ break; ++ } ++ FOR_EACH_ROLE_END(role) ++ } ++ if (!role_applied) { ++ cred = __task_cred(task); ++ rtmp = task->role; ++ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid)); ++ } ++ /* this handles non-nested inherited subjects, nested subjects will still ++ be dropped currently */ ++ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename); ++ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL); ++ /* change the role back so that we've made no modifications to the policy */ ++ task->role = rtmp; ++ ++ if (subj == NULL || task->tmpacl == NULL) { ++ ret = -EINVAL; ++ goto out; ++ } ++ } while_each_thread(task2, task); + -+ spin_lock(&gr_uid_lock); -+ loc = gr_find_uid(uid); ++ /* now actually apply the policy */ + -+ if (loc < 0) -+ goto out_unlock; ++ do_each_thread(task2, task) { ++ if (task->exec_file) { ++ role_applied = 0; ++ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) { ++ /* preserve special roles */ ++ FOR_EACH_ROLE_START(role) ++ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) { ++ task->role = role; ++ role_applied = 1; ++ break; ++ } ++ FOR_EACH_ROLE_END(role) ++ } ++ if (!role_applied) { ++ cred = __task_cred(task); ++ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid)); ++ } ++ /* this handles non-nested inherited subjects, nested subjects will still ++ be dropped currently */ ++ if (!reload_state->oldmode && task->inherited) ++ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename); ++ else { ++ /* looked up and tagged to the task previously */ ++ subj = task->tmpacl; ++ } ++ /* subj will be non-null */ ++ __gr_apply_subject_to_task(polstate, task, subj); ++ if (reload_state->oldmode) { ++ task->acl_role_id = 0; ++ task->acl_sp_role = 0; ++ task->inherited = 0; ++ } ++ } else { ++ // it's a kernel process ++ task->role = polstate->kernel_role; ++ task->acl = polstate->kernel_role->root_label; ++#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN ++ task->acl->mode &= ~GR_PROCFIND; ++#endif ++ } ++ } while_each_thread(task2, task); + -+ if (time_before_eq(uid_set[loc].expires, get_seconds())) -+ gr_remove_uid(loc); -+ else -+ ret = 1; ++ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state)); ++ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state)); ++ ++out: + -+out_unlock: -+ spin_unlock(&gr_uid_lock); + return ret; +} + -+static __inline__ int -+proc_is_setxid(const struct cred *cred) ++static int gracl_reload(struct gr_arg *args, unsigned char oldmode) +{ -+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) || -+ !uid_eq(cred->uid, cred->fsuid)) -+ return 1; -+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) || -+ !gid_eq(cred->gid, cred->fsgid)) -+ return 1; ++ struct gr_reload_state new_reload_state = { }; ++ int err; + -+ return 0; -+} ++ new_reload_state.oldpolicy_ptr = polstate; ++ new_reload_state.oldalloc_ptr = current_alloc_state; ++ new_reload_state.oldmode = oldmode; + -+extern int gr_fake_force_sig(int sig, struct task_struct *t); ++ current_alloc_state = &new_reload_state.newalloc; ++ polstate = &new_reload_state.newpolicy; + -+void -+gr_handle_crash(struct task_struct *task, const int sig) -+{ -+ struct acl_subject_label *curr; -+ struct task_struct *tsk, *tsk2; -+ const struct cred *cred; -+ const struct cred *cred2; ++ /* everything relevant is now saved off, copy in the new policy */ ++ if (init_variables(args, true)) { ++ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION); ++ err = -ENOMEM; ++ goto error; ++ } + -+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL) -+ return; ++ err = copy_user_acl(args); ++ free_init_variables(); ++ if (err) ++ goto error; ++ /* the new policy is copied in, with the old policy available via saved_state ++ first go through applying roles, making sure to preserve special roles ++ then apply new subjects, making sure to preserve inherited and nested subjects, ++ though currently only inherited subjects will be preserved ++ */ ++ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL); ++ if (err) ++ goto error; + -+ if (unlikely(!gr_acl_is_enabled())) -+ return; ++ /* we've now applied the new policy, so restore the old policy state to free it */ ++ polstate = &new_reload_state.oldpolicy; ++ current_alloc_state = &new_reload_state.oldalloc; ++ free_variables(true); + -+ curr = task->acl; ++ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied ++ to running_polstate/current_alloc_state inside stop_machine ++ */ ++ err = 0; ++ goto out; ++error: ++ /* on error of loading the new policy, we'll just keep the previous ++ policy set around ++ */ ++ free_variables(true); + -+ if (!(curr->resmask & (1U << GR_CRASH_RES))) -+ return; ++ /* doesn't affect runtime, but maintains consistent state */ ++out: ++ polstate = new_reload_state.oldpolicy_ptr; ++ current_alloc_state = new_reload_state.oldalloc_ptr; + -+ if (time_before_eq(curr->expires, get_seconds())) { -+ curr->expires = 0; -+ curr->crashes = 0; -+ } ++ return err; ++} + -+ curr->crashes++; ++static int ++gracl_init(struct gr_arg *args) ++{ ++ int error = 0; + -+ if (!curr->expires) -+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max; ++ memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt)); ++ memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum)); + -+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) && -+ time_after(curr->expires, get_seconds())) { -+ rcu_read_lock(); -+ cred = __task_cred(task); -+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) { -+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max); -+ spin_lock(&gr_uid_lock); -+ gr_insert_uid(cred->uid, curr->expires); -+ spin_unlock(&gr_uid_lock); -+ curr->expires = 0; -+ curr->crashes = 0; -+ read_lock(&tasklist_lock); -+ do_each_thread(tsk2, tsk) { -+ cred2 = __task_cred(tsk); -+ if (tsk != task && uid_eq(cred2->uid, cred->uid)) -+ gr_fake_force_sig(SIGKILL, tsk); -+ } while_each_thread(tsk2, tsk); -+ read_unlock(&tasklist_lock); -+ } else { -+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max); -+ read_lock(&tasklist_lock); -+ read_lock(&grsec_exec_file_lock); -+ do_each_thread(tsk2, tsk) { -+ if (likely(tsk != task)) { -+ // if this thread has the same subject as the one that triggered -+ // RES_CRASH and it's the same binary, kill it -+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file)) -+ gr_fake_force_sig(SIGKILL, tsk); -+ } -+ } while_each_thread(tsk2, tsk); -+ read_unlock(&grsec_exec_file_lock); -+ read_unlock(&tasklist_lock); -+ } -+ rcu_read_unlock(); ++ if (init_variables(args, false)) { ++ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION); ++ error = -ENOMEM; ++ goto out; + } + -+ return; ++ error = copy_user_acl(args); ++ free_init_variables(); ++ if (error) ++ goto out; ++ ++ error = gr_set_acls(0); ++ if (error) ++ goto out; ++ ++ gr_enable_rbac_system(); ++ ++ return 0; ++ ++out: ++ free_variables(false); ++ return error; +} + -+int -+gr_check_crash_exec(const struct file *filp) ++static int ++lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt, ++ unsigned char **sum) +{ -+ struct acl_subject_label *curr; -+ -+ if (unlikely(!gr_acl_is_enabled())) -+ return 0; ++ struct acl_role_label *r; ++ struct role_allowed_ip *ipp; ++ struct role_transition *trans; ++ unsigned int i; ++ int found = 0; ++ u32 curr_ip = current->signal->curr_ip; + -+ read_lock(&gr_inode_lock); -+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino, -+ __get_dev(filp->f_path.dentry), -+ current->role); -+ read_unlock(&gr_inode_lock); ++ current->signal->saved_ip = curr_ip; + -+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) || -+ (!curr->crashes && !curr->expires)) -+ return 0; ++ /* check transition table */ + -+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) && -+ time_after(curr->expires, get_seconds())) -+ return 1; -+ else if (time_before_eq(curr->expires, get_seconds())) { -+ curr->crashes = 0; -+ curr->expires = 0; ++ for (trans = current->role->transitions; trans; trans = trans->next) { ++ if (!strcmp(rolename, trans->rolename)) { ++ found = 1; ++ break; ++ } + } + -+ return 0; -+} ++ if (!found) ++ return 0; + -+void -+gr_handle_alertkill(struct task_struct *task) -+{ -+ struct acl_subject_label *curracl; -+ __u32 curr_ip; -+ struct task_struct *p, *p2; ++ /* handle special roles that do not require authentication ++ and check ip */ + -+ if (unlikely(!gr_acl_is_enabled())) -+ return; ++ FOR_EACH_ROLE_START(r) ++ if (!strcmp(rolename, r->rolename) && ++ (r->roletype & GR_ROLE_SPECIAL)) { ++ found = 0; ++ if (r->allowed_ips != NULL) { ++ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) { ++ if ((ntohl(curr_ip) & ipp->netmask) == ++ (ntohl(ipp->addr) & ipp->netmask)) ++ found = 1; ++ } ++ } else ++ found = 2; ++ if (!found) ++ return 0; + -+ curracl = task->acl; -+ curr_ip = task->signal->curr_ip; ++ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) || ++ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) { ++ *salt = NULL; ++ *sum = NULL; ++ return 1; ++ } ++ } ++ FOR_EACH_ROLE_END(r) + -+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) { -+ read_lock(&tasklist_lock); -+ do_each_thread(p2, p) { -+ if (p->signal->curr_ip == curr_ip) -+ gr_fake_force_sig(SIGKILL, p); -+ } while_each_thread(p2, p); -+ read_unlock(&tasklist_lock); -+ } else if (curracl->mode & GR_KILLPROC) -+ gr_fake_force_sig(SIGKILL, task); ++ for (i = 0; i < polstate->num_sprole_pws; i++) { ++ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) { ++ *salt = polstate->acl_special_roles[i]->salt; ++ *sum = polstate->acl_special_roles[i]->sum; ++ return 1; ++ } ++ } + -+ return; ++ return 0; +} -diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c -new file mode 100644 -index 0000000..98011b0 ---- /dev/null -+++ b/grsecurity/gracl_shm.c -@@ -0,0 +1,40 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include + -+int -+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid, -+ const time_t shm_createtime, const kuid_t cuid, const int shmid) ++int gr_check_secure_terminal(struct task_struct *task) +{ -+ struct task_struct *task; ++ struct task_struct *p, *p2, *p3; ++ struct files_struct *files; ++ struct fdtable *fdt; ++ struct file *our_file = NULL, *file; ++ int i; + -+ if (!gr_acl_is_enabled()) ++ if (task->signal->tty == NULL) + return 1; + -+ rcu_read_lock(); -+ read_lock(&tasklist_lock); -+ -+ task = find_task_by_vpid(shm_cprid); ++ files = get_files_struct(task); ++ if (files != NULL) { ++ rcu_read_lock(); ++ fdt = files_fdtable(files); ++ for (i=0; i < fdt->max_fds; i++) { ++ file = fcheck_files(files, i); ++ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) { ++ get_file(file); ++ our_file = file; ++ } ++ } ++ rcu_read_unlock(); ++ put_files_struct(files); ++ } + -+ if (unlikely(!task)) -+ task = find_task_by_vpid(shm_lapid); ++ if (our_file == NULL) ++ return 1; + -+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) || -+ (task_pid_nr(task) == shm_lapid)) && -+ (task->acl->mode & GR_PROTSHM) && -+ (task->acl != current->acl))) { -+ read_unlock(&tasklist_lock); ++ read_lock(&tasklist_lock); ++ do_each_thread(p2, p) { ++ files = get_files_struct(p); ++ if (files == NULL || ++ (p->signal && p->signal->tty == task->signal->tty)) { ++ if (files != NULL) ++ put_files_struct(files); ++ continue; ++ } ++ rcu_read_lock(); ++ fdt = files_fdtable(files); ++ for (i=0; i < fdt->max_fds; i++) { ++ file = fcheck_files(files, i); ++ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) && ++ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) { ++ p3 = task; ++ while (task_pid_nr(p3) > 0) { ++ if (p3 == p) ++ break; ++ p3 = p3->real_parent; ++ } ++ if (p3 == p) ++ break; ++ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p); ++ gr_handle_alertkill(p); ++ rcu_read_unlock(); ++ put_files_struct(files); ++ read_unlock(&tasklist_lock); ++ fput(our_file); ++ return 0; ++ } ++ } + rcu_read_unlock(); -+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid); -+ return 0; -+ } ++ put_files_struct(files); ++ } while_each_thread(p2, p); + read_unlock(&tasklist_lock); -+ rcu_read_unlock(); + ++ fput(our_file); + return 1; +} -diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c -new file mode 100644 -index 0000000..bc0be01 ---- /dev/null -+++ b/grsecurity/grsec_chdir.c -@@ -0,0 +1,19 @@ -+#include -+#include -+#include -+#include -+#include -+#include + -+void -+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt) ++ssize_t ++write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos) +{ -+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR -+ if ((grsec_enable_chdir && grsec_enable_group && -+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir && -+ !grsec_enable_group)) { -+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt); -+ } -+#endif -+ return; -+} -diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c -new file mode 100644 -index 0000000..bd6e105 ---- /dev/null -+++ b/grsecurity/grsec_chroot.c -@@ -0,0 +1,370 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "../fs/mount.h" -+#include -+#include ++ struct gr_arg_wrapper uwrap; ++ unsigned char *sprole_salt = NULL; ++ unsigned char *sprole_sum = NULL; ++ int error = 0; ++ int error2 = 0; ++ size_t req_count = 0; ++ unsigned char oldmode = 0; + -+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD -+static int gr_init_ran; -+#endif ++ mutex_lock(&gr_dev_mutex); + -+void gr_set_chroot_entries(struct task_struct *task, const struct path *path) -+{ -+#ifdef CONFIG_GRKERNSEC -+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry && -+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root -+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD -+ && gr_init_ran -+#endif -+ ) -+ task->gr_is_chrooted = 1; -+ else { -+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD -+ if (task_pid_nr(task) == 1 && !gr_init_ran) -+ gr_init_ran = 1; -+#endif -+ task->gr_is_chrooted = 0; -+ } ++ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) { ++ error = -EPERM; ++ goto out; ++ } + -+ task->gr_chroot_dentry = path->dentry; ++#ifdef CONFIG_COMPAT ++ pax_open_kernel(); ++ if (is_compat_task()) { ++ copy_gr_arg_wrapper = ©_gr_arg_wrapper_compat; ++ copy_gr_arg = ©_gr_arg_compat; ++ copy_acl_object_label = ©_acl_object_label_compat; ++ copy_acl_subject_label = ©_acl_subject_label_compat; ++ copy_acl_role_label = ©_acl_role_label_compat; ++ copy_acl_ip_label = ©_acl_ip_label_compat; ++ copy_role_allowed_ip = ©_role_allowed_ip_compat; ++ copy_role_transition = ©_role_transition_compat; ++ copy_sprole_pw = ©_sprole_pw_compat; ++ copy_gr_hash_struct = ©_gr_hash_struct_compat; ++ copy_pointer_from_array = ©_pointer_from_array_compat; ++ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat; ++ } else { ++ copy_gr_arg_wrapper = ©_gr_arg_wrapper_normal; ++ copy_gr_arg = ©_gr_arg_normal; ++ copy_acl_object_label = ©_acl_object_label_normal; ++ copy_acl_subject_label = ©_acl_subject_label_normal; ++ copy_acl_role_label = ©_acl_role_label_normal; ++ copy_acl_ip_label = ©_acl_ip_label_normal; ++ copy_role_allowed_ip = ©_role_allowed_ip_normal; ++ copy_role_transition = ©_role_transition_normal; ++ copy_sprole_pw = ©_sprole_pw_normal; ++ copy_gr_hash_struct = ©_gr_hash_struct_normal; ++ copy_pointer_from_array = ©_pointer_from_array_normal; ++ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal; ++ } ++ pax_close_kernel(); +#endif -+ return; -+} + -+void gr_clear_chroot_entries(struct task_struct *task) -+{ -+#ifdef CONFIG_GRKERNSEC -+ task->gr_is_chrooted = 0; -+ task->gr_chroot_dentry = NULL; -+#endif -+ return; -+} ++ req_count = get_gr_arg_wrapper_size(); + -+int -+gr_handle_chroot_unix(const pid_t pid) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX -+ struct task_struct *p; ++ if (count != req_count) { ++ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count); ++ error = -EINVAL; ++ goto out; ++ } + -+ if (unlikely(!grsec_enable_chroot_unix)) -+ return 1; ++ ++ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) { ++ gr_auth_expires = 0; ++ gr_auth_attempts = 0; ++ } + -+ if (likely(!proc_is_chrooted(current))) -+ return 1; ++ error = copy_gr_arg_wrapper(buf, &uwrap); ++ if (error) ++ goto out; + -+ rcu_read_lock(); -+ read_lock(&tasklist_lock); -+ p = find_task_by_vpid_unrestricted(pid); -+ if (unlikely(p && !have_same_root(current, p))) { -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); -+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG); -+ return 0; -+ } -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); -+#endif -+ return 1; -+} ++ error = copy_gr_arg(uwrap.arg, &gr_usermode); ++ if (error) ++ goto out; + -+int -+gr_handle_chroot_nice(void) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE -+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) { -+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG); -+ return -EPERM; ++ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM && ++ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES && ++ time_after(gr_auth_expires, get_seconds())) { ++ error = -EBUSY; ++ goto out; + } -+#endif -+ return 0; -+} + -+int -+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE -+ if (grsec_enable_chroot_nice && (niceval < task_nice(p)) -+ && proc_is_chrooted(current)) { -+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p)); -+ return -EACCES; ++ /* if non-root trying to do anything other than use a special role, ++ do not attempt authentication, do not count towards authentication ++ locking ++ */ ++ ++ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS && ++ gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM && ++ gr_is_global_nonroot(current_uid())) { ++ error = -EPERM; ++ goto out; + } -+#endif -+ return 0; -+} + -+int -+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK -+ struct task_struct *p; -+ int ret = 0; -+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid) -+ return ret; ++ /* ensure pw and special role name are null terminated */ + -+ read_lock(&tasklist_lock); -+ do_each_pid_task(pid, type, p) { -+ if (!have_same_root(current, p)) { -+ ret = 1; ++ gr_usermode.pw[GR_PW_LEN - 1] = '\0'; ++ gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0'; ++ ++ /* Okay. ++ * We have our enough of the argument structure..(we have yet ++ * to copy_from_user the tables themselves) . Copy the tables ++ * only if we need them, i.e. for loading operations. */ ++ ++ switch (gr_usermode.mode) { ++ case GR_STATUS: ++ if (gr_acl_is_enabled()) { ++ error = 1; ++ if (!gr_check_secure_terminal(current)) ++ error = 3; ++ } else ++ error = 2; + goto out; ++ case GR_SHUTDOWN: ++ if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) { ++ stop_machine(gr_rbac_disable, NULL, NULL); ++ free_variables(false); ++ memset(&gr_usermode, 0, sizeof(gr_usermode)); ++ memset(&gr_system_salt, 0, sizeof(gr_system_salt)); ++ memset(&gr_system_sum, 0, sizeof(gr_system_sum)); ++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG); ++ } else if (gr_acl_is_enabled()) { ++ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG); ++ error = -EPERM; ++ } else { ++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG); ++ error = -EAGAIN; ++ } ++ break; ++ case GR_ENABLE: ++ if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode))) ++ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION); ++ else { ++ if (gr_acl_is_enabled()) ++ error = -EAGAIN; ++ else ++ error = error2; ++ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION); ++ } ++ break; ++ case GR_OLDRELOAD: ++ oldmode = 1; ++ case GR_RELOAD: ++ if (!gr_acl_is_enabled()) { ++ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION); ++ error = -EAGAIN; ++ } else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) { ++ error2 = gracl_reload(&gr_usermode, oldmode); ++ if (!error2) ++ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION); ++ else { ++ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION); ++ error = error2; ++ } ++ } else { ++ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION); ++ error = -EPERM; ++ } ++ break; ++ case GR_SEGVMOD: ++ if (unlikely(!gr_acl_is_enabled())) { ++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG); ++ error = -EAGAIN; ++ break; + } -+ } while_each_pid_task(pid, type, p); -+out: -+ read_unlock(&tasklist_lock); -+ return ret; -+#endif -+ return 0; -+} + -+int -+gr_pid_is_chrooted(struct task_struct *p) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK -+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL) -+ return 0; ++ if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) { ++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG); ++ if (gr_usermode.segv_device && gr_usermode.segv_inode) { ++ struct acl_subject_label *segvacl; ++ segvacl = ++ lookup_acl_subj_label(gr_usermode.segv_inode, ++ gr_usermode.segv_device, ++ current->role); ++ if (segvacl) { ++ segvacl->crashes = 0; ++ segvacl->expires = 0; ++ } ++ } else if (gr_find_uid(gr_usermode.segv_uid) >= 0) { ++ gr_remove_uid(gr_usermode.segv_uid); ++ } ++ } else { ++ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG); ++ error = -EPERM; ++ } ++ break; ++ case GR_SPROLE: ++ case GR_SPROLEPAM: ++ if (unlikely(!gr_acl_is_enabled())) { ++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG); ++ error = -EAGAIN; ++ break; ++ } + -+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) || -+ !have_same_root(current, p)) { -+ return 1; -+ } -+#endif -+ return 0; -+} ++ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) { ++ current->role->expires = 0; ++ current->role->auth_attempts = 0; ++ } + -+EXPORT_SYMBOL(gr_pid_is_chrooted); ++ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES && ++ time_after(current->role->expires, get_seconds())) { ++ error = -EBUSY; ++ goto out; ++ } + -+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR) -+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt) -+{ -+ struct path path, currentroot; -+ int ret = 0; ++ if (lookup_special_role_auth ++ (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum) ++ && ((!sprole_salt && !sprole_sum) ++ || !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) { ++ char *p = ""; ++ assign_special_role(gr_usermode.sp_role); ++ read_lock(&tasklist_lock); ++ if (current->real_parent) ++ p = current->real_parent->role->rolename; ++ read_unlock(&tasklist_lock); ++ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG, ++ p, acl_sp_role_value); ++ } else { ++ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role); ++ error = -EPERM; ++ if(!(current->role->auth_attempts++)) ++ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT; + -+ path.dentry = (struct dentry *)u_dentry; -+ path.mnt = (struct vfsmount *)u_mnt; -+ get_fs_root(current->fs, ¤troot); -+ if (path_is_under(&path, ¤troot)) -+ ret = 1; -+ path_put(¤troot); ++ goto out; ++ } ++ break; ++ case GR_UNSPROLE: ++ if (unlikely(!gr_acl_is_enabled())) { ++ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG); ++ error = -EAGAIN; ++ break; ++ } + -+ return ret; -+} -+#endif ++ if (current->role->roletype & GR_ROLE_SPECIAL) { ++ char *p = ""; ++ int i = 0; + -+int -+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR -+ if (!grsec_enable_chroot_fchdir) -+ return 1; ++ read_lock(&tasklist_lock); ++ if (current->real_parent) { ++ p = current->real_parent->role->rolename; ++ i = current->real_parent->acl_role_id; ++ } ++ read_unlock(&tasklist_lock); + -+ if (!proc_is_chrooted(current)) -+ return 1; -+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) { -+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt); -+ return 0; ++ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i); ++ gr_set_acls(1); ++ } else { ++ error = -EPERM; ++ goto out; ++ } ++ break; ++ default: ++ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode); ++ error = -EINVAL; ++ break; + } -+#endif -+ return 1; ++ ++ if (error != -EPERM) ++ goto out; ++ ++ if(!(gr_auth_attempts++)) ++ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT; ++ ++ out: ++ mutex_unlock(&gr_dev_mutex); ++ ++ if (!error) ++ error = req_count; ++ ++ return error; +} + +int -+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid, -+ const time_t shm_createtime) ++gr_set_acls(const int type) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT -+ struct task_struct *p; -+ time_t starttime; -+ -+ if (unlikely(!grsec_enable_chroot_shmat)) -+ return 1; -+ -+ if (likely(!proc_is_chrooted(current))) -+ return 1; ++ struct task_struct *task, *task2; ++ struct acl_role_label *role = current->role; ++ struct acl_subject_label *subj; ++ __u16 acl_role_id = current->acl_role_id; ++ const struct cred *cred; ++ int ret; + + rcu_read_lock(); + read_lock(&tasklist_lock); ++ read_lock(&grsec_exec_file_lock); ++ do_each_thread(task2, task) { ++ /* check to see if we're called from the exit handler, ++ if so, only replace ACLs that have inherited the admin ++ ACL */ + -+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) { -+ starttime = p->start_time.tv_sec; -+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) { -+ if (have_same_root(current, p)) { -+ goto allow; -+ } else { ++ if (type && (task->role != role || ++ task->acl_role_id != acl_role_id)) ++ continue; ++ ++ task->acl_role_id = 0; ++ task->acl_sp_role = 0; ++ task->inherited = 0; ++ ++ if (task->exec_file) { ++ cred = __task_cred(task); ++ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid)); ++ subj = __gr_get_subject_for_task(polstate, task, NULL); ++ if (subj == NULL) { ++ ret = -EINVAL; ++ read_unlock(&grsec_exec_file_lock); + read_unlock(&tasklist_lock); + rcu_read_unlock(); -+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); -+ return 0; ++ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task)); ++ return ret; + } ++ __gr_apply_subject_to_task(polstate, task, subj); ++ } else { ++ // it's a kernel process ++ task->role = polstate->kernel_role; ++ task->acl = polstate->kernel_role->root_label; ++#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN ++ task->acl->mode &= ~GR_PROCFIND; ++#endif + } -+ /* creator exited, pid reuse, fall through to next check */ -+ } -+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) { -+ if (unlikely(!have_same_root(current, p))) { -+ read_unlock(&tasklist_lock); -+ rcu_read_unlock(); -+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); -+ return 0; -+ } -+ } -+ -+allow: ++ } while_each_thread(task2, task); ++ read_unlock(&grsec_exec_file_lock); + read_unlock(&tasklist_lock); + rcu_read_unlock(); -+#endif -+ return 1; ++ ++ return 0; +} +diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c +new file mode 100644 +index 0000000..39645c9 +--- /dev/null ++++ b/grsecurity/gracl_res.c +@@ -0,0 +1,68 @@ ++#include ++#include ++#include ++#include ++ ++static const char *restab_log[] = { ++ [RLIMIT_CPU] = "RLIMIT_CPU", ++ [RLIMIT_FSIZE] = "RLIMIT_FSIZE", ++ [RLIMIT_DATA] = "RLIMIT_DATA", ++ [RLIMIT_STACK] = "RLIMIT_STACK", ++ [RLIMIT_CORE] = "RLIMIT_CORE", ++ [RLIMIT_RSS] = "RLIMIT_RSS", ++ [RLIMIT_NPROC] = "RLIMIT_NPROC", ++ [RLIMIT_NOFILE] = "RLIMIT_NOFILE", ++ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK", ++ [RLIMIT_AS] = "RLIMIT_AS", ++ [RLIMIT_LOCKS] = "RLIMIT_LOCKS", ++ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING", ++ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE", ++ [RLIMIT_NICE] = "RLIMIT_NICE", ++ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO", ++ [RLIMIT_RTTIME] = "RLIMIT_RTTIME", ++ [GR_CRASH_RES] = "RLIMIT_CRASH" ++}; + +void -+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt) ++gr_log_resource(const struct task_struct *task, ++ const int res, const unsigned long wanted, const int gt) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG -+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current)) -+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt); -+#endif ++ const struct cred *cred; ++ unsigned long rlim; ++ ++ if (!gr_acl_is_enabled() && !grsec_resource_logging) ++ return; ++ ++ // not yet supported resource ++ if (unlikely(!restab_log[res])) ++ return; ++ ++ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME) ++ rlim = task_rlimit_max(task, res); ++ else ++ rlim = task_rlimit(task, res); ++ ++ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim))) ++ return; ++ ++ rcu_read_lock(); ++ cred = __task_cred(task); ++ ++ if (res == RLIMIT_NPROC && ++ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) || ++ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE))) ++ goto out_rcu_unlock; ++ else if (res == RLIMIT_MEMLOCK && ++ cap_raised(cred->cap_effective, CAP_IPC_LOCK)) ++ goto out_rcu_unlock; ++ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE)) ++ goto out_rcu_unlock; ++ rcu_read_unlock(); ++ ++ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim); ++ ++ return; ++out_rcu_unlock: ++ rcu_read_unlock(); + return; +} -+ -+int -+gr_handle_chroot_mknod(const struct dentry *dentry, -+ const struct vfsmount *mnt, const int mode) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD -+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) && -+ proc_is_chrooted(current)) { -+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt); -+ return -EPERM; -+ } +diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c +new file mode 100644 +index 0000000..2040e61 +--- /dev/null ++++ b/grsecurity/gracl_segv.c +@@ -0,0 +1,313 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE) ++#include ++#include ++#include "../fs/btrfs/async-thread.h" ++#include "../fs/btrfs/ctree.h" ++#include "../fs/btrfs/btrfs_inode.h" +#endif -+ return 0; -+} + -+int -+gr_handle_chroot_mount(const struct dentry *dentry, -+ const struct vfsmount *mnt, const char *dev_name) ++static struct crash_uid *uid_set; ++static unsigned short uid_used; ++static DEFINE_SPINLOCK(gr_uid_lock); ++extern rwlock_t gr_inode_lock; ++extern struct acl_subject_label * ++ lookup_acl_subj_label(const ino_t inode, const dev_t dev, ++ struct acl_role_label *role); ++ ++static inline dev_t __get_dev(const struct dentry *dentry) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT -+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) { -+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt); -+ return -EPERM; -+ } ++#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE) ++ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC) ++ return BTRFS_I(dentry->d_inode)->root->anon_dev; ++ else +#endif -+ return 0; ++ return dentry->d_sb->s_dev; +} + +int -+gr_handle_chroot_pivot(void) ++gr_init_uidset(void) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT -+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) { -+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG); -+ return -EPERM; -+ } -+#endif -+ return 0; ++ uid_set = ++ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL); ++ uid_used = 0; ++ ++ return uid_set ? 1 : 0; +} + -+int -+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt) ++void ++gr_free_uidset(void) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE -+ if (grsec_enable_chroot_double && proc_is_chrooted(current) && -+ !gr_is_outside_chroot(dentry, mnt)) { -+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt); -+ return -EPERM; ++ if (uid_set) { ++ struct crash_uid *tmpset; ++ spin_lock(&gr_uid_lock); ++ tmpset = uid_set; ++ uid_set = NULL; ++ uid_used = 0; ++ spin_unlock(&gr_uid_lock); ++ if (tmpset) ++ kfree(tmpset); + } -+#endif -+ return 0; -+} + -+extern const char *captab_log[]; -+extern int captab_log_entries; ++ return; ++} + +int -+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap) ++gr_find_uid(const uid_t uid) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS -+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) { -+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS; -+ if (cap_raised(chroot_caps, cap)) { -+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) { -+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]); -+ } -+ return 0; -+ } ++ struct crash_uid *tmp = uid_set; ++ uid_t buid; ++ int low = 0, high = uid_used - 1, mid; ++ ++ while (high >= low) { ++ mid = (low + high) >> 1; ++ buid = tmp[mid].uid; ++ if (buid == uid) ++ return mid; ++ if (buid > uid) ++ high = mid - 1; ++ if (buid < uid) ++ low = mid + 1; + } -+#endif -+ return 1; -+} + -+int -+gr_chroot_is_capable(const int cap) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS -+ return gr_task_chroot_is_capable(current, current_cred(), cap); -+#endif -+ return 1; ++ return -1; +} + -+int -+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap) ++static __inline__ void ++gr_insertsort(void) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS -+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) { -+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS; -+ if (cap_raised(chroot_caps, cap)) { -+ return 0; ++ unsigned short i, j; ++ struct crash_uid index; ++ ++ for (i = 1; i < uid_used; i++) { ++ index = uid_set[i]; ++ j = i; ++ while ((j > 0) && uid_set[j - 1].uid > index.uid) { ++ uid_set[j] = uid_set[j - 1]; ++ j--; + } ++ uid_set[j] = index; + } -+#endif -+ return 1; -+} + -+int -+gr_chroot_is_capable_nolog(const int cap) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS -+ return gr_task_chroot_is_capable_nolog(current, cap); -+#endif -+ return 1; ++ return; +} + -+int -+gr_handle_chroot_sysctl(const int op) ++static __inline__ void ++gr_insert_uid(const kuid_t kuid, const unsigned long expires) +{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL -+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) && -+ proc_is_chrooted(current)) -+ return -EACCES; -+#endif -+ return 0; -+} ++ int loc; ++ uid_t uid = GR_GLOBAL_UID(kuid); + -+void -+gr_handle_chroot_chdir(const struct path *path) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR -+ if (grsec_enable_chroot_chdir) -+ set_fs_pwd(current->fs, path); -+#endif -+ return; -+} ++ if (uid_used == GR_UIDTABLE_MAX) ++ return; + -+int -+gr_handle_chroot_chmod(const struct dentry *dentry, -+ const struct vfsmount *mnt, const int mode) -+{ -+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD -+ /* allow chmod +s on directories, but not files */ -+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) && -+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) && -+ proc_is_chrooted(current)) { -+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt); -+ return -EPERM; ++ loc = gr_find_uid(uid); ++ ++ if (loc >= 0) { ++ uid_set[loc].expires = expires; ++ return; + } -+#endif -+ return 0; -+} -diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c -new file mode 100644 -index 0000000..ce65ceb ---- /dev/null -+++ b/grsecurity/grsec_disabled.c -@@ -0,0 +1,434 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include + -+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS -+void -+pax_set_initial_flags(struct linux_binprm *bprm) -+{ ++ uid_set[uid_used].uid = uid; ++ uid_set[uid_used].expires = expires; ++ uid_used++; ++ ++ gr_insertsort(); ++ + return; +} -+#endif + -+#ifdef CONFIG_SYSCTL -+__u32 -+gr_handle_sysctl(const struct ctl_table * table, const int op) ++void ++gr_remove_uid(const unsigned short loc) +{ -+ return 0; -+} -+#endif ++ unsigned short i; + -+#ifdef CONFIG_TASKSTATS -+int gr_is_taskstats_denied(int pid) -+{ -+ return 0; -+} -+#endif ++ for (i = loc + 1; i < uid_used; i++) ++ uid_set[i - 1] = uid_set[i]; + -+int -+gr_acl_is_enabled(void) -+{ -+ return 0; -+} ++ uid_used--; + -+void -+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode) -+{ + return; +} + +int -+gr_handle_rawio(const struct inode *inode) ++gr_check_crash_uid(const kuid_t kuid) +{ -+ return 0; -+} ++ int loc; ++ int ret = 0; ++ uid_t uid; + -+void -+gr_acl_handle_psacct(struct task_struct *task, const long code) -+{ -+ return; -+} ++ if (unlikely(!gr_acl_is_enabled())) ++ return 0; + -+int -+gr_handle_ptrace(struct task_struct *task, const long request) -+{ -+ return 0; -+} ++ uid = GR_GLOBAL_UID(kuid); + -+int -+gr_handle_proc_ptrace(struct task_struct *task) -+{ -+ return 0; -+} ++ spin_lock(&gr_uid_lock); ++ loc = gr_find_uid(uid); + -+int -+gr_set_acls(const int type) -+{ -+ return 0; -+} ++ if (loc < 0) ++ goto out_unlock; + -+int -+gr_check_hidden_task(const struct task_struct *tsk) -+{ -+ return 0; -+} ++ if (time_before_eq(uid_set[loc].expires, get_seconds())) ++ gr_remove_uid(loc); ++ else ++ ret = 1; + -+int -+gr_check_protected_task(const struct task_struct *task) -+{ -+ return 0; ++out_unlock: ++ spin_unlock(&gr_uid_lock); ++ return ret; +} + -+int -+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) ++static __inline__ int ++proc_is_setxid(const struct cred *cred) +{ ++ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) || ++ !uid_eq(cred->uid, cred->fsuid)) ++ return 1; ++ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) || ++ !gid_eq(cred->gid, cred->fsgid)) ++ return 1; ++ + return 0; +} + -+void -+gr_copy_label(struct task_struct *tsk) -+{ -+ return; -+} ++extern int gr_fake_force_sig(int sig, struct task_struct *t); + +void -+gr_set_pax_flags(struct task_struct *task) ++gr_handle_crash(struct task_struct *task, const int sig) +{ -+ return; -+} ++ struct acl_subject_label *curr; ++ struct task_struct *tsk, *tsk2; ++ const struct cred *cred; ++ const struct cred *cred2; + -+int -+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt, -+ const int unsafe_share) -+{ -+ return 0; -+} ++ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL) ++ return; + -+void -+gr_handle_delete(const ino_t ino, const dev_t dev) -+{ -+ return; -+} ++ if (unlikely(!gr_acl_is_enabled())) ++ return; + -+void -+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt) -+{ -+ return; -+} ++ curr = task->acl; ++ ++ if (!(curr->resmask & (1U << GR_CRASH_RES))) ++ return; ++ ++ if (time_before_eq(curr->expires, get_seconds())) { ++ curr->expires = 0; ++ curr->crashes = 0; ++ } ++ ++ curr->crashes++; ++ ++ if (!curr->expires) ++ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max; ++ ++ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) && ++ time_after(curr->expires, get_seconds())) { ++ rcu_read_lock(); ++ cred = __task_cred(task); ++ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) { ++ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max); ++ spin_lock(&gr_uid_lock); ++ gr_insert_uid(cred->uid, curr->expires); ++ spin_unlock(&gr_uid_lock); ++ curr->expires = 0; ++ curr->crashes = 0; ++ read_lock(&tasklist_lock); ++ do_each_thread(tsk2, tsk) { ++ cred2 = __task_cred(tsk); ++ if (tsk != task && uid_eq(cred2->uid, cred->uid)) ++ gr_fake_force_sig(SIGKILL, tsk); ++ } while_each_thread(tsk2, tsk); ++ read_unlock(&tasklist_lock); ++ } else { ++ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max); ++ read_lock(&tasklist_lock); ++ read_lock(&grsec_exec_file_lock); ++ do_each_thread(tsk2, tsk) { ++ if (likely(tsk != task)) { ++ // if this thread has the same subject as the one that triggered ++ // RES_CRASH and it's the same binary, kill it ++ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file)) ++ gr_fake_force_sig(SIGKILL, tsk); ++ } ++ } while_each_thread(tsk2, tsk); ++ read_unlock(&grsec_exec_file_lock); ++ read_unlock(&tasklist_lock); ++ } ++ rcu_read_unlock(); ++ } + -+void -+gr_handle_crash(struct task_struct *task, const int sig) -+{ + return; +} + +int +gr_check_crash_exec(const struct file *filp) +{ -+ return 0; -+} ++ struct acl_subject_label *curr; + -+int -+gr_check_crash_uid(const kuid_t uid) -+{ -+ return 0; -+} ++ if (unlikely(!gr_acl_is_enabled())) ++ return 0; + -+void -+gr_handle_rename(struct inode *old_dir, struct inode *new_dir, -+ struct dentry *old_dentry, -+ struct dentry *new_dentry, -+ struct vfsmount *mnt, const __u8 replace) -+{ -+ return; -+} ++ read_lock(&gr_inode_lock); ++ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino, ++ __get_dev(filp->f_path.dentry), ++ current->role); ++ read_unlock(&gr_inode_lock); + -+int -+gr_search_socket(const int family, const int type, const int protocol) -+{ -+ return 1; -+} ++ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) || ++ (!curr->crashes && !curr->expires)) ++ return 0; ++ ++ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) && ++ time_after(curr->expires, get_seconds())) ++ return 1; ++ else if (time_before_eq(curr->expires, get_seconds())) { ++ curr->crashes = 0; ++ curr->expires = 0; ++ } + -+int -+gr_search_connectbind(const int mode, const struct socket *sock, -+ const struct sockaddr_in *addr) -+{ + return 0; +} + +void +gr_handle_alertkill(struct task_struct *task) +{ -+ return; -+} -+ -+__u32 -+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt) -+{ -+ return 1; -+} ++ struct acl_subject_label *curracl; ++ __u32 curr_ip; ++ struct task_struct *p, *p2; + -+__u32 -+gr_acl_handle_hidden_file(const struct dentry * dentry, -+ const struct vfsmount * mnt) -+{ -+ return 1; -+} ++ if (unlikely(!gr_acl_is_enabled())) ++ return; + -+__u32 -+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt, -+ int acc_mode) -+{ -+ return 1; -+} ++ curracl = task->acl; ++ curr_ip = task->signal->curr_ip; + -+__u32 -+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt) -+{ -+ return 1; -+} ++ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) { ++ read_lock(&tasklist_lock); ++ do_each_thread(p2, p) { ++ if (p->signal->curr_ip == curr_ip) ++ gr_fake_force_sig(SIGKILL, p); ++ } while_each_thread(p2, p); ++ read_unlock(&tasklist_lock); ++ } else if (curracl->mode & GR_KILLPROC) ++ gr_fake_force_sig(SIGKILL, task); + -+__u32 -+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt) -+{ -+ return 1; ++ return; +} +diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c +new file mode 100644 +index 0000000..98011b0 +--- /dev/null ++++ b/grsecurity/gracl_shm.c +@@ -0,0 +1,40 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + +int -+gr_acl_handle_mmap(const struct file *file, const unsigned long prot, -+ unsigned int *vm_flags) ++gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid, ++ const time_t shm_createtime, const kuid_t cuid, const int shmid) +{ -+ return 1; -+} ++ struct task_struct *task; + -+__u32 -+gr_acl_handle_truncate(const struct dentry * dentry, -+ const struct vfsmount * mnt) -+{ -+ return 1; -+} ++ if (!gr_acl_is_enabled()) ++ return 1; + -+__u32 -+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt) -+{ -+ return 1; -+} ++ rcu_read_lock(); ++ read_lock(&tasklist_lock); + -+__u32 -+gr_acl_handle_access(const struct dentry * dentry, -+ const struct vfsmount * mnt, const int fmode) -+{ -+ return 1; -+} ++ task = find_task_by_vpid(shm_cprid); + -+__u32 -+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt, -+ umode_t *mode) -+{ -+ return 1; -+} ++ if (unlikely(!task)) ++ task = find_task_by_vpid(shm_lapid); + -+__u32 -+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt) -+{ -+ return 1; -+} ++ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) || ++ (task_pid_nr(task) == shm_lapid)) && ++ (task->acl->mode & GR_PROTSHM) && ++ (task->acl != current->acl))) { ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); ++ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid); ++ return 0; ++ } ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); + -+__u32 -+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt) -+{ + return 1; +} +diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c +new file mode 100644 +index 0000000..bc0be01 +--- /dev/null ++++ b/grsecurity/grsec_chdir.c +@@ -0,0 +1,19 @@ ++#include ++#include ++#include ++#include ++#include ++#include + +void -+grsecurity_init(void) ++gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+ return; ++#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR ++ if ((grsec_enable_chdir && grsec_enable_group && ++ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir && ++ !grsec_enable_group)) { ++ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt); ++ } ++#endif ++ return; +} +diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c +new file mode 100644 +index 0000000..e10b319 +--- /dev/null ++++ b/grsecurity/grsec_chroot.c +@@ -0,0 +1,370 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "../fs/mount.h" ++#include ++#include + -+umode_t gr_acl_umask(void) ++#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD ++int gr_init_ran; ++#endif ++ ++void gr_set_chroot_entries(struct task_struct *task, const struct path *path) +{ -+ return 0; ++#ifdef CONFIG_GRKERNSEC ++ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry && ++ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root ++#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD ++ && gr_init_ran ++#endif ++ ) ++ task->gr_is_chrooted = 1; ++ else { ++#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD ++ if (task_pid_nr(task) == 1 && !gr_init_ran) ++ gr_init_ran = 1; ++#endif ++ task->gr_is_chrooted = 0; ++ } ++ ++ task->gr_chroot_dentry = path->dentry; ++#endif ++ return; +} + -+__u32 -+gr_acl_handle_mknod(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt, -+ const int mode) ++void gr_clear_chroot_entries(struct task_struct *task) ++{ ++#ifdef CONFIG_GRKERNSEC ++ task->gr_is_chrooted = 0; ++ task->gr_chroot_dentry = NULL; ++#endif ++ return; ++} ++ ++int ++gr_handle_chroot_unix(const pid_t pid) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX ++ struct task_struct *p; ++ ++ if (unlikely(!grsec_enable_chroot_unix)) ++ return 1; ++ ++ if (likely(!proc_is_chrooted(current))) ++ return 1; ++ ++ rcu_read_lock(); ++ read_lock(&tasklist_lock); ++ p = find_task_by_vpid_unrestricted(pid); ++ if (unlikely(p && !have_same_root(current, p))) { ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); ++ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG); ++ return 0; ++ } ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); ++#endif + return 1; +} + -+__u32 -+gr_acl_handle_mkdir(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt) ++int ++gr_handle_chroot_nice(void) +{ -+ return 1; ++#ifdef CONFIG_GRKERNSEC_CHROOT_NICE ++ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) { ++ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG); ++ return -EPERM; ++ } ++#endif ++ return 0; +} + -+__u32 -+gr_acl_handle_symlink(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt, const struct filename *from) ++int ++gr_handle_chroot_setpriority(struct task_struct *p, const int niceval) +{ -+ return 1; ++#ifdef CONFIG_GRKERNSEC_CHROOT_NICE ++ if (grsec_enable_chroot_nice && (niceval < task_nice(p)) ++ && proc_is_chrooted(current)) { ++ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p)); ++ return -EACCES; ++ } ++#endif ++ return 0; +} + -+__u32 -+gr_acl_handle_link(const struct dentry * new_dentry, -+ const struct dentry * parent_dentry, -+ const struct vfsmount * parent_mnt, -+ const struct dentry * old_dentry, -+ const struct vfsmount * old_mnt, const struct filename *to) ++int ++gr_handle_chroot_fowner(struct pid *pid, enum pid_type type) +{ -+ return 1; ++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK ++ struct task_struct *p; ++ int ret = 0; ++ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid) ++ return ret; ++ ++ read_lock(&tasklist_lock); ++ do_each_pid_task(pid, type, p) { ++ if (!have_same_root(current, p)) { ++ ret = 1; ++ goto out; ++ } ++ } while_each_pid_task(pid, type, p); ++out: ++ read_unlock(&tasklist_lock); ++ return ret; ++#endif ++ return 0; +} + +int -+gr_acl_handle_rename(const struct dentry *new_dentry, -+ const struct dentry *parent_dentry, -+ const struct vfsmount *parent_mnt, -+ const struct dentry *old_dentry, -+ const struct inode *old_parent_inode, -+ const struct vfsmount *old_mnt, const struct filename *newname) ++gr_pid_is_chrooted(struct task_struct *p) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK ++ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL) ++ return 0; ++ ++ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) || ++ !have_same_root(current, p)) { ++ return 1; ++ } ++#endif + return 0; +} + ++EXPORT_SYMBOL(gr_pid_is_chrooted); ++ ++#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR) ++int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt) ++{ ++ struct path path, currentroot; ++ int ret = 0; ++ ++ path.dentry = (struct dentry *)u_dentry; ++ path.mnt = (struct vfsmount *)u_mnt; ++ get_fs_root(current->fs, ¤troot); ++ if (path_is_under(&path, ¤troot)) ++ ret = 1; ++ path_put(¤troot); ++ ++ return ret; ++} ++#endif ++ +int -+gr_acl_handle_filldir(const struct file *file, const char *name, -+ const int namelen, const ino_t ino) ++gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR ++ if (!grsec_enable_chroot_fchdir) ++ return 1; ++ ++ if (!proc_is_chrooted(current)) ++ return 1; ++ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) { ++ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt); ++ return 0; ++ } ++#endif + return 1; +} + +int -+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid, -+ const time_t shm_createtime, const kuid_t cuid, const int shmid) ++gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid, ++ const time_t shm_createtime) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT ++ struct task_struct *p; ++ time_t starttime; ++ ++ if (unlikely(!grsec_enable_chroot_shmat)) ++ return 1; ++ ++ if (likely(!proc_is_chrooted(current))) ++ return 1; ++ ++ rcu_read_lock(); ++ read_lock(&tasklist_lock); ++ ++ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) { ++ starttime = p->start_time.tv_sec; ++ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) { ++ if (have_same_root(current, p)) { ++ goto allow; ++ } else { ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); ++ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); ++ return 0; ++ } ++ } ++ /* creator exited, pid reuse, fall through to next check */ ++ } ++ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) { ++ if (unlikely(!have_same_root(current, p))) { ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); ++ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG); ++ return 0; ++ } ++ } ++ ++allow: ++ read_unlock(&tasklist_lock); ++ rcu_read_unlock(); ++#endif + return 1; +} + ++void ++gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt) ++{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG ++ if (grsec_enable_chroot_execlog && proc_is_chrooted(current)) ++ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt); ++#endif ++ return; ++} ++ +int -+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr) ++gr_handle_chroot_mknod(const struct dentry *dentry, ++ const struct vfsmount *mnt, const int mode) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD ++ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) && ++ proc_is_chrooted(current)) { ++ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt); ++ return -EPERM; ++ } ++#endif + return 0; +} + +int -+gr_search_accept(const struct socket *sock) ++gr_handle_chroot_mount(const struct dentry *dentry, ++ const struct vfsmount *mnt, const char *dev_name) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT ++ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) { ++ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt); ++ return -EPERM; ++ } ++#endif + return 0; +} + +int -+gr_search_listen(const struct socket *sock) ++gr_handle_chroot_pivot(void) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT ++ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) { ++ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG); ++ return -EPERM; ++ } ++#endif + return 0; +} + +int -+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr) ++gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE ++ if (grsec_enable_chroot_double && proc_is_chrooted(current) && ++ !gr_is_outside_chroot(dentry, mnt)) { ++ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt); ++ return -EPERM; ++ } ++#endif + return 0; +} + -+__u32 -+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt) ++extern const char *captab_log[]; ++extern int captab_log_entries; ++ ++int ++gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS ++ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) { ++ kernel_cap_t chroot_caps = GR_CHROOT_CAPS; ++ if (cap_raised(chroot_caps, cap)) { ++ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) { ++ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]); ++ } ++ return 0; ++ } ++ } ++#endif + return 1; +} + -+__u32 -+gr_acl_handle_creat(const struct dentry * dentry, -+ const struct dentry * p_dentry, -+ const struct vfsmount * p_mnt, int open_flags, int acc_mode, -+ const int imode) ++int ++gr_chroot_is_capable(const int cap) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS ++ return gr_task_chroot_is_capable(current, current_cred(), cap); ++#endif + return 1; +} + -+void -+gr_acl_handle_exit(void) ++int ++gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap) +{ -+ return; ++#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS ++ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) { ++ kernel_cap_t chroot_caps = GR_CHROOT_CAPS; ++ if (cap_raised(chroot_caps, cap)) { ++ return 0; ++ } ++ } ++#endif ++ return 1; +} + +int -+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot) ++gr_chroot_is_capable_nolog(const int cap) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS ++ return gr_task_chroot_is_capable_nolog(current, cap); ++#endif + return 1; +} + ++int ++gr_handle_chroot_sysctl(const int op) ++{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL ++ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) && ++ proc_is_chrooted(current)) ++ return -EACCES; ++#endif ++ return 0; ++} ++ +void -+gr_set_role_label(const kuid_t uid, const kgid_t gid) ++gr_handle_chroot_chdir(const struct path *path) +{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR ++ if (grsec_enable_chroot_chdir) ++ set_fs_pwd(current->fs, path); ++#endif + return; +} + +int -+gr_acl_handle_procpidmem(const struct task_struct *task) ++gr_handle_chroot_chmod(const struct dentry *dentry, ++ const struct vfsmount *mnt, const int mode) ++{ ++#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD ++ /* allow chmod +s on directories, but not files */ ++ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) && ++ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) && ++ proc_is_chrooted(current)) { ++ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt); ++ return -EPERM; ++ } ++#endif ++ return 0; ++} +diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c +new file mode 100644 +index 0000000..0866ab2 +--- /dev/null ++++ b/grsecurity/grsec_disabled.c +@@ -0,0 +1,427 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef CONFIG_PAX_HAVE_ACL_FLAGS ++void ++pax_set_initial_flags(struct linux_binprm *bprm) ++{ ++ return; ++} ++#endif ++ ++#ifdef CONFIG_SYSCTL ++__u32 ++gr_handle_sysctl(const struct ctl_table * table, const int op) ++{ ++ return 0; ++} ++#endif ++ ++#ifdef CONFIG_TASKSTATS ++int gr_is_taskstats_denied(int pid) +{ + return 0; +} ++#endif + +int -+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb) ++gr_acl_is_enabled(void) +{ + return 0; +} + ++void ++gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode) ++{ ++ return; ++} ++ +int -+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr) ++gr_handle_rawio(const struct inode *inode) +{ + return 0; +} + +void -+gr_set_kernel_label(struct task_struct *task) ++gr_acl_handle_psacct(struct task_struct *task, const long code) +{ + return; +} + +int -+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs) ++gr_handle_ptrace(struct task_struct *task, const long request) +{ + return 0; +} + +int -+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs) ++gr_handle_proc_ptrace(struct task_struct *task) +{ + return 0; +} + -+int gr_acl_enable_at_secure(void) ++int ++gr_set_acls(const int type) +{ + return 0; +} + -+dev_t gr_get_dev_from_dentry(struct dentry *dentry) ++int ++gr_check_hidden_task(const struct task_struct *tsk) +{ -+ return dentry->d_sb->s_dev; ++ return 0; +} + -+void gr_put_exec_file(struct task_struct *task) ++int ++gr_check_protected_task(const struct task_struct *task) +{ -+ return; ++ return 0; +} + -+EXPORT_SYMBOL(gr_set_kernel_label); -+#ifdef CONFIG_SECURITY -+EXPORT_SYMBOL(gr_check_user_change); -+EXPORT_SYMBOL(gr_check_group_change); -+#endif -diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c -new file mode 100644 -index 0000000..387032b ---- /dev/null -+++ b/grsecurity/grsec_exec.c -@@ -0,0 +1,187 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include ++int ++gr_check_protected_task_fowner(struct pid *pid, enum pid_type type) ++{ ++ return 0; ++} + -+#include ++void ++gr_copy_label(struct task_struct *tsk) ++{ ++ return; ++} + -+#ifdef CONFIG_GRKERNSEC_EXECLOG -+static char gr_exec_arg_buf[132]; -+static DEFINE_MUTEX(gr_exec_arg_mutex); -+#endif ++void ++gr_set_pax_flags(struct task_struct *task) ++{ ++ return; ++} + -+struct user_arg_ptr { -+#ifdef CONFIG_COMPAT -+ bool is_compat; -+#endif -+ union { -+ const char __user *const __user *native; -+#ifdef CONFIG_COMPAT -+ const compat_uptr_t __user *compat; -+#endif -+ } ptr; -+}; ++int ++gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt, ++ const int unsafe_share) ++{ ++ return 0; ++} + -+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr); ++void ++gr_handle_delete(const ino_t ino, const dev_t dev) ++{ ++ return; ++} + +void -+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv) ++gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt) +{ -+#ifdef CONFIG_GRKERNSEC_EXECLOG -+ char *grarg = gr_exec_arg_buf; -+ unsigned int i, x, execlen = 0; -+ char c; ++ return; ++} + -+ if (!((grsec_enable_execlog && grsec_enable_group && -+ in_group_p(grsec_audit_gid)) -+ || (grsec_enable_execlog && !grsec_enable_group))) -+ return; ++void ++gr_handle_crash(struct task_struct *task, const int sig) ++{ ++ return; ++} + -+ mutex_lock(&gr_exec_arg_mutex); -+ memset(grarg, 0, sizeof(gr_exec_arg_buf)); ++int ++gr_check_crash_exec(const struct file *filp) ++{ ++ return 0; ++} + -+ for (i = 0; i < bprm->argc && execlen < 128; i++) { ++int ++gr_check_crash_uid(const kuid_t uid) ++{ ++ return 0; ++} ++ ++void ++gr_handle_rename(struct inode *old_dir, struct inode *new_dir, ++ struct dentry *old_dentry, ++ struct dentry *new_dentry, ++ struct vfsmount *mnt, const __u8 replace) ++{ ++ return; ++} ++ ++int ++gr_search_socket(const int family, const int type, const int protocol) ++{ ++ return 1; ++} ++ ++int ++gr_search_connectbind(const int mode, const struct socket *sock, ++ const struct sockaddr_in *addr) ++{ ++ return 0; ++} ++ ++void ++gr_handle_alertkill(struct task_struct *task) ++{ ++ return; ++} ++ ++__u32 ++gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_hidden_file(const struct dentry * dentry, ++ const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt, ++ int acc_mode) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++int ++gr_acl_handle_mmap(const struct file *file, const unsigned long prot, ++ unsigned int *vm_flags) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_truncate(const struct dentry * dentry, ++ const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_access(const struct dentry * dentry, ++ const struct vfsmount * mnt, const int fmode) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt, ++ umode_t *mode) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++void ++grsecurity_init(void) ++{ ++ return; ++} ++ ++umode_t gr_acl_umask(void) ++{ ++ return 0; ++} ++ ++__u32 ++gr_acl_handle_mknod(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt, ++ const int mode) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_mkdir(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_symlink(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt, const struct filename *from) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_link(const struct dentry * new_dentry, ++ const struct dentry * parent_dentry, ++ const struct vfsmount * parent_mnt, ++ const struct dentry * old_dentry, ++ const struct vfsmount * old_mnt, const struct filename *to) ++{ ++ return 1; ++} ++ ++int ++gr_acl_handle_rename(const struct dentry *new_dentry, ++ const struct dentry *parent_dentry, ++ const struct vfsmount *parent_mnt, ++ const struct dentry *old_dentry, ++ const struct inode *old_parent_inode, ++ const struct vfsmount *old_mnt, const struct filename *newname) ++{ ++ return 0; ++} ++ ++int ++gr_acl_handle_filldir(const struct file *file, const char *name, ++ const int namelen, const ino_t ino) ++{ ++ return 1; ++} ++ ++int ++gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid, ++ const time_t shm_createtime, const kuid_t cuid, const int shmid) ++{ ++ return 1; ++} ++ ++int ++gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr) ++{ ++ return 0; ++} ++ ++int ++gr_search_accept(const struct socket *sock) ++{ ++ return 0; ++} ++ ++int ++gr_search_listen(const struct socket *sock) ++{ ++ return 0; ++} ++ ++int ++gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr) ++{ ++ return 0; ++} ++ ++__u32 ++gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt) ++{ ++ return 1; ++} ++ ++__u32 ++gr_acl_handle_creat(const struct dentry * dentry, ++ const struct dentry * p_dentry, ++ const struct vfsmount * p_mnt, int open_flags, int acc_mode, ++ const int imode) ++{ ++ return 1; ++} ++ ++void ++gr_acl_handle_exit(void) ++{ ++ return; ++} ++ ++int ++gr_acl_handle_mprotect(const struct file *file, const unsigned long prot) ++{ ++ return 1; ++} ++ ++void ++gr_set_role_label(const kuid_t uid, const kgid_t gid) ++{ ++ return; ++} ++ ++int ++gr_acl_handle_procpidmem(const struct task_struct *task) ++{ ++ return 0; ++} ++ ++int ++gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb) ++{ ++ return 0; ++} ++ ++int ++gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr) ++{ ++ return 0; ++} ++ ++int ++gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs) ++{ ++ return 0; ++} ++ ++int ++gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs) ++{ ++ return 0; ++} ++ ++int gr_acl_enable_at_secure(void) ++{ ++ return 0; ++} ++ ++dev_t gr_get_dev_from_dentry(struct dentry *dentry) ++{ ++ return dentry->d_sb->s_dev; ++} ++ ++void gr_put_exec_file(struct task_struct *task) ++{ ++ return; ++} ++ ++#ifdef CONFIG_SECURITY ++EXPORT_SYMBOL(gr_check_user_change); ++EXPORT_SYMBOL(gr_check_group_change); ++#endif +diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c +new file mode 100644 +index 0000000..387032b +--- /dev/null ++++ b/grsecurity/grsec_exec.c +@@ -0,0 +1,187 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#ifdef CONFIG_GRKERNSEC_EXECLOG ++static char gr_exec_arg_buf[132]; ++static DEFINE_MUTEX(gr_exec_arg_mutex); ++#endif ++ ++struct user_arg_ptr { ++#ifdef CONFIG_COMPAT ++ bool is_compat; ++#endif ++ union { ++ const char __user *const __user *native; ++#ifdef CONFIG_COMPAT ++ const compat_uptr_t __user *compat; ++#endif ++ } ptr; ++}; ++ ++extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr); ++ ++void ++gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv) ++{ ++#ifdef CONFIG_GRKERNSEC_EXECLOG ++ char *grarg = gr_exec_arg_buf; ++ unsigned int i, x, execlen = 0; ++ char c; ++ ++ if (!((grsec_enable_execlog && grsec_enable_group && ++ in_group_p(grsec_audit_gid)) ++ || (grsec_enable_execlog && !grsec_enable_group))) ++ return; ++ ++ mutex_lock(&gr_exec_arg_mutex); ++ memset(grarg, 0, sizeof(gr_exec_arg_buf)); ++ ++ for (i = 0; i < bprm->argc && execlen < 128; i++) { + const char __user *p; + unsigned int len; + @@ -69341,10 +70421,10 @@ index 0000000..8ca18bf +} diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c new file mode 100644 -index 0000000..99a0cb9 +index 0000000..a88e901 --- /dev/null +++ b/grsecurity/grsec_init.c -@@ -0,0 +1,283 @@ +@@ -0,0 +1,272 @@ +#include +#include +#include @@ -69362,6 +70442,7 @@ index 0000000..99a0cb9 +int grsec_enable_link; +int grsec_enable_dmesg; +int grsec_enable_harden_ptrace; ++int grsec_enable_harden_ipc; +int grsec_enable_fifo; +int grsec_enable_execlog; +int grsec_enable_signal; @@ -69423,10 +70504,6 @@ index 0000000..99a0cb9 +char *gr_alert_log_buf; +char *gr_audit_log_buf; + -+extern struct gr_arg *gr_usermode; -+extern unsigned char *gr_system_salt; -+extern unsigned char *gr_system_sum; -+ +void __init +grsecurity_init(void) +{ @@ -69467,17 +70544,6 @@ index 0000000..99a0cb9 + return; + } + -+ /* allocate memory for authentication structure */ -+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL); -+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL); -+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL); -+ -+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) { -+ panic("Unable to allocate grsecurity authentication structure"); -+ return; -+ } -+ -+ +#ifdef CONFIG_GRKERNSEC_IO +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO) + grsec_disable_privio = 1; @@ -69516,6 +70582,9 @@ index 0000000..99a0cb9 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE + grsec_enable_harden_ptrace = 1; +#endif ++#ifdef CONFIG_GRKERNSEC_HARDEN_IPC ++ grsec_enable_harden_ipc = 1; ++#endif +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT + grsec_enable_mount = 1; +#endif @@ -69628,6 +70697,34 @@ index 0000000..99a0cb9 + + return; +} +diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c +new file mode 100644 +index 0000000..f365de0 +--- /dev/null ++++ b/grsecurity/grsec_ipc.c +@@ -0,0 +1,22 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++int ++gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode) ++{ ++#ifdef CONFIG_GRKERNSEC_HARDEN_IPC ++ int write = (requested_mode & 00002); ++ ++ if (grsec_enable_harden_ipc && !(requested_mode & ~granted_mode & 0007) && !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) { ++ gr_log_str2_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", write ? "writ" : "read", GR_GLOBAL_UID(ipcp->cuid)); ++ return 0; ++ } ++#endif ++ return 1; ++} diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c new file mode 100644 index 0000000..5e05e20 @@ -70242,10 +71339,10 @@ index 0000000..f7f29aa +} diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c new file mode 100644 -index 0000000..4e29cc7 +index 0000000..3860c7e --- /dev/null +++ b/grsecurity/grsec_sig.c -@@ -0,0 +1,246 @@ +@@ -0,0 +1,236 @@ +#include +#include +#include @@ -70322,20 +71419,10 @@ index 0000000..4e29cc7 +} +#endif + -+#ifdef CONFIG_GRKERNSEC_BRUTE +#define GR_USER_BAN_TIME (15 * 60) +#define GR_DAEMON_BRUTE_TIME (30 * 60) + -+static int __get_dumpable(unsigned long mm_flags) -+{ -+ int ret; -+ -+ ret = mm_flags & MMF_DUMPABLE_MASK; -+ return (ret >= 2) ? 2 : ret; -+} -+#endif -+ -+void gr_handle_brute_attach(unsigned long mm_flags) ++void gr_handle_brute_attach(int dumpable) +{ +#ifdef CONFIG_GRKERNSEC_BRUTE + struct task_struct *p = current; @@ -70356,7 +71443,7 @@ index 0000000..4e29cc7 + const struct cred *cred = __task_cred(p), *cred2; + struct task_struct *tsk, *tsk2; + -+ if (!__get_dumpable(mm_flags) && gr_is_global_nonroot(cred->uid)) { ++ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) { + struct user_struct *user; + + uid = cred->uid; @@ -70744,10 +71831,10 @@ index 0000000..4030d57 +} diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c new file mode 100644 -index 0000000..a147ae7 +index 0000000..8159888 --- /dev/null +++ b/grsecurity/grsec_sysctl.c -@@ -0,0 +1,470 @@ +@@ -0,0 +1,479 @@ +#include +#include +#include @@ -71187,6 +72274,15 @@ index 0000000..a147ae7 + .proc_handler = &proc_dointvec, + }, +#endif ++#ifdef CONFIG_GRKERNSEC_HARDEN_IPC ++ { ++ .procname = "harden_ipc", ++ .data = &grsec_enable_harden_ipc, ++ .maxlen = sizeof(int), ++ .mode = 0600, ++ .proc_handler = &proc_dointvec, ++ }, ++#endif + { + .procname = "grsec_lock", + .data = &grsec_lock, @@ -71808,6 +72904,54 @@ index b18ce4f..2ee2843 100644 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n)) + #endif /* _ASM_GENERIC_ATOMIC64_H */ +diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h +index a60a7cc..0fe12f2 100644 +--- a/include/asm-generic/bitops/__fls.h ++++ b/include/asm-generic/bitops/__fls.h +@@ -9,7 +9,7 @@ + * + * Undefined if no set bit exists, so code should check against 0 first. + */ +-static __always_inline unsigned long __fls(unsigned long word) ++static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word) + { + int num = BITS_PER_LONG - 1; + +diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h +index 0576d1f..dad6c71 100644 +--- a/include/asm-generic/bitops/fls.h ++++ b/include/asm-generic/bitops/fls.h +@@ -9,7 +9,7 @@ + * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. + */ + +-static __always_inline int fls(int x) ++static __always_inline int __intentional_overflow(-1) fls(int x) + { + int r = 32; + +diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h +index b097cf8..3d40e14 100644 +--- a/include/asm-generic/bitops/fls64.h ++++ b/include/asm-generic/bitops/fls64.h +@@ -15,7 +15,7 @@ + * at position 64. + */ + #if BITS_PER_LONG == 32 +-static __always_inline int fls64(__u64 x) ++static __always_inline int __intentional_overflow(-1) fls64(__u64 x) + { + __u32 h = x >> 32; + if (h) +@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x) + return fls(x); + } + #elif BITS_PER_LONG == 64 +-static __always_inline int fls64(__u64 x) ++static __always_inline int __intentional_overflow(-1) fls64(__u64 x) + { + if (x == 0) + return 0; diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h index 1bfcfe5..e04c5c9 100644 --- a/include/asm-generic/cache.h @@ -71976,10 +73120,10 @@ index 810431d..0ec4804f 100644 * (puds are folded into pgds so this doesn't get actually called, * but the define is needed for a generic inline function.) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h -index 0807ddf..cd67747 100644 +index f330d28..83ce28f 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h -@@ -741,6 +741,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd) +@@ -737,6 +737,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd) } #endif /* CONFIG_NUMA_BALANCING */ @@ -72028,10 +73172,10 @@ index dc1269c..48a4f51 100644 + #endif /* __ASM_GENERIC_UACCESS_H */ diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index 69732d2..cbe16d9 100644 +index 83e2c31..eeb4a04 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h -@@ -227,6 +227,7 @@ +@@ -232,6 +232,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ *(.rodata) *(.rodata.*) \ @@ -72039,7 +73183,7 @@ index 69732d2..cbe16d9 100644 *(__vermagic) /* Kernel version magic */ \ . = ALIGN(8); \ VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \ -@@ -710,17 +711,18 @@ +@@ -715,17 +716,18 @@ * section in the linker script will go there too. @phdr should have * a leading colon. * @@ -72076,18 +73220,18 @@ index 418d270..bfd2794 100644 struct crypto_instance { struct crypto_alg alg; diff --git a/include/drm/drmP.h b/include/drm/drmP.h -index 12083dc..39740ec 100644 +index b46fb45..b30d6d5 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h -@@ -69,6 +69,7 @@ +@@ -66,6 +66,7 @@ #include #include #include +#include #include #include - -@@ -293,10 +294,12 @@ do { \ + #include +@@ -277,10 +278,12 @@ do { \ * \param cmd command. * \param arg argument. */ @@ -72102,7 +73246,7 @@ index 12083dc..39740ec 100644 unsigned long arg); #define DRM_IOCTL_NR(n) _IOC_NR(n) -@@ -311,10 +314,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, +@@ -296,10 +299,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, struct drm_ioctl_desc { unsigned int cmd; int flags; @@ -72115,7 +73259,7 @@ index 12083dc..39740ec 100644 /** * Creates a driver or general drm_ioctl_desc array entry for the given -@@ -1015,7 +1018,7 @@ struct drm_info_list { +@@ -1027,7 +1030,7 @@ struct drm_info_list { int (*show)(struct seq_file*, void*); /** show callback */ u32 driver_features; /**< Required driver features for this entry */ void *data; @@ -72124,7 +73268,7 @@ index 12083dc..39740ec 100644 /** * debugfs node structure. This structure represents a debugfs file. -@@ -1088,7 +1091,7 @@ struct drm_device { +@@ -1098,7 +1101,7 @@ struct drm_device { /** \name Usage Counters */ /*@{ */ @@ -72133,7 +73277,7 @@ index 12083dc..39740ec 100644 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */ atomic_t vma_count; /**< Outstanding vma areas open */ int buf_use; /**< Buffers in use -- cannot alloc */ -@@ -1099,7 +1102,7 @@ struct drm_device { +@@ -1109,7 +1112,7 @@ struct drm_device { /*@{ */ unsigned long counters; enum drm_stat_type types[15]; @@ -72155,6 +73299,19 @@ index f43d556..94d9343 100644 /** * drm_connector_helper_funcs - helper operations for connectors +diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h +index 8a10f5c..5de7f5c 100644 +--- a/include/drm/i915_pciids.h ++++ b/include/drm/i915_pciids.h +@@ -37,7 +37,7 @@ + */ + #define INTEL_VGA_DEVICE(id, info) { \ + 0x8086, id, \ +- ~0, ~0, \ ++ PCI_ANY_ID, PCI_ANY_ID, \ + 0x030000, 0xff0000, \ + (unsigned long) info } + diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h index 72dcbe8..8db58d7 100644 --- a/include/drm/ttm/ttm_memory.h @@ -72203,8 +73360,21 @@ index c1da539..1dcec55 100644 struct atmphy_ops { int (*start)(struct atm_dev *dev); +diff --git a/include/linux/audit.h b/include/linux/audit.h +index 729a4d1..9b304ae 100644 +--- a/include/linux/audit.h ++++ b/include/linux/audit.h +@@ -193,7 +193,7 @@ static inline void audit_ptrace(struct task_struct *t) + extern unsigned int audit_serial(void); + extern int auditsc_get_stamp(struct audit_context *ctx, + struct timespec *t, unsigned int *serial); +-extern int audit_set_loginuid(kuid_t loginuid); ++extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid); + + static inline kuid_t audit_get_loginuid(struct task_struct *tsk) + { diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h -index 70cf138..0418ee2 100644 +index 7554fd4..0f86379 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -73,8 +73,10 @@ struct linux_binfmt { @@ -72219,11 +73389,42 @@ index 70cf138..0418ee2 100644 extern void __register_binfmt(struct linux_binfmt *fmt, int insert); +diff --git a/include/linux/bitops.h b/include/linux/bitops.h +index a3b6b82..2a7d758 100644 +--- a/include/linux/bitops.h ++++ b/include/linux/bitops.h +@@ -91,7 +91,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift) + * @word: value to rotate + * @shift: bits to roll + */ +-static inline __u32 rol32(__u32 word, unsigned int shift) ++static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift) + { + return (word << shift) | (word >> (32 - shift)); + } +@@ -101,7 +101,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift) + * @word: value to rotate + * @shift: bits to roll + */ +-static inline __u32 ror32(__u32 word, unsigned int shift) ++static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift) + { + return (word >> shift) | (word << (32 - shift)); + } +@@ -157,7 +157,7 @@ static inline __s32 sign_extend32(__u32 value, int index) + return (__s32)(value << shift) >> shift; + } + +-static inline unsigned fls_long(unsigned long l) ++static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l) + { + if (sizeof(l) == 4) + return fls(l); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h -index 2fdb4a4..54aad7e 100644 +index 0e6f765..885bb2b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h -@@ -1526,7 +1526,7 @@ struct block_device_operations { +@@ -1537,7 +1537,7 @@ struct block_device_operations { /* this callback is with swap_lock and sometimes page table lock held */ void (*swap_slot_free_notify) (struct block_device *, unsigned long); struct module *owner; @@ -72265,11 +73466,11 @@ index 4c57065..40346da 100644 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif diff --git a/include/linux/capability.h b/include/linux/capability.h -index d9a4f7f4..19f77d6 100644 +index a6ee1f9..e1ca49d 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h -@@ -213,8 +213,13 @@ extern bool ns_capable(struct user_namespace *ns, int cap); - extern bool nsown_capable(int cap); +@@ -212,8 +212,13 @@ extern bool capable(int cap); + extern bool ns_capable(struct user_namespace *ns, int cap); extern bool inode_capable(const struct inode *inode, int cap); extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap); +extern bool capable_nolog(int cap); @@ -72308,10 +73509,10 @@ index 4ce9056..86caac6 100644 extern struct cleancache_ops * cleancache_register_ops(struct cleancache_ops *ops); diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 1ec14a7..d0654a2 100644 +index 73bdb69..d66d47a 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h -@@ -132,6 +132,7 @@ struct clk_ops { +@@ -141,6 +141,7 @@ struct clk_ops { unsigned long); void (*init)(struct clk_hw *hw); }; @@ -72320,10 +73521,10 @@ index 1ec14a7..d0654a2 100644 /** * struct clk_init_data - holds init data that's common to all clocks and is diff --git a/include/linux/compat.h b/include/linux/compat.h -index ec1aee4..1077986 100644 +index 345da00..b6eff26 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h -@@ -312,7 +312,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, +@@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr, compat_size_t __user *len_ptr); asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32); @@ -72332,7 +73533,7 @@ index ec1aee4..1077986 100644 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg); asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp, compat_ssize_t msgsz, int msgflg); -@@ -419,7 +419,7 @@ extern int compat_ptrace_request(struct task_struct *child, +@@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child, extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t addr, compat_ulong_t data); asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, @@ -72505,19 +73706,23 @@ index 92669cd..1771a15 100644 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */ #ifdef CONFIG_KPROBES diff --git a/include/linux/completion.h b/include/linux/completion.h -index 3cd574d..adce5fa 100644 +index 3cd574d..240dcb0 100644 --- a/include/linux/completion.h +++ b/include/linux/completion.h -@@ -79,15 +79,15 @@ static inline void init_completion(struct completion *x) +@@ -78,16 +78,16 @@ static inline void init_completion(struct completion *x) + extern void wait_for_completion(struct completion *); extern void wait_for_completion_io(struct completion *); - extern int wait_for_completion_interruptible(struct completion *x); +-extern int wait_for_completion_interruptible(struct completion *x); -extern int wait_for_completion_killable(struct completion *x); ++extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1); +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1); extern unsigned long wait_for_completion_timeout(struct completion *x, - unsigned long timeout); +- unsigned long timeout); ++ unsigned long timeout) __intentional_overflow(-1); extern unsigned long wait_for_completion_io_timeout(struct completion *x, - unsigned long timeout); +- unsigned long timeout); ++ unsigned long timeout) __intentional_overflow(-1); extern long wait_for_completion_interruptible_timeout( - struct completion *x, unsigned long timeout); + struct completion *x, unsigned long timeout) __intentional_overflow(-1); @@ -72541,19 +73746,10 @@ index 34025df..d94bbbc 100644 /* * Users often need to create attribute structures for their configurable diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h -index 90d5a15..950cb80 100644 +index fcabc42..cba5d93 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h -@@ -266,7 +266,7 @@ struct cpufreq_driver { - int (*suspend) (struct cpufreq_policy *policy); - int (*resume) (struct cpufreq_policy *policy); - struct freq_attr **attr; --}; -+} __do_const; - - /* flags */ - -@@ -325,6 +325,7 @@ struct global_attr { +@@ -167,6 +167,7 @@ struct global_attr { ssize_t (*store)(struct kobject *a, struct attribute *b, const char *c, size_t count); }; @@ -72561,11 +73757,20 @@ index 90d5a15..950cb80 100644 #define define_one_global_ro(_name) \ static struct global_attr _name = \ +@@ -208,7 +209,7 @@ struct cpufreq_driver { + int (*suspend) (struct cpufreq_policy *policy); + int (*resume) (struct cpufreq_policy *policy); + struct freq_attr **attr; +-}; ++} __do_const; + + /* flags */ + #define CPUFREQ_STICKY 0x01 /* the driver isn't removed even if diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h -index 0bc4b74..973b368 100644 +index 781addc..d1e1fe6 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h -@@ -52,7 +52,8 @@ struct cpuidle_state { +@@ -50,7 +50,8 @@ struct cpuidle_state { int index); int (*enter_dead) (struct cpuidle_device *dev, int index); @@ -72575,7 +73780,7 @@ index 0bc4b74..973b368 100644 /* Idle State Flags */ #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */ -@@ -191,7 +192,7 @@ struct cpuidle_governor { +@@ -192,7 +193,7 @@ struct cpuidle_governor { void (*reflect) (struct cpuidle_device *dev, int index); struct module *owner; @@ -72719,10 +73924,10 @@ index 5f1ab92..39c35ae 100644 /** * struct devfreq - Device devfreq structure diff --git a/include/linux/device.h b/include/linux/device.h -index 22b546a..a573dc9 100644 +index 2a9d6ed..d14551e3 100644 --- a/include/linux/device.h +++ b/include/linux/device.h -@@ -305,7 +305,7 @@ struct subsys_interface { +@@ -313,7 +313,7 @@ struct subsys_interface { struct list_head node; int (*add_dev)(struct device *dev, struct subsys_interface *sif); int (*remove_dev)(struct device *dev, struct subsys_interface *sif); @@ -72731,7 +73936,7 @@ index 22b546a..a573dc9 100644 int subsys_interface_register(struct subsys_interface *sif); void subsys_interface_unregister(struct subsys_interface *sif); -@@ -493,7 +493,7 @@ struct device_type { +@@ -501,7 +501,7 @@ struct device_type { void (*release)(struct device *dev); const struct dev_pm_ops *pm; @@ -72740,7 +73945,7 @@ index 22b546a..a573dc9 100644 /* interface for exporting device attributes */ struct device_attribute { -@@ -503,11 +503,12 @@ struct device_attribute { +@@ -511,11 +511,12 @@ struct device_attribute { ssize_t (*store)(struct device *dev, struct device_attribute *attr, const char *buf, size_t count); }; @@ -72755,7 +73960,7 @@ index 22b546a..a573dc9 100644 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr, char *buf); diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h -index 94af418..b1ca7a2 100644 +index 3a8d0a2..c762be2 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -54,7 +54,7 @@ struct dma_map_ops { @@ -72768,10 +73973,10 @@ index 94af418..b1ca7a2 100644 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h -index cb286b1..923d066 100644 +index 0bc7275..4ccbf11 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h -@@ -1030,9 +1030,9 @@ struct dma_pinned_list { +@@ -1078,9 +1078,9 @@ struct dma_pinned_list { struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len); void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list); @@ -72816,7 +74021,7 @@ index 40a3c0e..4c45a38 100644 #endif diff --git a/include/linux/err.h b/include/linux/err.h -index 221fcfb..f29e5e2 100644 +index 15f92e0..e825a8e 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -19,12 +19,12 @@ @@ -72873,28 +74078,6 @@ index 085197b..0fa6f0b 100644 void do_close_on_exec(struct files_struct *); int iterate_fd(struct files_struct *, unsigned, int (*)(const void *, struct file *, unsigned), -diff --git a/include/linux/filter.h b/include/linux/filter.h -index a6ac848..a104a76 100644 ---- a/include/linux/filter.h -+++ b/include/linux/filter.h -@@ -20,6 +20,7 @@ struct compat_sock_fprog { - - struct sk_buff; - struct sock; -+struct bpf_jit_work; - - struct sk_filter - { -@@ -27,6 +28,9 @@ struct sk_filter - unsigned int len; /* Number of filter blocks */ - unsigned int (*bpf_func)(const struct sk_buff *skb, - const struct sock_filter *filter); -+#ifdef CONFIG_BPF_JIT -+ struct bpf_jit_work *work; -+#endif - struct rcu_head rcu; - struct sock_filter insns[0]; - }; diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h index 8293262..2b3b8bd 100644 --- a/include/linux/frontswap.h @@ -72909,10 +74092,10 @@ index 8293262..2b3b8bd 100644 extern bool frontswap_enabled; extern struct frontswap_ops * diff --git a/include/linux/fs.h b/include/linux/fs.h -index 9818747..788bfbd 100644 +index fefa7b0..5e04a8b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1554,7 +1554,8 @@ struct file_operations { +@@ -1552,7 +1552,8 @@ struct file_operations { long (*fallocate)(struct file *file, int mode, loff_t offset, loff_t len); int (*show_fdinfo)(struct seq_file *m, struct file *f); @@ -72922,7 +74105,7 @@ index 9818747..788bfbd 100644 struct inode_operations { struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int); -@@ -2740,4 +2741,14 @@ static inline bool dir_relax(struct inode *inode) +@@ -2746,4 +2747,14 @@ static inline bool dir_relax(struct inode *inode) return !IS_DEADDIR(inode); } @@ -72938,7 +74121,7 @@ index 9818747..788bfbd 100644 + #endif /* _LINUX_FS_H */ diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h -index 2b93a9a..855d94a 100644 +index 0efc3e6..e0e1e5f 100644 --- a/include/linux/fs_struct.h +++ b/include/linux/fs_struct.h @@ -6,7 +6,7 @@ @@ -72951,7 +74134,7 @@ index 2b93a9a..855d94a 100644 seqcount_t seq; int umask; diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h -index a9ff9a3..1ba1788 100644 +index 7823e9e..56b6f2f 100644 --- a/include/linux/fscache-cache.h +++ b/include/linux/fscache-cache.h @@ -113,7 +113,7 @@ struct fscache_operation { @@ -72973,7 +74156,7 @@ index a9ff9a3..1ba1788 100644 op->release = release; INIT_LIST_HEAD(&op->pend_link); diff --git a/include/linux/fscache.h b/include/linux/fscache.h -index 7a08623..4c07b0f 100644 +index 19b4645..3b73dfc 100644 --- a/include/linux/fscache.h +++ b/include/linux/fscache.h @@ -152,7 +152,7 @@ struct fscache_cookie_def { @@ -73099,10 +74282,10 @@ index 9b4dd49..61fd41d 100644 { diff --git a/include/linux/gracl.h b/include/linux/gracl.h new file mode 100644 -index 0000000..ebe6d72 +index 0000000..edb2cb6 --- /dev/null +++ b/include/linux/gracl.h -@@ -0,0 +1,319 @@ +@@ -0,0 +1,340 @@ +#ifndef GR_ACL_H +#define GR_ACL_H + @@ -73114,19 +74297,20 @@ index 0000000..ebe6d72 + +/* Major status information */ + -+#define GR_VERSION "grsecurity 2.9.1" -+#define GRSECURITY_VERSION 0x2901 ++#define GR_VERSION "grsecurity 3.0" ++#define GRSECURITY_VERSION 0x3000 + +enum { + GR_SHUTDOWN = 0, + GR_ENABLE = 1, + GR_SPROLE = 2, -+ GR_RELOAD = 3, ++ GR_OLDRELOAD = 3, + GR_SEGVMOD = 4, + GR_STATUS = 5, + GR_UNSPROLE = 6, + GR_PASSSET = 7, + GR_SPROLEPAM = 8, ++ GR_RELOAD = 9, +}; + +/* Password setup definitions @@ -73355,6 +74539,34 @@ index 0000000..ebe6d72 + __u32 s_size; +}; + ++struct gr_policy_state { ++ struct sprole_pw **acl_special_roles; ++ __u16 num_sprole_pws; ++ struct acl_role_label *kernel_role; ++ struct acl_role_label *role_list; ++ struct acl_role_label *default_role; ++ struct acl_role_db acl_role_set; ++ struct acl_subj_map_db subj_map_set; ++ struct name_db name_set; ++ struct inodev_db inodev_set; ++}; ++ ++struct gr_alloc_state { ++ unsigned long alloc_stack_next; ++ unsigned long alloc_stack_size; ++ void **alloc_stack; ++}; ++ ++struct gr_reload_state { ++ struct gr_policy_state oldpolicy; ++ struct gr_alloc_state oldalloc; ++ struct gr_policy_state newpolicy; ++ struct gr_alloc_state newalloc; ++ struct gr_policy_state *oldpolicy_ptr; ++ struct gr_alloc_state *oldalloc_ptr; ++ unsigned char oldmode; ++}; ++ +/* End Data Structures Section */ + +/* Hash functions generated by empirical testing by Brad Spengler @@ -73386,14 +74598,6 @@ index 0000000..ebe6d72 + return full_name_hash((const unsigned char *)name, len) % sz; +} + -+#define FOR_EACH_ROLE_START(role) \ -+ role = role_list; \ -+ while (role) { -+ -+#define FOR_EACH_ROLE_END(role) \ -+ role = role->prev; \ -+ } -+ +#define FOR_EACH_SUBJECT_START(role,subj,iter) \ + subj = NULL; \ + iter = 0; \ @@ -73747,7 +74951,7 @@ index 0000000..be66033 +#endif diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h new file mode 100644 -index 0000000..e337683 +index 0000000..d25522e --- /dev/null +++ b/include/linux/grinternal.h @@ -0,0 +1,229 @@ @@ -73773,7 +74977,6 @@ index 0000000..e337683 +int gr_check_protected_task(const struct task_struct *task); +__u32 to_gr_audit(const __u32 reqmode); +int gr_set_acls(const int type); -+int gr_apply_subject_to_task(struct task_struct *task); +int gr_acl_is_enabled(void); +char gr_roletype_to_char(void); + @@ -73834,6 +75037,7 @@ index 0000000..e337683 +extern int grsec_enable_blackhole; +extern int grsec_lastack_retries; +extern int grsec_enable_brute; ++extern int grsec_enable_harden_ipc; +extern int grsec_lock; + +extern spinlock_t grsec_alert_lock; @@ -73982,10 +75186,10 @@ index 0000000..e337683 +#endif diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h new file mode 100644 -index 0000000..a4396b5 +index 0000000..378a81a --- /dev/null +++ b/include/linux/grmsg.h -@@ -0,0 +1,113 @@ +@@ -0,0 +1,114 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by " @@ -74099,12 +75303,13 @@ index 0000000..a4396b5 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by " +#define GR_BRUTE_DAEMON_MSG "bruteforce prevention initiated for the next 30 minutes or until service restarted, stalling each fork 30 seconds. Please investigate the crash report for " +#define GR_BRUTE_SUID_MSG "bruteforce prevention initiated due to crash of %.950s against uid %u, banning suid/sgid execs for %u minutes. Please investigate the crash report for " ++#define GR_IPC_DENIED_MSG "denied %s of globally-%sable IPC with creator uid %u by " diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h new file mode 100644 -index 0000000..d6f5a21 +index 0000000..134860c --- /dev/null +++ b/include/linux/grsecurity.h -@@ -0,0 +1,244 @@ +@@ -0,0 +1,243 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H +#include @@ -74128,7 +75333,7 @@ index 0000000..d6f5a21 + +int gr_handle_new_usb(void); + -+void gr_handle_brute_attach(unsigned long mm_flags); ++void gr_handle_brute_attach(int dumpable); +void gr_handle_brute_check(void); +void gr_handle_kernel_exploit(void); + @@ -74235,7 +75440,6 @@ index 0000000..d6f5a21 + const struct vfsmount *mnt); +int gr_check_crash_exec(const struct file *filp); +int gr_acl_is_enabled(void); -+void gr_set_kernel_label(struct task_struct *task); +void gr_set_role_label(struct task_struct *task, const kuid_t uid, + const kgid_t gid); +int gr_set_proc_label(const struct dentry *dentry, @@ -74398,7 +75602,7 @@ index 7fb31da..08b5114 100644 unsigned start1, unsigned end1, unsigned start2, unsigned end2) diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h -index 1c7b89a..7f52502 100644 +index 1c7b89a..7dda400 100644 --- a/include/linux/hwmon-sysfs.h +++ b/include/linux/hwmon-sysfs.h @@ -25,7 +25,8 @@ @@ -74411,17 +75615,18 @@ index 1c7b89a..7f52502 100644 #define to_sensor_dev_attr(_dev_attr) \ container_of(_dev_attr, struct sensor_device_attribute, dev_attr) -@@ -41,7 +42,7 @@ struct sensor_device_attribute_2 { +@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 { struct device_attribute dev_attr; u8 index; u8 nr; -}; +} __do_const; ++typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const; #define to_sensor_dev_attr_2(_dev_attr) \ container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr) diff --git a/include/linux/i2c.h b/include/linux/i2c.h -index e988fa9..ff9f17e 100644 +index 2ab11dc..663a3f2 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -366,6 +366,7 @@ struct i2c_algorithm { @@ -74459,7 +75664,7 @@ index aff7ad8..3942bbd 100644 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp); extern void unregister_pppox_proto(int proto_num); diff --git a/include/linux/init.h b/include/linux/init.h -index e73f2b7..cc996e0 100644 +index f1c27a71..7d6010e 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -39,9 +39,17 @@ @@ -74516,10 +75721,10 @@ index 5cd0f09..c9f67cc 100644 .files = &init_files, \ .signal = &init_signals, \ diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h -index 5fa5afe..ac55b25 100644 +index 5e865b5..71bd258 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h -@@ -430,7 +430,7 @@ enum +@@ -361,7 +361,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. */ @@ -74528,7 +75733,7 @@ index 5fa5afe..ac55b25 100644 /* softirq mask and active fields moved to irq_cpustat_t in * asm/hardirq.h to get better cache usage. KAO -@@ -438,12 +438,12 @@ extern char *softirq_to_name[NR_SOFTIRQS]; +@@ -369,12 +369,12 @@ extern char *softirq_to_name[NR_SOFTIRQS]; struct softirq_action { @@ -74545,10 +75750,10 @@ index 5fa5afe..ac55b25 100644 extern void __raise_softirq_irqoff(unsigned int nr); diff --git a/include/linux/iommu.h b/include/linux/iommu.h -index 3aeb730..2177f39 100644 +index 7ea319e..f9e971d 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h -@@ -113,7 +113,7 @@ struct iommu_ops { +@@ -129,7 +129,7 @@ struct iommu_ops { u32 (*domain_get_windows)(struct iommu_domain *domain); unsigned long pgsize_bitmap; @@ -74571,7 +75776,7 @@ index 89b7c24..382af74 100644 return res->end - res->start + 1; } diff --git a/include/linux/irq.h b/include/linux/irq.h -index f04d3ba..bcf2cfb 100644 +index 56bb0dc..8ae94d62 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -333,7 +333,8 @@ struct irq_chip { @@ -74585,7 +75790,7 @@ index f04d3ba..bcf2cfb 100644 /* * irq_chip specific flags diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h -index 3e203eb..3fe68d0 100644 +index 0e5d9ec..46acb3a 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -59,9 +59,11 @@ @@ -74601,6 +75806,31 @@ index 3e203eb..3fe68d0 100644 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *, u32 offset, struct device_node *); +diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h +index d235e88..8ccbe74 100644 +--- a/include/linux/jiffies.h ++++ b/include/linux/jiffies.h +@@ -292,14 +292,14 @@ extern unsigned long preset_lpj; + /* + * Convert various time units to each other: + */ +-extern unsigned int jiffies_to_msecs(const unsigned long j); +-extern unsigned int jiffies_to_usecs(const unsigned long j); +-extern unsigned long msecs_to_jiffies(const unsigned int m); +-extern unsigned long usecs_to_jiffies(const unsigned int u); +-extern unsigned long timespec_to_jiffies(const struct timespec *value); ++extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1); ++extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1); ++extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1); ++extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1); ++extern unsigned long timespec_to_jiffies(const struct timespec *value) __intentional_overflow(-1); + extern void jiffies_to_timespec(const unsigned long jiffies, + struct timespec *value); +-extern unsigned long timeval_to_jiffies(const struct timeval *value); ++extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1); + extern void jiffies_to_timeval(const unsigned long jiffies, + struct timeval *value); + diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 6883e19..e854fcb 100644 --- a/include/linux/kallsyms.h @@ -74682,7 +75912,7 @@ index c6e091b..a940adf 100644 extern struct kgdb_arch arch_kgdb_ops; diff --git a/include/linux/kmod.h b/include/linux/kmod.h -index 0555cc6..b16a7a4 100644 +index 0555cc6..40116ce 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */ @@ -74694,11 +75924,21 @@ index 0555cc6..b16a7a4 100644 #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ +@@ -57,6 +59,9 @@ struct subprocess_info { + struct work_struct work; + struct completion *complete; + char *path; ++#ifdef CONFIG_GRKERNSEC ++ char *origpath; ++#endif + char **argv; + char **envp; + int wait; diff --git a/include/linux/kobject.h b/include/linux/kobject.h -index 939b112..ed6ed51 100644 +index de6dcbcc..4735f88 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h -@@ -111,7 +111,7 @@ struct kobj_type { +@@ -115,7 +115,7 @@ struct kobj_type { struct attribute **default_attrs; const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj); const void *(*namespace)(struct kobject *kobj); @@ -74707,7 +75947,7 @@ index 939b112..ed6ed51 100644 struct kobj_uevent_env { char *envp[UEVENT_NUM_ENVP]; -@@ -134,6 +134,7 @@ struct kobj_attribute { +@@ -138,6 +138,7 @@ struct kobj_attribute { ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count); }; @@ -74716,10 +75956,10 @@ index 939b112..ed6ed51 100644 extern const struct sysfs_ops kobj_sysfs_ops; diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h -index f66b065..c2c29b4 100644 +index df32d25..fb52e27 100644 --- a/include/linux/kobject_ns.h +++ b/include/linux/kobject_ns.h -@@ -43,7 +43,7 @@ struct kobj_ns_type_operations { +@@ -44,7 +44,7 @@ struct kobj_ns_type_operations { const void *(*netlink_ns)(struct sock *sk); const void *(*initial_ns)(void); void (*drop_ns)(void *); @@ -74742,10 +75982,10 @@ index 484604d..0f6c5b6 100644 if (atomic_sub_and_test((int) count, &kref->refcount)) { release(kref); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h -index a63d83e..77fd685 100644 +index 0fbbc7a..db081e3 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h -@@ -446,7 +446,7 @@ static inline void kvm_irqfd_exit(void) +@@ -458,7 +458,7 @@ static inline void kvm_irqfd_exit(void) { } #endif @@ -74754,7 +75994,7 @@ index a63d83e..77fd685 100644 struct module *module); void kvm_exit(void); -@@ -618,7 +618,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, +@@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg); int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run); @@ -74764,10 +76004,10 @@ index a63d83e..77fd685 100644 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); diff --git a/include/linux/libata.h b/include/linux/libata.h -index 4ea55bb..dcd2601 100644 +index 0e23c26..6ad8c33 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -924,7 +924,7 @@ struct ata_port_operations { +@@ -972,7 +972,7 @@ struct ata_port_operations { * fields must be pointers. */ const struct ata_port_operations *inherits; @@ -74822,7 +76062,7 @@ index f4d8a2f..38e6e46 100644 * list_move - delete from one list and add as another's head * @list: the entry to move diff --git a/include/linux/math64.h b/include/linux/math64.h -index 2913b86..8dcbb1e 100644 +index 69ed5f5..243ed51 100644 --- a/include/linux/math64.h +++ b/include/linux/math64.h @@ -15,7 +15,7 @@ @@ -74834,16 +76074,16 @@ index 2913b86..8dcbb1e 100644 { *remainder = dividend % divisor; return dividend / divisor; -@@ -33,7 +33,7 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder) +@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder) /** * div64_u64 - unsigned 64bit divide with 64bit divisor */ -static inline u64 div64_u64(u64 dividend, u64 divisor) -+static inline u64 __intentional_overflow(0) div64_u64(u64 dividend, u64 divisor) ++static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor) { return dividend / divisor; } -@@ -52,7 +52,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor) +@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor) #define div64_ul(x, y) div_u64((x), (y)) #ifndef div_u64_rem @@ -74852,7 +76092,16 @@ index 2913b86..8dcbb1e 100644 { *remainder = do_div(dividend, divisor); return dividend; -@@ -81,7 +81,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor); +@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder); + #endif + + #ifndef div64_u64 +-extern u64 div64_u64(u64 dividend, u64 divisor); ++extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor); + #endif + + #ifndef div64_s64 +@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor); * divide. */ #ifndef div_u64 @@ -74861,8 +76110,33 @@ index 2913b86..8dcbb1e 100644 { u32 remainder; return div_u64_rem(dividend, divisor, &remainder); +diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h +index da6716b..2e31db3 100644 +--- a/include/linux/mempolicy.h ++++ b/include/linux/mempolicy.h +@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol) + } + + #define vma_policy(vma) ((vma)->vm_policy) ++static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol) ++{ ++ vma->vm_policy = pol; ++} + + static inline void mpol_get(struct mempolicy *pol) + { +@@ -240,6 +244,9 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx) + } + + #define vma_policy(vma) NULL ++static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol) ++{ ++} + + static inline int + vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst) diff --git a/include/linux/mm.h b/include/linux/mm.h -index f022460..6ecf4f9 100644 +index 8b6e55e..c4edf39 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -113,6 +113,11 @@ extern unsigned int kobjsize(const void *objp); @@ -74876,8 +76150,8 @@ index f022460..6ecf4f9 100644 + #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */ - #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ -@@ -208,8 +213,8 @@ struct vm_operations_struct { + #ifdef CONFIG_MEM_SOFT_DIRTY +@@ -215,8 +220,8 @@ struct vm_operations_struct { /* called by access_process_vm when get_user_pages() fails, typically * for use by special VMAs that can switch between memory and hardware */ @@ -74888,7 +76162,7 @@ index f022460..6ecf4f9 100644 #ifdef CONFIG_NUMA /* * set_policy() op must add a reference to any non-NULL @new mempolicy -@@ -239,6 +244,7 @@ struct vm_operations_struct { +@@ -246,6 +251,7 @@ struct vm_operations_struct { int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr, unsigned long size, pgoff_t pgoff); }; @@ -74896,7 +76170,7 @@ index f022460..6ecf4f9 100644 struct mmu_gather; struct inode; -@@ -983,8 +989,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address, +@@ -977,8 +983,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address, unsigned long *pfn); int follow_phys(struct vm_area_struct *vma, unsigned long address, unsigned int flags, unsigned long *prot, resource_size_t *phys); @@ -74907,7 +76181,7 @@ index f022460..6ecf4f9 100644 static inline void unmap_shared_mapping_range(struct address_space *mapping, loff_t const holebegin, loff_t const holelen) -@@ -1023,9 +1029,9 @@ static inline int fixup_user_fault(struct task_struct *tsk, +@@ -1017,9 +1023,9 @@ static inline int fixup_user_fault(struct task_struct *tsk, } #endif @@ -74920,7 +76194,7 @@ index f022460..6ecf4f9 100644 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, unsigned long nr_pages, -@@ -1057,34 +1063,6 @@ int set_page_dirty(struct page *page); +@@ -1051,34 +1057,6 @@ int set_page_dirty(struct page *page); int set_page_dirty_lock(struct page *page); int clear_page_dirty_for_io(struct page *page); @@ -74955,7 +76229,7 @@ index f022460..6ecf4f9 100644 extern pid_t vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group); -@@ -1184,6 +1162,15 @@ static inline void sync_mm_rss(struct mm_struct *mm) +@@ -1178,6 +1156,15 @@ static inline void sync_mm_rss(struct mm_struct *mm) } #endif @@ -74971,7 +76245,7 @@ index f022460..6ecf4f9 100644 int vma_wants_writenotify(struct vm_area_struct *vma); extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr, -@@ -1202,8 +1189,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, +@@ -1196,8 +1183,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, { return 0; } @@ -74987,7 +76261,7 @@ index f022460..6ecf4f9 100644 #endif #ifdef __PAGETABLE_PMD_FOLDED -@@ -1212,8 +1206,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud, +@@ -1206,8 +1200,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud, { return 0; } @@ -75003,7 +76277,7 @@ index f022460..6ecf4f9 100644 #endif int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, -@@ -1231,11 +1232,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a +@@ -1225,11 +1226,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a NULL: pud_offset(pgd, address); } @@ -75027,7 +76301,16 @@ index f022460..6ecf4f9 100644 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */ #if USE_SPLIT_PTLOCKS -@@ -1531,6 +1544,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -1517,7 +1530,7 @@ extern int install_special_mapping(struct mm_struct *mm, + unsigned long addr, unsigned long len, + unsigned long flags, struct page **pages); + +-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); ++extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1); + + extern unsigned long mmap_region(struct file *file, unsigned long addr, + unsigned long len, vm_flags_t vm_flags, unsigned long pgoff); +@@ -1525,6 +1538,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long pgoff, unsigned long *populate); extern int do_munmap(struct mm_struct *, unsigned long, size_t); @@ -75035,7 +76318,7 @@ index f022460..6ecf4f9 100644 #ifdef CONFIG_MMU extern int __mm_populate(unsigned long addr, unsigned long len, -@@ -1559,10 +1573,11 @@ struct vm_unmapped_area_info { +@@ -1553,10 +1567,11 @@ struct vm_unmapped_area_info { unsigned long high_limit; unsigned long align_mask; unsigned long align_offset; @@ -75049,7 +76332,7 @@ index f022460..6ecf4f9 100644 /* * Search for an unmapped address range. -@@ -1574,7 +1589,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info); +@@ -1568,7 +1583,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info); * - satisfies (begin_addr & align_mask) == (align_offset & align_mask) */ static inline unsigned long @@ -75058,7 +76341,7 @@ index f022460..6ecf4f9 100644 { if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN)) return unmapped_area(info); -@@ -1637,6 +1652,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add +@@ -1631,6 +1646,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, struct vm_area_struct **pprev); @@ -75069,7 +76352,7 @@ index f022460..6ecf4f9 100644 /* Look up the first VMA which intersects the interval start_addr..end_addr-1, NULL if none. Assume start_addr < end_addr. */ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) -@@ -1665,15 +1684,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm, +@@ -1659,15 +1678,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm, return vma; } @@ -75085,7 +76368,7 @@ index f022460..6ecf4f9 100644 #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE unsigned long change_prot_numa(struct vm_area_struct *vma, unsigned long start, unsigned long end); -@@ -1725,6 +1735,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long); +@@ -1719,6 +1729,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long); static inline void vm_stat_account(struct mm_struct *mm, unsigned long flags, struct file *file, long pages) { @@ -75097,7 +76380,7 @@ index f022460..6ecf4f9 100644 mm->total_vm += pages; } #endif /* CONFIG_PROC_FS */ -@@ -1805,7 +1820,7 @@ extern int unpoison_memory(unsigned long pfn); +@@ -1800,7 +1815,7 @@ extern int unpoison_memory(unsigned long pfn); extern int sysctl_memory_failure_early_kill; extern int sysctl_memory_failure_recovery; extern void shake_page(struct page *p, int access); @@ -75106,7 +76389,7 @@ index f022460..6ecf4f9 100644 extern int soft_offline_page(struct page *page, int flags); extern void dump_page(struct page *page); -@@ -1842,5 +1857,11 @@ void __init setup_nr_node_ids(void); +@@ -1837,5 +1852,11 @@ void __init setup_nr_node_ids(void); static inline void setup_nr_node_ids(void) {} #endif @@ -75119,7 +76402,7 @@ index f022460..6ecf4f9 100644 #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index faf4b7c..1e70c6e 100644 +index d9851ee..619492d 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -289,6 +289,8 @@ struct vm_area_struct { @@ -75131,7 +76414,7 @@ index faf4b7c..1e70c6e 100644 }; struct core_thread { -@@ -435,6 +437,24 @@ struct mm_struct { +@@ -436,6 +438,24 @@ struct mm_struct { int first_nid; #endif struct uprobes_state uprobes_state; @@ -75179,7 +76462,7 @@ index c5d5278..f0b68c8 100644 } diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h -index af4a3b7..9ad8889 100644 +index bd791e4..8617c34f 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -396,7 +396,7 @@ struct zone { @@ -75223,7 +76506,7 @@ index 45e9214..a7227d6 100644 * struct dmi_device_id appears during expansion of * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it diff --git a/include/linux/module.h b/include/linux/module.h -index 46f1ea0..a34ca37 100644 +index 05f2447..2aee07c 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -17,9 +17,11 @@ @@ -75238,7 +76521,7 @@ index 46f1ea0..a34ca37 100644 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */ #define MODULE_SIG_STRING "~Module signature appended~\n" -@@ -54,12 +56,13 @@ struct module_attribute { +@@ -55,12 +57,13 @@ struct module_attribute { int (*test)(struct module *); void (*free)(struct module *); }; @@ -75253,7 +76536,7 @@ index 46f1ea0..a34ca37 100644 extern ssize_t __modver_version_show(struct module_attribute *, struct module_kobject *, char *); -@@ -232,7 +235,7 @@ struct module +@@ -238,7 +241,7 @@ struct module /* Sysfs stuff. */ struct module_kobject mkobj; @@ -75262,7 +76545,7 @@ index 46f1ea0..a34ca37 100644 const char *version; const char *srcversion; struct kobject *holders_dir; -@@ -281,19 +284,16 @@ struct module +@@ -287,19 +290,16 @@ struct module int (*init)(void); /* If this is non-NULL, vfree after init() returns */ @@ -75286,7 +76569,7 @@ index 46f1ea0..a34ca37 100644 /* Arch-specific module values */ struct mod_arch_specific arch; -@@ -349,6 +349,10 @@ struct module +@@ -355,6 +355,10 @@ struct module #ifdef CONFIG_EVENT_TRACING struct ftrace_event_call **trace_events; unsigned int num_trace_events; @@ -75297,7 +76580,7 @@ index 46f1ea0..a34ca37 100644 #endif #ifdef CONFIG_FTRACE_MCOUNT_RECORD unsigned int num_ftrace_callsites; -@@ -396,16 +400,46 @@ bool is_module_address(unsigned long addr); +@@ -402,16 +406,46 @@ bool is_module_address(unsigned long addr); bool is_module_percpu_address(unsigned long addr); bool is_module_text_address(unsigned long addr); @@ -75395,10 +76678,10 @@ index 560ca53..ef621ef 100644 } #endif diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h -index 27d9da3..5d94aa3 100644 +index c3eb102..073c4a6 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h -@@ -284,7 +284,7 @@ static inline void __kernel_param_unlock(void) +@@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void) * @len is usually just sizeof(string). */ #define module_param_string(name, string, len, perm) \ @@ -75407,7 +76690,7 @@ index 27d9da3..5d94aa3 100644 = { len, string }; \ __module_param_call(MODULE_PARAM_PREFIX, name, \ ¶m_ops_string, \ -@@ -423,7 +423,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp); +@@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp); */ #define module_param_array_named(name, array, type, nump, perm) \ param_check_##type(name, &(array)[0]); \ @@ -75417,7 +76700,7 @@ index 27d9da3..5d94aa3 100644 .ops = ¶m_ops_##type, \ .elemsize = sizeof(array[0]), .elem = array }; \ diff --git a/include/linux/namei.h b/include/linux/namei.h -index 5a5ff57..5ae5070 100644 +index 8e47bc7..c70fd73 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -19,7 +19,7 @@ struct nameidata { @@ -75429,7 +76712,7 @@ index 5a5ff57..5ae5070 100644 }; /* -@@ -84,12 +84,12 @@ extern void unlock_rename(struct dentry *, struct dentry *); +@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *); extern void nd_jump_link(struct nameidata *nd, struct path *path); @@ -75445,10 +76728,10 @@ index 5a5ff57..5ae5070 100644 return nd->saved_names[nd->depth]; } diff --git a/include/linux/net.h b/include/linux/net.h -index 4f27575..fc8a65f 100644 +index 8bd9d92..08b1c20 100644 --- a/include/linux/net.h +++ b/include/linux/net.h -@@ -183,7 +183,7 @@ struct net_proto_family { +@@ -191,7 +191,7 @@ struct net_proto_family { int (*create)(struct net *net, struct socket *sock, int protocol, int kern); struct module *owner; @@ -75458,18 +76741,18 @@ index 4f27575..fc8a65f 100644 struct iovec; struct kvec; diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 9a41568..203d903 100644 +index 25f5d2d1..5cf2120 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1061,6 +1061,7 @@ struct net_device_ops { - int (*ndo_change_carrier)(struct net_device *dev, - bool new_carrier); +@@ -1098,6 +1098,7 @@ struct net_device_ops { + sa_family_t sa_family, + __be16 port); }; +typedef struct net_device_ops __no_const net_device_ops_no_const; /* * The DEVICE structure. -@@ -1131,7 +1132,7 @@ struct net_device { +@@ -1169,7 +1170,7 @@ struct net_device { int iflink; struct net_device_stats stats; @@ -75479,7 +76762,7 @@ index 9a41568..203d903 100644 */ diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h -index de70f7b..2675e91 100644 +index 708fe72ab9..77084a3 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -82,7 +82,7 @@ struct nf_sockopt_ops { @@ -75491,19 +76774,6 @@ index de70f7b..2675e91 100644 /* Function to register/unregister hook points. */ int nf_register_hook(struct nf_hook_ops *reg); -diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h -index d80e275..c3510b8 100644 ---- a/include/linux/netfilter/ipset/ip_set.h -+++ b/include/linux/netfilter/ipset/ip_set.h -@@ -124,7 +124,7 @@ struct ip_set_type_variant { - /* Return true if "b" set is the same as "a" - * according to the create set parameters */ - bool (*same_set)(const struct ip_set *a, const struct ip_set *b); --}; -+} __do_const; - - /* The core set type structure */ - struct ip_set_type { diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h index cadb740..d7c37c0 100644 --- a/include/linux/netfilter/nfnetlink.h @@ -75560,29 +76830,29 @@ index d14a4c3..a078786 100644 struct atomic_notifier_head { spinlock_t lock; diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h -index a4c5624..79d6d88 100644 +index b2a0f15..4d7da32 100644 --- a/include/linux/oprofile.h +++ b/include/linux/oprofile.h -@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root, - int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, +@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root, + int oprofilefs_create_ro_ulong(struct dentry * root, char const * name, ulong * val); -/** Create a file for read-only access to an atomic_t. */ +/** Create a file for read-only access to an atomic_unchecked_t. */ - int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root, + int oprofilefs_create_ro_atomic(struct dentry * root, - char const * name, atomic_t * val); + char const * name, atomic_unchecked_t * val); /** create a directory */ - struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, + struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name); diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h -index 8db71dc..a76bf2c 100644 +index 430dd96..544e26e 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h -@@ -80,7 +80,8 @@ struct hotplug_slot_ops { - int (*get_attention_status) (struct hotplug_slot *slot, u8 *value); +@@ -71,7 +71,8 @@ struct hotplug_slot_ops { int (*get_latch_status) (struct hotplug_slot *slot, u8 *value); int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value); + int (*reset_slot) (struct hotplug_slot *slot, int probe); -}; +} __do_const; +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const; @@ -75590,10 +76860,10 @@ index 8db71dc..a76bf2c 100644 /** * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h -index c43f6ea..2d4416f 100644 +index c8ba627..24bdfa8 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h -@@ -328,8 +328,8 @@ struct perf_event { +@@ -327,8 +327,8 @@ struct perf_event { enum perf_event_active_state state; unsigned int attach_state; @@ -75604,7 +76874,7 @@ index c43f6ea..2d4416f 100644 /* * These are the total time in nanoseconds that the event -@@ -380,8 +380,8 @@ struct perf_event { +@@ -379,8 +379,8 @@ struct perf_event { * These accumulate total time (in nanoseconds) that children * events have been enabled and running, respectively. */ @@ -75615,7 +76885,7 @@ index c43f6ea..2d4416f 100644 /* * Protect attach/detach and child_list: -@@ -703,7 +703,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64 +@@ -702,7 +702,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64 entry->ip[entry->nr++] = ip; } @@ -75624,7 +76894,7 @@ index c43f6ea..2d4416f 100644 extern int sysctl_perf_event_mlock; extern int sysctl_perf_event_sample_rate; extern int sysctl_perf_cpu_time_max_percent; -@@ -718,19 +718,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, +@@ -717,19 +717,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, loff_t *ppos); @@ -75652,7 +76922,7 @@ index c43f6ea..2d4416f 100644 } extern void perf_event_init(void); -@@ -846,7 +851,7 @@ struct perf_pmu_events_attr { +@@ -845,7 +850,7 @@ struct perf_pmu_events_attr { struct device_attribute attr; u64 id; const char *event_str; @@ -75706,6 +76976,18 @@ index c256c59..8ea94c7 100644 extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd); +diff --git a/include/linux/pm.h b/include/linux/pm.h +index a224c7f..92d8a97 100644 +--- a/include/linux/pm.h ++++ b/include/linux/pm.h +@@ -576,6 +576,7 @@ extern int dev_pm_put_subsys_data(struct device *dev); + struct dev_pm_domain { + struct dev_pm_ops ops; + }; ++typedef struct dev_pm_domain __no_const dev_pm_domain_no_const; + + /* + * The PM_EVENT_ messages are also used by drivers implementing the legacy diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 7c1d252..c5c773e 100644 --- a/include/linux/pm_domain.h @@ -75842,7 +77124,7 @@ index f5d4723..a6ea2fa 100644 #define preempt_disable_notrace() barrier() diff --git a/include/linux/printk.h b/include/linux/printk.h -index 22c7052..ad3fa0a 100644 +index e6131a78..8e9fb61 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -106,6 +106,8 @@ static inline __printf(1, 2) __cold @@ -75899,8 +77181,21 @@ index 34a1e10..03a6d03 100644 struct proc_ns { void *ns; +diff --git a/include/linux/quota.h b/include/linux/quota.h +index cc7494a..1e27036 100644 +--- a/include/linux/quota.h ++++ b/include/linux/quota.h +@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */ + + extern bool qid_eq(struct kqid left, struct kqid right); + extern bool qid_lt(struct kqid left, struct kqid right); +-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid); ++extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1); + extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid); + extern bool qid_valid(struct kqid qid); + diff --git a/include/linux/random.h b/include/linux/random.h -index 6312dd9..2561947 100644 +index bf9085e..128eade 100644 --- a/include/linux/random.h +++ b/include/linux/random.h @@ -10,9 +10,19 @@ @@ -76080,7 +77375,7 @@ index 6dacb93..6174423 100644 static inline void anon_vma_merge(struct vm_area_struct *vma, struct vm_area_struct *next) diff --git a/include/linux/sched.h b/include/linux/sched.h -index 078066d..4090b3b 100644 +index b1e963e..114b8fd 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -62,6 +62,7 @@ struct bio_list; @@ -76091,7 +77386,7 @@ index 078066d..4090b3b 100644 /* * List of flags we want to share for kernel threads, -@@ -303,7 +304,7 @@ extern char __sched_text_start[], __sched_text_end[]; +@@ -295,7 +296,7 @@ extern char __sched_text_start[], __sched_text_end[]; extern int in_sched_functions(unsigned long addr); #define MAX_SCHEDULE_TIMEOUT LONG_MAX @@ -76100,7 +77395,7 @@ index 078066d..4090b3b 100644 extern signed long schedule_timeout_interruptible(signed long timeout); extern signed long schedule_timeout_killable(signed long timeout); extern signed long schedule_timeout_uninterruptible(signed long timeout); -@@ -314,6 +315,19 @@ struct nsproxy; +@@ -306,6 +307,19 @@ struct nsproxy; struct user_namespace; #ifdef CONFIG_MMU @@ -76120,7 +77415,7 @@ index 078066d..4090b3b 100644 extern void arch_pick_mmap_layout(struct mm_struct *mm); extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, -@@ -589,6 +603,17 @@ struct signal_struct { +@@ -585,6 +599,17 @@ struct signal_struct { #ifdef CONFIG_TASKSTATS struct taskstats *stats; #endif @@ -76138,7 +77433,7 @@ index 078066d..4090b3b 100644 #ifdef CONFIG_AUDIT unsigned audit_tty; unsigned audit_tty_log_passwd; -@@ -669,6 +694,14 @@ struct user_struct { +@@ -665,6 +690,14 @@ struct user_struct { struct key *session_keyring; /* UID's default session keyring */ #endif @@ -76153,7 +77448,7 @@ index 078066d..4090b3b 100644 /* Hash table maintenance information */ struct hlist_node uidhash_node; kuid_t uid; -@@ -1151,8 +1184,8 @@ struct task_struct { +@@ -1150,8 +1183,8 @@ struct task_struct { struct list_head thread_group; struct completion *vfork_done; /* for vfork() */ @@ -76164,7 +77459,7 @@ index 078066d..4090b3b 100644 cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; -@@ -1177,11 +1210,6 @@ struct task_struct { +@@ -1176,11 +1209,6 @@ struct task_struct { struct task_cputime cputime_expires; struct list_head cpu_timers[3]; @@ -76176,7 +77471,7 @@ index 078066d..4090b3b 100644 char comm[TASK_COMM_LEN]; /* executable name excluding path - access with [gs]et_task_comm (which lock it with task_lock()) -@@ -1198,6 +1226,10 @@ struct task_struct { +@@ -1197,6 +1225,10 @@ struct task_struct { #endif /* CPU-specific state of this task */ struct thread_struct thread; @@ -76187,7 +77482,7 @@ index 078066d..4090b3b 100644 /* filesystem information */ struct fs_struct *fs; /* open file information */ -@@ -1271,6 +1303,10 @@ struct task_struct { +@@ -1270,6 +1302,10 @@ struct task_struct { gfp_t lockdep_reclaim_gfp; #endif @@ -76198,7 +77493,7 @@ index 078066d..4090b3b 100644 /* journalling filesystem info */ void *journal_info; -@@ -1309,6 +1345,10 @@ struct task_struct { +@@ -1308,6 +1344,10 @@ struct task_struct { /* cg_list protected by css_set_lock and tsk->alloc_lock */ struct list_head cg_list; #endif @@ -76209,7 +77504,7 @@ index 078066d..4090b3b 100644 #ifdef CONFIG_FUTEX struct robust_list_head __user *robust_list; #ifdef CONFIG_COMPAT -@@ -1406,8 +1446,76 @@ struct task_struct { +@@ -1411,8 +1451,78 @@ struct task_struct { unsigned int sequential_io; unsigned int sequential_io_avg; #endif @@ -76224,10 +77519,12 @@ index 078066d..4090b3b 100644 +#endif + struct dentry *gr_chroot_dentry; + struct acl_subject_label *acl; ++ struct acl_subject_label *tmpacl; + struct acl_role_label *role; + struct file *exec_file; + unsigned long brute_expires; + u16 acl_role_id; ++ u8 inherited; + /* is this the task that authenticated to the special role */ + u8 acl_sp_role; + u8 is_writable; @@ -76286,7 +77583,7 @@ index 078066d..4090b3b 100644 /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) -@@ -1466,7 +1574,7 @@ struct pid_namespace; +@@ -1471,7 +1581,7 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -76295,7 +77592,7 @@ index 078066d..4090b3b 100644 { return tsk->pid; } -@@ -1916,7 +2024,9 @@ void yield(void); +@@ -1921,7 +2031,9 @@ void yield(void); extern struct exec_domain default_exec_domain; union thread_union { @@ -76305,7 +77602,7 @@ index 078066d..4090b3b 100644 unsigned long stack[THREAD_SIZE/sizeof(long)]; }; -@@ -1949,6 +2059,7 @@ extern struct pid_namespace init_pid_ns; +@@ -1954,6 +2066,7 @@ extern struct pid_namespace init_pid_ns; */ extern struct task_struct *find_task_by_vpid(pid_t nr); @@ -76313,7 +77610,7 @@ index 078066d..4090b3b 100644 extern struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns); -@@ -2113,7 +2224,7 @@ extern void __cleanup_sighand(struct sighand_struct *); +@@ -2118,7 +2231,7 @@ extern void __cleanup_sighand(struct sighand_struct *); extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -76322,7 +77619,7 @@ index 078066d..4090b3b 100644 extern int allow_signal(int); extern int disallow_signal(int); -@@ -2304,9 +2415,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p) +@@ -2309,9 +2422,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p) #endif @@ -76347,7 +77644,7 @@ index bf8086b..962b035 100644 extern unsigned int sysctl_sched_latency; extern unsigned int sysctl_sched_min_granularity; diff --git a/include/linux/security.h b/include/linux/security.h -index 7ce53ae..8ee24a5 100644 +index 9d37e2b..43368e4 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -27,6 +27,7 @@ @@ -76367,6 +77664,19 @@ index 7ce53ae..8ee24a5 100644 #ifdef CONFIG_MMU extern unsigned long mmap_min_addr; extern unsigned long dac_mmap_min_addr; +diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h +index dc368b8..e895209 100644 +--- a/include/linux/semaphore.h ++++ b/include/linux/semaphore.h +@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val) + } + + extern void down(struct semaphore *sem); +-extern int __must_check down_interruptible(struct semaphore *sem); ++extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1); + extern int __must_check down_killable(struct semaphore *sem); + extern int __must_check down_trylock(struct semaphore *sem); + extern int __must_check down_timeout(struct semaphore *sem, long jiffies); diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index 4e32edc..f8f2d18 100644 --- a/include/linux/seq_file.h @@ -76405,10 +77715,10 @@ index 429c199..4d42e38 100644 /* shm_mode upper byte flags */ diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 3b71a4e..5c9f309 100644 +index f66f346..2e304d5 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -648,7 +648,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, +@@ -639,7 +639,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, extern struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags, int node); extern struct sk_buff *build_skb(void *data, unsigned int frag_size); @@ -76417,7 +77727,7 @@ index 3b71a4e..5c9f309 100644 gfp_t priority) { return __alloc_skb(size, priority, 0, NUMA_NO_NODE); -@@ -764,7 +764,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb) +@@ -755,7 +755,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb) */ static inline int skb_queue_empty(const struct sk_buff_head *list) { @@ -76426,7 +77736,7 @@ index 3b71a4e..5c9f309 100644 } /** -@@ -777,7 +777,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list) +@@ -768,7 +768,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list) static inline bool skb_queue_is_last(const struct sk_buff_head *list, const struct sk_buff *skb) { @@ -76435,7 +77745,7 @@ index 3b71a4e..5c9f309 100644 } /** -@@ -790,7 +790,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list, +@@ -781,7 +781,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list, static inline bool skb_queue_is_first(const struct sk_buff_head *list, const struct sk_buff *skb) { @@ -76444,7 +77754,7 @@ index 3b71a4e..5c9f309 100644 } /** -@@ -1750,7 +1750,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len) +@@ -1741,7 +1741,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len) * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD @@ -76453,7 +77763,7 @@ index 3b71a4e..5c9f309 100644 #endif extern int ___pskb_trim(struct sk_buff *skb, unsigned int len); -@@ -2345,7 +2345,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, +@@ -2339,7 +2339,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock, int *err); extern unsigned int datagram_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait); @@ -76462,7 +77772,7 @@ index 3b71a4e..5c9f309 100644 int offset, struct iovec *to, int size); extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, -@@ -2636,6 +2636,9 @@ static inline void nf_reset(struct sk_buff *skb) +@@ -2618,6 +2618,9 @@ static inline void nf_reset(struct sk_buff *skb) nf_bridge_put(skb->nf_bridge); skb->nf_bridge = NULL; #endif @@ -76473,10 +77783,10 @@ index 3b71a4e..5c9f309 100644 static inline void nf_reset_trace(struct sk_buff *skb) diff --git a/include/linux/slab.h b/include/linux/slab.h -index 6c5cc0e..9ca0fd6 100644 +index 74f1058..914b7da 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h -@@ -12,15 +12,29 @@ +@@ -14,15 +14,29 @@ #include #include #include @@ -76507,7 +77817,7 @@ index 6c5cc0e..9ca0fd6 100644 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */ #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */ #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */ -@@ -89,10 +103,13 @@ +@@ -91,10 +105,13 @@ * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can. * Both make kfree a no-op. */ @@ -76522,9 +77832,9 @@ index 6c5cc0e..9ca0fd6 100644 - (unsigned long)ZERO_SIZE_PTR) +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1) + #include - struct mem_cgroup; -@@ -132,6 +149,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t); +@@ -135,6 +152,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t); void kfree(const void *); void kzfree(const void *); size_t ksize(const void *); @@ -76533,7 +77843,7 @@ index 6c5cc0e..9ca0fd6 100644 /* * Some archs want to perform DMA into kmalloc caches and need a guaranteed -@@ -164,7 +183,7 @@ struct kmem_cache { +@@ -167,7 +186,7 @@ struct kmem_cache { unsigned int align; /* Alignment as calculated */ unsigned long flags; /* Active flags on the slab */ const char *name; /* Slab name for sysfs */ @@ -76542,7 +77852,7 @@ index 6c5cc0e..9ca0fd6 100644 void (*ctor)(void *); /* Called on object slot creation */ struct list_head list; /* List of all slab caches on the system */ }; -@@ -238,6 +257,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; +@@ -241,6 +260,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1]; extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; #endif @@ -76553,7 +77863,7 @@ index 6c5cc0e..9ca0fd6 100644 /* * Figure out which kmalloc slab an allocation of a certain size * belongs to. -@@ -246,7 +269,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; +@@ -249,7 +272,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; * 2 = 120 .. 192 bytes * n = 2^(n-1) .. 2^n -1 */ @@ -76562,29 +77872,25 @@ index 6c5cc0e..9ca0fd6 100644 { if (!size) return 0; -@@ -492,7 +515,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep, - #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \ - (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \ - (defined(CONFIG_SLOB) && defined(CONFIG_TRACING)) --extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long); -+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1); - #define kmalloc_track_caller(size, flags) \ - __kmalloc_track_caller(size, flags, _RET_IP_) +@@ -292,11 +315,11 @@ static __always_inline int kmalloc_index(size_t size) + } + #endif /* !CONFIG_SLOB */ + +-void *__kmalloc(size_t size, gfp_t flags); ++void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1); + void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags); + + #ifdef CONFIG_NUMA +-void *__kmalloc_node(size_t size, gfp_t flags, int node); ++void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1); + void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); #else -@@ -512,7 +535,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long); - #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \ - (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \ - (defined(CONFIG_SLOB) && defined(CONFIG_TRACING)) --extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long); -+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1); - #define kmalloc_node_track_caller(size, flags, node) \ - __kmalloc_node_track_caller(size, flags, node, \ - _RET_IP_) + static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node) diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h -index cd40158..4e2f7af 100644 +index e9346b4..1494959 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h -@@ -50,7 +50,7 @@ struct kmem_cache { +@@ -36,7 +36,7 @@ struct kmem_cache { /* 4) cache creation/removal */ const char *name; struct list_head list; @@ -76593,7 +77899,7 @@ index cd40158..4e2f7af 100644 int object_size; int align; -@@ -66,10 +66,14 @@ struct kmem_cache { +@@ -52,10 +52,14 @@ struct kmem_cache { unsigned long node_allocs; unsigned long node_frees; unsigned long node_overflow; @@ -76612,79 +77918,11 @@ index cd40158..4e2f7af 100644 /* * If debugging is enabled, then the allocator can add additional -@@ -103,7 +107,7 @@ struct kmem_cache { - }; - - void *kmem_cache_alloc(struct kmem_cache *, gfp_t); --void *__kmalloc(size_t size, gfp_t flags); -+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1); - - #ifdef CONFIG_TRACING - extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t); -@@ -136,6 +140,13 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) - cachep = kmalloc_dma_caches[i]; - else - #endif -+ -+#ifdef CONFIG_PAX_USERCOPY_SLABS -+ if (flags & GFP_USERCOPY) -+ cachep = kmalloc_usercopy_caches[i]; -+ else -+#endif -+ - cachep = kmalloc_caches[i]; - - ret = kmem_cache_alloc_trace(cachep, flags, size); -@@ -146,7 +157,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) - } - - #ifdef CONFIG_NUMA --extern void *__kmalloc_node(size_t size, gfp_t flags, int node); -+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1); - extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); - - #ifdef CONFIG_TRACING -@@ -185,6 +196,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) - cachep = kmalloc_dma_caches[i]; - else - #endif -+ -+#ifdef CONFIG_PAX_USERCOPY_SLABS -+ if (flags & GFP_USERCOPY) -+ cachep = kmalloc_usercopy_caches[i]; -+ else -+#endif -+ - cachep = kmalloc_caches[i]; - - return kmem_cache_alloc_node_trace(cachep, flags, node, size); -diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h -index 095a5a4..4b82027 100644 ---- a/include/linux/slob_def.h -+++ b/include/linux/slob_def.h -@@ -11,7 +11,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep, - return kmem_cache_alloc_node(cachep, flags, NUMA_NO_NODE); - } - --void *__kmalloc_node(size_t size, gfp_t flags, int node); -+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1); - - static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) - { -@@ -23,7 +23,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) - return __kmalloc_node(size, flags, NUMA_NO_NODE); - } - --static __always_inline void *__kmalloc(size_t size, gfp_t flags) -+static __always_inline __size_overflow(1) void *__kmalloc(size_t size, gfp_t flags) - { - return kmalloc(size, flags); - } diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h -index 027276f..092bfe8 100644 +index cc0b67e..a0329b1 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h -@@ -80,7 +80,7 @@ struct kmem_cache { +@@ -74,7 +74,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; gfp_t allocflags; /* gfp flags to use on each alloc */ @@ -76693,38 +77931,11 @@ index 027276f..092bfe8 100644 void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -@@ -105,7 +105,7 @@ struct kmem_cache { - }; - - void *kmem_cache_alloc(struct kmem_cache *, gfp_t); --void *__kmalloc(size_t size, gfp_t flags); -+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1); - - static __always_inline void * - kmalloc_order(size_t size, gfp_t flags, unsigned int order) -@@ -149,7 +149,7 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order) - } - #endif - --static __always_inline void *kmalloc_large(size_t size, gfp_t flags) -+static __always_inline __size_overflow(1) void *kmalloc_large(size_t size, gfp_t flags) - { - unsigned int order = get_order(size); - return kmalloc_order_trace(size, flags, order); -@@ -175,7 +175,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags) - } - - #ifdef CONFIG_NUMA --void *__kmalloc_node(size_t size, gfp_t flags, int node); -+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1); - void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); - - #ifdef CONFIG_TRACING diff --git a/include/linux/smp.h b/include/linux/smp.h -index c181399..09d7b92 100644 +index 731f523..3340268 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h -@@ -217,7 +217,9 @@ static inline void kick_all_cpus_sync(void) { } +@@ -186,7 +186,9 @@ static inline void __smp_call_function_single(int cpuid, #endif #define get_cpu() ({ preempt_disable(); smp_processor_id(); }) @@ -76795,7 +78006,7 @@ index 07d8e53..dc934c9 100644 #endif /* _LINUX_SUNRPC_ADDR_H */ diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h -index bfe11be..12bc8c4 100644 +index 6740801..c535f27 100644 --- a/include/linux/sunrpc/clnt.h +++ b/include/linux/sunrpc/clnt.h @@ -96,7 +96,7 @@ struct rpc_procinfo { @@ -76808,10 +78019,10 @@ index bfe11be..12bc8c4 100644 #ifdef __KERNEL__ diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h -index 1f0216b..6a4fa50 100644 +index 6eecfc2..7ada79d 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h -@@ -411,7 +411,7 @@ struct svc_procedure { +@@ -410,7 +410,7 @@ struct svc_procedure { unsigned int pc_count; /* call count */ unsigned int pc_cachetype; /* cache info (NFS) */ unsigned int pc_xdrressize; /* maximum size of XDR reply */ @@ -76877,7 +78088,7 @@ index a5ffd32..0935dea 100644 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h -index 84662ec..5271947 100644 +index 7fac04e..de57300 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -97,8 +97,14 @@ struct sigaltstack; @@ -76896,7 +78107,7 @@ index 84662ec..5271947 100644 #define __SC_CAST(t, a) (t) a #define __SC_ARGS(t, a) a #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long)) -@@ -362,11 +368,11 @@ asmlinkage long sys_sync(void); +@@ -363,11 +369,11 @@ asmlinkage long sys_sync(void); asmlinkage long sys_fsync(unsigned int fd); asmlinkage long sys_fdatasync(unsigned int fd); asmlinkage long sys_bdflush(int func, long data); @@ -76912,7 +78123,7 @@ index 84662ec..5271947 100644 asmlinkage long sys_truncate(const char __user *path, long length); asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length); asmlinkage long sys_stat(const char __user *filename, -@@ -578,7 +584,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *); +@@ -579,7 +585,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *); asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *); asmlinkage long sys_send(int, void __user *, size_t, unsigned); asmlinkage long sys_sendto(int, void __user *, size_t, unsigned, @@ -76966,7 +78177,7 @@ index 14a8ff2..af52bad 100644 struct ctl_node { struct rb_node node; diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h -index 9e8a9b5..753de68 100644 +index 11baec7..706f99f 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -33,7 +33,8 @@ struct attribute { @@ -76989,7 +78200,7 @@ index 9e8a9b5..753de68 100644 /** * Use these macros to make defining attributes easier. See include/linux/device.h -@@ -123,7 +125,8 @@ struct bin_attribute { +@@ -126,7 +128,8 @@ struct bin_attribute { char *, loff_t, size_t); int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr, struct vm_area_struct *vma); @@ -77021,10 +78232,10 @@ index 7faf933..9b85a0c 100644 #ifdef CONFIG_MAGIC_SYSRQ diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h -index e7e0473..7989295 100644 +index 4ae6f32..425d3e1 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h -@@ -148,6 +148,15 @@ static inline bool test_and_clear_restore_sigmask(void) +@@ -150,6 +150,15 @@ static inline bool test_and_clear_restore_sigmask(void) #error "no set_restore_sigmask() provided and default one won't work" #endif @@ -77041,10 +78252,10 @@ index e7e0473..7989295 100644 #endif /* _LINUX_THREAD_INFO_H */ diff --git a/include/linux/tty.h b/include/linux/tty.h -index 01ac30e..bf18a71 100644 +index 64f8646..1515fc7 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h -@@ -194,7 +194,7 @@ struct tty_port { +@@ -197,7 +197,7 @@ struct tty_port { const struct tty_port_operations *ops; /* Port operations */ spinlock_t lock; /* Lock protecting tty field */ int blocked_open; /* Waiting to open */ @@ -77053,7 +78264,7 @@ index 01ac30e..bf18a71 100644 wait_queue_head_t open_wait; /* Open waiters */ wait_queue_head_t close_wait; /* Close waiters */ wait_queue_head_t delta_msr_wait; /* Modem status change */ -@@ -547,7 +547,7 @@ extern int tty_port_open(struct tty_port *port, +@@ -546,7 +546,7 @@ extern int tty_port_open(struct tty_port *port, struct tty_struct *tty, struct file *filp); static inline int tty_port_users(struct tty_port *port) { @@ -77076,10 +78287,10 @@ index 756a609..b302dd6 100644 struct tty_driver { int magic; /* magic number for this structure */ diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h -index a1b0489..f02e17c 100644 +index f15c898..207b7d1 100644 --- a/include/linux/tty_ldisc.h +++ b/include/linux/tty_ldisc.h -@@ -198,7 +198,7 @@ struct tty_ldisc_ops { +@@ -211,7 +211,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -77204,10 +78415,10 @@ index 99c1b4d..562e6f3 100644 static inline void put_unaligned_le16(u16 val, void *p) diff --git a/include/linux/usb.h b/include/linux/usb.h -index 0eec268..4496526 100644 +index 39cfa0a..d45fa38 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -560,7 +560,7 @@ struct usb_device { +@@ -563,7 +563,7 @@ struct usb_device { int maxchild; u32 quirks; @@ -77216,7 +78427,7 @@ index 0eec268..4496526 100644 unsigned long active_duration; -@@ -1617,7 +1617,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in, +@@ -1637,7 +1637,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in, extern int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request, __u8 requesttype, __u16 value, __u16 index, @@ -77279,8 +78490,34 @@ index 6f8fbcf..8259001 100644 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \ + MODULE_GRSEC +diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h +index 502073a..a7de024 100644 +--- a/include/linux/vga_switcheroo.h ++++ b/include/linux/vga_switcheroo.h +@@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev); + + void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic); + +-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain); +-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain); ++int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain); ++int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain); + #else + + static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {} +@@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return + + static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {} + +-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } +-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; } ++static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; } ++static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; } + + #endif + #endif /* _LINUX_VGA_SWITCHEROO_H_ */ diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h -index 4b8a891..c20e936 100644 +index 4b8a891..cb8df6e 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */ @@ -77295,28 +78532,17 @@ index 4b8a891..c20e936 100644 /* bits [20..32] reserved for arch specific ioremap internals */ /* -@@ -75,7 +80,7 @@ extern void *vmalloc_32_user(unsigned long size); - extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot); - extern void *__vmalloc_node_range(unsigned long size, unsigned long align, - unsigned long start, unsigned long end, gfp_t gfp_mask, -- pgprot_t prot, int node, const void *caller); -+ pgprot_t prot, int node, const void *caller) __size_overflow(1); - extern void vfree(const void *addr); - - extern void *vmap(struct page **pages, unsigned int count, -@@ -141,8 +146,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes); - extern void free_vm_area(struct vm_struct *area); +@@ -142,7 +147,7 @@ extern void free_vm_area(struct vm_struct *area); /* for /dev/kmem */ --extern long vread(char *buf, char *addr, unsigned long count); + extern long vread(char *buf, char *addr, unsigned long count); -extern long vwrite(char *buf, char *addr, unsigned long count); -+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3); +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3); /* * Internals. Dont't use.. diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h -index c586679..f06b389 100644 +index e4b9480..5a5f65a 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -90,18 +90,18 @@ static inline void vm_events_fold_cpu(int cpu) @@ -77335,15 +78561,20 @@ index c586679..f06b389 100644 + atomic_long_add_unchecked(x, &vm_stat[item]); } - static inline unsigned long global_page_state(enum zone_stat_item item) +-static inline unsigned long global_page_state(enum zone_stat_item item) ++static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item) { - long x = atomic_long_read(&vm_stat[item]); + long x = atomic_long_read_unchecked(&vm_stat[item]); #ifdef CONFIG_SMP if (x < 0) x = 0; -@@ -112,7 +112,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item) - static inline unsigned long zone_page_state(struct zone *zone, +@@ -109,10 +109,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item) + return x; + } + +-static inline unsigned long zone_page_state(struct zone *zone, ++static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone, enum zone_stat_item item) { - long x = atomic_long_read(&zone->vm_stat[item]); @@ -77360,7 +78591,7 @@ index c586679..f06b389 100644 #ifdef CONFIG_SMP int cpu; -@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone, +@@ -220,8 +220,8 @@ static inline void __mod_zone_page_state(struct zone *zone, static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -77371,7 +78602,7 @@ index c586679..f06b389 100644 } static inline void __inc_zone_page_state(struct page *page, -@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page, +@@ -232,8 +232,8 @@ static inline void __inc_zone_page_state(struct page *page, static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item) { @@ -77383,7 +78614,7 @@ index c586679..f06b389 100644 static inline void __dec_zone_page_state(struct page *page, diff --git a/include/linux/xattr.h b/include/linux/xattr.h -index fdbafc6..49dfe4f 100644 +index 91b0a68..0e9adf6 100644 --- a/include/linux/xattr.h +++ b/include/linux/xattr.h @@ -28,7 +28,7 @@ struct xattr_handler { @@ -77394,7 +78625,7 @@ index fdbafc6..49dfe4f 100644 +} __do_const; struct xattr { - char *name; + const char *name; @@ -37,6 +37,9 @@ struct xattr { }; @@ -77405,18 +78636,6 @@ index fdbafc6..49dfe4f 100644 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t); ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size); int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int); -diff --git a/include/linux/yam.h b/include/linux/yam.h -index 7fe2822..512cdc2 100644 ---- a/include/linux/yam.h -+++ b/include/linux/yam.h -@@ -77,6 +77,6 @@ struct yamdrv_ioctl_cfg { - - struct yamdrv_ioctl_mcs { - int cmd; -- int bitrate; -+ unsigned int bitrate; - unsigned char bits[YAM_FPGA_SIZE]; - }; diff --git a/include/linux/zlib.h b/include/linux/zlib.h index 9c5a6b4..09c9438 100644 --- a/include/linux/zlib.h @@ -77465,11 +78684,11 @@ index c9b1593..a572459 100644 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects. Since the parent disappears this ensures that v4l2_dev doesn't have an diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h -index d9fa68f..45c88d1 100644 +index 9a36d92..0aafe2a 100644 --- a/include/net/9p/transport.h +++ b/include/net/9p/transport.h -@@ -63,7 +63,7 @@ struct p9_trans_module { - int (*cancelled)(struct p9_client *, struct p9_req_t *req); +@@ -60,7 +60,7 @@ struct p9_trans_module { + int (*cancel) (struct p9_client *, struct p9_req_t *req); int (*zc_request)(struct p9_client *, struct p9_req_t *, char *, char *, int , int, int, int); -}; @@ -77603,10 +78822,10 @@ index 53f464d..0bd0b49 100644 #endif /* _NET_INETPEER_H */ diff --git a/include/net/ip.h b/include/net/ip.h -index edfa591..a643b82 100644 +index 301f10c..b52cdaf 100644 --- a/include/net/ip.h +++ b/include/net/ip.h -@@ -202,7 +202,7 @@ extern struct local_ports { +@@ -212,7 +212,7 @@ extern struct local_ports { } sysctl_local_ports; extern void inet_get_local_port_range(int *low, int *high); @@ -77629,10 +78848,10 @@ index cbf2be3..3683f6d 100644 fib_info_update_nh_saddr((net), &FIB_RES_NH(res))) #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw) diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h -index f0d70f0..185f15b 100644 +index 772252d..1e69799 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h -@@ -588,7 +588,7 @@ struct ip_vs_conn { +@@ -558,7 +558,7 @@ struct ip_vs_conn { struct ip_vs_conn *control; /* Master control connection */ atomic_t n_control; /* Number of controlled ones */ struct ip_vs_dest *dest; /* real server */ @@ -77641,7 +78860,7 @@ index f0d70f0..185f15b 100644 /* packet transmitter for different forwarding methods. If it mangles the packet, it must return NF_DROP or better NF_STOLEN, -@@ -737,7 +737,7 @@ struct ip_vs_dest { +@@ -705,7 +705,7 @@ struct ip_vs_dest { __be16 port; /* port number of the server */ union nf_inet_addr addr; /* IP address of the server */ volatile unsigned int flags; /* dest status flags */ @@ -77650,7 +78869,7 @@ index f0d70f0..185f15b 100644 atomic_t weight; /* server weight */ atomic_t refcnt; /* reference counter */ -@@ -993,11 +993,11 @@ struct netns_ipvs { +@@ -960,11 +960,11 @@ struct netns_ipvs { /* ip_vs_lblc */ int sysctl_lblc_expiration; struct ctl_table_header *lblc_ctl_header; @@ -77757,10 +78976,10 @@ index 567c681..cd73ac0 100644 struct llc_sap_state { u8 curr_state; diff --git a/include/net/mac80211.h b/include/net/mac80211.h -index 551ba6a..11c99c1 100644 +index cc6035f..a8406fc 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -4221,7 +4221,7 @@ struct rate_control_ops { +@@ -4361,7 +4361,7 @@ struct rate_control_ops { void (*add_sta_debugfs)(void *priv, void *priv_sta, struct dentry *dir); void (*remove_sta_debugfs)(void *priv, void *priv_sta); @@ -77770,7 +78989,7 @@ index 551ba6a..11c99c1 100644 static inline int rate_supported(struct ieee80211_sta *sta, enum ieee80211_band band, diff --git a/include/net/neighbour.h b/include/net/neighbour.h -index 7e748ad..5c6229b 100644 +index 536501a..7c6193c 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -123,7 +123,7 @@ struct neigh_ops { @@ -77783,16 +79002,14 @@ index 7e748ad..5c6229b 100644 struct pneigh_entry { struct pneigh_entry *next; diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h -index 84e37b1..8eba19a 100644 +index 9d22f08..980fbf8 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h -@@ -119,8 +119,8 @@ struct net { +@@ -120,7 +120,7 @@ struct net { struct netns_ipvs *ipvs; #endif struct sock *diag_nlsk; -- atomic_t rt_genid; - atomic_t fnhe_genid; -+ atomic_unchecked_t rt_genid; + atomic_unchecked_t fnhe_genid; }; @@ -77818,20 +79035,36 @@ index 84e37b1..8eba19a 100644 /* * Use these carefully. If you implement a network device and it -@@ -335,22 +339,22 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header) +@@ -335,23 +339,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header) - static inline int rt_genid(struct net *net) + static inline int rt_genid_ipv4(struct net *net) { -- return atomic_read(&net->rt_genid); -+ return atomic_read_unchecked(&net->rt_genid); +- return atomic_read(&net->ipv4.rt_genid); ++ return atomic_read_unchecked(&net->ipv4.rt_genid); } - static inline void rt_genid_bump(struct net *net) + static inline void rt_genid_bump_ipv4(struct net *net) { -- atomic_inc(&net->rt_genid); -+ atomic_inc_unchecked(&net->rt_genid); +- atomic_inc(&net->ipv4.rt_genid); ++ atomic_inc_unchecked(&net->ipv4.rt_genid); } + #if IS_ENABLED(CONFIG_IPV6) + static inline int rt_genid_ipv6(struct net *net) + { +- return atomic_read(&net->ipv6.rt_genid); ++ return atomic_read_unchecked(&net->ipv6.rt_genid); + } + + static inline void rt_genid_bump_ipv6(struct net *net) + { +- atomic_inc(&net->ipv6.rt_genid); ++ atomic_inc_unchecked(&net->ipv6.rt_genid); + } + #else + static inline int rt_genid_ipv6(struct net *net) +@@ -373,12 +377,12 @@ static inline void rt_genid_bump_all(struct net *net) + static inline int fnhe_genid(struct net *net) { - return atomic_read(&net->fnhe_genid); @@ -77898,7 +79131,7 @@ index c9c0c53..53f24c3 100644 }; diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h -index 2ba9de8..47bd6c7 100644 +index bf2ec22..5e7f9d9 100644 --- a/include/net/netns/ipv4.h +++ b/include/net/netns/ipv4.h @@ -67,7 +67,7 @@ struct netns_ipv4 { @@ -77910,24 +79143,34 @@ index 2ba9de8..47bd6c7 100644 #ifdef CONFIG_IP_MROUTE #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES +@@ -77,6 +77,6 @@ struct netns_ipv4 { + struct fib_rules_ops *mr_rules_ops; + #endif + #endif +- atomic_t rt_genid; ++ atomic_unchecked_t rt_genid; + }; + #endif diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h -index 005e2c2..023d340 100644 +index 0fb2401..477d81c 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h -@@ -71,7 +71,7 @@ struct netns_ipv6 { +@@ -71,8 +71,8 @@ struct netns_ipv6 { struct fib_rules_ops *mr6_rules_ops; #endif #endif - atomic_t dev_addr_genid; +- atomic_t rt_genid; + atomic_unchecked_t dev_addr_genid; ++ atomic_unchecked_t rt_genid; }; #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6) diff --git a/include/net/ping.h b/include/net/ping.h -index 5db0224..0d65365 100644 +index 2b496e9..935fd8d 100644 --- a/include/net/ping.h +++ b/include/net/ping.h -@@ -55,7 +55,7 @@ struct ping_iter_state { +@@ -56,7 +56,7 @@ struct ping_iter_state { extern struct proto ping_prot; extern struct ping_table ping_table; #if IS_ENABLED(CONFIG_IPV6) @@ -77972,10 +79215,10 @@ index 7026648..584cc8c 100644 extern int __rtnl_link_register(struct rtnl_link_ops *ops); extern void __rtnl_link_unregister(struct rtnl_link_ops *ops); diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h -index 2a82d13..62a31c2 100644 +index 4ef75af..5aa073a 100644 --- a/include/net/sctp/sm.h +++ b/include/net/sctp/sm.h -@@ -87,7 +87,7 @@ typedef void (sctp_timer_event_t) (unsigned long); +@@ -81,7 +81,7 @@ typedef void (sctp_timer_event_t) (unsigned long); typedef struct { sctp_state_fn_t *fn; const char *name; @@ -77984,7 +79227,7 @@ index 2a82d13..62a31c2 100644 /* A naming convention of "sctp_sf_xxx" applies to all the state functions * currently in use. -@@ -299,7 +299,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *); +@@ -293,7 +293,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *); __u32 sctp_generate_tsn(const struct sctp_endpoint *); /* Extern declarations for major data structures. */ @@ -77994,10 +79237,10 @@ index 2a82d13..62a31c2 100644 /* Get the size of a DATA chunk payload. */ diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h -index e745c92..3641448 100644 +index 2174d8d..71d5257 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h -@@ -516,7 +516,7 @@ struct sctp_pf { +@@ -508,7 +508,7 @@ struct sctp_pf { struct sctp_association *asoc); void (*addr_v4map) (struct sctp_sock *, union sctp_addr *); struct sctp_af *af; @@ -78007,10 +79250,10 @@ index e745c92..3641448 100644 /* Structure to track chunk fragments that have been acked, but peer diff --git a/include/net/sock.h b/include/net/sock.h -index 31d5cfb..9ee0602 100644 +index 808cbc2..8617e9c 100644 --- a/include/net/sock.h +++ b/include/net/sock.h -@@ -331,7 +331,7 @@ struct sock { +@@ -332,7 +332,7 @@ struct sock { unsigned int sk_napi_id; unsigned int sk_ll_usec; #endif @@ -78019,7 +79262,16 @@ index 31d5cfb..9ee0602 100644 int sk_rcvbuf; struct sk_filter __rcu *sk_filter; -@@ -1803,7 +1803,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags) +@@ -1194,7 +1194,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot) + return ret >> PAGE_SHIFT; + } + +-static inline long ++static inline long __intentional_overflow(-1) + sk_memory_allocated(const struct sock *sk) + { + struct proto *prot = sk->sk_prot; +@@ -1821,7 +1821,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags) } static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb, @@ -78028,7 +79280,7 @@ index 31d5cfb..9ee0602 100644 int copy, int offset) { if (skb->ip_summed == CHECKSUM_NONE) { -@@ -2065,7 +2065,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk) +@@ -2083,7 +2083,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk) } } @@ -78038,10 +79290,10 @@ index 31d5cfb..9ee0602 100644 /** * sk_page_frag - return an appropriate page_frag diff --git a/include/net/tcp.h b/include/net/tcp.h -index d198005..c974a393 100644 +index b1aa324..b8530ea 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h -@@ -521,7 +521,7 @@ extern void tcp_retransmit_timer(struct sock *sk); +@@ -527,7 +527,7 @@ extern void tcp_retransmit_timer(struct sock *sk); extern void tcp_xmit_retransmit_queue(struct sock *); extern void tcp_simple_retransmit(struct sock *); extern int tcp_trim_head(struct sock *, struct sk_buff *, u32); @@ -78050,7 +79302,7 @@ index d198005..c974a393 100644 extern void tcp_send_probe0(struct sock *); extern void tcp_send_partial(struct sock *); -@@ -694,8 +694,8 @@ struct tcp_skb_cb { +@@ -699,8 +699,8 @@ struct tcp_skb_cb { struct inet6_skb_parm h6; #endif } header; /* For incoming frames */ @@ -78061,7 +79313,7 @@ index d198005..c974a393 100644 __u32 when; /* used to compute rtt's */ __u8 tcp_flags; /* TCP header flags. (tcp[13]) */ -@@ -709,7 +709,7 @@ struct tcp_skb_cb { +@@ -714,7 +714,7 @@ struct tcp_skb_cb { __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */ /* 1 byte hole */ @@ -78071,7 +79323,7 @@ index d198005..c974a393 100644 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0])) diff --git a/include/net/xfrm.h b/include/net/xfrm.h -index e823786..53b0608 100644 +index e253bf0..2278b4b 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -287,7 +287,6 @@ struct xfrm_dst; @@ -78137,7 +79389,7 @@ index e823786..53b0608 100644 static __inline__ diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h -index 1a046b1..ee0bef0 100644 +index 1017e0b..227aa4d 100644 --- a/include/rdma/iw_cm.h +++ b/include/rdma/iw_cm.h @@ -122,7 +122,7 @@ struct iw_cm_verbs { @@ -78171,10 +79423,10 @@ index e1379b4..67eafbe 100644 u8 qfull; enum fc_lport_state state; diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h -index a44954c..5da04b2 100644 +index d65fbec..f80fef2 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h -@@ -172,9 +172,9 @@ struct scsi_device { +@@ -180,9 +180,9 @@ struct scsi_device { unsigned int max_device_blocked; /* what device_blocked counts down from */ #define SCSI_DEFAULT_DEVICE_BLOCKED 3 @@ -78202,7 +79454,7 @@ index b797e8f..8e2c3aa 100644 /** diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h -index 9031a26..750d592 100644 +index ae6c3b8..fd748ac 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -128,7 +128,7 @@ struct snd_compr_ops { @@ -78215,10 +79467,10 @@ index 9031a26..750d592 100644 /** * struct snd_compr: Compressed device diff --git a/include/sound/soc.h b/include/sound/soc.h -index 6eabee7..58afb50 100644 +index d22cb0a..c6ba150 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h -@@ -783,7 +783,7 @@ struct snd_soc_codec_driver { +@@ -780,7 +780,7 @@ struct snd_soc_codec_driver { /* probe ordering - for components with runtime dependencies */ int probe_order; int remove_order; @@ -78227,7 +79479,7 @@ index 6eabee7..58afb50 100644 /* SoC platform interface */ struct snd_soc_platform_driver { -@@ -829,7 +829,7 @@ struct snd_soc_platform_driver { +@@ -826,7 +826,7 @@ struct snd_soc_platform_driver { unsigned int (*read)(struct snd_soc_platform *, unsigned int); int (*write)(struct snd_soc_platform *, unsigned int, unsigned int); int (*bespoke_trigger)(struct snd_pcm_substream *, int); @@ -78237,10 +79489,10 @@ index 6eabee7..58afb50 100644 struct snd_soc_platform { const char *name; diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h -index e34fc90..ecefa2c 100644 +index 5bdb8b7..bb1096c 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h -@@ -643,7 +643,7 @@ struct se_device { +@@ -663,7 +663,7 @@ struct se_device { spinlock_t stats_lock; /* Active commands on this virtual SE device */ atomic_t simple_cmds; @@ -78599,10 +79851,10 @@ index 30f5362..8ed8ac9 100644 void *pmi_pal; u8 *vbe_state_orig; /* diff --git a/init/Kconfig b/init/Kconfig -index fed81b5..0d3b964 100644 +index 3ecd8a1..627843f 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1069,6 +1069,7 @@ endif # CGROUPS +@@ -1086,6 +1086,7 @@ endif # CGROUPS config CHECKPOINT_RESTORE bool "Checkpoint/restore support" if EXPERT @@ -78610,7 +79862,7 @@ index fed81b5..0d3b964 100644 default n help Enables additional kernel features in a sake of checkpoint/restore. -@@ -1553,7 +1554,7 @@ config SLUB_DEBUG +@@ -1557,7 +1558,7 @@ config SLUB_DEBUG config COMPAT_BRK bool "Disable heap randomization" @@ -78619,7 +79871,7 @@ index fed81b5..0d3b964 100644 help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -@@ -1827,7 +1828,7 @@ config INIT_ALL_POSSIBLE +@@ -1832,7 +1833,7 @@ config INIT_ALL_POSSIBLE config STOP_MACHINE bool default y @@ -78643,10 +79895,10 @@ index 7bc47ee..6da2dc7 100644 ifneq ($(CONFIG_BLK_DEV_INITRD),y) obj-y += noinitramfs.o diff --git a/init/do_mounts.c b/init/do_mounts.c -index 816014c..c2054db 100644 +index a51cddc..25c2768 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -355,11 +355,11 @@ static void __init get_fs_names(char *page) +@@ -357,11 +357,11 @@ static void __init get_fs_names(char *page) static int __init do_mount_root(char *name, char *fs, int flags, void *data) { struct super_block *s; @@ -78660,7 +79912,7 @@ index 816014c..c2054db 100644 s = current->fs->pwd.dentry->d_sb; ROOT_DEV = s->s_dev; printk(KERN_INFO -@@ -480,18 +480,18 @@ void __init change_floppy(char *fmt, ...) +@@ -482,18 +482,18 @@ void __init change_floppy(char *fmt, ...) va_start(args, fmt); vsprintf(buf, fmt, args); va_end(args); @@ -78682,7 +79934,7 @@ index 816014c..c2054db 100644 termios.c_lflag |= ICANON; sys_ioctl(fd, TCSETSF, (long)&termios); sys_close(fd); -@@ -585,6 +585,6 @@ void __init prepare_namespace(void) +@@ -587,8 +587,8 @@ void __init prepare_namespace(void) mount_root(); out: devtmpfs_mount("dev"); @@ -78691,6 +79943,8 @@ index 816014c..c2054db 100644 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((const char __force_user *)"."); } + + static bool is_tmpfs; diff --git a/init/do_mounts.h b/init/do_mounts.h index f5b978a..69dbfe8 100644 --- a/init/do_mounts.h @@ -78976,10 +80230,10 @@ index a67ef9d..2d17ed9 100644 #ifdef CONFIG_BLK_DEV_RAM int fd; diff --git a/init/main.c b/init/main.c -index 586cd33..f1af30f 100644 +index 63d3e8f..50bd5f8 100644 --- a/init/main.c +++ b/init/main.c -@@ -102,6 +102,8 @@ static inline void mark_rodata_ro(void) { } +@@ -103,6 +103,8 @@ static inline void mark_rodata_ro(void) { } extern void tc_init(void); #endif @@ -78988,7 +80242,7 @@ index 586cd33..f1af30f 100644 /* * Debug helper: via this flag we know that we are in 'early bootup code' * where only the boot processor is running with IRQ disabled. This means -@@ -155,6 +157,74 @@ static int __init set_reset_devices(char *str) +@@ -156,6 +158,75 @@ static int __init set_reset_devices(char *str) __setup("reset_devices", set_reset_devices); @@ -79032,6 +80286,7 @@ index 586cd33..f1af30f 100644 + clone_pgd_mask = ~(pgdval_t)0UL; + pax_user_shadow_base = 0UL; + setup_clear_cpu_cap(X86_FEATURE_PCID); ++ setup_clear_cpu_cap(X86_FEATURE_INVPCID); +#endif + + return 0; @@ -79063,7 +80318,7 @@ index 586cd33..f1af30f 100644 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; -@@ -680,25 +750,24 @@ int __init_or_module do_one_initcall(initcall_t fn) +@@ -682,25 +753,24 @@ int __init_or_module do_one_initcall(initcall_t fn) { int count = preempt_count(); int ret; @@ -79094,7 +80349,7 @@ index 586cd33..f1af30f 100644 return ret; } -@@ -805,8 +874,8 @@ static int run_init_process(const char *init_filename) +@@ -807,10 +877,14 @@ static int run_init_process(const char *init_filename) { argv_init[0] = init_filename; return do_execve(init_filename, @@ -79104,8 +80359,26 @@ index 586cd33..f1af30f 100644 + (const char __user *const __force_user *)envp_init); } ++#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD ++extern int gr_init_ran; ++#endif ++ static noinline void __init kernel_init_freeable(void); -@@ -883,7 +952,7 @@ static noinline void __init kernel_init_freeable(void) + + static int __ref kernel_init(void *unused) +@@ -831,6 +905,11 @@ static int __ref kernel_init(void *unused) + pr_err("Failed to execute %s\n", ramdisk_execute_command); + } + ++#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD ++ /* if no initrd was used, be extra sure we enforce chroot restrictions */ ++ gr_init_ran = 1; ++#endif ++ + /* + * We try each of these until one succeeds. + * +@@ -885,7 +964,7 @@ static noinline void __init kernel_init_freeable(void) do_basic_setup(); /* Open the /dev/console on the rootfs, this should never fail */ @@ -79114,7 +80387,7 @@ index 586cd33..f1af30f 100644 pr_err("Warning: unable to open an initial console.\n"); (void) sys_dup(0); -@@ -896,11 +965,13 @@ static noinline void __init kernel_init_freeable(void) +@@ -898,11 +977,13 @@ static noinline void __init kernel_init_freeable(void) if (!ramdisk_execute_command) ramdisk_execute_command = "/init"; @@ -79130,7 +80403,7 @@ index 586cd33..f1af30f 100644 * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c -index 130dfec..cc88451 100644 +index b0e99de..09f385c 100644 --- a/ipc/ipc_sysctl.c +++ b/ipc/ipc_sysctl.c @@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table) @@ -79152,7 +80425,7 @@ index 130dfec..cc88451 100644 memcpy(&ipc_table, table, sizeof(ipc_table)); ipc_table.data = get_ipc(table); @@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write, - static int proc_ipc_callback_dointvec(ctl_table *table, int write, + static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { - struct ctl_table ipc_table; @@ -79160,7 +80433,7 @@ index 130dfec..cc88451 100644 size_t lenp_bef = *lenp; int rc; -@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec(ctl_table *table, int write, +@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write, static int proc_ipc_doulongvec_minmax(ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -79233,7 +80506,7 @@ index 558aa91..359e718 100644 msg_params.flg = msgflg; diff --git a/ipc/sem.c b/ipc/sem.c -index 8e2bf30..a711151 100644 +index db9d241..bc8427c 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -562,10 +562,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, @@ -79265,7 +80538,7 @@ index 8e2bf30..a711151 100644 sem_params.flg = semflg; sem_params.u.nsems = nsems; diff --git a/ipc/shm.c b/ipc/shm.c -index d697396..40e887d 100644 +index 7a51443..3a257d8 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -72,6 +72,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp); @@ -79283,7 +80556,7 @@ index d697396..40e887d 100644 void shm_init_ns(struct ipc_namespace *ns) { ns->shm_ctlmax = SHMMAX; -@@ -551,6 +559,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) +@@ -554,6 +562,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) shp->shm_lprid = 0; shp->shm_atim = shp->shm_dtim = 0; shp->shm_ctim = get_seconds(); @@ -79298,7 +80571,7 @@ index d697396..40e887d 100644 shp->shm_segsz = size; shp->shm_nattch = 0; shp->shm_file = file; -@@ -604,18 +620,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, +@@ -607,18 +623,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, return 0; } @@ -79323,7 +80596,7 @@ index d697396..40e887d 100644 shm_params.key = key; shm_params.flg = shmflg; shm_params.u.size = size; -@@ -1076,6 +1093,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, +@@ -1089,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, f_mode = FMODE_READ | FMODE_WRITE; } if (shmflg & SHM_EXEC) { @@ -79336,7 +80609,7 @@ index d697396..40e887d 100644 prot |= PROT_EXEC; acc_mode |= S_IXUGO; } -@@ -1100,10 +1123,22 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, +@@ -1113,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, if (err) goto out_unlock; @@ -79350,6 +80623,9 @@ index d697396..40e887d 100644 +#endif + ipc_lock_object(&shp->shm_perm); + + /* check if shm_destroy() is tearing down shp */ +@@ -1125,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, path = shp->shm_file->f_path; path_get(&path); shp->shm_nattch++; @@ -79359,6 +80635,29 @@ index d697396..40e887d 100644 size = i_size_read(path.dentry->d_inode); ipc_unlock_object(&shp->shm_perm); rcu_read_unlock(); +diff --git a/ipc/util.c b/ipc/util.c +index 7684f41..f7da711 100644 +--- a/ipc/util.c ++++ b/ipc/util.c +@@ -71,6 +71,8 @@ struct ipc_proc_iface { + int (*show)(struct seq_file *, void *); + }; + ++extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode); ++ + static void ipc_memory_notifier(struct work_struct *work) + { + ipcns_notify(IPCNS_MEMCHANGED); +@@ -560,6 +562,9 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag) + granted_mode >>= 6; + else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid)) + granted_mode >>= 3; ++ else if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode)) ++ return -1; ++ + /* is there some bit set in requested_mode but not in granted_mode? */ + if ((requested_mode & ~granted_mode & 0007) && + !ns_capable(ns->user_ns, CAP_IPC_OWNER)) diff --git a/kernel/acct.c b/kernel/acct.c index 8d6e145..33e0b1e 100644 --- a/kernel/acct.c @@ -79373,7 +80672,7 @@ index 8d6e145..33e0b1e 100644 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); diff --git a/kernel/audit.c b/kernel/audit.c -index 7b0e23a..5b27ab9 100644 +index 7ddfd8a..49766eb 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -118,7 +118,7 @@ u32 audit_sig_sid = 0; @@ -79403,13 +80702,7 @@ index 7b0e23a..5b27ab9 100644 audit_rate_limit, audit_backlog_limit); audit_panic(message); -@@ -659,18 +659,19 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - - switch (msg_type) { - case AUDIT_GET: -+ status_set.mask = 0; - status_set.enabled = audit_enabled; - status_set.failure = audit_failure; +@@ -665,7 +665,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) status_set.pid = audit_pid; status_set.rate_limit = audit_rate_limit; status_set.backlog_limit = audit_backlog_limit; @@ -79418,22 +80711,15 @@ index 7b0e23a..5b27ab9 100644 status_set.backlog = skb_queue_len(&audit_skb_queue); audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0, &status_set, sizeof(status_set)); - break; - case AUDIT_SET: -- if (nlh->nlmsg_len < sizeof(struct audit_status)) -+ if (nlmsg_len(nlh) < sizeof(struct audit_status)) - return -EINVAL; - status_get = (struct audit_status *)data; - if (status_get->mask & AUDIT_STATUS_ENABLED) { -@@ -832,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - - memset(&s, 0, sizeof(s)); - /* guard against past and future API changes */ -- memcpy(&s, data, min(sizeof(s), (size_t)nlh->nlmsg_len)); -+ memcpy(&s, data, min_t(size_t, sizeof(s), nlmsg_len(nlh))); - if ((s.enabled != 0 && s.enabled != 1) || - (s.log_passwd != 0 && s.log_passwd != 1)) - return -EINVAL; +@@ -1252,7 +1252,7 @@ void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf, + int i, avail, new_len; + unsigned char *ptr; + struct sk_buff *skb; +- static const unsigned char *hex = "0123456789ABCDEF"; ++ static const unsigned char hex[] = "0123456789ABCDEF"; + + if (!ab) + return; diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 9845cb3..3ec9369 100644 --- a/kernel/auditsc.c @@ -79457,7 +80743,7 @@ index 9845cb3..3ec9369 100644 struct audit_buffer *ab; diff --git a/kernel/capability.c b/kernel/capability.c -index f6c2ce5..982c0f9 100644 +index 4e66bf9..cdccecf 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr) @@ -79539,12 +80825,12 @@ index f6c2ce5..982c0f9 100644 +EXPORT_SYMBOL(capable_nolog); + /** - * nsown_capable - Check superior capability to one's own user_ns - * @cap: The capability in question -@@ -464,3 +489,10 @@ bool inode_capable(const struct inode *inode, int cap) - + * inode_capable - Check superior capability over inode + * @inode: The inode in question +@@ -453,3 +478,11 @@ bool inode_capable(const struct inode *inode, int cap) return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid); } + EXPORT_SYMBOL(inode_capable); + +bool inode_capable_nolog(const struct inode *inode, int cap) +{ @@ -79552,11 +80838,12 @@ index f6c2ce5..982c0f9 100644 + + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid); +} ++EXPORT_SYMBOL(inode_capable_nolog); diff --git a/kernel/cgroup.c b/kernel/cgroup.c -index e919633..f46b08f 100644 +index 5c9127d..f871169 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5623,7 +5623,7 @@ static int cgroup_css_links_read(struct cgroup *cgrp, +@@ -5844,7 +5844,7 @@ static int cgroup_css_links_read(struct cgroup_subsys_state *css, struct css_set *cset = link->cset; struct task_struct *task; int count = 0; @@ -79967,10 +81254,10 @@ index 00eb8f7..d7e3244 100644 #ifdef CONFIG_MODULE_UNLOAD { diff --git a/kernel/events/core.c b/kernel/events/core.c -index f86599e..b18b180 100644 +index 953c143..5646bb1 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c -@@ -156,8 +156,15 @@ static struct srcu_struct pmus_srcu; +@@ -157,8 +157,15 @@ static struct srcu_struct pmus_srcu; * 0 - disallow raw tracepoint access for unpriv * 1 - disallow cpu events for unpriv * 2 - disallow kernel profiling for unpriv @@ -79987,7 +81274,7 @@ index f86599e..b18b180 100644 /* Minimum for 512 kiB + 1 user control page */ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */ -@@ -270,7 +277,7 @@ void perf_sample_event_took(u64 sample_len_ns) +@@ -271,7 +278,7 @@ void perf_sample_event_took(u64 sample_len_ns) update_perf_cpu_limits(); } @@ -79996,7 +81283,7 @@ index f86599e..b18b180 100644 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx, enum event_type_t event_type); -@@ -2936,7 +2943,7 @@ static void __perf_event_read(void *info) +@@ -2940,7 +2947,7 @@ static void __perf_event_read(void *info) static inline u64 perf_event_count(struct perf_event *event) { @@ -80005,7 +81292,7 @@ index f86599e..b18b180 100644 } static u64 perf_event_read(struct perf_event *event) -@@ -3282,9 +3289,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running) +@@ -3308,9 +3315,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running) mutex_lock(&event->child_mutex); total += perf_event_read(event); *enabled += event->total_time_enabled + @@ -80017,7 +81304,7 @@ index f86599e..b18b180 100644 list_for_each_entry(child, &event->child_list, child_list) { total += perf_event_read(child); -@@ -3670,10 +3677,10 @@ void perf_event_update_userpage(struct perf_event *event) +@@ -3725,10 +3732,10 @@ void perf_event_update_userpage(struct perf_event *event) userpg->offset -= local64_read(&event->hw.prev_count); userpg->time_enabled = enabled + @@ -80030,7 +81317,7 @@ index f86599e..b18b180 100644 arch_perf_update_userpage(userpg, now); -@@ -4223,7 +4230,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size, +@@ -4279,7 +4286,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size, /* Data. */ sp = perf_user_stack_pointer(regs); @@ -80039,7 +81326,7 @@ index f86599e..b18b180 100644 dyn_size = dump_size - rem; perf_output_skip(handle, rem); -@@ -4311,11 +4318,11 @@ static void perf_output_read_one(struct perf_output_handle *handle, +@@ -4370,11 +4377,11 @@ static void perf_output_read_one(struct perf_output_handle *handle, values[n++] = perf_event_count(event); if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) { values[n++] = enabled + @@ -80053,7 +81340,7 @@ index f86599e..b18b180 100644 } if (read_format & PERF_FORMAT_ID) values[n++] = primary_event_id(event); -@@ -5024,12 +5031,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) +@@ -5112,12 +5119,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) * need to add enough zero bytes after the string to handle * the 64bit alignment we do later. */ @@ -80068,7 +81355,7 @@ index f86599e..b18b180 100644 if (IS_ERR(name)) { name = strncpy(tmp, "//toolong", sizeof(tmp)); goto got_name; -@@ -6498,7 +6505,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, +@@ -6639,7 +6646,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, event->parent = parent_event; event->ns = get_pid_ns(task_active_pid_ns(current)); @@ -80077,7 +81364,7 @@ index f86599e..b18b180 100644 event->state = PERF_EVENT_STATE_INACTIVE; -@@ -6807,6 +6814,11 @@ SYSCALL_DEFINE5(perf_event_open, +@@ -6938,6 +6945,11 @@ SYSCALL_DEFINE5(perf_event_open, if (flags & ~PERF_FLAG_ALL) return -EINVAL; @@ -80089,7 +81376,7 @@ index f86599e..b18b180 100644 err = perf_copy_attr(attr_uptr, &attr); if (err) return err; -@@ -7139,10 +7151,10 @@ static void sync_child_event(struct perf_event *child_event, +@@ -7271,10 +7283,10 @@ static void sync_child_event(struct perf_event *child_event, /* * Add back the child's count to the parent's count: */ @@ -80216,7 +81503,7 @@ index a949819..a5f127d 100644 { struct signal_struct *sig = current->signal; diff --git a/kernel/fork.c b/kernel/fork.c -index 200a7a2..43e52da 100644 +index 086fe73..72c1122 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) @@ -80228,20 +81515,17 @@ index 200a7a2..43e52da 100644 #endif /* -@@ -345,13 +345,81 @@ free_tsk: +@@ -345,12 +345,80 @@ free_tsk: } #ifdef CONFIG_MMU -static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt) - { -- struct vm_area_struct *mpnt, *tmp, *prev, **pprev; -- struct rb_node **rb_link, *rb_parent; -- int retval; ++{ + struct vm_area_struct *tmp; - unsigned long charge; - struct mempolicy *pol; ++ unsigned long charge; + struct file *file; ++ int retval; + + charge = 0; + if (mpnt->vm_flags & VM_ACCOUNT) { @@ -80257,10 +81541,9 @@ index 200a7a2..43e52da 100644 + *tmp = *mpnt; + tmp->vm_mm = mm; + INIT_LIST_HEAD(&tmp->anon_vma_chain); -+ pol = mpol_dup(vma_policy(mpnt)); -+ if (IS_ERR(pol)) ++ retval = vma_dup_policy(mpnt, tmp); ++ if (retval) + goto fail_nomem_policy; -+ vma_set_policy(tmp, pol); + if (anon_vma_fork(tmp, mpnt)) + goto fail_nomem_anon_vma_fork; + tmp->vm_flags &= ~VM_LOCKED; @@ -80298,7 +81581,7 @@ index 200a7a2..43e52da 100644 + return tmp; + +fail_nomem_anon_vma_fork: -+ mpol_put(pol); ++ mpol_put(vma_policy(tmp)); +fail_nomem_policy: + kmem_cache_free(vm_area_cachep, tmp); +fail_nomem: @@ -80307,14 +81590,15 @@ index 200a7a2..43e52da 100644 +} + +static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) -+{ -+ struct vm_area_struct *mpnt, *tmp, *prev, **pprev; -+ struct rb_node **rb_link, *rb_parent; -+ int retval; + { + struct vm_area_struct *mpnt, *tmp, *prev, **pprev; + struct rb_node **rb_link, *rb_parent; + int retval; +- unsigned long charge; uprobe_start_dup_mmap(); down_write(&oldmm->mmap_sem); -@@ -380,57 +448,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) +@@ -379,55 +447,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) prev = NULL; for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) { @@ -80338,11 +81622,9 @@ index 200a7a2..43e52da 100644 - goto fail_nomem; - *tmp = *mpnt; - INIT_LIST_HEAD(&tmp->anon_vma_chain); -- pol = mpol_dup(vma_policy(mpnt)); -- retval = PTR_ERR(pol); -- if (IS_ERR(pol)) +- retval = vma_dup_policy(mpnt, tmp); +- if (retval) - goto fail_nomem_policy; -- vma_set_policy(tmp, pol); - tmp->vm_mm = mm; - if (anon_vma_fork(tmp, mpnt)) - goto fail_nomem_anon_vma_fork; @@ -80376,7 +81658,7 @@ index 200a7a2..43e52da 100644 } /* -@@ -462,6 +488,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) +@@ -459,6 +487,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) if (retval) goto out; } @@ -80408,12 +81690,12 @@ index 200a7a2..43e52da 100644 /* a new mm has just been created */ arch_dup_mmap(oldmm, mm); retval = 0; -@@ -471,14 +522,6 @@ out: +@@ -468,14 +521,6 @@ out: up_write(&oldmm->mmap_sem); uprobe_end_dup_mmap(); return retval; -fail_nomem_anon_vma_fork: -- mpol_put(pol); +- mpol_put(vma_policy(tmp)); -fail_nomem_policy: - kmem_cache_free(vm_area_cachep, tmp); -fail_nomem: @@ -80423,7 +81705,7 @@ index 200a7a2..43e52da 100644 } static inline int mm_alloc_pgd(struct mm_struct *mm) -@@ -691,8 +734,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) +@@ -688,8 +733,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) return ERR_PTR(err); mm = get_task_mm(task); @@ -80434,7 +81716,7 @@ index 200a7a2..43e52da 100644 mmput(mm); mm = ERR_PTR(-EACCES); } -@@ -914,13 +957,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk) +@@ -911,13 +956,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk) spin_unlock(&fs->lock); return -EAGAIN; } @@ -80456,7 +81738,7 @@ index 200a7a2..43e52da 100644 return 0; } -@@ -1131,7 +1181,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid) +@@ -1128,7 +1180,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid) * parts of the process environment (as per the clone * flags). The actual kick-off is left to the caller. */ @@ -80465,7 +81747,7 @@ index 200a7a2..43e52da 100644 unsigned long stack_start, unsigned long stack_size, int __user *child_tidptr, -@@ -1201,6 +1251,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1200,6 +1252,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -80475,7 +81757,7 @@ index 200a7a2..43e52da 100644 if (atomic_read(&p->real_cred->user->processes) >= task_rlimit(p, RLIMIT_NPROC)) { if (p->real_cred->user != INIT_USER && -@@ -1450,6 +1503,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1449,6 +1504,11 @@ static struct task_struct *copy_process(unsigned long clone_flags, goto bad_fork_free_pid; } @@ -80487,7 +81769,7 @@ index 200a7a2..43e52da 100644 if (likely(p->pid)) { ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace); -@@ -1535,6 +1593,8 @@ bad_fork_cleanup_count: +@@ -1534,6 +1594,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -80496,7 +81778,7 @@ index 200a7a2..43e52da 100644 return ERR_PTR(retval); } -@@ -1605,6 +1665,7 @@ long do_fork(unsigned long clone_flags, +@@ -1595,6 +1657,7 @@ long do_fork(unsigned long clone_flags, p = copy_process(clone_flags, stack_start, stack_size, child_tidptr, NULL, trace); @@ -80504,7 +81786,7 @@ index 200a7a2..43e52da 100644 /* * Do this prior waking up the new thread - the thread pointer * might get invalid after that point, if the thread exits quickly. -@@ -1619,6 +1680,8 @@ long do_fork(unsigned long clone_flags, +@@ -1609,6 +1672,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -80513,7 +81795,7 @@ index 200a7a2..43e52da 100644 if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1735,7 +1798,7 @@ void __init proc_caches_init(void) +@@ -1725,7 +1790,7 @@ void __init proc_caches_init(void) mm_cachep = kmem_cache_create("mm_struct", sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN, SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL); @@ -80522,7 +81804,7 @@ index 200a7a2..43e52da 100644 mmap_init(); nsproxy_cache_init(); } -@@ -1775,7 +1838,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) +@@ -1765,7 +1830,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -80531,7 +81813,7 @@ index 200a7a2..43e52da 100644 return 0; *new_fsp = copy_fs_struct(fs); -@@ -1887,7 +1950,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) +@@ -1872,7 +1937,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) fs = current->fs; spin_lock(&fs->lock); current->fs = new_fs; @@ -80667,18 +81949,18 @@ index 55fcce6..0e4cf34 100644 return 0; } diff --git a/kernel/jump_label.c b/kernel/jump_label.c -index 60f48fa..7f3a770 100644 +index 297a924..7290070 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c -@@ -13,6 +13,7 @@ - #include +@@ -14,6 +14,7 @@ #include #include + #include +#include #ifdef HAVE_JUMP_LABEL -@@ -50,7 +51,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop) +@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop) size = (((unsigned long)stop - (unsigned long)start) / sizeof(struct jump_entry)); @@ -80688,7 +81970,7 @@ index 60f48fa..7f3a770 100644 } static void jump_label_update(struct static_key *key, int enable); -@@ -357,10 +360,12 @@ static void jump_label_invalidate_module_init(struct module *mod) +@@ -358,10 +361,12 @@ static void jump_label_invalidate_module_init(struct module *mod) struct jump_entry *iter_stop = iter_start + mod->num_jump_entries; struct jump_entry *iter; @@ -80831,7 +82113,7 @@ index e30ac0f..3528cac 100644 /* diff --git a/kernel/kexec.c b/kernel/kexec.c -index 59f7b55..4022f65 100644 +index 2a74f30..d139351 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -1041,7 +1041,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry, @@ -80845,7 +82127,7 @@ index 59f7b55..4022f65 100644 /* Don't allow clients that don't understand the native diff --git a/kernel/kmod.c b/kernel/kmod.c -index b086006..a27913b 100644 +index b086006..6d2e579 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info) @@ -80973,7 +82255,38 @@ index b086006..a27913b 100644 EXPORT_SYMBOL(__request_module); #endif /* CONFIG_MODULES */ -@@ -303,7 +356,7 @@ static int wait_for_helper(void *data) +@@ -218,6 +271,19 @@ static int ____call_usermodehelper(void *data) + */ + set_user_nice(current, 0); + ++#ifdef CONFIG_GRKERNSEC ++ /* this is race-free as far as userland is concerned as we copied ++ out the path to be used prior to this point and are now operating ++ on that copy ++ */ ++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && ++ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) { ++ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path); ++ retval = -EPERM; ++ goto fail; ++ } ++#endif ++ + retval = -ENOMEM; + new = prepare_kernel_cred(current); + if (!new) +@@ -260,6 +326,10 @@ static int call_helper(void *data) + + static void call_usermodehelper_freeinfo(struct subprocess_info *info) + { ++#ifdef CONFIG_GRKERNSEC ++ kfree(info->path); ++ info->path = info->origpath; ++#endif + if (info->cleanup) + (*info->cleanup)(info); + kfree(info); +@@ -303,7 +373,7 @@ static int wait_for_helper(void *data) * * Thus the __user pointer cast is valid here. */ @@ -80982,7 +82295,20 @@ index b086006..a27913b 100644 /* * If ret is 0, either ____call_usermodehelper failed and the -@@ -650,7 +703,7 @@ EXPORT_SYMBOL(call_usermodehelper); +@@ -542,7 +612,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv, + goto out; + + INIT_WORK(&sub_info->work, __call_usermodehelper); ++#ifdef CONFIG_GRKERNSEC ++ sub_info->origpath = path; ++ sub_info->path = kstrdup(path, gfp_mask); ++#else + sub_info->path = path; ++#endif + sub_info->argv = argv; + sub_info->envp = envp; + +@@ -650,7 +725,7 @@ EXPORT_SYMBOL(call_usermodehelper); static int proc_cap_handler(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -80992,7 +82318,7 @@ index b086006..a27913b 100644 kernel_cap_t new_cap; int err, i; diff --git a/kernel/kprobes.c b/kernel/kprobes.c -index 6e33498..3133bd3 100644 +index a0d367a..11c18b6 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -31,6 +31,9 @@ @@ -81005,25 +82331,22 @@ index 6e33498..3133bd3 100644 #include #include #include -@@ -185,7 +188,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c) - * kernel image and loaded module images reside. This is required - * so x86_64 can correctly handle the %rip-relative fixups. - */ -- kip->insns = module_alloc(PAGE_SIZE); -+ kip->insns = module_alloc_exec(PAGE_SIZE); - if (!kip->insns) { - kfree(kip); - return NULL; -@@ -225,7 +228,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx) - */ - if (!list_is_singular(&kip->list)) { - list_del(&kip->list); -- module_free(NULL, kip->insns); -+ module_free_exec(NULL, kip->insns); - kfree(kip); - } - return 1; -@@ -2083,7 +2086,7 @@ static int __init init_kprobes(void) +@@ -135,12 +138,12 @@ enum kprobe_slot_state { + + static void *alloc_insn_page(void) + { +- return module_alloc(PAGE_SIZE); ++ return module_alloc_exec(PAGE_SIZE); + } + + static void free_insn_page(void *page) + { +- module_free(NULL, page); ++ module_free_exec(NULL, page); + } + + struct kprobe_insn_cache kprobe_insn_slots = { +@@ -2066,7 +2069,7 @@ static int __init init_kprobes(void) { int i, err = 0; unsigned long offset = 0, size = 0; @@ -81032,7 +82355,7 @@ index 6e33498..3133bd3 100644 const char *symbol_name; void *addr; struct kprobe_blackpoint *kb; -@@ -2168,11 +2171,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p, +@@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p, kprobe_type = "k"; if (sym) @@ -81046,7 +82369,7 @@ index 6e33498..3133bd3 100644 p->addr, kprobe_type, p->addr); if (!pp) -@@ -2209,7 +2212,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v) +@@ -2192,7 +2195,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v) const char *sym = NULL; unsigned int i = *(loff_t *) v; unsigned long offset = 0; @@ -81056,7 +82379,7 @@ index 6e33498..3133bd3 100644 head = &kprobe_table[i]; preempt_disable(); diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c -index 6ada93c..dce7d5d 100644 +index 9659d38..bffd520 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c @@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj, @@ -81159,7 +82482,7 @@ index b2c71c5..7b88d63 100644 seq_printf(m, "%40s %14lu %29s %pS\n", name, stats->contending_point[i], diff --git a/kernel/module.c b/kernel/module.c -index 2069158..71101bb 100644 +index dc58274..3ddfa55 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -61,6 +61,7 @@ @@ -81170,7 +82493,7 @@ index 2069158..71101bb 100644 #include #include "module-internal.h" -@@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list); +@@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list); /* Bounds of module allocation, for speeding __module_address. * Protected by module_mutex. */ @@ -81180,7 +82503,7 @@ index 2069158..71101bb 100644 int register_module_notifier(struct notifier_block * nb) { -@@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr, +@@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr, return true; list_for_each_entry_rcu(mod, &modules, list) { @@ -81189,7 +82512,7 @@ index 2069158..71101bb 100644 { mod->syms, mod->syms + mod->num_syms, mod->crcs, NOT_GPL_ONLY, false }, { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms, -@@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr, +@@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr, if (mod->state == MODULE_STATE_UNFORMED) continue; @@ -81198,7 +82521,7 @@ index 2069158..71101bb 100644 return true; } return false; -@@ -490,7 +492,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info) +@@ -491,7 +493,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info) if (!pcpusec->sh_size) return 0; @@ -81207,7 +82530,7 @@ index 2069158..71101bb 100644 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", mod->name, align, PAGE_SIZE); align = PAGE_SIZE; -@@ -1096,7 +1098,7 @@ struct module_attribute module_uevent = +@@ -1097,7 +1099,7 @@ struct module_attribute module_uevent = static ssize_t show_coresize(struct module_attribute *mattr, struct module_kobject *mk, char *buffer) { @@ -81216,7 +82539,7 @@ index 2069158..71101bb 100644 } static struct module_attribute modinfo_coresize = -@@ -1105,7 +1107,7 @@ static struct module_attribute modinfo_coresize = +@@ -1106,7 +1108,7 @@ static struct module_attribute modinfo_coresize = static ssize_t show_initsize(struct module_attribute *mattr, struct module_kobject *mk, char *buffer) { @@ -81225,7 +82548,7 @@ index 2069158..71101bb 100644 } static struct module_attribute modinfo_initsize = -@@ -1320,7 +1322,7 @@ resolve_symbol_wait(struct module *mod, +@@ -1321,7 +1323,7 @@ resolve_symbol_wait(struct module *mod, */ #ifdef CONFIG_SYSFS @@ -81234,7 +82557,7 @@ index 2069158..71101bb 100644 static inline bool sect_empty(const Elf_Shdr *sect) { return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0; -@@ -1460,7 +1462,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info) +@@ -1461,7 +1463,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info) { unsigned int notes, loaded, i; struct module_notes_attrs *notes_attrs; @@ -81243,7 +82566,7 @@ index 2069158..71101bb 100644 /* failed to create section attributes, so can't create notes */ if (!mod->sect_attrs) -@@ -1572,7 +1574,7 @@ static void del_usage_links(struct module *mod) +@@ -1573,7 +1575,7 @@ static void del_usage_links(struct module *mod) static int module_add_modinfo_attrs(struct module *mod) { struct module_attribute *attr; @@ -81252,7 +82575,7 @@ index 2069158..71101bb 100644 int error = 0; int i; -@@ -1786,21 +1788,21 @@ static void set_section_ro_nx(void *base, +@@ -1795,21 +1797,21 @@ static void set_section_ro_nx(void *base, static void unset_module_core_ro_nx(struct module *mod) { @@ -81282,7 +82605,7 @@ index 2069158..71101bb 100644 set_memory_rw); } -@@ -1813,14 +1815,14 @@ void set_all_modules_text_rw(void) +@@ -1822,14 +1824,14 @@ void set_all_modules_text_rw(void) list_for_each_entry_rcu(mod, &modules, list) { if (mod->state == MODULE_STATE_UNFORMED) continue; @@ -81303,7 +82626,7 @@ index 2069158..71101bb 100644 set_memory_rw); } } -@@ -1836,14 +1838,14 @@ void set_all_modules_text_ro(void) +@@ -1845,14 +1847,14 @@ void set_all_modules_text_ro(void) list_for_each_entry_rcu(mod, &modules, list) { if (mod->state == MODULE_STATE_UNFORMED) continue; @@ -81324,7 +82647,7 @@ index 2069158..71101bb 100644 set_memory_ro); } } -@@ -1894,16 +1896,19 @@ static void free_module(struct module *mod) +@@ -1903,16 +1905,19 @@ static void free_module(struct module *mod) /* This may be NULL, but that's OK */ unset_module_init_ro_nx(mod); @@ -81347,7 +82670,7 @@ index 2069158..71101bb 100644 #ifdef CONFIG_MPU update_protections(current->mm); -@@ -1973,9 +1978,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) +@@ -1982,9 +1987,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) int ret = 0; const struct kernel_symbol *ksym; @@ -81379,7 +82702,7 @@ index 2069158..71101bb 100644 switch (sym[i].st_shndx) { case SHN_COMMON: /* We compiled with -fno-common. These are not -@@ -1996,7 +2023,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) +@@ -2005,7 +2032,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) ksym = resolve_symbol_wait(mod, info, name); /* Ok if resolved. */ if (ksym && !IS_ERR(ksym)) { @@ -81389,7 +82712,7 @@ index 2069158..71101bb 100644 break; } -@@ -2015,11 +2044,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) +@@ -2024,11 +2053,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info) secbase = (unsigned long)mod_percpu(mod); else secbase = info->sechdrs[sym[i].st_shndx].sh_addr; @@ -81410,7 +82733,7 @@ index 2069158..71101bb 100644 return ret; } -@@ -2103,22 +2141,12 @@ static void layout_sections(struct module *mod, struct load_info *info) +@@ -2112,22 +2150,12 @@ static void layout_sections(struct module *mod, struct load_info *info) || s->sh_entsize != ~0UL || strstarts(sname, ".init")) continue; @@ -81437,7 +82760,7 @@ index 2069158..71101bb 100644 } pr_debug("Init section allocation order:\n"); -@@ -2132,23 +2160,13 @@ static void layout_sections(struct module *mod, struct load_info *info) +@@ -2141,23 +2169,13 @@ static void layout_sections(struct module *mod, struct load_info *info) || s->sh_entsize != ~0UL || !strstarts(sname, ".init")) continue; @@ -81466,7 +82789,7 @@ index 2069158..71101bb 100644 } } -@@ -2321,7 +2339,7 @@ static void layout_symtab(struct module *mod, struct load_info *info) +@@ -2330,7 +2348,7 @@ static void layout_symtab(struct module *mod, struct load_info *info) /* Put symbol section at end of init part of module. */ symsect->sh_flags |= SHF_ALLOC; @@ -81475,7 +82798,7 @@ index 2069158..71101bb 100644 info->index.sym) | INIT_OFFSET_MASK; pr_debug("\t%s\n", info->secstrings + symsect->sh_name); -@@ -2338,13 +2356,13 @@ static void layout_symtab(struct module *mod, struct load_info *info) +@@ -2347,13 +2365,13 @@ static void layout_symtab(struct module *mod, struct load_info *info) } /* Append room for core symbols at end of core part. */ @@ -81493,7 +82816,7 @@ index 2069158..71101bb 100644 info->index.str) | INIT_OFFSET_MASK; pr_debug("\t%s\n", info->secstrings + strsect->sh_name); } -@@ -2362,12 +2380,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) +@@ -2371,12 +2389,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) /* Make sure we get permanent strtab: don't use info->strtab. */ mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr; @@ -81510,7 +82833,7 @@ index 2069158..71101bb 100644 src = mod->symtab; for (ndst = i = 0; i < mod->num_symtab; i++) { if (i == 0 || -@@ -2379,6 +2399,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) +@@ -2388,6 +2408,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) } } mod->core_num_syms = ndst; @@ -81519,7 +82842,7 @@ index 2069158..71101bb 100644 } #else static inline void layout_symtab(struct module *mod, struct load_info *info) -@@ -2412,17 +2434,33 @@ void * __weak module_alloc(unsigned long size) +@@ -2421,17 +2443,33 @@ void * __weak module_alloc(unsigned long size) return vmalloc_exec(size); } @@ -81558,7 +82881,7 @@ index 2069158..71101bb 100644 mutex_unlock(&module_mutex); } return ret; -@@ -2698,8 +2736,14 @@ static struct module *setup_load_info(struct load_info *info, int flags) +@@ -2706,8 +2744,14 @@ static struct module *setup_load_info(struct load_info *info, int flags) static int check_modinfo(struct module *mod, struct load_info *info, int flags) { const char *modmagic = get_modinfo(info, "vermagic"); @@ -81573,7 +82896,7 @@ index 2069158..71101bb 100644 if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -2725,7 +2769,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) +@@ -2733,7 +2777,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) } /* Set up license info based on the info section */ @@ -81582,7 +82905,7 @@ index 2069158..71101bb 100644 return 0; } -@@ -2806,7 +2850,7 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2814,7 +2858,7 @@ static int move_module(struct module *mod, struct load_info *info) void *ptr; /* Do the allocs. */ @@ -81591,7 +82914,7 @@ index 2069158..71101bb 100644 /* * The pointer to this block is stored in the module structure * which is inside the block. Just mark it as not being a -@@ -2816,11 +2860,11 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2824,11 +2868,11 @@ static int move_module(struct module *mod, struct load_info *info) if (!ptr) return -ENOMEM; @@ -81607,7 +82930,7 @@ index 2069158..71101bb 100644 /* * The pointer to this block is stored in the module structure * which is inside the block. This block doesn't need to be -@@ -2829,13 +2873,45 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2837,13 +2881,45 @@ static int move_module(struct module *mod, struct load_info *info) */ kmemleak_ignore(ptr); if (!ptr) { @@ -81657,7 +82980,7 @@ index 2069158..71101bb 100644 /* Transfer each section which specifies SHF_ALLOC */ pr_debug("final section addresses:\n"); -@@ -2846,16 +2922,45 @@ static int move_module(struct module *mod, struct load_info *info) +@@ -2854,16 +2930,45 @@ static int move_module(struct module *mod, struct load_info *info) if (!(shdr->sh_flags & SHF_ALLOC)) continue; @@ -81710,7 +83033,7 @@ index 2069158..71101bb 100644 pr_debug("\t0x%lx %s\n", (long)shdr->sh_addr, info->secstrings + shdr->sh_name); } -@@ -2912,12 +3017,12 @@ static void flush_module_icache(const struct module *mod) +@@ -2920,12 +3025,12 @@ static void flush_module_icache(const struct module *mod) * Do it before processing of module parameters, so the module * can provide parameter accessor functions of its own. */ @@ -81729,7 +83052,7 @@ index 2069158..71101bb 100644 set_fs(old_fs); } -@@ -2974,8 +3079,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags) +@@ -2982,8 +3087,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags) static void module_deallocate(struct module *mod, struct load_info *info) { percpu_modfree(mod); @@ -81742,7 +83065,7 @@ index 2069158..71101bb 100644 } int __weak module_finalize(const Elf_Ehdr *hdr, -@@ -2988,7 +3095,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr, +@@ -2996,7 +3103,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr, static int post_relocation(struct module *mod, const struct load_info *info) { /* Sort exception table now relocations are done. */ @@ -81752,7 +83075,7 @@ index 2069158..71101bb 100644 /* Copy relocated percpu area over. */ percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr, -@@ -3042,16 +3151,16 @@ static int do_init_module(struct module *mod) +@@ -3050,16 +3159,16 @@ static int do_init_module(struct module *mod) MODULE_STATE_COMING, mod); /* Set RO and NX regions for core */ @@ -81777,7 +83100,7 @@ index 2069158..71101bb 100644 do_mod_ctors(mod); /* Start the module */ -@@ -3113,11 +3222,12 @@ static int do_init_module(struct module *mod) +@@ -3121,11 +3230,12 @@ static int do_init_module(struct module *mod) mod->strtab = mod->core_strtab; #endif unset_module_init_ro_nx(mod); @@ -81795,7 +83118,7 @@ index 2069158..71101bb 100644 mutex_unlock(&module_mutex); wake_up_all(&module_wq); -@@ -3261,9 +3371,38 @@ static int load_module(struct load_info *info, const char __user *uargs, +@@ -3269,9 +3379,38 @@ static int load_module(struct load_info *info, const char __user *uargs, if (err) goto free_unload; @@ -81834,7 +83157,7 @@ index 2069158..71101bb 100644 /* Fix up syms, so that st_value is a pointer to location. */ err = simplify_symbols(mod, info); if (err < 0) -@@ -3279,13 +3418,6 @@ static int load_module(struct load_info *info, const char __user *uargs, +@@ -3287,13 +3426,6 @@ static int load_module(struct load_info *info, const char __user *uargs, flush_module_icache(mod); @@ -81848,7 +83171,7 @@ index 2069158..71101bb 100644 dynamic_debug_setup(info->debug, info->num_debug); /* Finally it's fully formed, ready to start executing. */ -@@ -3320,11 +3452,10 @@ static int load_module(struct load_info *info, const char __user *uargs, +@@ -3328,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs, ddebug_cleanup: dynamic_debug_remove(info->debug); synchronize_sched(); @@ -81861,7 +83184,7 @@ index 2069158..71101bb 100644 free_unload: module_unload_free(mod); unlink_mod: -@@ -3407,10 +3538,16 @@ static const char *get_ksymbol(struct module *mod, +@@ -3415,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod, unsigned long nextval; /* At worse, next value is at end of module */ @@ -81881,7 +83204,7 @@ index 2069158..71101bb 100644 /* Scan for closest preceding symbol, and next symbol. (ELF starts real symbols at 1). */ -@@ -3661,7 +3798,7 @@ static int m_show(struct seq_file *m, void *p) +@@ -3669,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p) return 0; seq_printf(m, "%s %u", @@ -81890,7 +83213,7 @@ index 2069158..71101bb 100644 print_unload_info(m, mod); /* Informative for users. */ -@@ -3670,7 +3807,7 @@ static int m_show(struct seq_file *m, void *p) +@@ -3678,7 +3815,7 @@ static int m_show(struct seq_file *m, void *p) mod->state == MODULE_STATE_COMING ? "Loading": "Live"); /* Used by oprofile and other similar tools. */ @@ -81899,7 +83222,7 @@ index 2069158..71101bb 100644 /* Taints info */ if (mod->taints) -@@ -3706,7 +3843,17 @@ static const struct file_operations proc_modules_operations = { +@@ -3714,7 +3851,17 @@ static const struct file_operations proc_modules_operations = { static int __init proc_modules_init(void) { @@ -81917,7 +83240,7 @@ index 2069158..71101bb 100644 return 0; } module_init(proc_modules_init); -@@ -3767,14 +3914,14 @@ struct module *__module_address(unsigned long addr) +@@ -3775,14 +3922,14 @@ struct module *__module_address(unsigned long addr) { struct module *mod; @@ -81935,7 +83258,7 @@ index 2069158..71101bb 100644 return mod; } return NULL; -@@ -3809,11 +3956,20 @@ bool is_module_text_address(unsigned long addr) +@@ -3817,11 +3964,20 @@ bool is_module_text_address(unsigned long addr) */ struct module *__module_text_address(unsigned long addr) { @@ -82008,7 +83331,7 @@ index 0799fd3..d06ae3b 100644 extern void debug_mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key); diff --git a/kernel/mutex.c b/kernel/mutex.c -index a52ee7bb..f361f16 100644 +index d24105b..15648eb 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node) @@ -82029,8 +83352,8 @@ index a52ee7bb..f361f16 100644 smp_wmb(); } -@@ -514,7 +514,7 @@ slowpath: - spin_lock_mutex(&lock->wait_lock, flags); +@@ -520,7 +520,7 @@ slowpath: + goto skip_wait; debug_mutex_lock_common(lock, &waiter); - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task)); @@ -82038,16 +83361,16 @@ index a52ee7bb..f361f16 100644 /* add waiting tasks to the end of the waitqueue (FIFO): */ list_add_tail(&waiter.list, &lock->wait_list); -@@ -565,7 +565,7 @@ slowpath: - done: - lock_acquired(&lock->dep_map, ip); - /* got the lock - rejoice! */ +@@ -564,7 +564,7 @@ slowpath: + schedule_preempt_disabled(); + spin_lock_mutex(&lock->wait_lock, flags); + } - mutex_remove_waiter(lock, &waiter, current_thread_info()); + mutex_remove_waiter(lock, &waiter, task); - mutex_set_owner(lock); - - if (!__builtin_constant_p(ww_ctx == NULL)) { -@@ -604,7 +604,7 @@ done: + /* set it to 0 if there are no waiters left: */ + if (likely(list_empty(&lock->wait_list))) + atomic_set(&lock->count, 0); +@@ -601,7 +601,7 @@ skip_wait: return 0; err: @@ -82113,10 +83436,10 @@ index 2d5cc4c..d9ea600 100644 return -ENOENT; } diff --git a/kernel/panic.c b/kernel/panic.c -index 8018646..b6a5b4f 100644 +index b6c482c..5578061 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -403,7 +403,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, +@@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, disable_trace_on_warning(); pr_warn("------------[ cut here ]------------\n"); @@ -82125,7 +83448,7 @@ index 8018646..b6a5b4f 100644 raw_smp_processor_id(), current->pid, file, line, caller); if (args) -@@ -457,7 +457,8 @@ EXPORT_SYMBOL(warn_slowpath_null); +@@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) { @@ -82136,7 +83459,7 @@ index 8018646..b6a5b4f 100644 } EXPORT_SYMBOL(__stack_chk_fail); diff --git a/kernel/pid.c b/kernel/pid.c -index ebe5e80..5d6d634 100644 +index 9b9a266..c20ef80 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -33,6 +33,7 @@ @@ -82156,7 +83479,7 @@ index ebe5e80..5d6d634 100644 int pid_max_min = RESERVED_PIDS + 1; int pid_max_max = PID_MAX_LIMIT; -@@ -440,10 +441,18 @@ EXPORT_SYMBOL(pid_task); +@@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task); */ struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns) { @@ -82176,7 +83499,7 @@ index ebe5e80..5d6d634 100644 } struct task_struct *find_task_by_vpid(pid_t vnr) -@@ -451,6 +460,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr) +@@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr) return find_task_by_pid_ns(vnr, task_active_pid_ns(current)); } @@ -82192,7 +83515,7 @@ index ebe5e80..5d6d634 100644 { struct pid *pid; diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c -index 601bb36..f7e6f34 100644 +index 4208655..19f36a5 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c @@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write, @@ -82385,7 +83708,7 @@ index 06ec886..9dba35e 100644 if (pm_wakeup_pending()) { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index 5b5a708..ec7637e 100644 +index b4e8500..b457a6c 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file) @@ -82462,10 +83785,10 @@ index 6631e1e..310c266 100644 } diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index a146ee3..ffed4c3 100644 +index 1f4bcb3..99cf7ab 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c -@@ -326,7 +326,7 @@ static int ptrace_attach(struct task_struct *task, long request, +@@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request, if (seize) flags |= PT_SEIZED; rcu_read_lock(); @@ -82474,7 +83797,7 @@ index a146ee3..ffed4c3 100644 flags |= PT_PTRACE_CAP; rcu_read_unlock(); task->ptrace = flags; -@@ -537,7 +537,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst +@@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst break; return -EIO; } @@ -82483,7 +83806,7 @@ index a146ee3..ffed4c3 100644 return -EFAULT; copied += retval; src += retval; -@@ -805,7 +805,7 @@ int ptrace_request(struct task_struct *child, long request, +@@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request, bool seized = child->ptrace & PT_SEIZED; int ret = -EIO; siginfo_t siginfo, *si; @@ -82492,7 +83815,7 @@ index a146ee3..ffed4c3 100644 unsigned long __user *datalp = datavp; unsigned long flags; -@@ -1051,14 +1051,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr, +@@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr, goto out; } @@ -82515,7 +83838,7 @@ index a146ee3..ffed4c3 100644 goto out_put_task_struct; } -@@ -1086,7 +1093,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr, +@@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr, copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0); if (copied != sizeof(tmp)) return -EIO; @@ -82524,7 +83847,7 @@ index a146ee3..ffed4c3 100644 } int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr, -@@ -1180,7 +1187,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request, +@@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request, } asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, @@ -82533,7 +83856,7 @@ index a146ee3..ffed4c3 100644 { struct task_struct *child; long ret; -@@ -1196,14 +1203,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, +@@ -1197,14 +1204,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid, goto out; } @@ -82557,10 +83880,10 @@ index a146ee3..ffed4c3 100644 } diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c -index cce6ba8..7c758b1f 100644 +index b02a339..ce2d20c 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c -@@ -412,10 +412,10 @@ int rcu_jiffies_till_stall_check(void) +@@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void) * for CONFIG_RCU_CPU_STALL_TIMEOUT. */ if (till_stall_check < 3) { @@ -82574,7 +83897,7 @@ index cce6ba8..7c758b1f 100644 } return till_stall_check * HZ + RCU_STALL_DELAY_DELTA; diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c -index aa34411..4832cd4 100644 +index 9ed6075..c9e8a63 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c @@ -45,7 +45,7 @@ @@ -82596,10 +83919,10 @@ index aa34411..4832cd4 100644 __rcu_process_callbacks(&rcu_sched_ctrlblk); __rcu_process_callbacks(&rcu_bh_ctrlblk); diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c -index f4871e5..8ef5741 100644 +index be63101..05cf721 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c -@@ -164,12 +164,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) = +@@ -170,12 +170,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) = { 0 }; static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) = { 0 }; @@ -82618,7 +83941,7 @@ index f4871e5..8ef5741 100644 static long n_rcu_torture_barrier_error; static long n_rcu_torture_boost_ktrerror; static long n_rcu_torture_boost_rterror; -@@ -287,11 +287,11 @@ rcu_torture_alloc(void) +@@ -293,11 +293,11 @@ rcu_torture_alloc(void) spin_lock_bh(&rcu_torture_lock); if (list_empty(&rcu_torture_freelist)) { @@ -82632,7 +83955,7 @@ index f4871e5..8ef5741 100644 p = rcu_torture_freelist.next; list_del_init(p); spin_unlock_bh(&rcu_torture_lock); -@@ -304,7 +304,7 @@ rcu_torture_alloc(void) +@@ -310,7 +310,7 @@ rcu_torture_alloc(void) static void rcu_torture_free(struct rcu_torture *p) { @@ -82641,7 +83964,7 @@ index f4871e5..8ef5741 100644 spin_lock_bh(&rcu_torture_lock); list_add_tail(&p->rtort_free, &rcu_torture_freelist); spin_unlock_bh(&rcu_torture_lock); -@@ -424,7 +424,7 @@ rcu_torture_cb(struct rcu_head *p) +@@ -431,7 +431,7 @@ rcu_torture_cb(struct rcu_head *p) i = rp->rtort_pipe_count; if (i > RCU_TORTURE_PIPE_LEN) i = RCU_TORTURE_PIPE_LEN; @@ -82650,25 +83973,25 @@ index f4871e5..8ef5741 100644 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) { rp->rtort_mbtest = 0; rcu_torture_free(rp); -@@ -472,7 +472,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p) - i = rp->rtort_pipe_count; - if (i > RCU_TORTURE_PIPE_LEN) - i = RCU_TORTURE_PIPE_LEN; -- atomic_inc(&rcu_torture_wcount[i]); -+ atomic_inc_unchecked(&rcu_torture_wcount[i]); - if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) { - rp->rtort_mbtest = 0; - list_del(&rp->rtort_free); -@@ -952,7 +952,7 @@ rcu_torture_writer(void *arg) +@@ -821,7 +821,7 @@ rcu_torture_writer(void *arg) i = old_rp->rtort_pipe_count; if (i > RCU_TORTURE_PIPE_LEN) i = RCU_TORTURE_PIPE_LEN; - atomic_inc(&rcu_torture_wcount[i]); + atomic_inc_unchecked(&rcu_torture_wcount[i]); old_rp->rtort_pipe_count++; - cur_ops->deferred_free(old_rp); - } -@@ -1038,7 +1038,7 @@ static void rcu_torture_timer(unsigned long unused) + if (gp_normal == gp_exp) + exp = !!(rcu_random(&rand) & 0x80); +@@ -839,7 +839,7 @@ rcu_torture_writer(void *arg) + i = rp->rtort_pipe_count; + if (i > RCU_TORTURE_PIPE_LEN) + i = RCU_TORTURE_PIPE_LEN; +- atomic_inc(&rcu_torture_wcount[i]); ++ atomic_inc_unchecked(&rcu_torture_wcount[i]); + if (++rp->rtort_pipe_count >= + RCU_TORTURE_PIPE_LEN) { + rp->rtort_mbtest = 0; +@@ -938,7 +938,7 @@ static void rcu_torture_timer(unsigned long unused) return; } if (p->rtort_mbtest == 0) @@ -82677,7 +84000,7 @@ index f4871e5..8ef5741 100644 spin_lock(&rand_lock); cur_ops->read_delay(&rand); n_rcu_torture_timers++; -@@ -1108,7 +1108,7 @@ rcu_torture_reader(void *arg) +@@ -1008,7 +1008,7 @@ rcu_torture_reader(void *arg) continue; } if (p->rtort_mbtest == 0) @@ -82686,7 +84009,7 @@ index f4871e5..8ef5741 100644 cur_ops->read_delay(&rand); preempt_disable(); pipe_count = p->rtort_pipe_count; -@@ -1171,11 +1171,11 @@ rcu_torture_printk(char *page) +@@ -1071,11 +1071,11 @@ rcu_torture_printk(char *page) rcu_torture_current, rcu_torture_current_version, list_empty(&rcu_torture_freelist), @@ -82702,7 +84025,7 @@ index f4871e5..8ef5741 100644 n_rcu_torture_boost_ktrerror, n_rcu_torture_boost_rterror); cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ", -@@ -1194,14 +1194,14 @@ rcu_torture_printk(char *page) +@@ -1094,14 +1094,14 @@ rcu_torture_printk(char *page) n_barrier_attempts, n_rcu_torture_barrier_error); cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG); @@ -82719,7 +84042,7 @@ index f4871e5..8ef5741 100644 WARN_ON_ONCE(1); } cnt += sprintf(&page[cnt], "Reader Pipe: "); -@@ -1215,7 +1215,7 @@ rcu_torture_printk(char *page) +@@ -1115,7 +1115,7 @@ rcu_torture_printk(char *page) cnt += sprintf(&page[cnt], "Free-Block Circulation: "); for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { cnt += sprintf(&page[cnt], " %d", @@ -82728,7 +84051,7 @@ index f4871e5..8ef5741 100644 } cnt += sprintf(&page[cnt], "\n"); if (cur_ops->stats) -@@ -1924,7 +1924,7 @@ rcu_torture_cleanup(void) +@@ -1830,7 +1830,7 @@ rcu_torture_cleanup(void) rcu_torture_stats_print(); /* -After- the stats thread is stopped! */ @@ -82737,7 +84060,7 @@ index f4871e5..8ef5741 100644 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE"); else if (n_online_successes != n_online_attempts || n_offline_successes != n_offline_attempts) -@@ -1992,18 +1992,18 @@ rcu_torture_init(void) +@@ -1952,18 +1952,18 @@ rcu_torture_init(void) rcu_torture_current = NULL; rcu_torture_current_version = 0; @@ -82763,10 +84086,10 @@ index f4871e5..8ef5741 100644 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) { per_cpu(rcu_torture_count, cpu)[i] = 0; diff --git a/kernel/rcutree.c b/kernel/rcutree.c -index 068de3a..5e7db2f 100644 +index 32618b3..c1fb822 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c -@@ -358,9 +358,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval, +@@ -382,9 +382,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval, rcu_prepare_for_idle(smp_processor_id()); /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */ smp_mb__before_atomic_inc(); /* See above. */ @@ -82778,7 +84101,7 @@ index 068de3a..5e7db2f 100644 /* * It is illegal to enter an extended quiescent state while -@@ -496,10 +496,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval, +@@ -501,10 +501,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval, int user) { smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */ @@ -82789,9 +84112,9 @@ index 068de3a..5e7db2f 100644 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1)); + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)); rcu_cleanup_after_idle(smp_processor_id()); - trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting); + trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting); if (!user && !is_idle_task(current)) { -@@ -638,14 +638,14 @@ void rcu_nmi_enter(void) +@@ -623,14 +623,14 @@ void rcu_nmi_enter(void) struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks); if (rdtp->dynticks_nmi_nesting == 0 && @@ -82809,7 +84132,7 @@ index 068de3a..5e7db2f 100644 } /** -@@ -664,9 +664,9 @@ void rcu_nmi_exit(void) +@@ -649,9 +649,9 @@ void rcu_nmi_exit(void) return; /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */ smp_mb__before_atomic_inc(); /* See above. */ @@ -82821,7 +84144,7 @@ index 068de3a..5e7db2f 100644 } /** -@@ -680,7 +680,7 @@ int rcu_is_cpu_idle(void) +@@ -665,7 +665,7 @@ int rcu_is_cpu_idle(void) int ret; preempt_disable(); @@ -82830,16 +84153,16 @@ index 068de3a..5e7db2f 100644 preempt_enable(); return ret; } -@@ -748,7 +748,7 @@ static int rcu_is_cpu_rrupt_from_idle(void) - */ - static int dyntick_save_progress_counter(struct rcu_data *rdp) +@@ -734,7 +734,7 @@ static int rcu_is_cpu_rrupt_from_idle(void) + static int dyntick_save_progress_counter(struct rcu_data *rdp, + bool *isidle, unsigned long *maxj) { - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks); + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks); + rcu_sysidle_check_cpu(rdp, isidle, maxj); return (rdp->dynticks_snap & 0x1) == 0; } - -@@ -763,7 +763,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp) +@@ -751,7 +751,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp, unsigned int curr; unsigned int snap; @@ -82848,7 +84171,7 @@ index 068de3a..5e7db2f 100644 snap = (unsigned int)rdp->dynticks_snap; /* -@@ -1351,9 +1351,9 @@ static int rcu_gp_init(struct rcu_state *rsp) +@@ -1341,9 +1341,9 @@ static int rcu_gp_init(struct rcu_state *rsp) rdp = this_cpu_ptr(rsp->rda); rcu_preempt_check_blocked_tasks(rnp); rnp->qsmask = rnp->qsmaskinit; @@ -82860,7 +84183,7 @@ index 068de3a..5e7db2f 100644 if (rnp == rdp->mynode) __note_gp_changes(rsp, rnp, rdp); rcu_preempt_boost_start_gp(rnp); -@@ -1435,7 +1435,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp) +@@ -1434,7 +1434,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp) */ rcu_for_each_node_breadth_first(rsp, rnp) { raw_spin_lock_irq(&rnp->lock); @@ -82869,7 +84192,7 @@ index 068de3a..5e7db2f 100644 rdp = this_cpu_ptr(rsp->rda); if (rnp == rdp->mynode) __note_gp_changes(rsp, rnp, rdp); -@@ -1765,7 +1765,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp, +@@ -1766,7 +1766,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp, rsp->qlen += rdp->qlen; rdp->n_cbs_orphaned += rdp->qlen; rdp->qlen_lazy = 0; @@ -82878,7 +84201,7 @@ index 068de3a..5e7db2f 100644 } /* -@@ -2011,7 +2011,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp) +@@ -2012,7 +2012,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp) } smp_mb(); /* List handling before counting for rcu_barrier(). */ rdp->qlen_lazy -= count_lazy; @@ -82887,7 +84210,7 @@ index 068de3a..5e7db2f 100644 rdp->n_cbs_invoked += count; /* Reinstate batch limit if we have worked down the excess. */ -@@ -2202,7 +2202,7 @@ __rcu_process_callbacks(struct rcu_state *rsp) +@@ -2209,7 +2209,7 @@ __rcu_process_callbacks(struct rcu_state *rsp) /* * Do RCU core processing for the current CPU. */ @@ -82896,7 +84219,16 @@ index 068de3a..5e7db2f 100644 { struct rcu_state *rsp; -@@ -2325,7 +2325,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu), +@@ -2316,7 +2316,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu), + WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */ + if (debug_rcu_head_queue(head)) { + /* Probable double call_rcu(), so leak the callback. */ +- ACCESS_ONCE(head->func) = rcu_leak_callback; ++ ACCESS_ONCE_RW(head->func) = rcu_leak_callback; + WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n"); + return; + } +@@ -2344,7 +2344,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu), local_irq_restore(flags); return; } @@ -82905,7 +84237,7 @@ index 068de3a..5e7db2f 100644 if (lazy) rdp->qlen_lazy++; else -@@ -2534,11 +2534,11 @@ void synchronize_sched_expedited(void) +@@ -2553,11 +2553,11 @@ void synchronize_sched_expedited(void) * counter wrap on a 32-bit system. Quite a few more CPUs would of * course be required on a 64-bit system. */ @@ -82919,7 +84251,7 @@ index 068de3a..5e7db2f 100644 return; } -@@ -2546,7 +2546,7 @@ void synchronize_sched_expedited(void) +@@ -2565,7 +2565,7 @@ void synchronize_sched_expedited(void) * Take a ticket. Note that atomic_inc_return() implies a * full memory barrier. */ @@ -82928,7 +84260,7 @@ index 068de3a..5e7db2f 100644 firstsnap = snap; get_online_cpus(); WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id())); -@@ -2559,14 +2559,14 @@ void synchronize_sched_expedited(void) +@@ -2578,14 +2578,14 @@ void synchronize_sched_expedited(void) synchronize_sched_expedited_cpu_stop, NULL) == -EAGAIN) { put_online_cpus(); @@ -82945,7 +84277,7 @@ index 068de3a..5e7db2f 100644 return; } -@@ -2575,7 +2575,7 @@ void synchronize_sched_expedited(void) +@@ -2594,7 +2594,7 @@ void synchronize_sched_expedited(void) udelay(trycount * num_online_cpus()); } else { wait_rcu_gp(call_rcu_sched); @@ -82954,7 +84286,7 @@ index 068de3a..5e7db2f 100644 return; } -@@ -2584,7 +2584,7 @@ void synchronize_sched_expedited(void) +@@ -2603,7 +2603,7 @@ void synchronize_sched_expedited(void) if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) { /* ensure test happens before caller kfree */ smp_mb__before_atomic_inc(); /* ^^^ */ @@ -82963,7 +84295,7 @@ index 068de3a..5e7db2f 100644 return; } -@@ -2596,10 +2596,10 @@ void synchronize_sched_expedited(void) +@@ -2615,10 +2615,10 @@ void synchronize_sched_expedited(void) * period works for us. */ get_online_cpus(); @@ -82976,7 +84308,7 @@ index 068de3a..5e7db2f 100644 /* * Everyone up to our most recent fetch is covered by our grace -@@ -2608,16 +2608,16 @@ void synchronize_sched_expedited(void) +@@ -2627,16 +2627,16 @@ void synchronize_sched_expedited(void) * than we did already did their update. */ do { @@ -82996,7 +84328,7 @@ index 068de3a..5e7db2f 100644 put_online_cpus(); } -@@ -2799,7 +2799,7 @@ static void _rcu_barrier(struct rcu_state *rsp) +@@ -2829,7 +2829,7 @@ static void _rcu_barrier(struct rcu_state *rsp) * ACCESS_ONCE() to prevent the compiler from speculating * the increment to precede the early-exit check. */ @@ -83005,7 +84337,7 @@ index 068de3a..5e7db2f 100644 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1); _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done); smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */ -@@ -2849,7 +2849,7 @@ static void _rcu_barrier(struct rcu_state *rsp) +@@ -2879,7 +2879,7 @@ static void _rcu_barrier(struct rcu_state *rsp) /* Increment ->n_barrier_done to prevent duplicate work. */ smp_mb(); /* Keep increment after above mechanism. */ @@ -83014,7 +84346,7 @@ index 068de3a..5e7db2f 100644 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0); _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done); smp_mb(); /* Keep increment before caller's subsequent code. */ -@@ -2894,10 +2894,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) +@@ -2924,10 +2924,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo); init_callback_list(rdp); rdp->qlen_lazy = 0; @@ -83027,10 +84359,10 @@ index 068de3a..5e7db2f 100644 rdp->cpu = cpu; rdp->rsp = rsp; rcu_boot_init_nocb_percpu_data(rdp); -@@ -2930,8 +2930,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible) - rdp->blimit = blimit; +@@ -2961,8 +2961,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible) init_callback_list(rdp); /* Re-enable callbacks on this CPU. */ rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE; + rcu_sysidle_init_percpu_data(rdp->dynticks); - atomic_set(&rdp->dynticks->dynticks, - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1); + atomic_set_unchecked(&rdp->dynticks->dynticks, @@ -83039,19 +84371,24 @@ index 068de3a..5e7db2f 100644 /* Add CPU to rcu_node bitmasks. */ diff --git a/kernel/rcutree.h b/kernel/rcutree.h -index b383258..2440c1e 100644 +index 5f97eab..db8f687 100644 --- a/kernel/rcutree.h +++ b/kernel/rcutree.h -@@ -87,7 +87,7 @@ struct rcu_dynticks { +@@ -87,11 +87,11 @@ struct rcu_dynticks { long long dynticks_nesting; /* Track irq/process nesting level. */ /* Process level is worth LLONG_MAX/2. */ int dynticks_nmi_nesting; /* Track NMI nesting level. */ - atomic_t dynticks; /* Even value for idle, else odd. */ + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */ - #ifdef CONFIG_RCU_FAST_NO_HZ - bool all_lazy; /* Are all CPU's CBs lazy? */ - unsigned long nonlazy_posted; -@@ -419,17 +419,17 @@ struct rcu_state { + #ifdef CONFIG_NO_HZ_FULL_SYSIDLE + long long dynticks_idle_nesting; + /* irq/process nesting level from idle. */ +- atomic_t dynticks_idle; /* Even value for idle, else odd. */ ++ atomic_unchecked_t dynticks_idle; /* Even value for idle, else odd. */ + /* "Idle" excludes userspace execution. */ + unsigned long dynticks_idle_jiffies; + /* End of last non-NMI non-idle period. */ +@@ -427,17 +427,17 @@ struct rcu_state { /* _rcu_barrier(). */ /* End of fields guarded by barrier_mutex. */ @@ -83081,10 +84418,19 @@ index b383258..2440c1e 100644 unsigned long jiffies_force_qs; /* Time at which to invoke */ /* force_quiescent_state(). */ diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h -index 769e12e..7b2139b 100644 +index 130c97b..bcbe7f7 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h -@@ -902,7 +902,7 @@ void synchronize_rcu_expedited(void) +@@ -744,7 +744,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp) + static int sync_rcu_preempt_exp_done(struct rcu_node *rnp) + { + return !rcu_preempted_readers_exp(rnp) && +- ACCESS_ONCE(rnp->expmask) == 0; ++ ACCESS_ONCE_RW(rnp->expmask) == 0; + } + + /* +@@ -900,7 +900,7 @@ void synchronize_rcu_expedited(void) /* Clean up and exit. */ smp_mb(); /* ensure expedited GP seen before counter increment. */ @@ -83093,7 +84439,7 @@ index 769e12e..7b2139b 100644 unlock_mb_ret: mutex_unlock(&sync_rcu_preempt_exp_mutex); mb_ret: -@@ -1476,7 +1476,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu) +@@ -1474,7 +1474,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu) free_cpumask_var(cm); } @@ -83102,7 +84448,7 @@ index 769e12e..7b2139b 100644 .store = &rcu_cpu_kthread_task, .thread_should_run = rcu_cpu_kthread_should_run, .thread_fn = rcu_cpu_kthread, -@@ -1941,7 +1941,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu) +@@ -1939,7 +1939,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu) print_cpu_stall_fast_no_hz(fast_no_hz, cpu); pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n", cpu, ticks_value, ticks_title, @@ -83111,7 +84457,7 @@ index 769e12e..7b2139b 100644 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting, rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu), fast_no_hz); -@@ -2104,7 +2104,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp, +@@ -2102,7 +2102,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp, /* Enqueue the callback on the nocb list and update counts. */ old_rhpp = xchg(&rdp->nocb_tail, rhtp); @@ -83120,7 +84466,7 @@ index 769e12e..7b2139b 100644 atomic_long_add(rhcount, &rdp->nocb_q_count); atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy); -@@ -2244,12 +2244,12 @@ static int rcu_nocb_kthread(void *arg) +@@ -2242,12 +2242,12 @@ static int rcu_nocb_kthread(void *arg) * Extract queued callbacks, update counts, and wait * for a grace period to elapse. */ @@ -83136,7 +84482,7 @@ index 769e12e..7b2139b 100644 rcu_nocb_wait_gp(rdp); /* Each pass through the following loop invokes a callback. */ -@@ -2271,8 +2271,8 @@ static int rcu_nocb_kthread(void *arg) +@@ -2269,8 +2269,8 @@ static int rcu_nocb_kthread(void *arg) list = next; } trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1); @@ -83147,7 +84493,7 @@ index 769e12e..7b2139b 100644 rdp->n_nocbs_invoked += c; } return 0; -@@ -2299,7 +2299,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp) +@@ -2297,7 +2297,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp) t = kthread_run(rcu_nocb_kthread, rdp, "rcuo%c/%d", rsp->abbr, cpu); BUG_ON(IS_ERR(t)); @@ -83156,6 +84502,69 @@ index 769e12e..7b2139b 100644 } } +@@ -2423,11 +2423,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq) + + /* Record start of fully idle period. */ + j = jiffies; +- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j; ++ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j; + smp_mb__before_atomic_inc(); +- atomic_inc(&rdtp->dynticks_idle); ++ atomic_inc_unchecked(&rdtp->dynticks_idle); + smp_mb__after_atomic_inc(); +- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1); ++ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1); + } + + /* +@@ -2492,9 +2492,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq) + + /* Record end of idle period. */ + smp_mb__before_atomic_inc(); +- atomic_inc(&rdtp->dynticks_idle); ++ atomic_inc_unchecked(&rdtp->dynticks_idle); + smp_mb__after_atomic_inc(); +- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1)); ++ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1)); + + /* + * If we are the timekeeping CPU, we are permitted to be non-idle +@@ -2535,7 +2535,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle, + WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu); + + /* Pick up current idle and NMI-nesting counter and check. */ +- cur = atomic_read(&rdtp->dynticks_idle); ++ cur = atomic_read_unchecked(&rdtp->dynticks_idle); + if (cur & 0x1) { + *isidle = false; /* We are not idle! */ + return; +@@ -2598,7 +2598,7 @@ static void rcu_sysidle(unsigned long j) + case RCU_SYSIDLE_NOT: + + /* First time all are idle, so note a short idle period. */ +- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT; ++ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT; + break; + + case RCU_SYSIDLE_SHORT: +@@ -2635,7 +2635,7 @@ static void rcu_sysidle(unsigned long j) + static void rcu_sysidle_cancel(void) + { + smp_mb(); +- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT; ++ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT; + } + + /* +@@ -2683,7 +2683,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp) + smp_mb(); /* grace period precedes setting inuse. */ + + rshp = container_of(rhp, struct rcu_sysidle_head, rh); +- ACCESS_ONCE(rshp->inuse) = 0; ++ ACCESS_ONCE_RW(rshp->inuse) = 0; + } + + /* diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c index cf6c174..a8f4b50 100644 --- a/kernel/rcutree_trace.c @@ -83337,10 +84746,10 @@ index 4a07353..66b5291 100644 #ifdef CONFIG_RT_GROUP_SCHED /* diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 05c39f0..442e6fe 100644 +index 5ac63c9..d912786 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible); +@@ -2868,7 +2868,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible); * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1, * or number of jiffies left till timeout) if completed. */ @@ -83349,7 +84758,7 @@ index 05c39f0..442e6fe 100644 wait_for_completion_interruptible_timeout(struct completion *x, unsigned long timeout) { -@@ -2902,7 +2902,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout); +@@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout); * * Return: -ERESTARTSYS if interrupted, 0 if completed. */ @@ -83358,7 +84767,7 @@ index 05c39f0..442e6fe 100644 { long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE); if (t == -ERESTARTSYS) -@@ -2923,7 +2923,7 @@ EXPORT_SYMBOL(wait_for_completion_killable); +@@ -2906,7 +2906,7 @@ EXPORT_SYMBOL(wait_for_completion_killable); * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1, * or number of jiffies left till timeout) if completed. */ @@ -83367,7 +84776,7 @@ index 05c39f0..442e6fe 100644 wait_for_completion_killable_timeout(struct completion *x, unsigned long timeout) { -@@ -3149,6 +3149,8 @@ int can_nice(const struct task_struct *p, const int nice) +@@ -3132,6 +3132,8 @@ int can_nice(const struct task_struct *p, const int nice) /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -83376,7 +84785,7 @@ index 05c39f0..442e6fe 100644 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } -@@ -3182,7 +3184,8 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -3165,7 +3167,8 @@ SYSCALL_DEFINE1(nice, int, increment) if (nice > 19) nice = 19; @@ -83386,7 +84795,7 @@ index 05c39f0..442e6fe 100644 return -EPERM; retval = security_task_setnice(current, nice); -@@ -3344,6 +3347,7 @@ recheck: +@@ -3327,6 +3330,7 @@ recheck: unsigned long rlim_rtprio = task_rlimit(p, RLIMIT_RTPRIO); @@ -83394,7 +84803,7 @@ index 05c39f0..442e6fe 100644 /* can't set/change the rt policy */ if (policy != p->policy && !rlim_rtprio) return -EPERM; -@@ -4473,7 +4477,7 @@ static void migrate_tasks(unsigned int dead_cpu) +@@ -4456,7 +4460,7 @@ static void migrate_tasks(unsigned int dead_cpu) #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL) @@ -83403,7 +84812,7 @@ index 05c39f0..442e6fe 100644 { .procname = "sched_domain", .mode = 0555, -@@ -4490,17 +4494,17 @@ static struct ctl_table sd_ctl_root[] = { +@@ -4473,17 +4477,17 @@ static struct ctl_table sd_ctl_root[] = { {} }; @@ -83425,7 +84834,7 @@ index 05c39f0..442e6fe 100644 /* * In the intermediate directories, both the child directory and -@@ -4508,22 +4512,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep) +@@ -4491,22 +4495,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep) * will always be set. In the lowest directory the names are * static strings and all have proc handlers. */ @@ -83457,7 +84866,7 @@ index 05c39f0..442e6fe 100644 const char *procname, void *data, int maxlen, umode_t mode, proc_handler *proc_handler, bool load_idx) -@@ -4543,7 +4550,7 @@ set_table_entry(struct ctl_table *entry, +@@ -4526,7 +4533,7 @@ set_table_entry(struct ctl_table *entry, static struct ctl_table * sd_alloc_ctl_domain_table(struct sched_domain *sd) { @@ -83466,7 +84875,7 @@ index 05c39f0..442e6fe 100644 if (table == NULL) return NULL; -@@ -4578,9 +4585,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd) +@@ -4561,9 +4568,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd) return table; } @@ -83478,7 +84887,7 @@ index 05c39f0..442e6fe 100644 struct sched_domain *sd; int domain_num = 0, i; char buf[32]; -@@ -4607,11 +4614,13 @@ static struct ctl_table_header *sd_sysctl_header; +@@ -4590,11 +4597,13 @@ static struct ctl_table_header *sd_sysctl_header; static void register_sched_domain_sysctl(void) { int i, cpu_num = num_possible_cpus(); @@ -83493,7 +84902,7 @@ index 05c39f0..442e6fe 100644 if (entry == NULL) return; -@@ -4634,8 +4643,12 @@ static void unregister_sched_domain_sysctl(void) +@@ -4617,8 +4626,12 @@ static void unregister_sched_domain_sysctl(void) if (sd_sysctl_header) unregister_sysctl_table(sd_sysctl_header); sd_sysctl_header = NULL; @@ -83509,7 +84918,7 @@ index 05c39f0..442e6fe 100644 #else static void register_sched_domain_sysctl(void) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 31cbc15..ba68c15 100644 +index 7c70201..23f52b6 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -869,7 +869,7 @@ void task_numa_fault(int node, int pages, bool migrated) @@ -83521,7 +84930,7 @@ index 31cbc15..ba68c15 100644 p->mm->numa_scan_offset = 0; } -@@ -5727,7 +5727,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { } +@@ -5838,7 +5838,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { } * run_rebalance_domains is triggered when needed from the scheduler tick. * Also triggered for nohz idle balancing (with nohz_balancing_kick set). */ @@ -83531,7 +84940,7 @@ index 31cbc15..ba68c15 100644 int this_cpu = smp_processor_id(); struct rq *this_rq = cpu_rq(this_cpu); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index ef0a7b2..1b728c1 100644 +index b3c5653..a4d192a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1004,7 +1004,7 @@ struct sched_class { @@ -83544,7 +84953,7 @@ index ef0a7b2..1b728c1 100644 #define sched_class_highest (&stop_sched_class) #define for_each_class(class) \ diff --git a/kernel/signal.c b/kernel/signal.c -index 50e4107..9409983 100644 +index ded28b9..6886c08 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep; @@ -83704,7 +85113,7 @@ index eb89e18..a4e6792 100644 mutex_unlock(&smpboot_threads_lock); put_online_cpus(); diff --git a/kernel/softirq.c b/kernel/softirq.c -index adf6c00..5d89b73 100644 +index d7d498d..94fe0f7 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned; @@ -83783,7 +85192,7 @@ index 01d5ccb..cdcbee6 100644 return idx; } diff --git a/kernel/sys.c b/kernel/sys.c -index 771129b..dc0c7e3 100644 +index c18ecca..b3c2dd2 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -149,6 +149,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error) @@ -83817,7 +85226,7 @@ index 771129b..dc0c7e3 100644 + if (gr_check_group_change(kgid, kgid, kgid)) + goto error; + - if (nsown_capable(CAP_SETGID)) + if (ns_capable(old->user_ns, CAP_SETGID)) new->gid = new->egid = new->sgid = new->fsgid = kgid; else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid)) @@ -404,7 +417,7 @@ error: @@ -83849,7 +85258,7 @@ index 771129b..dc0c7e3 100644 + if (gr_check_user_change(kuid, kuid, kuid)) + goto error; + - if (nsown_capable(CAP_SETUID)) { + if (ns_capable(old->user_ns, CAP_SETUID)) { new->suid = new->uid = kuid; if (!uid_eq(kuid, old->uid)) { @@ -603,6 +625,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid) @@ -83874,7 +85283,7 @@ index 771129b..dc0c7e3 100644 if (egid != (gid_t) -1) @@ -746,12 +774,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid) uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) || - nsown_capable(CAP_SETUID)) { + ns_capable(old->user_ns, CAP_SETUID)) { if (!uid_eq(kuid, old->fsuid)) { + if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid)) + goto error; @@ -83892,7 +85301,7 @@ index 771129b..dc0c7e3 100644 @@ -784,12 +816,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid) if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) || gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) || - nsown_capable(CAP_SETGID)) { + ns_capable(old->user_ns, CAP_SETGID)) { + if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid)) + goto error; + @@ -83946,7 +85355,7 @@ index 771129b..dc0c7e3 100644 if (!retval) { if (old_rlim) diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 07f6fc4..65fb3d4 100644 +index b2f06f3..e6354ab 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -93,7 +93,6 @@ @@ -84226,7 +85635,7 @@ index 145bb4d..b2aa969 100644 return cmd_attr_register_cpumask(info); else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK]) diff --git a/kernel/time.c b/kernel/time.c -index 7c7964c..784a599 100644 +index 7c7964c..2a0d412 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz) @@ -84241,17 +85650,8 @@ index 7c7964c..784a599 100644 sys_tz = *tz; update_vsyscall_tz(); if (firsttime) { -@@ -502,7 +507,7 @@ EXPORT_SYMBOL(usecs_to_jiffies); - * The >> (NSEC_JIFFIE_SC - SEC_JIFFIE_SC) converts the scaled nsec - * value to a scaled second value. - */ --unsigned long -+unsigned long __intentional_overflow(-1) - timespec_to_jiffies(const struct timespec *value) - { - unsigned long sec = value->tv_sec; diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c -index eec50fc..65e5df6 100644 +index 88c9c65..7497ebc 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -795,7 +795,7 @@ static int __init alarmtimer_init(void) @@ -84456,10 +85856,10 @@ index b8b8560..75b1a09 100644 ret = -EIO; bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt, diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index a6d098c..bb8cf65 100644 +index f3bd09ee..9bb9586 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c -@@ -1950,12 +1950,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) +@@ -1944,12 +1944,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec) if (unlikely(ftrace_disabled)) return 0; @@ -84479,7 +85879,7 @@ index a6d098c..bb8cf65 100644 } /* -@@ -4028,8 +4033,10 @@ static int ftrace_process_locs(struct module *mod, +@@ -4043,8 +4048,10 @@ static int ftrace_process_locs(struct module *mod, if (!count) return 0; @@ -84490,7 +85890,7 @@ index a6d098c..bb8cf65 100644 start_pg = ftrace_allocate_pages(count); if (!start_pg) -@@ -4752,8 +4759,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, +@@ -4766,8 +4773,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write, #ifdef CONFIG_FUNCTION_GRAPH_TRACER static int ftrace_graph_active; @@ -84499,9 +85899,9 @@ index a6d098c..bb8cf65 100644 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace) { return 0; -@@ -4897,6 +4902,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state, - return NOTIFY_DONE; - } +@@ -4918,6 +4923,10 @@ static struct ftrace_ops fgraph_ops __read_mostly = { + FTRACE_OPS_FL_RECURSION_SAFE, + }; +static struct notifier_block ftrace_suspend_notifier = { + .notifier_call = ftrace_suspend_notifier_call @@ -84510,7 +85910,7 @@ index a6d098c..bb8cf65 100644 int register_ftrace_graph(trace_func_graph_ret_t retfunc, trace_func_graph_ent_t entryfunc) { -@@ -4910,7 +4919,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, +@@ -4931,7 +4940,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, goto out; } @@ -84797,7 +86197,7 @@ index cc2f66f..05edd54 100644 *data_page = bpage; diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 496f94d..754aeea 100644 +index b778e96..4e84621 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3335,7 +3335,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set) @@ -84810,10 +86210,10 @@ index 496f94d..754aeea 100644 /* do nothing if flag is already set */ if (!!(trace_flags & mask) == !!enabled) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h -index afaae41..64871f8 100644 +index 10c86fb..645ab0a 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h -@@ -1025,7 +1025,7 @@ extern const char *__stop___trace_bprintk_fmt[]; +@@ -1029,7 +1029,7 @@ extern const char *__stop___tracepoint_str[]; void trace_printk_init_buffers(void); void trace_printk_start_comm(void); int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set); @@ -84843,55 +86243,17 @@ index 26dc348..8708ca7 100644 + return atomic64_inc_return_unchecked(&trace_counter); } diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 29a7ebc..eb473cf 100644 +index 368a4d5..7b6d1d5 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c -@@ -1778,10 +1778,6 @@ static LIST_HEAD(ftrace_module_file_list); - struct ftrace_module_file_ops { - struct list_head list; - struct module *mod; -- struct file_operations id; -- struct file_operations enable; -- struct file_operations format; -- struct file_operations filter; - }; - - static struct ftrace_module_file_ops * -@@ -1822,17 +1818,12 @@ trace_create_file_ops(struct module *mod) - - file_ops->mod = mod; - -- file_ops->id = ftrace_event_id_fops; -- file_ops->id.owner = mod; -- -- file_ops->enable = ftrace_enable_fops; -- file_ops->enable.owner = mod; -- -- file_ops->filter = ftrace_event_filter_fops; -- file_ops->filter.owner = mod; -- -- file_ops->format = ftrace_event_format_fops; -- file_ops->format.owner = mod; -+ pax_open_kernel(); -+ mod->trace_id.owner = mod; -+ mod->trace_enable.owner = mod; -+ mod->trace_filter.owner = mod; -+ mod->trace_format.owner = mod; -+ pax_close_kernel(); - - list_add(&file_ops->list, &ftrace_module_file_list); - -@@ -1925,8 +1916,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call, - struct ftrace_module_file_ops *file_ops) - { - return __trace_add_new_event(call, tr, -- &file_ops->id, &file_ops->enable, -- &file_ops->filter, &file_ops->format); -+ &file_ops->mod->trace_id, &file_ops->mod->trace_enable, -+ &file_ops->mod->trace_filter, &file_ops->mod->trace_format); +@@ -1673,7 +1673,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call, + return 0; } - #else +-struct ftrace_module_file_ops; + static void __add_event_to_tracers(struct ftrace_event_call *call); + + /* Add an additional event_call dynamically */ diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c index b3dcfb2..ebee344 100644 --- a/kernel/trace/trace_mmiotrace.c @@ -84980,7 +86342,7 @@ index b20428c..4845a10 100644 local_irq_save(flags); diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c -index 9064b91..1f5d2f8 100644 +index 13fb113..a6ced3f 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -82,6 +82,21 @@ int create_user_ns(struct cred *new) @@ -85005,7 +86367,7 @@ index 9064b91..1f5d2f8 100644 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL); if (!ns) return -ENOMEM; -@@ -862,7 +877,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns) +@@ -860,7 +875,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns) if (atomic_read(¤t->mm->mm_users) > 1) return -EINVAL; @@ -85028,7 +86390,7 @@ index 4f69f9a..7c6f8f8 100644 memcpy(&uts_table, table, sizeof(uts_table)); uts_table.data = get_uts(table, write); diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 1241d8c..d5cfc28 100644 +index 4431610..4265616 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; } @@ -85041,10 +86403,10 @@ index 1241d8c..d5cfc28 100644 .thread_should_run = watchdog_should_run, .thread_fn = watchdog, diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index e93f7b9..989fcd7 100644 +index 93c2652..66a1cfd 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c -@@ -4627,7 +4627,7 @@ static void rebind_workers(struct worker_pool *pool) +@@ -4668,7 +4668,7 @@ static void rebind_workers(struct worker_pool *pool) WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND)); worker_flags |= WORKER_REBOUND; worker_flags &= ~WORKER_UNBOUND; @@ -85054,7 +86416,7 @@ index e93f7b9..989fcd7 100644 spin_unlock_irq(&pool->lock); diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug -index 1501aa5..e771896 100644 +index 094f315..244a824 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -836,7 +836,7 @@ config DEBUG_MUTEXES @@ -85093,15 +86455,15 @@ index 1501aa5..e771896 100644 select LOCKDEP select DEBUG_SPINLOCK select DEBUG_MUTEXES -@@ -1357,6 +1357,7 @@ config LATENCYTOP +@@ -1376,6 +1376,7 @@ config LATENCYTOP depends on DEBUG_KERNEL depends on STACKTRACE_SUPPORT depends on PROC_FS + depends on !GRKERNSEC_HIDESYM - select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND + select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC select KALLSYMS select KALLSYMS_ALL -@@ -1373,7 +1374,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS +@@ -1392,7 +1393,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS config DEBUG_STRICT_USER_COPY_CHECKS bool "Strict user copy size checks" depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS @@ -85110,7 +86472,7 @@ index 1501aa5..e771896 100644 help Enabling this option turns a certain set of sanity checks for user copy operations into compile time failures. -@@ -1483,7 +1484,7 @@ endmenu # runtime tests +@@ -1502,7 +1503,7 @@ endmenu # runtime tests config PROVIDE_OHCI1394_DMA_INIT bool "Remote debugging over FireWire early on boot" @@ -85119,7 +86481,7 @@ index 1501aa5..e771896 100644 help If you want to debug problems which hang or crash the kernel early on boot and the crashing machine has a FireWire port, you can use -@@ -1512,7 +1513,7 @@ config PROVIDE_OHCI1394_DMA_INIT +@@ -1531,7 +1532,7 @@ config PROVIDE_OHCI1394_DMA_INIT config FIREWIRE_OHCI_REMOTE_DMA bool "Remote debugging over FireWire with firewire-ohci" @@ -85129,10 +86491,10 @@ index 1501aa5..e771896 100644 This option lets you use the FireWire bus for remote debugging with help of the firewire-ohci driver. It enables unfiltered diff --git a/lib/Makefile b/lib/Makefile -index 7baccfd..3ceb95f 100644 +index f3bb2cb..b358ace 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -50,7 +50,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o +@@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o obj-$(CONFIG_BTREE) += btree.o obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o @@ -85195,7 +86557,7 @@ index 1686034..a9c00c8 100644 file = NULL; line = 0; diff --git a/lib/debugobjects.c b/lib/debugobjects.c -index 37061ed..da83f48 100644 +index bf2c8b1..1d00ccf 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c @@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack) @@ -85230,7 +86592,7 @@ index 8235331..5881053 100644 EXPORT_SYMBOL(devm_ioport_unmap); #endif /* CONFIG_HAS_IOPORT */ diff --git a/lib/div64.c b/lib/div64.c -index a163b6c..9618fa5 100644 +index 4382ad7..08aa558 100644 --- a/lib/div64.c +++ b/lib/div64.c @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base) @@ -85242,7 +86604,7 @@ index a163b6c..9618fa5 100644 { u64 quotient; -@@ -90,7 +90,7 @@ EXPORT_SYMBOL(div_s64_rem); +@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem); * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt' */ #ifndef div64_u64 @@ -85323,10 +86685,10 @@ index bd2bea9..6b3c95e 100644 return false; diff --git a/lib/kobject.c b/lib/kobject.c -index 4a1f33d..2f3ca75 100644 +index 084f7b1..d265b8a 100644 --- a/lib/kobject.c +++ b/lib/kobject.c -@@ -859,9 +859,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add); +@@ -875,9 +875,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add); static DEFINE_SPINLOCK(kobj_ns_type_lock); @@ -85339,7 +86701,7 @@ index 4a1f33d..2f3ca75 100644 enum kobj_ns_type type = ops->type; int error; diff --git a/lib/list_debug.c b/lib/list_debug.c -index c24c2f7..06e070b 100644 +index c24c2f7..f0296f4 100644 --- a/lib/list_debug.c +++ b/lib/list_debug.c @@ -11,7 +11,9 @@ @@ -85352,50 +86714,61 @@ index c24c2f7..06e070b 100644 /* * Insert a new entry between two known consecutive entries. * -@@ -19,21 +21,32 @@ +@@ -19,21 +21,40 @@ * the prev/next entries already! */ --void __list_add(struct list_head *new, -- struct list_head *prev, -- struct list_head *next) +static bool __list_add_debug(struct list_head *new, + struct list_head *prev, + struct list_head *next) ++{ ++ if (unlikely(next->prev != prev)) { ++ printk(KERN_ERR "list_add corruption. next->prev should be " ++ "prev (%p), but was %p. (next=%p).\n", ++ prev, next->prev, next); ++ BUG(); ++ return false; ++ } ++ if (unlikely(prev->next != next)) { ++ printk(KERN_ERR "list_add corruption. prev->next should be " ++ "next (%p), but was %p. (prev=%p).\n", ++ next, prev->next, prev); ++ BUG(); ++ return false; ++ } ++ if (unlikely(new == prev || new == next)) { ++ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n", ++ new, prev, next); ++ BUG(); ++ return false; ++ } ++ return true; ++} ++ + void __list_add(struct list_head *new, +- struct list_head *prev, +- struct list_head *next) ++ struct list_head *prev, ++ struct list_head *next) { - WARN(next->prev != prev, -+ if (WARN(next->prev != prev, - "list_add corruption. next->prev should be " - "prev (%p), but was %p. (next=%p).\n", +- "list_add corruption. next->prev should be " +- "prev (%p), but was %p. (next=%p).\n", - prev, next->prev, next); - WARN(prev->next != next, -+ prev, next->prev, next) || -+ WARN(prev->next != next, - "list_add corruption. prev->next should be " - "next (%p), but was %p. (prev=%p).\n", +- "list_add corruption. prev->next should be " +- "next (%p), but was %p. (prev=%p).\n", - next, prev->next, prev); - WARN(new == prev || new == next, - "list_add double add: new=%p, prev=%p, next=%p.\n", - new, prev, next); -+ next, prev->next, prev) || -+ WARN(new == prev || new == next, -+ "list_add double add: new=%p, prev=%p, next=%p.\n", -+ new, prev, next)) -+ return false; -+ return true; -+} -+ -+void __list_add(struct list_head *new, -+ struct list_head *prev, -+ struct list_head *next) -+{ + if (!__list_add_debug(new, prev, next)) + return; + next->prev = new; new->next = next; new->prev = prev; -@@ -41,7 +54,7 @@ void __list_add(struct list_head *new, +@@ -41,28 +62,46 @@ void __list_add(struct list_head *new, } EXPORT_SYMBOL(__list_add); @@ -85404,11 +86777,45 @@ index c24c2f7..06e070b 100644 { struct list_head *prev, *next; -@@ -60,9 +73,16 @@ void __list_del_entry(struct list_head *entry) - WARN(next->prev != entry, - "list_del corruption. next->prev should be %p, " - "but was %p\n", entry, next->prev)) + prev = entry->prev; + next = entry->next; + +- if (WARN(next == LIST_POISON1, +- "list_del corruption, %p->next is LIST_POISON1 (%p)\n", +- entry, LIST_POISON1) || +- WARN(prev == LIST_POISON2, +- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n", +- entry, LIST_POISON2) || +- WARN(prev->next != entry, +- "list_del corruption. prev->next should be %p, " +- "but was %p\n", entry, prev->next) || +- WARN(next->prev != entry, +- "list_del corruption. next->prev should be %p, " +- "but was %p\n", entry, next->prev)) ++ if (unlikely(next == LIST_POISON1)) { ++ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n", ++ entry, LIST_POISON1); ++ BUG(); ++ return false; ++ } ++ if (unlikely(prev == LIST_POISON2)) { ++ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n", ++ entry, LIST_POISON2); ++ BUG(); ++ return false; ++ } ++ if (unlikely(entry->prev->next != entry)) { ++ printk(KERN_ERR "list_del corruption. prev->next should be %p, " ++ "but was %p\n", entry, prev->next); ++ BUG(); ++ return false; ++ } ++ if (unlikely(entry->next->prev != entry)) { ++ printk(KERN_ERR "list_del corruption. next->prev should be %p, " ++ "but was %p\n", entry, next->prev); ++ BUG(); + return false; ++ } + return true; +} + @@ -85422,7 +86829,7 @@ index c24c2f7..06e070b 100644 } EXPORT_SYMBOL(__list_del_entry); -@@ -86,15 +106,85 @@ EXPORT_SYMBOL(list_del); +@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del); void __list_add_rcu(struct list_head *new, struct list_head *prev, struct list_head *next) { @@ -85515,7 +86922,7 @@ index c24c2f7..06e070b 100644 +} +EXPORT_SYMBOL(pax_list_del_rcu); diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c -index 7deeb62..144eb47 100644 +index 1a53d49..ace934c 100644 --- a/lib/percpu-refcount.c +++ b/lib/percpu-refcount.c @@ -29,7 +29,7 @@ @@ -85528,10 +86935,10 @@ index 7deeb62..144eb47 100644 /** * percpu_ref_init - initialize a percpu refcount diff --git a/lib/radix-tree.c b/lib/radix-tree.c -index e796429..6e38f9f 100644 +index 7811ed3..f80ca19 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c -@@ -92,7 +92,7 @@ struct radix_tree_preload { +@@ -93,7 +93,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE]; }; @@ -85567,7 +86974,7 @@ index a28df52..3d55877 100644 unsigned long c; diff --git a/lib/swiotlb.c b/lib/swiotlb.c -index d23762e..e21eab2 100644 +index 4e8686c..3e8c92f 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -664,7 +664,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent); @@ -85594,7 +87001,7 @@ index 4f5b1dd..7cab418 100644 +} +EXPORT_SYMBOL(copy_to_user_overflow); diff --git a/lib/vsprintf.c b/lib/vsprintf.c -index 739a363..aa668d7 100644 +index d76555c..62d4bfe 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -16,6 +16,9 @@ @@ -85607,7 +87014,7 @@ index 739a363..aa668d7 100644 #include #include /* for KSYM_SYMBOL_LEN */ #include -@@ -1078,7 +1081,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr, +@@ -1155,7 +1158,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr, return number(buf, end, *(const netdev_features_t *)addr, spec); } @@ -85619,7 +87026,7 @@ index 739a363..aa668d7 100644 /* * Show a '%p' thing. A kernel extension is that the '%p' is followed -@@ -1091,6 +1098,7 @@ int kptr_restrict __read_mostly; +@@ -1168,6 +1175,7 @@ int kptr_restrict __read_mostly; * - 'f' For simple symbolic function names without offset * - 'S' For symbolic direct pointers with offset * - 's' For symbolic direct pointers without offset @@ -85627,7 +87034,7 @@ index 739a363..aa668d7 100644 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation * - 'B' For backtraced symbolic direct pointers with offset * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref] -@@ -1155,12 +1163,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, +@@ -1232,12 +1240,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, if (!ptr && *fmt != 'K') { /* @@ -85642,7 +87049,7 @@ index 739a363..aa668d7 100644 } switch (*fmt) { -@@ -1170,6 +1178,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, +@@ -1247,6 +1255,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, /* Fallthrough */ case 'S': case 's': @@ -85655,7 +87062,7 @@ index 739a363..aa668d7 100644 case 'B': return symbol_string(buf, end, ptr, spec, fmt); case 'R': -@@ -1225,6 +1239,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, +@@ -1302,6 +1316,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, va_end(va); return buf; } @@ -85664,9 +87071,9 @@ index 739a363..aa668d7 100644 case 'K': /* * %pK cannot be used in IRQ context because its test -@@ -1254,6 +1270,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, - return number(buf, end, - (unsigned long long) *((phys_addr_t *)ptr), spec); +@@ -1363,6 +1379,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, + ((const struct file *)ptr)->f_path.dentry, + spec, fmt); } + +#ifdef CONFIG_GRKERNSEC_HIDESYM @@ -85686,7 +87093,7 @@ index 739a363..aa668d7 100644 spec.flags |= SMALL; if (spec.field_width == -1) { spec.field_width = default_width; -@@ -1977,11 +2008,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) +@@ -2086,11 +2117,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) typeof(type) value; \ if (sizeof(type) == 8) { \ args = PTR_ALIGN(args, sizeof(u32)); \ @@ -85701,7 +87108,7 @@ index 739a363..aa668d7 100644 } \ args += sizeof(type); \ value; \ -@@ -2044,7 +2075,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) +@@ -2153,7 +2184,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) case FORMAT_TYPE_STR: { const char *str_arg = args; args += strlen(str_arg) + 1; @@ -85718,10 +87125,10 @@ index 0000000..7cd6065 @@ -0,0 +1 @@ +-grsec diff --git a/mm/Kconfig b/mm/Kconfig -index 6509d27..dbec5b8 100644 +index 394838f..0e5f816 100644 --- a/mm/Kconfig +++ b/mm/Kconfig -@@ -317,10 +317,10 @@ config KSM +@@ -317,10 +317,11 @@ config KSM root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set). config DEFAULT_MMAP_MIN_ADDR @@ -85730,12 +87137,13 @@ index 6509d27..dbec5b8 100644 depends on MMU - default 4096 - help ++ default 32768 if ALPHA || ARM || PARISC || SPARC32 + default 65536 + help This is the portion of low virtual memory which should be protected from userspace allocation. Keeping a user from writing to low pages can help reduce the impact of kernel NULL pointer bugs. -@@ -351,7 +351,7 @@ config MEMORY_FAILURE +@@ -351,7 +352,7 @@ config MEMORY_FAILURE config HWPOISON_INJECT tristate "HWPoison pages injector" @@ -85745,7 +87153,7 @@ index 6509d27..dbec5b8 100644 config NOMMU_INITIAL_TRIM_EXCESS diff --git a/mm/backing-dev.c b/mm/backing-dev.c -index e04454c..ca5be3e 100644 +index ce682f7..1fb54f9 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -12,7 +12,7 @@ @@ -85757,7 +87165,7 @@ index e04454c..ca5be3e 100644 struct backing_dev_info default_backing_dev_info = { .name = "default", -@@ -522,7 +522,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name, +@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name, return err; err = bdi_register(bdi, NULL, "%.28s-%ld", name, @@ -85767,10 +87175,10 @@ index e04454c..ca5be3e 100644 bdi_destroy(bdi); return err; diff --git a/mm/filemap.c b/mm/filemap.c -index 4b51ac1..5aa90ff 100644 +index ae4846f..b0acebe 100644 --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -1766,7 +1766,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma) +@@ -1768,7 +1768,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma) struct address_space *mapping = file->f_mapping; if (!mapping->a_ops->readpage) @@ -85779,7 +87187,7 @@ index 4b51ac1..5aa90ff 100644 file_accessed(file); vma->vm_ops = &generic_file_vm_ops; return 0; -@@ -1948,7 +1948,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr, +@@ -1950,7 +1950,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr, while (bytes) { char __user *buf = iov->iov_base + base; @@ -85788,7 +87196,7 @@ index 4b51ac1..5aa90ff 100644 base = 0; left = __copy_from_user_inatomic(vaddr, buf, copy); -@@ -1977,7 +1977,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page, +@@ -1979,7 +1979,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page, BUG_ON(!in_atomic()); kaddr = kmap_atomic(page); if (likely(i->nr_segs == 1)) { @@ -85797,7 +87205,7 @@ index 4b51ac1..5aa90ff 100644 char __user *buf = i->iov->iov_base + i->iov_offset; left = __copy_from_user_inatomic(kaddr + offset, buf, bytes); copied = bytes - left; -@@ -2005,7 +2005,7 @@ size_t iov_iter_copy_from_user(struct page *page, +@@ -2007,7 +2007,7 @@ size_t iov_iter_copy_from_user(struct page *page, kaddr = kmap(page); if (likely(i->nr_segs == 1)) { @@ -85806,7 +87214,7 @@ index 4b51ac1..5aa90ff 100644 char __user *buf = i->iov->iov_base + i->iov_offset; left = __copy_from_user(kaddr + offset, buf, bytes); copied = bytes - left; -@@ -2035,7 +2035,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes) +@@ -2037,7 +2037,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes) * zero-length segments (without overruning the iovec). */ while (bytes || unlikely(i->count && !iov->iov_len)) { @@ -85815,7 +87223,7 @@ index 4b51ac1..5aa90ff 100644 copy = min(bytes, iov->iov_len - base); BUG_ON(!i->count || i->count < copy); -@@ -2106,6 +2106,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i +@@ -2108,6 +2108,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i *pos = i_size_read(inode); if (limit != RLIM_INFINITY) { @@ -85868,10 +87276,10 @@ index b32b70c..e512eb0 100644 set_page_address(page, (void *)vaddr); diff --git a/mm/hugetlb.c b/mm/hugetlb.c -index b60f330..ee7de7e 100644 +index 0b7656e..d21cefc 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c -@@ -2022,15 +2022,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, +@@ -2094,15 +2094,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, struct hstate *h = &default_hstate; unsigned long tmp; int ret; @@ -85892,7 +87300,7 @@ index b60f330..ee7de7e 100644 if (ret) goto out; -@@ -2087,15 +2089,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, +@@ -2147,15 +2149,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, struct hstate *h = &default_hstate; unsigned long tmp; int ret; @@ -85913,7 +87321,7 @@ index b60f330..ee7de7e 100644 if (ret) goto out; -@@ -2545,6 +2549,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2605,6 +2609,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma, return 1; } @@ -85941,7 +87349,7 @@ index b60f330..ee7de7e 100644 /* * Hugetlb_cow() should be called with page lock of the original hugepage held. * Called with hugetlb_instantiation_mutex held and pte_page locked so we -@@ -2663,6 +2688,11 @@ retry_avoidcopy: +@@ -2721,6 +2746,11 @@ retry_avoidcopy: make_huge_pte(vma, new_page, 1)); page_remove_rmap(old_page); hugepage_add_new_anon_rmap(new_page, vma, address); @@ -85953,7 +87361,7 @@ index b60f330..ee7de7e 100644 /* Make the old page be freed below */ new_page = old_page; } -@@ -2821,6 +2851,10 @@ retry: +@@ -2883,6 +2913,10 @@ retry: && (vma->vm_flags & VM_SHARED))); set_huge_pte_at(mm, address, ptep, new_pte); @@ -85964,7 +87372,7 @@ index b60f330..ee7de7e 100644 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { /* Optimization, do the COW without a second fault */ ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page); -@@ -2850,6 +2884,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2912,6 +2946,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, static DEFINE_MUTEX(hugetlb_instantiation_mutex); struct hstate *h = hstate_vma(vma); @@ -85975,7 +87383,7 @@ index b60f330..ee7de7e 100644 address &= huge_page_mask(h); ptep = huge_pte_offset(mm, address); -@@ -2863,6 +2901,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2925,6 +2963,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, VM_FAULT_SET_HINDEX(hstate_index(h)); } @@ -86003,10 +87411,10 @@ index b60f330..ee7de7e 100644 if (!ptep) return VM_FAULT_OOM; diff --git a/mm/internal.h b/mm/internal.h -index 4390ac6..fc60373c 100644 +index 684f7aa..9eb9edc 100644 --- a/mm/internal.h +++ b/mm/internal.h -@@ -95,6 +95,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address); +@@ -97,6 +97,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address); * in mm/page_alloc.c */ extern void __free_pages_bootmem(struct page *page, unsigned int order); @@ -86014,7 +87422,7 @@ index 4390ac6..fc60373c 100644 extern void prep_compound_page(struct page *page, unsigned long order); #ifdef CONFIG_MEMORY_FAILURE extern bool is_free_buddy_page(struct page *page); -@@ -350,7 +351,7 @@ extern u32 hwpoison_filter_enable; +@@ -352,7 +353,7 @@ extern u32 hwpoison_filter_enable; extern unsigned long vm_mmap_pgoff(struct file *, unsigned long, unsigned long, unsigned long, @@ -86024,7 +87432,7 @@ index 4390ac6..fc60373c 100644 extern void set_pageblock_order(void); unsigned long reclaim_clean_pages_from_list(struct zone *zone, diff --git a/mm/kmemleak.c b/mm/kmemleak.c -index c8d7f31..2dbeffd 100644 +index e126b0e..e986018 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq, @@ -86068,10 +87476,10 @@ index d53adf9..03a24bf 100644 set_fs(old_fs); diff --git a/mm/madvise.c b/mm/madvise.c -index 7055883..aafb1ed 100644 +index 539eeb9..e24a987 100644 --- a/mm/madvise.c +++ b/mm/madvise.c -@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct * vma, +@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma, pgoff_t pgoff; unsigned long new_flags = vma->vm_flags; @@ -86096,8 +87504,8 @@ index 7055883..aafb1ed 100644 vma->vm_flags = new_flags; out: -@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct * vma, - struct vm_area_struct ** prev, +@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma, + struct vm_area_struct **prev, unsigned long start, unsigned long end) { + @@ -86108,7 +87516,7 @@ index 7055883..aafb1ed 100644 *prev = vma; if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP)) return -EINVAL; -@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct * vma, +@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma, zap_page_range(vma, start, end - start, &details); } else zap_page_range(vma, start, end - start, NULL); @@ -86130,7 +87538,7 @@ index 7055883..aafb1ed 100644 return 0; } -@@ -485,6 +516,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) +@@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior) if (end < start) return error; @@ -86147,21 +87555,8 @@ index 7055883..aafb1ed 100644 error = 0; if (end == start) return error; -diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index aa44621..99011b3 100644 ---- a/mm/memcontrol.c -+++ b/mm/memcontrol.c -@@ -2772,6 +2772,8 @@ done: - return 0; - nomem: - *ptr = NULL; -+ if (gfp_mask & __GFP_NOFAIL) -+ return 0; - return -ENOMEM; - bypass: - *ptr = root_mem_cgroup; diff --git a/mm/memory-failure.c b/mm/memory-failure.c -index 2c13aa7..64cbc3f 100644 +index bf3351b..aea800d 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0; @@ -86182,7 +87577,7 @@ index 2c13aa7..64cbc3f 100644 #ifdef __ARCH_SI_TRAPNO si.si_trapno = trapno; #endif -@@ -760,7 +760,7 @@ static struct page_state { +@@ -762,7 +762,7 @@ static struct page_state { unsigned long res; char *msg; int (*action)(struct page *p, unsigned long pfn); @@ -86191,7 +87586,7 @@ index 2c13aa7..64cbc3f 100644 { reserved, reserved, "reserved kernel", me_kernel }, /* * free pages are specially detected outside this table: -@@ -1051,7 +1051,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags) +@@ -1053,7 +1053,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags) nr_pages = 1 << compound_order(hpage); else /* normal page or thp */ nr_pages = 1; @@ -86200,7 +87595,7 @@ index 2c13aa7..64cbc3f 100644 /* * We need/can do nothing about count=0 pages. -@@ -1081,7 +1081,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags) +@@ -1083,7 +1083,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags) if (!PageHWPoison(hpage) || (hwpoison_filter(p) && TestClearPageHWPoison(p)) || (p != hpage && TestSetPageHWPoison(hpage))) { @@ -86209,7 +87604,7 @@ index 2c13aa7..64cbc3f 100644 return 0; } set_page_hwpoison_huge_page(hpage); -@@ -1148,7 +1148,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags) +@@ -1152,7 +1152,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags) } if (hwpoison_filter(p)) { if (TestClearPageHWPoison(p)) @@ -86218,16 +87613,16 @@ index 2c13aa7..64cbc3f 100644 unlock_page(hpage); put_page(hpage); return 0; -@@ -1350,7 +1350,7 @@ int unpoison_memory(unsigned long pfn) +@@ -1370,7 +1370,7 @@ int unpoison_memory(unsigned long pfn) return 0; } if (TestClearPageHWPoison(p)) -- atomic_long_sub(nr_pages, &num_poisoned_pages); -+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages); +- atomic_long_dec(&num_poisoned_pages); ++ atomic_long_dec_unchecked(&num_poisoned_pages); pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn); return 0; } -@@ -1364,7 +1364,7 @@ int unpoison_memory(unsigned long pfn) +@@ -1384,7 +1384,7 @@ int unpoison_memory(unsigned long pfn) */ if (TestClearPageHWPoison(page)) { pr_info("MCE: Software-unpoisoned page %#lx\n", pfn); @@ -86236,30 +87631,16 @@ index 2c13aa7..64cbc3f 100644 freeit = 1; if (PageHuge(page)) clear_page_hwpoison_huge_page(page); -@@ -1491,7 +1491,7 @@ static int soft_offline_huge_page(struct page *page, int flags) +@@ -1521,7 +1521,7 @@ static int soft_offline_huge_page(struct page *page, int flags) } else { set_page_hwpoison_huge_page(hpage); dequeue_hwpoisoned_huge_page(hpage); -- atomic_long_add(1 << compound_trans_order(hpage), -+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), +- atomic_long_add(1 << compound_order(hpage), ++ atomic_long_add_unchecked(1 << compound_order(hpage), &num_poisoned_pages); } return ret; -@@ -1551,11 +1551,11 @@ int soft_offline_page(struct page *page, int flags) - if (PageHuge(page)) { - set_page_hwpoison_huge_page(hpage); - dequeue_hwpoisoned_huge_page(hpage); -- atomic_long_add(1 << compound_trans_order(hpage), -+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), - &num_poisoned_pages); - } else { - SetPageHWPoison(page); -- atomic_long_inc(&num_poisoned_pages); -+ atomic_long_inc_unchecked(&num_poisoned_pages); - } - } - unset_migratetype_isolate(page, MIGRATE_MOVABLE); -@@ -1595,7 +1595,7 @@ static int __soft_offline_page(struct page *page, int flags) +@@ -1560,7 +1560,7 @@ static int __soft_offline_page(struct page *page, int flags) put_page(page); pr_info("soft_offline: %#lx: invalidated\n", pfn); SetPageHWPoison(page); @@ -86268,7 +87649,7 @@ index 2c13aa7..64cbc3f 100644 return 0; } -@@ -1640,7 +1640,7 @@ static int __soft_offline_page(struct page *page, int flags) +@@ -1605,7 +1605,7 @@ static int __soft_offline_page(struct page *page, int flags) if (!is_free_buddy_page(page)) pr_info("soft offline: %#lx: page leaked\n", pfn); @@ -86277,11 +87658,25 @@ index 2c13aa7..64cbc3f 100644 } } else { pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n", +@@ -1666,11 +1666,11 @@ int soft_offline_page(struct page *page, int flags) + if (PageHuge(page)) { + set_page_hwpoison_huge_page(hpage); + dequeue_hwpoisoned_huge_page(hpage); +- atomic_long_add(1 << compound_order(hpage), ++ atomic_long_add_unchecked(1 << compound_order(hpage), + &num_poisoned_pages); + } else { + SetPageHWPoison(page); +- atomic_long_inc(&num_poisoned_pages); ++ atomic_long_inc_unchecked(&num_poisoned_pages); + } + } + unset: diff --git a/mm/memory.c b/mm/memory.c -index af84bc0..2ed0816 100644 +index d176154..cd1b387 100644 --- a/mm/memory.c +++ b/mm/memory.c -@@ -426,6 +426,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, +@@ -402,6 +402,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, free_pte_range(tlb, pmd, addr); } while (pmd++, addr = next, addr != end); @@ -86289,7 +87684,7 @@ index af84bc0..2ed0816 100644 start &= PUD_MASK; if (start < floor) return; -@@ -440,6 +441,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, +@@ -416,6 +417,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, pmd = pmd_offset(pud, start); pud_clear(pud); pmd_free_tlb(tlb, pmd, start); @@ -86298,7 +87693,7 @@ index af84bc0..2ed0816 100644 } static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, -@@ -459,6 +462,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, +@@ -435,6 +438,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, free_pmd_range(tlb, pud, addr, next, floor, ceiling); } while (pud++, addr = next, addr != end); @@ -86306,7 +87701,7 @@ index af84bc0..2ed0816 100644 start &= PGDIR_MASK; if (start < floor) return; -@@ -473,6 +477,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, +@@ -449,6 +453,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, pud = pud_offset(pgd, start); pgd_clear(pgd); pud_free_tlb(tlb, pud, start); @@ -86315,7 +87710,7 @@ index af84bc0..2ed0816 100644 } /* -@@ -1645,12 +1651,6 @@ no_page_table: +@@ -1636,12 +1642,6 @@ no_page_table: return page; } @@ -86328,7 +87723,7 @@ index af84bc0..2ed0816 100644 /** * __get_user_pages() - pin user pages in memory * @tsk: task_struct of target task -@@ -1737,10 +1737,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, +@@ -1728,10 +1728,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, i = 0; @@ -86341,7 +87736,7 @@ index af84bc0..2ed0816 100644 if (!vma && in_gate_area(mm, start)) { unsigned long pg = start & PAGE_MASK; pgd_t *pgd; -@@ -1789,7 +1789,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, +@@ -1780,7 +1780,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, goto next_page; } @@ -86350,7 +87745,7 @@ index af84bc0..2ed0816 100644 (vma->vm_flags & (VM_IO | VM_PFNMAP)) || !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1818,11 +1818,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, +@@ -1809,11 +1809,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, int ret; unsigned int fault_flags = 0; @@ -86362,7 +87757,7 @@ index af84bc0..2ed0816 100644 if (foll_flags & FOLL_WRITE) fault_flags |= FAULT_FLAG_WRITE; if (nonblocking) -@@ -1902,7 +1897,7 @@ next_page: +@@ -1893,7 +1888,7 @@ next_page: start += page_increm * PAGE_SIZE; nr_pages -= page_increm; } while (nr_pages && start < vma->vm_end); @@ -86371,7 +87766,7 @@ index af84bc0..2ed0816 100644 return i; } EXPORT_SYMBOL(__get_user_pages); -@@ -2109,6 +2104,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, +@@ -2100,6 +2095,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr, page_add_file_rmap(page); set_pte_at(mm, addr, pte, mk_pte(page, prot)); @@ -86382,7 +87777,7 @@ index af84bc0..2ed0816 100644 retval = 0; pte_unmap_unlock(pte, ptl); return retval; -@@ -2153,9 +2152,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, +@@ -2144,9 +2143,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, if (!page_count(page)) return -EINVAL; if (!(vma->vm_flags & VM_MIXEDMAP)) { @@ -86404,7 +87799,7 @@ index af84bc0..2ed0816 100644 } return insert_page(vma, addr, page, vma->vm_page_prot); } -@@ -2238,6 +2249,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, +@@ -2229,6 +2240,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn) { BUG_ON(!(vma->vm_flags & VM_MIXEDMAP)); @@ -86412,7 +87807,7 @@ index af84bc0..2ed0816 100644 if (addr < vma->vm_start || addr >= vma->vm_end) return -EFAULT; -@@ -2485,7 +2497,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, +@@ -2476,7 +2488,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud, BUG_ON(pud_huge(*pud)); @@ -86423,7 +87818,7 @@ index af84bc0..2ed0816 100644 if (!pmd) return -ENOMEM; do { -@@ -2505,7 +2519,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd, +@@ -2496,7 +2510,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd, unsigned long next; int err; @@ -86434,7 +87829,7 @@ index af84bc0..2ed0816 100644 if (!pud) return -ENOMEM; do { -@@ -2593,6 +2609,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo +@@ -2584,6 +2600,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo copy_user_highpage(dst, src, va, vma); } @@ -86621,7 +88016,7 @@ index af84bc0..2ed0816 100644 /* * This routine handles present pages, when users try to write * to a shared page. It is done by copying the page to a new address -@@ -2809,6 +3005,12 @@ gotten: +@@ -2800,6 +2996,12 @@ gotten: */ page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (likely(pte_same(*page_table, orig_pte))) { @@ -86634,7 +88029,7 @@ index af84bc0..2ed0816 100644 if (old_page) { if (!PageAnon(old_page)) { dec_mm_counter_fast(mm, MM_FILEPAGES); -@@ -2860,6 +3062,10 @@ gotten: +@@ -2851,6 +3053,10 @@ gotten: page_remove_rmap(old_page); } @@ -86645,7 +88040,7 @@ index af84bc0..2ed0816 100644 /* Free the old page.. */ new_page = old_page; ret |= VM_FAULT_WRITE; -@@ -3137,6 +3343,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3128,6 +3334,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, swap_free(entry); if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) try_to_free_swap(page); @@ -86657,7 +88052,7 @@ index af84bc0..2ed0816 100644 unlock_page(page); if (page != swapcache) { /* -@@ -3160,6 +3371,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3151,6 +3362,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, page_table); @@ -86669,7 +88064,7 @@ index af84bc0..2ed0816 100644 unlock: pte_unmap_unlock(page_table, ptl); out: -@@ -3179,40 +3395,6 @@ out_release: +@@ -3170,40 +3386,6 @@ out_release: } /* @@ -86710,7 +88105,7 @@ index af84bc0..2ed0816 100644 * We enter with non-exclusive mmap_sem (to exclude vma changes, * but allow concurrent faults), and pte mapped but not yet locked. * We return with mmap_sem still held, but pte unmapped and unlocked. -@@ -3221,27 +3403,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3212,27 +3394,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, pte_t *page_table, pmd_t *pmd, unsigned int flags) { @@ -86743,7 +88138,7 @@ index af84bc0..2ed0816 100644 if (unlikely(anon_vma_prepare(vma))) goto oom; page = alloc_zeroed_user_highpage_movable(vma, address); -@@ -3265,6 +3443,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3256,6 +3434,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, if (!pte_none(*page_table)) goto release; @@ -86755,7 +88150,7 @@ index af84bc0..2ed0816 100644 inc_mm_counter_fast(mm, MM_ANONPAGES); page_add_new_anon_rmap(page, vma, address); setpte: -@@ -3272,6 +3455,12 @@ setpte: +@@ -3263,6 +3446,12 @@ setpte: /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, page_table); @@ -86768,7 +88163,7 @@ index af84bc0..2ed0816 100644 unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -3415,6 +3604,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3406,6 +3595,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, */ /* Only go through if we didn't race with anybody else... */ if (likely(pte_same(*page_table, orig_pte))) { @@ -86781,7 +88176,7 @@ index af84bc0..2ed0816 100644 flush_icache_page(vma, page); entry = mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -3436,6 +3631,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3427,6 +3622,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, /* no need to invalidate: a not-present page won't be cached */ update_mmu_cache(vma, address, page_table); @@ -86796,7 +88191,7 @@ index af84bc0..2ed0816 100644 } else { if (cow_page) mem_cgroup_uncharge_page(cow_page); -@@ -3757,6 +3960,12 @@ int handle_pte_fault(struct mm_struct *mm, +@@ -3737,6 +3940,12 @@ static int handle_pte_fault(struct mm_struct *mm, if (flags & FAULT_FLAG_WRITE) flush_tlb_fix_spurious_fault(vma, address); } @@ -86809,7 +88204,7 @@ index af84bc0..2ed0816 100644 unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -3773,6 +3982,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3753,9 +3962,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, pmd_t *pmd; pte_t *pte; @@ -86817,10 +88212,6 @@ index af84bc0..2ed0816 100644 + struct vm_area_struct *vma_m; +#endif + - __set_current_state(TASK_RUNNING); - - count_vm_event(PGFAULT); -@@ -3784,6 +3997,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); @@ -86855,7 +88246,7 @@ index af84bc0..2ed0816 100644 retry: pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); -@@ -3882,6 +4123,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) +@@ -3894,6 +4135,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) spin_unlock(&mm->page_table_lock); return 0; } @@ -86879,7 +88270,7 @@ index af84bc0..2ed0816 100644 #endif /* __PAGETABLE_PUD_FOLDED */ #ifndef __PAGETABLE_PMD_FOLDED -@@ -3912,6 +4170,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) +@@ -3924,6 +4182,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) spin_unlock(&mm->page_table_lock); return 0; } @@ -86910,7 +88301,7 @@ index af84bc0..2ed0816 100644 #endif /* __PAGETABLE_PMD_FOLDED */ #if !defined(__HAVE_ARCH_GATE_AREA) -@@ -3925,7 +4207,7 @@ static int __init gate_vma_init(void) +@@ -3937,7 +4219,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; @@ -86919,7 +88310,7 @@ index af84bc0..2ed0816 100644 return 0; } -@@ -4059,8 +4341,8 @@ out: +@@ -4071,8 +4353,8 @@ out: return ret; } @@ -86930,7 +88321,7 @@ index af84bc0..2ed0816 100644 { resource_size_t phys_addr; unsigned long prot = 0; -@@ -4085,8 +4367,8 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, +@@ -4098,8 +4380,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys); * Access another process' address space as given in mm. If non-NULL, use the * given task for page fault accounting. */ @@ -86941,7 +88332,7 @@ index af84bc0..2ed0816 100644 { struct vm_area_struct *vma; void *old_buf = buf; -@@ -4094,7 +4376,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, +@@ -4107,7 +4389,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, down_read(&mm->mmap_sem); /* ignore errors, just check how much was successfully transferred */ while (len) { @@ -86950,7 +88341,7 @@ index af84bc0..2ed0816 100644 void *maddr; struct page *page = NULL; -@@ -4153,8 +4435,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, +@@ -4166,8 +4448,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, * * The caller must hold a reference on @mm. */ @@ -86961,7 +88352,7 @@ index af84bc0..2ed0816 100644 { return __access_remote_vm(NULL, mm, addr, buf, len, write); } -@@ -4164,11 +4446,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr, +@@ -4177,11 +4459,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr, * Source/target buffer must be kernel space, * Do not walk the page table directly, use get_user_pages */ @@ -86977,10 +88368,10 @@ index af84bc0..2ed0816 100644 mm = get_task_mm(tsk); if (!mm) diff --git a/mm/mempolicy.c b/mm/mempolicy.c -index 4baf12e..5497066 100644 +index 0472964..7d5a0ea 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c -@@ -708,6 +708,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, +@@ -746,6 +746,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, unsigned long vmstart; unsigned long vmend; @@ -86991,7 +88382,7 @@ index 4baf12e..5497066 100644 vma = find_vma(mm, start); if (!vma || vma->vm_start > start) return -EFAULT; -@@ -751,6 +755,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, +@@ -789,6 +793,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, err = vma_replace_policy(vma, new_pol); if (err) goto out; @@ -87008,7 +88399,7 @@ index 4baf12e..5497066 100644 } out: -@@ -1206,6 +1220,17 @@ static long do_mbind(unsigned long start, unsigned long len, +@@ -1252,6 +1266,17 @@ static long do_mbind(unsigned long start, unsigned long len, if (end < start) return -EINVAL; @@ -87026,7 +88417,7 @@ index 4baf12e..5497066 100644 if (end == start) return 0; -@@ -1434,8 +1459,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode, +@@ -1480,8 +1505,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode, */ tcred = __task_cred(task); if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) && @@ -87036,7 +88427,7 @@ index 4baf12e..5497066 100644 rcu_read_unlock(); err = -EPERM; goto out_put; -@@ -1466,6 +1490,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode, +@@ -1512,6 +1536,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode, goto out; } @@ -87053,10 +88444,10 @@ index 4baf12e..5497066 100644 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE); diff --git a/mm/migrate.c b/mm/migrate.c -index 25ca7ca..abe1836 100644 +index c046927..6996b40 100644 --- a/mm/migrate.c +++ b/mm/migrate.c -@@ -1399,8 +1399,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, +@@ -1404,8 +1404,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, */ tcred = __task_cred(task); if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) && @@ -87067,18 +88458,18 @@ index 25ca7ca..abe1836 100644 err = -EPERM; goto out; diff --git a/mm/mlock.c b/mm/mlock.c -index 79b7cf7..37472bf 100644 +index d480cd6..0f98458 100644 --- a/mm/mlock.c +++ b/mm/mlock.c -@@ -13,6 +13,7 @@ - #include +@@ -14,6 +14,7 @@ + #include #include #include +#include #include #include #include -@@ -334,7 +335,7 @@ static int do_mlock(unsigned long start, size_t len, int on) +@@ -568,7 +569,7 @@ static int do_mlock(unsigned long start, size_t len, int on) { unsigned long nstart, end, tmp; struct vm_area_struct * vma, * prev; @@ -87087,7 +88478,7 @@ index 79b7cf7..37472bf 100644 VM_BUG_ON(start & ~PAGE_MASK); VM_BUG_ON(len != PAGE_ALIGN(len)); -@@ -343,6 +344,9 @@ static int do_mlock(unsigned long start, size_t len, int on) +@@ -577,6 +578,9 @@ static int do_mlock(unsigned long start, size_t len, int on) return -EINVAL; if (end == start) return 0; @@ -87097,7 +88488,7 @@ index 79b7cf7..37472bf 100644 vma = find_vma(current->mm, start); if (!vma || vma->vm_start > start) return -ENOMEM; -@@ -354,6 +358,11 @@ static int do_mlock(unsigned long start, size_t len, int on) +@@ -588,6 +592,11 @@ static int do_mlock(unsigned long start, size_t len, int on) for (nstart = start ; ; ) { vm_flags_t newflags; @@ -87109,7 +88500,7 @@ index 79b7cf7..37472bf 100644 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */ newflags = vma->vm_flags & ~VM_LOCKED; -@@ -466,6 +475,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) +@@ -700,6 +709,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) lock_limit >>= PAGE_SHIFT; /* check against resource limits */ @@ -87117,7 +88508,7 @@ index 79b7cf7..37472bf 100644 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK)) error = do_mlock(start, len, 1); up_write(¤t->mm->mmap_sem); -@@ -500,12 +510,18 @@ static int do_mlockall(int flags) +@@ -734,6 +744,11 @@ static int do_mlockall(int flags) for (vma = current->mm->mmap; vma ; vma = prev->vm_next) { vm_flags_t newflags; @@ -87129,14 +88520,7 @@ index 79b7cf7..37472bf 100644 newflags = vma->vm_flags & ~VM_LOCKED; if (flags & MCL_CURRENT) newflags |= VM_LOCKED; - - /* Ignore errors */ - mlock_fixup(vma, &prev, vma->vm_start, vma->vm_end, newflags); -+ cond_resched(); - } - out: - return 0; -@@ -532,6 +548,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) +@@ -767,6 +782,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) lock_limit >>= PAGE_SHIFT; ret = -ENOMEM; @@ -87145,7 +88529,7 @@ index 79b7cf7..37472bf 100644 capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); diff --git a/mm/mmap.c b/mm/mmap.c -index f9c97d1..3468d3b 100644 +index 362e5f1..8968e02 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -36,6 +36,7 @@ @@ -87368,7 +88752,7 @@ index f9c97d1..3468d3b 100644 mm->stack_vm += pages; } #endif /* CONFIG_PROC_FS */ -@@ -1213,7 +1296,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -1212,7 +1295,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, * (the exception is when the underlying filesystem is noexec * mounted, in which case we dont add PROT_EXEC.) */ @@ -87377,7 +88761,7 @@ index f9c97d1..3468d3b 100644 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC))) prot |= PROT_EXEC; -@@ -1239,7 +1322,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -1238,7 +1321,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -87386,7 +88770,7 @@ index f9c97d1..3468d3b 100644 if (addr & ~PAGE_MASK) return addr; -@@ -1250,6 +1333,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -1249,6 +1332,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) | mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC; @@ -87430,7 +88814,7 @@ index f9c97d1..3468d3b 100644 if (flags & MAP_LOCKED) if (!can_do_mlock()) return -EPERM; -@@ -1261,6 +1381,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -1260,6 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, locked += mm->locked_vm; lock_limit = rlimit(RLIMIT_MEMLOCK); lock_limit >>= PAGE_SHIFT; @@ -87438,7 +88822,7 @@ index f9c97d1..3468d3b 100644 if (locked > lock_limit && !capable(CAP_IPC_LOCK)) return -EAGAIN; } -@@ -1341,6 +1462,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, +@@ -1344,6 +1465,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, vm_flags |= VM_NORESERVE; } @@ -87448,7 +88832,7 @@ index f9c97d1..3468d3b 100644 addr = mmap_region(file, addr, len, vm_flags, pgoff); if (!IS_ERR_VALUE(addr) && ((vm_flags & VM_LOCKED) || -@@ -1434,7 +1558,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma) +@@ -1437,7 +1561,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma) vm_flags_t vm_flags = vma->vm_flags; /* If it was private or non-writable, the write bit is already clear */ @@ -87457,9 +88841,9 @@ index f9c97d1..3468d3b 100644 return 0; /* The backer wishes to know when pages are first written to? */ -@@ -1482,7 +1606,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1483,7 +1607,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr, + struct rb_node **rb_link, *rb_parent; unsigned long charged = 0; - struct inode *inode = file ? file_inode(file) : NULL; +#ifdef CONFIG_PAX_SEGMEXEC + struct vm_area_struct *vma_m = NULL; @@ -87480,7 +88864,7 @@ index f9c97d1..3468d3b 100644 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) { unsigned long nr_pages; -@@ -1501,11 +1640,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr, +@@ -1502,11 +1641,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr, /* Clear old maps */ error = -ENOMEM; @@ -87493,7 +88877,7 @@ index f9c97d1..3468d3b 100644 } /* -@@ -1536,6 +1674,16 @@ munmap_back: +@@ -1537,6 +1675,16 @@ munmap_back: goto unacct_error; } @@ -87510,7 +88894,7 @@ index f9c97d1..3468d3b 100644 vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -1560,6 +1708,13 @@ munmap_back: +@@ -1556,6 +1704,13 @@ munmap_back: if (error) goto unmap_and_free_vma; @@ -87524,19 +88908,20 @@ index f9c97d1..3468d3b 100644 /* Can addr have changed?? * * Answer: Yes, several device drivers can do it in their -@@ -1598,6 +1753,11 @@ munmap_back: - vma_link(mm, vma, prev, rb_link, rb_parent); - file = vma->vm_file; +@@ -1589,6 +1744,12 @@ munmap_back: + } + vma_link(mm, vma, prev, rb_link, rb_parent); ++ +#ifdef CONFIG_PAX_SEGMEXEC + if (vma_m) + BUG_ON(pax_mirror_vma(vma_m, vma)); +#endif + /* Once vma denies write, undo our temporary denial count */ - if (correct_wcount) - atomic_inc(&inode->i_writecount); -@@ -1605,6 +1765,7 @@ out: + if (vm_flags & VM_DENYWRITE) + allow_write_access(file); +@@ -1597,6 +1758,7 @@ out: perf_event_mmap(vma); vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); @@ -87544,7 +88929,7 @@ index f9c97d1..3468d3b 100644 if (vm_flags & VM_LOCKED) { if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm))) -@@ -1628,6 +1789,12 @@ unmap_and_free_vma: +@@ -1629,6 +1791,12 @@ unmap_and_free_vma: unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); charged = 0; free_vma: @@ -87557,7 +88942,7 @@ index f9c97d1..3468d3b 100644 kmem_cache_free(vm_area_cachep, vma); unacct_error: if (charged) -@@ -1635,7 +1802,63 @@ unacct_error: +@@ -1636,7 +1804,63 @@ unacct_error: return error; } @@ -87622,7 +89007,7 @@ index f9c97d1..3468d3b 100644 { /* * We implement the search by looking for an rbtree node that -@@ -1683,11 +1906,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info) +@@ -1684,11 +1908,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info) } } @@ -87653,7 +89038,7 @@ index f9c97d1..3468d3b 100644 if (gap_end >= low_limit && gap_end - gap_start >= length) goto found; -@@ -1737,7 +1978,7 @@ found: +@@ -1738,7 +1980,7 @@ found: return gap_start; } @@ -87662,7 +89047,7 @@ index f9c97d1..3468d3b 100644 { struct mm_struct *mm = current->mm; struct vm_area_struct *vma; -@@ -1791,6 +2032,24 @@ check_current: +@@ -1792,6 +2034,24 @@ check_current: gap_end = vma->vm_start; if (gap_end < low_limit) return -ENOMEM; @@ -87687,15 +89072,15 @@ index f9c97d1..3468d3b 100644 if (gap_start <= high_limit && gap_end - gap_start >= length) goto found; -@@ -1854,6 +2113,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, +@@ -1855,6 +2115,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, struct mm_struct *mm = current->mm; struct vm_area_struct *vma; struct vm_unmapped_area_info info; + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags); - if (len > TASK_SIZE) + if (len > TASK_SIZE - mmap_min_addr) return -ENOMEM; -@@ -1861,19 +2121,29 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, +@@ -1862,19 +2123,30 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, if (flags & MAP_FIXED) return addr; @@ -87706,9 +89091,9 @@ index f9c97d1..3468d3b 100644 if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); -- if (TASK_SIZE - len >= addr && + if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && - (!vma || addr + len <= vma->vm_start)) -+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset)) ++ check_heap_stack_gap(vma, addr, len, offset)) return addr; } @@ -87727,15 +89112,15 @@ index f9c97d1..3468d3b 100644 return vm_unmapped_area(&info); } #endif -@@ -1892,6 +2162,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, +@@ -1893,6 +2165,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, struct mm_struct *mm = current->mm; unsigned long addr = addr0; struct vm_unmapped_area_info info; + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags); /* requested length too big for entire address space */ - if (len > TASK_SIZE) -@@ -1900,12 +2171,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, + if (len > TASK_SIZE - mmap_min_addr) +@@ -1901,12 +2174,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, if (flags & MAP_FIXED) return addr; @@ -87747,21 +89132,21 @@ index f9c97d1..3468d3b 100644 if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); -- if (TASK_SIZE - len >= addr && + if (TASK_SIZE - len >= addr && addr >= mmap_min_addr && - (!vma || addr + len <= vma->vm_start)) -+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset)) ++ check_heap_stack_gap(vma, addr, len, offset)) return addr; } -@@ -1914,6 +2188,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, - info.low_limit = PAGE_SIZE; +@@ -1915,6 +2192,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, + info.low_limit = max(PAGE_SIZE, mmap_min_addr); info.high_limit = mm->mmap_base; info.align_mask = 0; + info.threadstack_offset = offset; addr = vm_unmapped_area(&info); /* -@@ -1926,6 +2201,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, +@@ -1927,6 +2205,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, VM_BUG_ON(addr != -ENOMEM); info.flags = 0; info.low_limit = TASK_UNMAPPED_BASE; @@ -87774,7 +89159,7 @@ index f9c97d1..3468d3b 100644 info.high_limit = TASK_SIZE; addr = vm_unmapped_area(&info); } -@@ -2027,6 +2308,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr, +@@ -2028,6 +2312,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr, return vma; } @@ -87803,7 +89188,7 @@ index f9c97d1..3468d3b 100644 /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -2043,6 +2346,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -2044,6 +2350,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns return -ENOMEM; /* Stack limit test */ @@ -87811,7 +89196,7 @@ index f9c97d1..3468d3b 100644 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur)) return -ENOMEM; -@@ -2053,6 +2357,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -2054,6 +2361,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns locked = mm->locked_vm + grow; limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur); limit >>= PAGE_SHIFT; @@ -87819,7 +89204,7 @@ index f9c97d1..3468d3b 100644 if (locked > limit && !capable(CAP_IPC_LOCK)) return -ENOMEM; } -@@ -2082,37 +2387,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns +@@ -2083,37 +2391,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns * PA-RISC uses this for its stack; IA64 for its Register Backing Store. * vma is the last one with address > vma->vm_end. Have to extend vma. */ @@ -87877,7 +89262,7 @@ index f9c97d1..3468d3b 100644 unsigned long size, grow; size = address - vma->vm_start; -@@ -2147,6 +2463,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) +@@ -2148,6 +2467,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) } } } @@ -87886,7 +89271,7 @@ index f9c97d1..3468d3b 100644 vma_unlock_anon_vma(vma); khugepaged_enter_vma_merge(vma); validate_mm(vma->vm_mm); -@@ -2161,6 +2479,8 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2162,6 +2483,8 @@ int expand_downwards(struct vm_area_struct *vma, unsigned long address) { int error; @@ -87895,7 +89280,7 @@ index f9c97d1..3468d3b 100644 /* * We must make sure the anon_vma is allocated -@@ -2174,6 +2494,15 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2175,6 +2498,15 @@ int expand_downwards(struct vm_area_struct *vma, if (error) return error; @@ -87911,7 +89296,7 @@ index f9c97d1..3468d3b 100644 vma_lock_anon_vma(vma); /* -@@ -2183,9 +2512,17 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2184,9 +2516,17 @@ int expand_downwards(struct vm_area_struct *vma, */ /* Somebody else might have raced and expanded it already */ @@ -87930,7 +89315,7 @@ index f9c97d1..3468d3b 100644 size = vma->vm_end - address; grow = (vma->vm_start - address) >> PAGE_SHIFT; -@@ -2210,13 +2547,27 @@ int expand_downwards(struct vm_area_struct *vma, +@@ -2211,13 +2551,27 @@ int expand_downwards(struct vm_area_struct *vma, vma->vm_pgoff -= grow; anon_vma_interval_tree_post_update_vma(vma); vma_gap_update(vma); @@ -87958,7 +89343,7 @@ index f9c97d1..3468d3b 100644 khugepaged_enter_vma_merge(vma); validate_mm(vma->vm_mm); return error; -@@ -2314,6 +2665,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -2315,6 +2669,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) do { long nrpages = vma_pages(vma); @@ -87972,7 +89357,7 @@ index f9c97d1..3468d3b 100644 if (vma->vm_flags & VM_ACCOUNT) nr_accounted += nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); -@@ -2358,6 +2716,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2359,6 +2720,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma, insertion_point = (prev ? &prev->vm_next : &mm->mmap); vma->vm_prev = NULL; do { @@ -87989,7 +89374,7 @@ index f9c97d1..3468d3b 100644 vma_rb_erase(vma, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -2384,14 +2752,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2384,14 +2755,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct *new; int err = -ENOMEM; @@ -88023,7 +89408,7 @@ index f9c97d1..3468d3b 100644 /* most fields are the same, copy all, and then fixup */ *new = *vma; -@@ -2404,6 +2791,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2404,6 +2794,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT); } @@ -88043,20 +89428,22 @@ index f9c97d1..3468d3b 100644 + } +#endif + - pol = mpol_dup(vma_policy(vma)); - if (IS_ERR(pol)) { - err = PTR_ERR(pol); -@@ -2426,6 +2829,36 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, + err = vma_dup_policy(vma, new); + if (err) + goto out_free_vma; +@@ -2423,6 +2829,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, else err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); +#ifdef CONFIG_PAX_SEGMEXEC + if (!err && vma_m) { ++ struct mempolicy *pol = vma_policy(new); ++ + if (anon_vma_clone(new_m, vma_m)) + goto out_free_mpol; + + mpol_get(pol); -+ vma_set_policy(new_m, pol); ++ set_vma_policy(new_m, pol); + + if (new_m->vm_file) + get_file(new_m->vm_file); @@ -88083,13 +89470,13 @@ index f9c97d1..3468d3b 100644 /* Success. */ if (!err) return 0; -@@ -2435,10 +2868,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2432,10 +2870,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, new->vm_ops->close(new); if (new->vm_file) fput(new->vm_file); - unlink_anon_vmas(new); out_free_mpol: - mpol_put(pol); + mpol_put(vma_policy(new)); out_free_vma: + +#ifdef CONFIG_PAX_SEGMEXEC @@ -88103,7 +89490,7 @@ index f9c97d1..3468d3b 100644 kmem_cache_free(vm_area_cachep, new); out_err: return err; -@@ -2451,6 +2892,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, +@@ -2448,6 +2894,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma, int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, int new_below) { @@ -88119,7 +89506,7 @@ index f9c97d1..3468d3b 100644 if (mm->map_count >= sysctl_max_map_count) return -ENOMEM; -@@ -2462,11 +2912,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -2459,11 +2914,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, * work. This now handles partial unmappings. * Jeremy Fitzhardinge */ @@ -88150,7 +89537,7 @@ index f9c97d1..3468d3b 100644 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -2541,6 +3010,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) +@@ -2538,6 +3012,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len) /* Fix up all other VM information */ remove_vma_list(mm, vma); @@ -88159,7 +89546,7 @@ index f9c97d1..3468d3b 100644 return 0; } -@@ -2549,6 +3020,13 @@ int vm_munmap(unsigned long start, size_t len) +@@ -2546,6 +3022,13 @@ int vm_munmap(unsigned long start, size_t len) int ret; struct mm_struct *mm = current->mm; @@ -88173,7 +89560,7 @@ index f9c97d1..3468d3b 100644 down_write(&mm->mmap_sem); ret = do_munmap(mm, start, len); up_write(&mm->mmap_sem); -@@ -2562,16 +3040,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) +@@ -2559,16 +3042,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) return vm_munmap(addr, len); } @@ -88190,7 +89577,7 @@ index f9c97d1..3468d3b 100644 /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -2585,6 +3053,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2582,6 +3055,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; @@ -88198,7 +89585,7 @@ index f9c97d1..3468d3b 100644 len = PAGE_ALIGN(len); if (!len) -@@ -2592,16 +3061,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2589,16 +3063,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -88230,7 +89617,7 @@ index f9c97d1..3468d3b 100644 locked += mm->locked_vm; lock_limit = rlimit(RLIMIT_MEMLOCK); lock_limit >>= PAGE_SHIFT; -@@ -2618,21 +3101,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2615,21 +3103,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) /* * Clear old maps. this also does some error checking for us */ @@ -88255,7 +89642,7 @@ index f9c97d1..3468d3b 100644 return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2646,7 +3128,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2643,7 +3130,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -88264,7 +89651,7 @@ index f9c97d1..3468d3b 100644 return -ENOMEM; } -@@ -2660,9 +3142,10 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) +@@ -2657,10 +3144,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len) vma_link(mm, vma, prev, rb_link, rb_parent); out: perf_event_mmap(vma); @@ -88273,11 +89660,12 @@ index f9c97d1..3468d3b 100644 if (flags & VM_LOCKED) - mm->locked_vm += (len >> PAGE_SHIFT); + mm->locked_vm += charged; + vma->vm_flags |= VM_SOFTDIRTY; + track_exec_limit(mm, addr, addr + len, flags); return addr; } -@@ -2724,6 +3207,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -2722,6 +3210,7 @@ void exit_mmap(struct mm_struct *mm) while (vma) { if (vma->vm_flags & VM_ACCOUNT) nr_accounted += vma_pages(vma); @@ -88285,7 +89673,7 @@ index f9c97d1..3468d3b 100644 vma = remove_vma(vma); } vm_unacct_memory(nr_accounted); -@@ -2740,6 +3224,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -2738,6 +3227,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) struct vm_area_struct *prev; struct rb_node **rb_link, *rb_parent; @@ -88299,7 +89687,7 @@ index f9c97d1..3468d3b 100644 /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2763,7 +3254,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) +@@ -2761,7 +3257,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) security_vm_enough_memory_mm(mm, vma_pages(vma))) return -ENOMEM; @@ -88321,8 +89709,8 @@ index f9c97d1..3468d3b 100644 return 0; } -@@ -2783,6 +3288,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, - struct mempolicy *pol; +@@ -2780,6 +3290,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, + struct rb_node **rb_link, *rb_parent; bool faulted_in_anon_vma = true; + BUG_ON(vma->vm_mirror); @@ -88330,7 +89718,7 @@ index f9c97d1..3468d3b 100644 /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2849,6 +3356,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, +@@ -2844,6 +3356,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, return NULL; } @@ -88350,7 +89738,7 @@ index f9c97d1..3468d3b 100644 + return -ENOMEM; + pol_m = vma_policy(vma_m); + mpol_get(pol_m); -+ vma_set_policy(vma_m, pol_m); ++ set_vma_policy(vma_m, pol_m); + vma_m->vm_start += SEGMEXEC_TASK_SIZE; + vma_m->vm_end += SEGMEXEC_TASK_SIZE; + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED); @@ -88370,7 +89758,7 @@ index f9c97d1..3468d3b 100644 /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2860,6 +3400,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages) +@@ -2855,6 +3400,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages) lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT; @@ -88378,7 +89766,7 @@ index f9c97d1..3468d3b 100644 if (cur + npages > lim) return 0; return 1; -@@ -2930,6 +3471,22 @@ int install_special_mapping(struct mm_struct *mm, +@@ -2925,6 +3471,22 @@ int install_special_mapping(struct mm_struct *mm, vma->vm_start = addr; vma->vm_end = addr + len; @@ -88398,11 +89786,11 @@ index f9c97d1..3468d3b 100644 + } +#endif + - vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; + vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); diff --git a/mm/mprotect.c b/mm/mprotect.c -index 94722a4..e661e29 100644 +index 6c3f56f..b2340b0 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -23,10 +23,18 @@ @@ -88424,7 +89812,7 @@ index 94722a4..e661e29 100644 #ifndef pgprot_modify static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) -@@ -233,6 +241,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start, +@@ -241,6 +249,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start, return pages; } @@ -88473,7 +89861,7 @@ index 94722a4..e661e29 100644 int mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, unsigned long start, unsigned long end, unsigned long newflags) -@@ -245,11 +295,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, +@@ -253,11 +303,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, int error; int dirty_accountable = 0; @@ -88503,7 +89891,7 @@ index 94722a4..e661e29 100644 /* * If we make a private mapping writable we increase our commit; * but (without finer accounting) cannot reduce our commit if we -@@ -266,6 +334,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, +@@ -274,6 +342,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev, } } @@ -88546,7 +89934,7 @@ index 94722a4..e661e29 100644 /* * First try to merge with previous and/or next vma. */ -@@ -296,9 +400,21 @@ success: +@@ -304,9 +408,21 @@ success: * vm_flags and vm_page_prot are protected by the mmap_sem * held in write mode. */ @@ -88569,7 +89957,7 @@ index 94722a4..e661e29 100644 if (vma_wants_writenotify(vma)) { vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED); -@@ -337,6 +453,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, +@@ -345,6 +461,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, end = start + len; if (end <= start) return -ENOMEM; @@ -88587,7 +89975,7 @@ index 94722a4..e661e29 100644 if (!arch_validate_prot(prot)) return -EINVAL; -@@ -344,7 +471,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, +@@ -352,7 +479,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, /* * Does the application expect PROT_READ to imply PROT_EXEC: */ @@ -88596,7 +89984,7 @@ index 94722a4..e661e29 100644 prot |= PROT_EXEC; vm_flags = calc_vm_prot_bits(prot); -@@ -376,6 +503,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, +@@ -384,6 +511,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, if (start > vma->vm_start) prev = vma; @@ -88608,7 +89996,7 @@ index 94722a4..e661e29 100644 for (nstart = start ; ; ) { unsigned long newflags; -@@ -386,6 +518,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, +@@ -394,6 +526,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, /* newflags >> 4 shift VM_MAY% in place of VM_% */ if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) { @@ -88623,7 +90011,7 @@ index 94722a4..e661e29 100644 error = -EACCES; goto out; } -@@ -400,6 +540,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, +@@ -408,6 +548,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len, error = mprotect_fixup(vma, &prev, nstart, tmp, newflags); if (error) goto out; @@ -88634,30 +90022,10 @@ index 94722a4..e661e29 100644 if (nstart < prev->vm_end) diff --git a/mm/mremap.c b/mm/mremap.c -index 0843feb..5607f47 100644 +index 0843feb..4f5b2e6 100644 --- a/mm/mremap.c +++ b/mm/mremap.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #include "internal.h" - -@@ -62,8 +63,10 @@ static pmd_t *alloc_new_pmd(struct mm_struct *mm, struct vm_area_struct *vma, - return NULL; - - pmd = pmd_alloc(mm, pud, addr); -- if (!pmd) -+ if (!pmd) { -+ pud_free(mm, pud); - return NULL; -+ } - - VM_BUG_ON(pmd_trans_huge(*pmd)); - -@@ -144,6 +147,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, +@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, continue; pte = ptep_get_and_clear(mm, old_addr, old_pte); pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr); @@ -88670,7 +90038,7 @@ index 0843feb..5607f47 100644 pte = move_soft_dirty_pte(pte); set_pte_at(mm, new_addr, new_pte, pte); } -@@ -337,6 +346,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, +@@ -337,6 +343,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, if (is_vm_hugetlb_page(vma)) goto Einval; @@ -88682,7 +90050,7 @@ index 0843feb..5607f47 100644 /* We can't remap across vm area boundaries */ if (old_len > vma->vm_end - addr) goto Efault; -@@ -392,20 +406,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len, +@@ -392,20 +403,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len, unsigned long ret = -EINVAL; unsigned long charged = 0; unsigned long map_flags; @@ -88713,7 +90081,7 @@ index 0843feb..5607f47 100644 goto out; ret = do_munmap(mm, new_addr, new_len); -@@ -474,6 +493,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, +@@ -474,6 +490,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, unsigned long ret = -EINVAL; unsigned long charged = 0; bool locked = false; @@ -88721,7 +90089,7 @@ index 0843feb..5607f47 100644 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) return ret; -@@ -495,6 +515,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, +@@ -495,6 +512,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, if (!new_len) return ret; @@ -88739,7 +90107,7 @@ index 0843feb..5607f47 100644 down_write(¤t->mm->mmap_sem); if (flags & MREMAP_FIXED) { -@@ -545,6 +576,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, +@@ -545,6 +573,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, new_addr = addr; } ret = addr; @@ -88747,7 +90115,7 @@ index 0843feb..5607f47 100644 goto out; } } -@@ -568,7 +600,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, +@@ -568,7 +597,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, goto out; } @@ -88828,10 +90196,10 @@ index ecd1f15..77039bd 100644 struct mm_struct *mm; diff --git a/mm/page-writeback.c b/mm/page-writeback.c -index 3f0c895..60cd104 100644 +index 6380758..4064aec 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c -@@ -659,7 +659,7 @@ unsigned long bdi_dirty_limit(struct backing_dev_info *bdi, unsigned long dirty) +@@ -690,7 +690,7 @@ static inline long long pos_ratio_polynom(unsigned long setpoint, * card's bdi_dirty may rush to many times higher than bdi_setpoint. * - the bdi dirty thresh drops quickly due to change of JBOD workload */ @@ -88841,10 +90209,10 @@ index 3f0c895..60cd104 100644 unsigned long bg_thresh, unsigned long dirty, diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index b100255..fba1254 100644 +index dd886fa..7686339 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -60,6 +60,7 @@ +@@ -61,6 +61,7 @@ #include #include #include @@ -88852,7 +90220,7 @@ index b100255..fba1254 100644 #include #include -@@ -353,7 +354,7 @@ out: +@@ -354,7 +355,7 @@ out: * This usage means that zero-order pages may not be compound. */ @@ -88861,7 +90229,7 @@ index b100255..fba1254 100644 { __free_pages_ok(page, compound_order(page)); } -@@ -710,6 +711,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order) +@@ -712,6 +713,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order) int i; int bad = 0; @@ -88872,7 +90240,7 @@ index b100255..fba1254 100644 trace_mm_page_free(page, order); kmemcheck_free_shadow(page, order); -@@ -725,6 +730,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order) +@@ -728,6 +733,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order) debug_check_no_obj_freed(page_address(page), PAGE_SIZE << order); } @@ -88885,7 +90253,7 @@ index b100255..fba1254 100644 arch_free_page(page, order); kernel_map_pages(page, 1 << order, 0); -@@ -747,6 +758,20 @@ static void __free_pages_ok(struct page *page, unsigned int order) +@@ -750,6 +761,20 @@ static void __free_pages_ok(struct page *page, unsigned int order) local_irq_restore(flags); } @@ -88899,16 +90267,16 @@ index b100255..fba1254 100644 +} +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy); + -+volatile u64 latent_entropy; ++volatile u64 latent_entropy __latent_entropy; +EXPORT_SYMBOL(latent_entropy); +#endif + void __init __free_pages_bootmem(struct page *page, unsigned int order) { unsigned int nr_pages = 1 << order; -@@ -762,6 +787,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order) - set_page_count(p, 0); - } +@@ -765,6 +790,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order) + __ClearPageReserved(p); + set_page_count(p, 0); +#ifdef CONFIG_PAX_LATENT_ENTROPY + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) { @@ -88923,10 +90291,10 @@ index b100255..fba1254 100644 + } +#endif + - page_zone(page)->managed_pages += 1 << order; + page_zone(page)->managed_pages += nr_pages; set_page_refcounted(page); __free_pages(page, order); -@@ -867,8 +905,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) +@@ -870,8 +908,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) arch_alloc_page(page, order); kernel_map_pages(page, 1 << order, 1); @@ -88938,7 +90306,7 @@ index b100255..fba1254 100644 if (order && (gfp_flags & __GFP_COMP)) prep_compound_page(page, order); diff --git a/mm/page_io.c b/mm/page_io.c -index ba05b64..ef2f314 100644 +index 8c79a47..a689e0d 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc, @@ -89015,7 +90383,7 @@ index fd26d04..0cea1b0 100644 if (!mm || IS_ERR(mm)) { rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH; diff --git a/mm/rmap.c b/mm/rmap.c -index b2e29ac..4168491 100644 +index fd3ee7a..3613079 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma) @@ -89118,7 +90486,7 @@ index b2e29ac..4168491 100644 /* diff --git a/mm/shmem.c b/mm/shmem.c -index e43dc55..930e3a2 100644 +index 8297623..6b9dfe9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -33,7 +33,7 @@ @@ -89402,10 +90770,10 @@ index a535033..2f98fe5 100644 if (slab_equal_or_root(cachep, s)) return cachep; diff --git a/mm/slab_common.c b/mm/slab_common.c -index 538bade..36fed99 100644 +index e2e98af..3b1a163 100644 --- a/mm/slab_common.c +++ b/mm/slab_common.c -@@ -22,11 +22,22 @@ +@@ -23,11 +23,22 @@ #include "slab.h" @@ -89429,7 +90797,7 @@ index 538bade..36fed99 100644 #ifdef CONFIG_DEBUG_VM static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name, size_t size) -@@ -209,7 +220,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size, +@@ -212,7 +223,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size, err = __kmem_cache_create(s, flags); if (!err) { @@ -89438,7 +90806,7 @@ index 538bade..36fed99 100644 list_add(&s->list, &slab_caches); memcg_cache_list_add(memcg, s); } else { -@@ -255,8 +266,7 @@ void kmem_cache_destroy(struct kmem_cache *s) +@@ -258,8 +269,7 @@ void kmem_cache_destroy(struct kmem_cache *s) get_online_cpus(); mutex_lock(&slab_mutex); @@ -89448,7 +90816,7 @@ index 538bade..36fed99 100644 list_del(&s->list); if (!__kmem_cache_shutdown(s)) { -@@ -302,7 +312,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz +@@ -305,7 +315,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n", name, size, err); @@ -89457,7 +90825,7 @@ index 538bade..36fed99 100644 } struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size, -@@ -315,7 +325,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size, +@@ -318,7 +328,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size, create_boot_cache(s, name, size, flags); list_add(&s->list, &slab_caches); @@ -89466,7 +90834,7 @@ index 538bade..36fed99 100644 return s; } -@@ -327,6 +337,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; +@@ -330,6 +340,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1]; EXPORT_SYMBOL(kmalloc_dma_caches); #endif @@ -89478,7 +90846,7 @@ index 538bade..36fed99 100644 /* * Conversion table for small slabs sizes / 8 to the index in the * kmalloc array. This is necessary for slabs < 192 since we have non power -@@ -391,6 +406,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags) +@@ -394,6 +409,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags) return kmalloc_dma_caches[index]; #endif @@ -89492,7 +90860,7 @@ index 538bade..36fed99 100644 return kmalloc_caches[index]; } -@@ -447,7 +469,7 @@ void __init create_kmalloc_caches(unsigned long flags) +@@ -450,7 +472,7 @@ void __init create_kmalloc_caches(unsigned long flags) for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) { if (!kmalloc_caches[i]) { kmalloc_caches[i] = create_kmalloc_cache(NULL, @@ -89501,7 +90869,7 @@ index 538bade..36fed99 100644 } /* -@@ -456,10 +478,10 @@ void __init create_kmalloc_caches(unsigned long flags) +@@ -459,10 +481,10 @@ void __init create_kmalloc_caches(unsigned long flags) * earlier power of two caches */ if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6) @@ -89514,7 +90882,7 @@ index 538bade..36fed99 100644 } /* Kmalloc array is now usable */ -@@ -492,6 +514,23 @@ void __init create_kmalloc_caches(unsigned long flags) +@@ -495,6 +517,23 @@ void __init create_kmalloc_caches(unsigned long flags) } } #endif @@ -89538,7 +90906,7 @@ index 538bade..36fed99 100644 } #endif /* !CONFIG_SLOB */ -@@ -523,6 +562,9 @@ void print_slabinfo_header(struct seq_file *m) +@@ -535,6 +574,9 @@ void print_slabinfo_header(struct seq_file *m) seq_puts(m, " : globalstat " " "); seq_puts(m, " : cpustat "); @@ -89549,7 +90917,7 @@ index 538bade..36fed99 100644 seq_putc(m, '\n'); } diff --git a/mm/slob.c b/mm/slob.c -index 91bd3f2..e2f549e 100644 +index 4bf8809..98a6914 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next) @@ -89833,7 +91201,7 @@ index 91bd3f2..e2f549e 100644 @@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags) - void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node) + void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node) { - void *b; + void *b = NULL; @@ -89867,7 +91235,7 @@ index 91bd3f2..e2f549e 100644 if (b && c->ctor) c->ctor(b); -@@ -564,10 +676,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); +@@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); static void __kmem_cache_free(void *b, int size) { @@ -89884,7 +91252,7 @@ index 91bd3f2..e2f549e 100644 } static void kmem_rcu_free(struct rcu_head *head) -@@ -580,17 +696,31 @@ static void kmem_rcu_free(struct rcu_head *head) +@@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head) void kmem_cache_free(struct kmem_cache *c, void *b) { @@ -89920,7 +91288,7 @@ index 91bd3f2..e2f549e 100644 EXPORT_SYMBOL(kmem_cache_free); diff --git a/mm/slub.c b/mm/slub.c -index e3ba1f2..bd45dac 100644 +index 96f2169..9111a59 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -207,7 +207,7 @@ struct track { @@ -89932,7 +91300,7 @@ index e3ba1f2..bd45dac 100644 static int sysfs_slab_add(struct kmem_cache *); static int sysfs_slab_alias(struct kmem_cache *, const char *); static void sysfs_slab_remove(struct kmem_cache *); -@@ -528,7 +528,7 @@ static void print_track(const char *s, struct track *t) +@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t) if (!t->addr) return; @@ -89941,7 +91309,7 @@ index e3ba1f2..bd45dac 100644 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid); #ifdef CONFIG_STACKTRACE { -@@ -2609,6 +2609,14 @@ static __always_inline void slab_free(struct kmem_cache *s, +@@ -2616,6 +2616,14 @@ static __always_inline void slab_free(struct kmem_cache *s, slab_free_hook(s, x); @@ -89956,7 +91324,7 @@ index e3ba1f2..bd45dac 100644 redo: /* * Determine the currently cpus per cpu slab. -@@ -2676,7 +2684,7 @@ static int slub_min_objects; +@@ -2683,7 +2691,7 @@ static int slub_min_objects; * Merge control. If this is set then no merging of slab caches will occur. * (Could be removed. This was introduced to pacify the merge skeptics.) */ @@ -89965,7 +91333,7 @@ index e3ba1f2..bd45dac 100644 /* * Calculate the order of allocation given an slab object size. -@@ -2953,6 +2961,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) +@@ -2960,6 +2968,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) s->inuse = size; if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) || @@ -89975,7 +91343,7 @@ index e3ba1f2..bd45dac 100644 s->ctor)) { /* * Relocate free pointer after the object if it is not -@@ -3298,6 +3309,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) +@@ -3305,6 +3316,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node) EXPORT_SYMBOL(__kmalloc_node); #endif @@ -90035,7 +91403,7 @@ index e3ba1f2..bd45dac 100644 size_t ksize(const void *object) { struct page *page; -@@ -3362,6 +3426,7 @@ void kfree(const void *x) +@@ -3333,6 +3397,7 @@ void kfree(const void *x) if (unlikely(ZERO_OR_NULL_PTR(x))) return; @@ -90043,7 +91411,7 @@ index e3ba1f2..bd45dac 100644 page = virt_to_head_page(x); if (unlikely(!PageSlab(page))) { BUG_ON(!PageCompound(page)); -@@ -3667,7 +3732,7 @@ static int slab_unmergeable(struct kmem_cache *s) +@@ -3638,7 +3703,7 @@ static int slab_unmergeable(struct kmem_cache *s) /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -90052,7 +91420,7 @@ index e3ba1f2..bd45dac 100644 return 1; return 0; -@@ -3725,7 +3790,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, +@@ -3696,7 +3761,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, s = find_mergeable(memcg, size, align, flags, name, ctor); if (s) { @@ -90061,7 +91429,7 @@ index e3ba1f2..bd45dac 100644 /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3734,7 +3799,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, +@@ -3705,7 +3770,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size, s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *))); if (sysfs_slab_alias(s, name)) { @@ -90070,7 +91438,7 @@ index e3ba1f2..bd45dac 100644 s = NULL; } } -@@ -3854,7 +3919,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, +@@ -3825,7 +3890,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, } #endif @@ -90079,7 +91447,7 @@ index e3ba1f2..bd45dac 100644 static int count_inuse(struct page *page) { return page->inuse; -@@ -4241,12 +4306,12 @@ static void resiliency_test(void) +@@ -4214,12 +4279,12 @@ static void resiliency_test(void) validate_slab_cache(kmalloc_caches[9]); } #else @@ -90094,7 +91462,7 @@ index e3ba1f2..bd45dac 100644 enum slab_stat_type { SL_ALL, /* All slabs */ SL_PARTIAL, /* Only partially allocated slabs */ -@@ -4490,7 +4555,7 @@ SLAB_ATTR_RO(ctor); +@@ -4459,7 +4524,7 @@ SLAB_ATTR_RO(ctor); static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -90103,7 +91471,7 @@ index e3ba1f2..bd45dac 100644 } SLAB_ATTR_RO(aliases); -@@ -4578,6 +4643,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf) +@@ -4547,6 +4612,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf) SLAB_ATTR_RO(cache_dma); #endif @@ -90118,7 +91486,7 @@ index e3ba1f2..bd45dac 100644 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf) { return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU)); -@@ -4912,6 +4985,9 @@ static struct attribute *slab_attrs[] = { +@@ -4881,6 +4954,9 @@ static struct attribute *slab_attrs[] = { #ifdef CONFIG_ZONE_DMA &cache_dma_attr.attr, #endif @@ -90128,7 +91496,7 @@ index e3ba1f2..bd45dac 100644 #ifdef CONFIG_NUMA &remote_node_defrag_ratio_attr.attr, #endif -@@ -5143,6 +5219,7 @@ static char *create_unique_id(struct kmem_cache *s) +@@ -5113,6 +5189,7 @@ static char *create_unique_id(struct kmem_cache *s) return name; } @@ -90136,7 +91504,7 @@ index e3ba1f2..bd45dac 100644 static int sysfs_slab_add(struct kmem_cache *s) { int err; -@@ -5166,7 +5243,7 @@ static int sysfs_slab_add(struct kmem_cache *s) +@@ -5136,7 +5213,7 @@ static int sysfs_slab_add(struct kmem_cache *s) } s->kobj.kset = slab_kset; @@ -90145,7 +91513,7 @@ index e3ba1f2..bd45dac 100644 if (err) { kobject_put(&s->kobj); return err; -@@ -5200,6 +5277,7 @@ static void sysfs_slab_remove(struct kmem_cache *s) +@@ -5170,6 +5247,7 @@ static void sysfs_slab_remove(struct kmem_cache *s) kobject_del(&s->kobj); kobject_put(&s->kobj); } @@ -90153,7 +91521,7 @@ index e3ba1f2..bd45dac 100644 /* * Need to buffer aliases during bootup until sysfs becomes -@@ -5213,6 +5291,7 @@ struct saved_alias { +@@ -5183,6 +5261,7 @@ struct saved_alias { static struct saved_alias *alias_list; @@ -90161,7 +91529,7 @@ index e3ba1f2..bd45dac 100644 static int sysfs_slab_alias(struct kmem_cache *s, const char *name) { struct saved_alias *al; -@@ -5235,6 +5314,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name) +@@ -5205,6 +5284,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name) alias_list = al; return 0; } @@ -90192,10 +91560,10 @@ index 27eeab3..7c3f7f2 100644 return pgd; } diff --git a/mm/sparse.c b/mm/sparse.c -index 308d503..3dbbd04 100644 +index 4ac1d7e..bbfcb1f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c -@@ -764,7 +764,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) +@@ -745,7 +745,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) for (i = 0; i < PAGES_PER_SECTION; i++) { if (PageHWPoison(&memmap[i])) { @@ -90205,7 +91573,7 @@ index 308d503..3dbbd04 100644 } } diff --git a/mm/swap.c b/mm/swap.c -index c899502..d4dc2cd 100644 +index 759c3ca..7c1a5b4 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -77,6 +77,8 @@ static void __put_compound_page(struct page *page) @@ -90218,7 +91586,7 @@ index c899502..d4dc2cd 100644 } diff --git a/mm/swapfile.c b/mm/swapfile.c -index 6cf2e60..d204b3e 100644 +index de7c904..c84bf11 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex); @@ -90230,7 +91598,7 @@ index 6cf2e60..d204b3e 100644 static inline unsigned char swap_count(unsigned char ent) { -@@ -1699,7 +1699,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) +@@ -1949,7 +1949,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) } filp_close(swap_file, NULL); err = 0; @@ -90239,7 +91607,7 @@ index 6cf2e60..d204b3e 100644 wake_up_interruptible(&proc_poll_wait); out_dput: -@@ -1716,8 +1716,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait) +@@ -1966,8 +1966,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait) poll_wait(file, &proc_poll_wait, wait); @@ -90250,7 +91618,7 @@ index 6cf2e60..d204b3e 100644 return POLLIN | POLLRDNORM | POLLERR | POLLPRI; } -@@ -1815,7 +1815,7 @@ static int swaps_open(struct inode *inode, struct file *file) +@@ -2065,7 +2065,7 @@ static int swaps_open(struct inode *inode, struct file *file) return ret; seq = file->private_data; @@ -90259,7 +91627,7 @@ index 6cf2e60..d204b3e 100644 return 0; } -@@ -2203,7 +2203,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) +@@ -2524,7 +2524,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) (frontswap_map) ? "FS" : ""); mutex_unlock(&swapon_mutex); @@ -90269,7 +91637,7 @@ index 6cf2e60..d204b3e 100644 if (S_ISREG(inode->i_mode)) diff --git a/mm/util.c b/mm/util.c -index 7441c41..c3de793 100644 +index eaf63fc2..32b2629 100644 --- a/mm/util.c +++ b/mm/util.c @@ -294,6 +294,12 @@ done: @@ -90286,7 +91654,7 @@ index 7441c41..c3de793 100644 } #endif diff --git a/mm/vmalloc.c b/mm/vmalloc.c -index 13a5495..6707d97 100644 +index 1074543..136dbe0 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end) @@ -90389,16 +91757,7 @@ index 13a5495..6707d97 100644 if (!pmd_none(*pmd)) { pte_t *ptep, pte; -@@ -339,7 +375,7 @@ static void purge_vmap_area_lazy(void); - * Allocate a region of KVA of the specified size and alignment, within the - * vstart and vend. - */ --static struct vmap_area *alloc_vmap_area(unsigned long size, -+static __size_overflow(1) struct vmap_area *alloc_vmap_area(unsigned long size, - unsigned long align, - unsigned long vstart, unsigned long vend, - int node, gfp_t gfp_mask) -@@ -1308,6 +1344,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, +@@ -1303,6 +1339,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, struct vm_struct *area; BUG_ON(in_interrupt()); @@ -90415,7 +91774,7 @@ index 13a5495..6707d97 100644 if (flags & VM_IOREMAP) align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER); -@@ -1533,6 +1579,11 @@ void *vmap(struct page **pages, unsigned int count, +@@ -1528,6 +1574,11 @@ void *vmap(struct page **pages, unsigned int count, if (count > totalram_pages) return NULL; @@ -90427,7 +91786,7 @@ index 13a5495..6707d97 100644 area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1634,6 +1685,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, +@@ -1629,6 +1680,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, if (!size || (size >> PAGE_SHIFT) > totalram_pages) goto fail; @@ -90441,7 +91800,7 @@ index 13a5495..6707d97 100644 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED, start, end, node, gfp_mask, caller); if (!area) -@@ -1810,10 +1868,9 @@ EXPORT_SYMBOL(vzalloc_node); +@@ -1805,10 +1863,9 @@ EXPORT_SYMBOL(vzalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -90453,7 +91812,7 @@ index 13a5495..6707d97 100644 NUMA_NO_NODE, __builtin_return_address(0)); } -@@ -2120,6 +2177,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr, +@@ -2115,6 +2172,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr, { struct vm_struct *area; @@ -90462,7 +91821,7 @@ index 13a5495..6707d97 100644 size = PAGE_ALIGN(size); if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr)) -@@ -2605,7 +2664,11 @@ static int s_show(struct seq_file *m, void *p) +@@ -2600,7 +2659,11 @@ static int s_show(struct seq_file *m, void *p) v->addr, v->addr + v->size, v->size); if (v->caller) @@ -90475,10 +91834,10 @@ index 13a5495..6707d97 100644 if (v->nr_pages) seq_printf(m, " pages=%d", v->nr_pages); diff --git a/mm/vmstat.c b/mm/vmstat.c -index 20c2ef4..15e7ab7 100644 +index 5a442a7..5eb281e 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu) +@@ -79,7 +79,7 @@ void vm_events_fold_cpu(int cpu) * * vm_stat contains the global counters */ @@ -90487,25 +91846,34 @@ index 20c2ef4..15e7ab7 100644 EXPORT_SYMBOL(vm_stat); #ifdef CONFIG_SMP -@@ -452,7 +452,7 @@ void refresh_cpu_vm_stats(int cpu) - v = p->vm_stat_diff[i]; - p->vm_stat_diff[i] = 0; - local_irq_restore(flags); +@@ -423,7 +423,7 @@ static inline void fold_diff(int *diff) + + for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) + if (diff[i]) +- atomic_long_add(diff[i], &vm_stat[i]); ++ atomic_long_add_unchecked(diff[i], &vm_stat[i]); + } + + /* +@@ -455,7 +455,7 @@ static void refresh_cpu_vm_stats(void) + v = this_cpu_xchg(p->vm_stat_diff[i], 0); + if (v) { + - atomic_long_add(v, &zone->vm_stat[i]); + atomic_long_add_unchecked(v, &zone->vm_stat[i]); global_diff[i] += v; #ifdef CONFIG_NUMA /* 3 seconds idle till flush */ -@@ -490,7 +490,7 @@ void refresh_cpu_vm_stats(int cpu) +@@ -517,7 +517,7 @@ void cpu_vm_stats_fold(int cpu) - for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) - if (global_diff[i]) -- atomic_long_add(global_diff[i], &vm_stat[i]); -+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]); - } - - /* -@@ -505,8 +505,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset) + v = p->vm_stat_diff[i]; + p->vm_stat_diff[i] = 0; +- atomic_long_add(v, &zone->vm_stat[i]); ++ atomic_long_add_unchecked(v, &zone->vm_stat[i]); + global_diff[i] += v; + } + } +@@ -537,8 +537,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset) if (pset->vm_stat_diff[i]) { int v = pset->vm_stat_diff[i]; pset->vm_stat_diff[i] = 0; @@ -90516,7 +91884,7 @@ index 20c2ef4..15e7ab7 100644 } } #endif -@@ -1241,10 +1241,20 @@ static int __init setup_vmstat(void) +@@ -1281,10 +1281,20 @@ static int __init setup_vmstat(void) start_cpu_timer(cpu); #endif #ifdef CONFIG_PROC_FS @@ -90542,10 +91910,10 @@ index 20c2ef4..15e7ab7 100644 return 0; } diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c -index 2fb2d88..8c06e40 100644 +index 61fc573..b5e47d0 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c -@@ -469,7 +469,7 @@ out: +@@ -472,7 +472,7 @@ out: return NOTIFY_DONE; } @@ -90554,7 +91922,7 @@ index 2fb2d88..8c06e40 100644 .notifier_call = vlan_device_event, }; -@@ -544,8 +544,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) +@@ -547,8 +547,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) err = -EPERM; if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) break; @@ -90564,19 +91932,6 @@ index 2fb2d88..8c06e40 100644 struct vlan_net *vn; vn = net_generic(net, vlan_net_id); -diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c -index 3091297..c7e634a 100644 ---- a/net/8021q/vlan_netlink.c -+++ b/net/8021q/vlan_netlink.c -@@ -171,7 +171,7 @@ static size_t vlan_get_size(const struct net_device *dev) - - return nla_total_size(2) + /* IFLA_VLAN_PROTOCOL */ - nla_total_size(2) + /* IFLA_VLAN_ID */ -- sizeof(struct ifla_vlan_flags) + /* IFLA_VLAN_FLAGS */ -+ nla_total_size(sizeof(struct ifla_vlan_flags)) + /* IFLA_VLAN_FLAGS */ - vlan_qos_map_size(vlan->nr_ingress_mappings) + - vlan_qos_map_size(vlan->nr_egress_mappings); - } diff --git a/net/9p/mod.c b/net/9p/mod.c index 6ab36ae..6f1841b 100644 --- a/net/9p/mod.c @@ -90718,10 +92073,10 @@ index 919a5ce..cc6b444 100644 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL); if (!table) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c -index 62da527..aa27535 100644 +index 0a8a80c..f7e89aa 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c -@@ -120,7 +120,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) +@@ -121,7 +121,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) /* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(random_seqno)); @@ -90730,7 +92085,7 @@ index 62da527..aa27535 100644 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); -@@ -701,9 +701,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) +@@ -703,9 +703,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff); /* change sequence number to network order */ @@ -90742,7 +92097,7 @@ index 62da527..aa27535 100644 batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn); batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc); -@@ -1109,7 +1109,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, +@@ -1111,7 +1111,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, return; /* could be changed by schedule_own_packet() */ @@ -90765,10 +92120,10 @@ index c478e6b..469fd2f 100644 hard_iface->net_dev->name); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c -index 33b6144..3212ac5 100644 +index 813db4e..847edac 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c -@@ -261,7 +261,7 @@ static int batadv_interface_tx(struct sk_buff *skb, +@@ -263,7 +263,7 @@ static int batadv_interface_tx(struct sk_buff *skb, primary_if->net_dev->dev_addr, ETH_ALEN); /* set broadcast sequence number */ @@ -90777,7 +92132,7 @@ index 33b6144..3212ac5 100644 bcast_packet->seqno = htonl(seqno); batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay); -@@ -481,7 +481,7 @@ static int batadv_softif_init_late(struct net_device *dev) +@@ -483,7 +483,7 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN); atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE); @@ -90818,10 +92173,10 @@ index b2c94e1..3d47e07 100644 atomic_t batman_queue_left; char num_ifaces; diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c -index 857e1b8..5ad07b2 100644 +index 48b31d3..62a0bcb 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c -@@ -270,7 +270,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv, +@@ -272,7 +272,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv, frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail; frag2->flags = large_tail; @@ -90831,10 +92186,10 @@ index 857e1b8..5ad07b2 100644 frag2->seqno = htons(seqno); diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c -index 9bd7d95..6c4884f 100644 +index fa4bf66..e92948f 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -934,7 +934,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, +@@ -932,7 +932,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, uf.event_mask[1] = *((u32 *) f->event_mask + 1); } @@ -90844,10 +92199,10 @@ index 9bd7d95..6c4884f 100644 err = -EFAULT; break; diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c -index 8c3499b..2661c6a 100644 +index 63fa111..b166ec6 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c -@@ -3510,8 +3510,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, +@@ -3511,8 +3511,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, break; case L2CAP_CONF_RFC: @@ -90912,10 +92267,10 @@ index 0098af8..fb5a31f 100644 err = -EFAULT; break; diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c -index 30b3721..c1bd0a0 100644 +index c1c6028..17e8dcc 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c -@@ -666,7 +666,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c +@@ -665,7 +665,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c struct sock *sk = sock->sk; struct bt_security sec; int err = 0; @@ -90924,7 +92279,7 @@ index 30b3721..c1bd0a0 100644 u32 opt; BT_DBG("sk %p", sk); -@@ -688,7 +688,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c +@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c sec.level = BT_SECURITY_LOW; @@ -90934,44 +92289,27 @@ index 30b3721..c1bd0a0 100644 err = -EFAULT; break; diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c -index b6e44ad..5b0d514 100644 +index 84fcf9f..e389b27 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c -@@ -309,7 +309,7 @@ static void rfcomm_dev_del(struct rfcomm_dev *dev) - BUG_ON(test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags)); - - spin_lock_irqsave(&dev->port.lock, flags); -- if (dev->port.count > 0) { -+ if (atomic_read(&dev->port.count) > 0) { - spin_unlock_irqrestore(&dev->port.lock, flags); - return; - } -@@ -659,10 +659,10 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp) - return -ENODEV; +@@ -684,7 +684,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp) + BT_DBG("tty %p id %d", tty, tty->index); BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst, - dev->channel, dev->port.count); + dev->channel, atomic_read(&dev->port.count)); - spin_lock_irqsave(&dev->port.lock, flags); -- if (++dev->port.count > 1) { -+ if (atomic_inc_return(&dev->port.count) > 1) { - spin_unlock_irqrestore(&dev->port.lock, flags); - return 0; - } -@@ -727,10 +727,10 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp) - return; + err = tty_port_open(&dev->port, tty, filp); + if (err) +@@ -707,7 +707,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp) + struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc, - dev->port.count); + atomic_read(&dev->port.count)); - spin_lock_irqsave(&dev->port.lock, flags); -- if (!--dev->port.count) { -+ if (!atomic_dec_return(&dev->port.count)) { - spin_unlock_irqrestore(&dev->port.lock, flags); - if (dev->tty_dev->parent) - device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST); + tty_port_close(&dev->port, tty, filp); + } diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c index 5180938..7c470c3 100644 --- a/net/bridge/netfilter/ebt_ulog.c @@ -91100,7 +92438,7 @@ index 3ab8dd2..b9aef13 100644 }; diff --git a/net/can/gw.c b/net/can/gw.c -index 2f291f9..98c986a 100644 +index 3f9b0f3..fc6d4fa 100644 --- a/net/can/gw.c +++ b/net/can/gw.c @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops, @@ -91111,7 +92449,7 @@ index 2f291f9..98c986a 100644 static struct kmem_cache *cgw_cache __read_mostly; -@@ -927,6 +926,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh) +@@ -954,6 +953,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh) return err; } @@ -91122,7 +92460,7 @@ index 2f291f9..98c986a 100644 static __init int cgw_module_init(void) { /* sanitize given module parameter */ -@@ -942,7 +945,6 @@ static __init int cgw_module_init(void) +@@ -969,7 +972,6 @@ static __init int cgw_module_init(void) return -ENOMEM; /* set notifier */ @@ -91131,7 +92469,7 @@ index 2f291f9..98c986a 100644 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) { diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c -index eb0a46a..5f3bae8 100644 +index 4a5df7b..9ad1f1d 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -186,7 +186,7 @@ static void con_fault(struct ceph_connection *con); @@ -91153,13 +92491,13 @@ index eb0a46a..5f3bae8 100644 switch (ss->ss_family) { diff --git a/net/compat.c b/net/compat.c -index f0a1ba6..0541331 100644 +index dd32e34..6066f87 100644 --- a/net/compat.c +++ b/net/compat.c -@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) - __get_user(kmsg->msg_controllen, &umsg->msg_controllen) || - __get_user(kmsg->msg_flags, &umsg->msg_flags)) +@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg) return -EFAULT; + if (kmsg->msg_namelen > sizeof(struct sockaddr_storage)) + kmsg->msg_namelen = sizeof(struct sockaddr_storage); - kmsg->msg_name = compat_ptr(tmp1); - kmsg->msg_iov = compat_ptr(tmp2); - kmsg->msg_control = compat_ptr(tmp3); @@ -91169,7 +92507,7 @@ index f0a1ba6..0541331 100644 return 0; } -@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, +@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, if (kern_msg->msg_namelen) { if (mode == VERIFY_READ) { @@ -91178,7 +92516,7 @@ index f0a1ba6..0541331 100644 kern_msg->msg_namelen, kern_address); if (err < 0) -@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, +@@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, kern_msg->msg_name = NULL; tot_len = iov_from_user_compat_to_kern(kern_iov, @@ -91187,7 +92525,7 @@ index f0a1ba6..0541331 100644 kern_msg->msg_iovlen); if (tot_len >= 0) kern_msg->msg_iov = kern_iov; -@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, +@@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov, #define CMSG_COMPAT_FIRSTHDR(msg) \ (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \ @@ -91211,7 +92549,7 @@ index f0a1ba6..0541331 100644 msg->msg_controllen) return NULL; return (struct compat_cmsghdr __user *)ptr; -@@ -219,7 +219,7 @@ Efault: +@@ -222,7 +222,7 @@ Efault: int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data) { @@ -91220,7 +92558,7 @@ index f0a1ba6..0541331 100644 struct compat_cmsghdr cmhdr; struct compat_timeval ctv; struct compat_timespec cts[3]; -@@ -275,7 +275,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat +@@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm) { @@ -91229,7 +92567,7 @@ index f0a1ba6..0541331 100644 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int); int fdnum = scm->fp->count; struct file **fp = scm->fp->fp; -@@ -363,7 +363,7 @@ static int do_set_sock_timeout(struct socket *sock, int level, +@@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level, return -EFAULT; old_fs = get_fs(); set_fs(KERNEL_DS); @@ -91238,7 +92576,7 @@ index f0a1ba6..0541331 100644 set_fs(old_fs); return err; -@@ -424,7 +424,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname, +@@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname, len = sizeof(ktime); old_fs = get_fs(); set_fs(KERNEL_DS); @@ -91247,7 +92585,7 @@ index f0a1ba6..0541331 100644 set_fs(old_fs); if (!err) { -@@ -567,7 +567,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, +@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, case MCAST_JOIN_GROUP: case MCAST_LEAVE_GROUP: { @@ -91256,7 +92594,7 @@ index f0a1ba6..0541331 100644 struct group_req __user *kgr = compat_alloc_user_space(sizeof(struct group_req)); u32 interface; -@@ -588,7 +588,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, +@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, case MCAST_BLOCK_SOURCE: case MCAST_UNBLOCK_SOURCE: { @@ -91265,7 +92603,7 @@ index f0a1ba6..0541331 100644 struct group_source_req __user *kgsr = compat_alloc_user_space( sizeof(struct group_source_req)); u32 interface; -@@ -609,7 +609,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, +@@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname, } case MCAST_MSFILTER: { @@ -91274,7 +92612,7 @@ index f0a1ba6..0541331 100644 struct group_filter __user *kgf; u32 interface, fmode, numsrc; -@@ -647,7 +647,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname, +@@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname, char __user *optval, int __user *optlen, int (*getsockopt)(struct sock *, int, int, char __user *, int __user *)) { @@ -91283,7 +92621,7 @@ index f0a1ba6..0541331 100644 struct group_filter __user *kgf; int __user *koptlen; u32 interface, fmode, numsrc; -@@ -805,7 +805,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args) +@@ -808,7 +808,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args) if (call < SYS_SOCKET || call > SYS_SENDMMSG) return -EINVAL; @@ -91293,10 +92631,10 @@ index f0a1ba6..0541331 100644 a0 = a[0]; a1 = a[1]; diff --git a/net/core/datagram.c b/net/core/datagram.c -index 8ab48cd..57b1a80 100644 +index af814e7..3d761de 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c -@@ -300,7 +300,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags) +@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags) } kfree_skb(skb); @@ -91306,7 +92644,7 @@ index 8ab48cd..57b1a80 100644 return err; diff --git a/net/core/dev.c b/net/core/dev.c -index 26755dd..2a232de 100644 +index 3d13874..6e78dc7 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1680,14 +1680,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) @@ -91326,7 +92664,7 @@ index 26755dd..2a232de 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -2431,7 +2431,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) +@@ -2428,7 +2428,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb) struct dev_gso_cb { void (*destructor)(struct sk_buff *skb); @@ -91335,7 +92673,7 @@ index 26755dd..2a232de 100644 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb) -@@ -3206,7 +3206,7 @@ enqueue: +@@ -3203,7 +3203,7 @@ enqueue: local_irq_restore(flags); @@ -91344,7 +92682,7 @@ index 26755dd..2a232de 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -3278,7 +3278,7 @@ int netif_rx_ni(struct sk_buff *skb) +@@ -3275,7 +3275,7 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); @@ -91353,7 +92691,7 @@ index 26755dd..2a232de 100644 { struct softnet_data *sd = &__get_cpu_var(softnet_data); -@@ -3612,7 +3612,7 @@ ncls: +@@ -3609,7 +3609,7 @@ ncls: ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev); } else { drop: @@ -91362,7 +92700,7 @@ index 26755dd..2a232de 100644 kfree_skb(skb); /* Jamal, now you will not able to escape explaining * me how you were going to use this. :-) -@@ -4272,7 +4272,7 @@ void netif_napi_del(struct napi_struct *napi) +@@ -4269,7 +4269,7 @@ void netif_napi_del(struct napi_struct *napi) } EXPORT_SYMBOL(netif_napi_del); @@ -91371,7 +92709,7 @@ index 26755dd..2a232de 100644 { struct softnet_data *sd = &__get_cpu_var(softnet_data); unsigned long time_limit = jiffies + 2; -@@ -5730,7 +5730,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, +@@ -5973,7 +5973,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, } else { netdev_stats_to_stats64(storage, &dev->stats); } @@ -91439,7 +92777,7 @@ index dfa602c..3103d88 100644 fle->object = flo; else diff --git a/net/core/iovec.c b/net/core/iovec.c -index de178e4..1dabd8b 100644 +index 7d84ea1..55385ae 100644 --- a/net/core/iovec.c +++ b/net/core/iovec.c @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a @@ -91451,7 +92789,7 @@ index de178e4..1dabd8b 100644 err = move_addr_to_kernel(namep, m->msg_namelen, address); if (err < 0) -@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a +@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a } size = m->msg_iovlen * sizeof(struct iovec); @@ -91461,10 +92799,10 @@ index de178e4..1dabd8b 100644 m->msg_iov = iov; diff --git a/net/core/neighbour.c b/net/core/neighbour.c -index 60533db..14842cc 100644 +index 6072610..7374c18 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c -@@ -2776,7 +2776,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write, +@@ -2774,7 +2774,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { int size, ret; @@ -91492,10 +92830,10 @@ index 2bf8329..7960607 100644 return 0; diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c -index 981fed3..536af34 100644 +index d954b56..b0a0f7a 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c -@@ -1311,7 +1311,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr) +@@ -1356,7 +1356,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr) } EXPORT_SYMBOL(netdev_class_remove_file); @@ -91505,7 +92843,7 @@ index 981fed3..536af34 100644 kobj_ns_type_register(&net_ns_type_operations); return class_register(&net_class); diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c -index f9765203..9feaef8 100644 +index 81d3a9a..a0bd7a8 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list, @@ -91567,7 +92905,7 @@ index fc75c9e..8c8e9be 100644 iph->ttl = 64; iph->protocol = IPPROTO_UDP; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c -index ca198c1d1..125372f 100644 +index 2a0e21d..6ad7642 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -58,7 +58,7 @@ struct rtnl_link { @@ -91606,7 +92944,7 @@ index ca198c1d1..125372f 100644 EXPORT_SYMBOL_GPL(__rtnl_link_unregister); diff --git a/net/core/scm.c b/net/core/scm.c -index b4da80b..98d6bdb 100644 +index b442e7e..6f5b5a2 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send); @@ -91646,10 +92984,10 @@ index b4da80b..98d6bdb 100644 { struct socket *sock; diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index 2c3d0f5..f5a326f 100644 +index c28c7fe..a399a6d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -3082,13 +3082,15 @@ void __init skb_init(void) +@@ -3104,13 +3104,15 @@ void __init skb_init(void) skbuff_head_cache = kmem_cache_create("skbuff_head_cache", sizeof(struct sk_buff), 0, @@ -91667,11 +93005,19 @@ index 2c3d0f5..f5a326f 100644 NULL); } +@@ -3541,6 +3543,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) + skb->tstamp.tv64 = 0; + skb->pkt_type = PACKET_HOST; + skb->skb_iif = 0; ++ skb->local_df = 0; + skb_dst_drop(skb); + skb->mark = 0; + secpath_reset(skb); diff --git a/net/core/sock.c b/net/core/sock.c -index 2c097c5..bf72858 100644 +index 0b39e7a..5e9f91e 100644 --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -392,7 +392,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -393,7 +393,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) struct sk_buff_head *list = &sk->sk_receive_queue; if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) { @@ -91680,7 +93026,7 @@ index 2c097c5..bf72858 100644 trace_sock_rcvqueue_full(sk, skb); return -ENOMEM; } -@@ -402,7 +402,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -403,7 +403,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) return err; if (!sk_rmem_schedule(sk, skb, skb->truesize)) { @@ -91689,7 +93035,7 @@ index 2c097c5..bf72858 100644 return -ENOBUFS; } -@@ -422,7 +422,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -423,7 +423,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) skb_dst_force(skb); spin_lock_irqsave(&list->lock, flags); @@ -91698,7 +93044,7 @@ index 2c097c5..bf72858 100644 __skb_queue_tail(list, skb); spin_unlock_irqrestore(&list->lock, flags); -@@ -442,7 +442,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) +@@ -443,7 +443,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) skb->dev = NULL; if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) { @@ -91707,7 +93053,7 @@ index 2c097c5..bf72858 100644 goto discard_and_relse; } if (nested) -@@ -460,7 +460,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) +@@ -461,7 +461,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested) mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_); } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) { bh_unlock_sock(sk); @@ -91716,7 +93062,7 @@ index 2c097c5..bf72858 100644 goto discard_and_relse; } -@@ -948,12 +948,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname, +@@ -949,12 +949,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname, struct timeval tm; } v; @@ -91732,7 +93078,7 @@ index 2c097c5..bf72858 100644 return -EINVAL; memset(&v, 0, sizeof(v)); -@@ -1105,11 +1105,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname, +@@ -1106,11 +1106,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname, case SO_PEERNAME: { @@ -91746,7 +93092,7 @@ index 2c097c5..bf72858 100644 return -EINVAL; if (copy_to_user(optval, address, len)) return -EFAULT; -@@ -1182,7 +1182,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, +@@ -1183,7 +1183,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, if (len > lv) len = lv; @@ -91755,7 +93101,7 @@ index 2c097c5..bf72858 100644 return -EFAULT; lenout: if (put_user(len, optlen)) -@@ -2303,7 +2303,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) +@@ -2326,7 +2326,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) */ smp_wmb(); atomic_set(&sk->sk_refcnt, 1); @@ -91764,6 +93110,24 @@ index 2c097c5..bf72858 100644 } EXPORT_SYMBOL(sock_init_data); +@@ -2451,6 +2451,7 @@ void sock_enable_timestamp(struct sock *sk, int flag) + int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len, + int level, int type) + { ++ struct sock_extended_err ee; + struct sock_exterr_skb *serr; + struct sk_buff *skb, *skb2; + int copied, err; +@@ -2472,7 +2473,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len, + sock_recv_timestamp(msg, sk, skb); + + serr = SKB_EXT_ERR(skb); +- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee); ++ ee = serr->ee; ++ put_cmsg(msg, level, type, sizeof ee, &ee); + + msg->msg_flags |= MSG_ERRQUEUE; + err = copied; diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c index a0e9cf6..ef7f9ed 100644 --- a/net/core/sock_diag.c @@ -91827,10 +93191,10 @@ index a0e9cf6..ef7f9ed 100644 } EXPORT_SYMBOL_GPL(sock_diag_unregister); diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c -index 31107ab..ae03d5a 100644 +index cca4441..5e616de 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c -@@ -31,7 +31,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write, +@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write, { unsigned int orig_size, size; int ret, i; @@ -91839,7 +93203,16 @@ index 31107ab..ae03d5a 100644 .data = &size, .maxlen = sizeof(size), .mode = table->mode -@@ -350,13 +350,12 @@ static struct ctl_table netns_core_table[] = { +@@ -199,7 +199,7 @@ static int set_default_qdisc(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) + { + char id[IFNAMSIZ]; +- struct ctl_table tbl = { ++ ctl_table_no_const tbl = { + .data = id, + .maxlen = IFNAMSIZ, + }; +@@ -378,13 +378,12 @@ static struct ctl_table netns_core_table[] = { static __net_init int sysctl_core_net_init(struct net *net) { @@ -91855,7 +93228,7 @@ index 31107ab..ae03d5a 100644 if (tbl == NULL) goto err_dup; -@@ -366,17 +365,16 @@ static __net_init int sysctl_core_net_init(struct net *net) +@@ -394,17 +393,16 @@ static __net_init int sysctl_core_net_init(struct net *net) if (net->user_ns != &init_user_ns) { tbl[0].procname = NULL; } @@ -91877,7 +93250,7 @@ index 31107ab..ae03d5a 100644 err_dup: return -ENOMEM; } -@@ -391,7 +389,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net) +@@ -419,7 +417,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net) kfree(tbl); } @@ -91921,10 +93294,10 @@ index 5325b54..a0d4d69 100644 *lenp = len; diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c -index 3b9d5f2..d7015c6 100644 +index 008f337..b03b8c9 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c -@@ -459,7 +459,7 @@ static int lowpan_header_create(struct sk_buff *skb, +@@ -548,7 +548,7 @@ static int lowpan_header_create(struct sk_buff *skb, hc06_ptr += 3; } else { /* compress nothing */ @@ -91934,10 +93307,10 @@ index 3b9d5f2..d7015c6 100644 *hc06_ptr = tmp; hc06_ptr += 4; diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c -index dd6b523..dfe558f 100644 +index cfeb85c..385989a 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1687,13 +1687,9 @@ static int __init inet_init(void) +@@ -1675,13 +1675,9 @@ static int __init inet_init(void) BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb)); @@ -91952,7 +93325,7 @@ index dd6b523..dfe558f 100644 rc = proto_register(&udp_prot, 1); if (rc) -@@ -1802,8 +1798,6 @@ out_unregister_udp_proto: +@@ -1790,8 +1786,6 @@ out_unregister_udp_proto: proto_unregister(&udp_prot); out_unregister_tcp_proto: proto_unregister(&tcp_prot); @@ -91962,10 +93335,10 @@ index dd6b523..dfe558f 100644 } diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index 34ca6d5..b6421e8 100644 +index a1b5bcb..62ec5c6 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c -@@ -1532,7 +1532,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) +@@ -1533,7 +1533,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb) idx = 0; head = &net->dev_index_head[h]; rcu_read_lock(); @@ -91974,7 +93347,7 @@ index 34ca6d5..b6421e8 100644 net->dev_base_seq; hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) -@@ -1843,7 +1843,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb, +@@ -1844,7 +1844,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb, idx = 0; head = &net->dev_index_head[h]; rcu_read_lock(); @@ -91983,7 +93356,7 @@ index 34ca6d5..b6421e8 100644 net->dev_base_seq; hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) -@@ -2068,7 +2068,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write, +@@ -2069,7 +2069,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write, #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \ DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush) @@ -91992,7 +93365,7 @@ index 34ca6d5..b6421e8 100644 struct ctl_table_header *sysctl_header; struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX]; } devinet_sysctl = { -@@ -2186,7 +2186,7 @@ static __net_init int devinet_init_net(struct net *net) +@@ -2191,7 +2191,7 @@ static __net_init int devinet_init_net(struct net *net) int err; struct ipv4_devconf *all, *dflt; #ifdef CONFIG_SYSCTL @@ -92001,7 +93374,7 @@ index 34ca6d5..b6421e8 100644 struct ctl_table_header *forw_hdr; #endif -@@ -2204,7 +2204,7 @@ static __net_init int devinet_init_net(struct net *net) +@@ -2209,7 +2209,7 @@ static __net_init int devinet_init_net(struct net *net) goto err_alloc_dflt; #ifdef CONFIG_SYSCTL @@ -92010,7 +93383,7 @@ index 34ca6d5..b6421e8 100644 if (tbl == NULL) goto err_alloc_ctl; -@@ -2224,7 +2224,10 @@ static __net_init int devinet_init_net(struct net *net) +@@ -2229,7 +2229,10 @@ static __net_init int devinet_init_net(struct net *net) goto err_reg_dflt; err = -ENOMEM; @@ -92022,7 +93395,7 @@ index 34ca6d5..b6421e8 100644 if (forw_hdr == NULL) goto err_reg_ctl; net->ipv4.forw_hdr = forw_hdr; -@@ -2240,8 +2243,7 @@ err_reg_ctl: +@@ -2245,8 +2248,7 @@ err_reg_ctl: err_reg_dflt: __devinet_sysctl_unregister(all); err_reg_all: @@ -92087,7 +93460,7 @@ index 6acb541..9ea617d 100644 void inet_get_local_port_range(int *low, int *high) diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c -index 7bd8983..3abdcf6 100644 +index 96da9c7..b956690 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c @@ -18,12 +18,15 @@ @@ -92182,7 +93555,7 @@ index b66910a..cfe416e 100644 return -ENOMEM; } diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c -index 8d6939e..19d0a95 100644 +index d7aea4c..a8ee872 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -115,7 +115,7 @@ static bool log_ecn_error = true; @@ -92213,10 +93586,10 @@ index 8d6939e..19d0a95 100644 .maxtype = IFLA_GRE_MAX, .policy = ipgre_policy, diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c -index d9c4f11..02b82dbc 100644 +index 23e6ab0..be67a57 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c -@@ -1152,7 +1152,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, +@@ -1153,7 +1153,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, len = min_t(unsigned int, len, opt->optlen); if (put_user(len, optlen)) return -EFAULT; @@ -92226,7 +93599,7 @@ index d9c4f11..02b82dbc 100644 return -EFAULT; return 0; } -@@ -1283,7 +1284,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, +@@ -1284,7 +1285,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, if (sk->sk_type != SOCK_STREAM) return -ENOPROTOOPT; @@ -92236,19 +93609,19 @@ index d9c4f11..02b82dbc 100644 msg.msg_flags = flags; diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c -index 17cc0ff..63856c4 100644 +index 26847e1..75d2d2f 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c -@@ -47,7 +47,7 @@ - #define HASH_SIZE 16 - #define HASH(addr) (((__force u32)addr^((__force u32)addr>>4))&(HASH_SIZE-1)) +@@ -44,7 +44,7 @@ + #include + #include -static struct rtnl_link_ops vti_link_ops __read_mostly; +static struct rtnl_link_ops vti_link_ops; static int vti_net_id __read_mostly; - struct vti_net { -@@ -840,7 +840,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = { + static int vti_tunnel_init(struct net_device *dev); +@@ -425,7 +425,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = { [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) }, }; @@ -92289,7 +93662,7 @@ index efa1138..20dbba0 100644 return res; } diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c -index b3ac3c3..ec6bd95 100644 +index 7f80fb4..b0328f6 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); @@ -92301,7 +93674,7 @@ index b3ac3c3..ec6bd95 100644 static int ipip_err(struct sk_buff *skb, u32 info) { -@@ -409,7 +409,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { +@@ -408,7 +408,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = { [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 }, }; @@ -92444,7 +93817,7 @@ index cbc2215..9cb993c 100644 /* copy_len <= skb->len, so can't fail. */ if (skb_copy_bits(skb, 0, pm->payload, copy_len) < 0) diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 746427c..80eab72 100644 +index c482f7c..2784262 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -55,7 +55,7 @@ @@ -92483,17 +93856,17 @@ index 746427c..80eab72 100644 info, (u8 *)icmph); #endif } -@@ -850,7 +850,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, - return ip_recv_error(sk, msg, len); +@@ -841,7 +841,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, + return ip_recv_error(sk, msg, len, addr_len); #if IS_ENABLED(CONFIG_IPV6) } else if (family == AF_INET6) { -- return pingv6_ops.ipv6_recv_error(sk, msg, len); -+ return pingv6_ops->ipv6_recv_error(sk, msg, len); +- return pingv6_ops.ipv6_recv_error(sk, msg, len, ++ return pingv6_ops->ipv6_recv_error(sk, msg, len, + addr_len); #endif } - } @@ -900,7 +900,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, - IP6CB(skb)->iif); + } if (inet6_sk(sk)->rxopt.all) - pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb); @@ -92511,10 +93884,10 @@ index 746427c..80eab72 100644 static int ping_v4_seq_show(struct seq_file *seq, void *v) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c -index 6fb2337..9cd6b20 100644 +index 7d3db78..9fd511d 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c -@@ -309,7 +309,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) int raw_rcv(struct sock *sk, struct sk_buff *skb) { if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) { @@ -92566,10 +93939,10 @@ index 6fb2337..9cd6b20 100644 static int raw_seq_show(struct seq_file *seq, void *v) diff --git a/net/ipv4/route.c b/net/ipv4/route.c -index a9a54a2..647316e 100644 +index 62290b5..f0d944f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -2615,34 +2615,34 @@ static struct ctl_table ipv4_route_flush_table[] = { +@@ -2617,34 +2617,34 @@ static struct ctl_table ipv4_route_flush_table[] = { .maxlen = sizeof(int), .mode = 0200, .proc_handler = ipv4_sysctl_rtcache_flush, @@ -92612,22 +93985,22 @@ index a9a54a2..647316e 100644 err_dup: return -ENOMEM; } -@@ -2665,8 +2665,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = { +@@ -2667,8 +2667,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = { static __net_init int rt_genid_init(struct net *net) { -- atomic_set(&net->rt_genid, 0); +- atomic_set(&net->ipv4.rt_genid, 0); - atomic_set(&net->fnhe_genid, 0); -+ atomic_set_unchecked(&net->rt_genid, 0); ++ atomic_set_unchecked(&net->ipv4.rt_genid, 0); + atomic_set_unchecked(&net->fnhe_genid, 0); get_random_bytes(&net->ipv4.dev_addr_genid, sizeof(net->ipv4.dev_addr_genid)); return 0; diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c -index 610e324..fd42e75 100644 +index 540279f..9855b16 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c -@@ -57,7 +57,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write, +@@ -58,7 +58,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write, { int ret; int range[2]; @@ -92636,7 +94009,7 @@ index 610e324..fd42e75 100644 .data = &range, .maxlen = sizeof(range), .mode = table->mode, -@@ -110,7 +110,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write, +@@ -111,7 +111,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write, int ret; gid_t urange[2]; kgid_t low, high; @@ -92645,7 +94018,7 @@ index 610e324..fd42e75 100644 .data = &urange, .maxlen = sizeof(urange), .mode = table->mode, -@@ -141,7 +141,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write, +@@ -142,7 +142,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { char val[TCP_CA_NAME_MAX]; @@ -92654,7 +94027,7 @@ index 610e324..fd42e75 100644 .data = val, .maxlen = TCP_CA_NAME_MAX, }; -@@ -160,7 +160,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl, +@@ -161,7 +161,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -92663,7 +94036,7 @@ index 610e324..fd42e75 100644 int ret; tbl.data = kmalloc(tbl.maxlen, GFP_USER); -@@ -177,7 +177,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl, +@@ -178,7 +178,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -92672,7 +94045,7 @@ index 610e324..fd42e75 100644 int ret; tbl.data = kmalloc(tbl.maxlen, GFP_USER); -@@ -203,15 +203,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write, +@@ -204,15 +204,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write, struct mem_cgroup *memcg; #endif @@ -92693,7 +94066,7 @@ index 610e324..fd42e75 100644 } ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos); -@@ -239,7 +241,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write, +@@ -240,7 +242,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { @@ -92702,7 +94075,7 @@ index 610e324..fd42e75 100644 struct tcp_fastopen_context *ctxt; int ret; u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */ -@@ -482,7 +484,7 @@ static struct ctl_table ipv4_table[] = { +@@ -483,7 +485,7 @@ static struct ctl_table ipv4_table[] = { }, { .procname = "ip_local_reserved_ports", @@ -92711,7 +94084,7 @@ index 610e324..fd42e75 100644 .maxlen = 65536, .mode = 0644, .proc_handler = proc_do_large_bitmap, -@@ -847,11 +849,10 @@ static struct ctl_table ipv4_net_table[] = { +@@ -864,11 +866,10 @@ static struct ctl_table ipv4_net_table[] = { static __net_init int ipv4_sysctl_init_net(struct net *net) { @@ -92725,7 +94098,7 @@ index 610e324..fd42e75 100644 if (table == NULL) goto err_alloc; -@@ -886,15 +887,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) +@@ -903,15 +904,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) tcp_init_mem(net); @@ -92746,7 +94119,7 @@ index 610e324..fd42e75 100644 err_alloc: return -ENOMEM; } -@@ -916,16 +919,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = { +@@ -933,16 +936,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = { static __init int sysctl_ipv4_init(void) { struct ctl_table_header *hdr; @@ -92764,10 +94137,10 @@ index 610e324..fd42e75 100644 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table); if (hdr == NULL) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 3ca2139..c4cc060 100644 +index 068c8fb..a755c52 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -4379,7 +4379,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb, +@@ -4435,7 +4435,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb, * simplifies code) */ static void @@ -92776,7 +94149,7 @@ index 3ca2139..c4cc060 100644 struct sk_buff *head, struct sk_buff *tail, u32 start, u32 end) { -@@ -5465,6 +5465,7 @@ discard: +@@ -5520,6 +5520,7 @@ discard: tcp_paws_reject(&tp->rx_opt, 0)) goto discard_and_undo; @@ -92784,7 +94157,7 @@ index 3ca2139..c4cc060 100644 if (th->syn) { /* We see SYN without ACK. It is attempt of * simultaneous connect with crossed SYNs. -@@ -5515,6 +5516,7 @@ discard: +@@ -5570,6 +5571,7 @@ discard: goto discard; #endif } @@ -92792,7 +94165,7 @@ index 3ca2139..c4cc060 100644 /* "fifth, if neither of the SYN or RST bits is set then * drop the segment and return." */ -@@ -5560,7 +5562,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, +@@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, goto discard; if (th->syn) { @@ -92802,7 +94175,7 @@ index 3ca2139..c4cc060 100644 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0) return 1; diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c -index b299da5..097db06 100644 +index 5031f68..91569e2 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly; @@ -92816,7 +94189,7 @@ index b299da5..097db06 100644 #ifdef CONFIG_TCP_MD5SIG static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key, __be32 daddr, __be32 saddr, const struct tcphdr *th); -@@ -1830,6 +1834,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) +@@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) return 0; reset: @@ -92826,7 +94199,7 @@ index b299da5..097db06 100644 tcp_v4_send_reset(rsk, skb); discard: kfree_skb(skb); -@@ -1975,12 +1982,19 @@ int tcp_v4_rcv(struct sk_buff *skb) +@@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb) TCP_SKB_CB(skb)->sacked = 0; sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -92849,7 +94222,7 @@ index b299da5..097db06 100644 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) { NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); -@@ -2034,6 +2048,10 @@ csum_error: +@@ -2033,6 +2047,10 @@ csum_error: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -92861,7 +94234,7 @@ index b299da5..097db06 100644 } diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c -index ab1c086..2a8d76b 100644 +index 58a3e69..7f0626e 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -27,6 +27,10 @@ @@ -92875,7 +94248,7 @@ index ab1c086..2a8d76b 100644 int sysctl_tcp_syncookies __read_mostly = 1; EXPORT_SYMBOL(sysctl_tcp_syncookies); -@@ -715,7 +719,10 @@ embryonic_reset: +@@ -711,7 +715,10 @@ embryonic_reset: * avoid becoming vulnerable to outside attack aiming at * resetting legit local connections. */ @@ -92887,45 +94260,11 @@ index ab1c086..2a8d76b 100644 } else if (fastopen) { /* received a valid RST pkt */ reqsk_fastopen_remove(sk, req, true); tcp_reset(sk); -diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c -index 170737a..75cbd26 100644 ---- a/net/ipv4/tcp_output.c -+++ b/net/ipv4/tcp_output.c -@@ -982,6 +982,9 @@ static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb) - static void tcp_set_skb_tso_segs(const struct sock *sk, struct sk_buff *skb, - unsigned int mss_now) - { -+ /* Make sure we own this skb before messing gso_size/gso_segs */ -+ WARN_ON_ONCE(skb_cloned(skb)); -+ - if (skb->len <= mss_now || !sk_can_gso(sk) || - skb->ip_summed == CHECKSUM_NONE) { - /* Avoid the costly divide in the normal -@@ -1063,9 +1066,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, - if (nsize < 0) - nsize = 0; - -- if (skb_cloned(skb) && -- skb_is_nonlinear(skb) && -- pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) -+ if (skb_unclone(skb, GFP_ATOMIC)) - return -ENOMEM; - - /* Get a new skb... force flag on. */ -@@ -2334,6 +2335,8 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) - int oldpcount = tcp_skb_pcount(skb); - - if (unlikely(oldpcount > 1)) { -+ if (skb_unclone(skb, GFP_ATOMIC)) -+ return -ENOMEM; - tcp_init_tso_segs(sk, skb, cur_mss); - tcp_adjust_pcount(sk, skb, oldpcount - tcp_skb_pcount(skb)); - } diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c -index d4943f6..e7a74a5 100644 +index 611beab..c4b6e1d 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c -@@ -204,7 +204,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf, +@@ -245,7 +245,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf, if (cnt + width >= len) break; @@ -92964,7 +94303,7 @@ index 4b85e6f..22f9ac9 100644 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) { /* Has it gone just too far? */ diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c -index 766e6ba..aff2f8d 100644 +index 5e2c2f1..6473c22 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -87,6 +87,7 @@ @@ -92996,7 +94335,7 @@ index 766e6ba..aff2f8d 100644 /* * This routine is called by the ICMP module when it gets some * sort of error condition. If err < 0 then the socket should -@@ -891,9 +899,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, +@@ -892,9 +900,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, dport = usin->sin_port; if (dport == 0) return -EINVAL; @@ -93015,7 +94354,7 @@ index 766e6ba..aff2f8d 100644 daddr = inet->inet_daddr; dport = inet->inet_dport; /* Open fast path for connected socket. -@@ -1137,7 +1154,7 @@ static unsigned int first_packet_length(struct sock *sk) +@@ -1141,7 +1158,7 @@ static unsigned int first_packet_length(struct sock *sk) IS_UDPLITE(sk)); UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, IS_UDPLITE(sk)); @@ -93024,7 +94363,7 @@ index 766e6ba..aff2f8d 100644 __skb_unlink(skb, rcvq); __skb_queue_tail(&list_kill, skb); } -@@ -1223,6 +1240,10 @@ try_again: +@@ -1221,6 +1238,10 @@ try_again: if (!skb) goto out; @@ -93035,7 +94374,7 @@ index 766e6ba..aff2f8d 100644 ulen = skb->len - sizeof(struct udphdr); copied = len; if (copied > ulen) -@@ -1256,7 +1277,7 @@ try_again: +@@ -1254,7 +1275,7 @@ try_again: if (unlikely(err)) { trace_kfree_skb(skb, udp_recvmsg); if (!peeked) { @@ -93044,7 +94383,7 @@ index 766e6ba..aff2f8d 100644 UDP_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, is_udplite); } -@@ -1543,7 +1564,7 @@ csum_error: +@@ -1542,7 +1563,7 @@ csum_error: UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite); drop: UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); @@ -93053,7 +94392,7 @@ index 766e6ba..aff2f8d 100644 kfree_skb(skb); return -1; } -@@ -1562,7 +1583,7 @@ static void flush_stack(struct sock **stack, unsigned int count, +@@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count, skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); if (!skb1) { @@ -93062,7 +94401,7 @@ index 766e6ba..aff2f8d 100644 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk)); UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, -@@ -1734,6 +1755,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, +@@ -1733,6 +1754,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, goto csum_error; UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -93072,7 +94411,7 @@ index 766e6ba..aff2f8d 100644 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -@@ -2166,7 +2190,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, +@@ -2165,7 +2189,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)), 0, sock_i_ino(sp), atomic_read(&sp->sk_refcnt), sp, @@ -93082,10 +94421,10 @@ index 766e6ba..aff2f8d 100644 int udp4_seq_show(struct seq_file *seq, void *v) diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c -index 9a459be..c7bc04c 100644 +index adf9983..8e45d0a 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c -@@ -181,11 +181,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) +@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) fl4->flowi4_tos = iph->tos; } @@ -93099,7 +94438,7 @@ index 9a459be..c7bc04c 100644 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2); } -@@ -264,19 +264,18 @@ static struct ctl_table xfrm4_policy_table[] = { +@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = { static int __net_init xfrm4_net_init(struct net *net) { @@ -93124,7 +94463,7 @@ index 9a459be..c7bc04c 100644 if (!hdr) goto err_reg; -@@ -284,8 +283,7 @@ static int __net_init xfrm4_net_init(struct net *net) +@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net) return 0; err_reg: @@ -93135,10 +94474,10 @@ index 9a459be..c7bc04c 100644 return -ENOMEM; } diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index 0f99f7b..9375cf5 100644 +index cd3fb30..b7dfef7 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -618,7 +618,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb, +@@ -586,7 +586,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb, idx = 0; head = &net->dev_index_head[h]; rcu_read_lock(); @@ -93147,7 +94486,7 @@ index 0f99f7b..9375cf5 100644 net->dev_base_seq; hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) -@@ -2408,7 +2408,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg) +@@ -2364,7 +2364,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg) p.iph.ihl = 5; p.iph.protocol = IPPROTO_IPV6; p.iph.ttl = 64; @@ -93156,7 +94495,7 @@ index 0f99f7b..9375cf5 100644 if (ops->ndo_do_ioctl) { mm_segment_t oldfs = get_fs(); -@@ -4057,7 +4057,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, +@@ -3977,7 +3977,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, s_ip_idx = ip_idx = cb->args[2]; rcu_read_lock(); @@ -93165,16 +94504,16 @@ index 0f99f7b..9375cf5 100644 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) { idx = 0; head = &net->dev_index_head[h]; -@@ -4678,7 +4678,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) +@@ -4603,7 +4603,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) dst_free(&ifp->rt->dst); break; } - atomic_inc(&net->ipv6.dev_addr_genid); + atomic_inc_unchecked(&net->ipv6.dev_addr_genid); + rt_genid_bump_ipv6(net); } - static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) -@@ -4698,7 +4698,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write, +@@ -4624,7 +4624,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write, int *valp = ctl->data; int val = *valp; loff_t pos = *ppos; @@ -93183,7 +94522,7 @@ index 0f99f7b..9375cf5 100644 int ret; /* -@@ -4783,7 +4783,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write, +@@ -4709,7 +4709,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write, int *valp = ctl->data; int val = *valp; loff_t pos = *ppos; @@ -93192,11 +94531,24 @@ index 0f99f7b..9375cf5 100644 int ret; /* +diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c +index 8132b44..b8eca70 100644 +--- a/net/ipv6/af_inet6.c ++++ b/net/ipv6/af_inet6.c +@@ -767,7 +767,7 @@ static int __net_init inet6_net_init(struct net *net) + + net->ipv6.sysctl.bindv6only = 0; + net->ipv6.sysctl.icmpv6_time = 1*HZ; +- atomic_set(&net->ipv6.rt_genid, 0); ++ atomic_set_unchecked(&net->ipv6.rt_genid, 0); + + err = ipv6_init_mibs(net); + if (err) diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c -index 197e6f4..16d8396 100644 +index c66c6df..f375d3c 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c -@@ -904,5 +904,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, +@@ -908,5 +908,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp, 0, sock_i_ino(sp), atomic_read(&sp->sk_refcnt), sp, @@ -93204,10 +94556,10 @@ index 197e6f4..16d8396 100644 + atomic_read_unchecked(&sp->sk_drops)); } diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c -index 7cfc8d2..c5394b6 100644 +index eef8d94..cfa1852 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c -@@ -989,7 +989,7 @@ struct ctl_table ipv6_icmp_table_template[] = { +@@ -997,7 +997,7 @@ struct ctl_table ipv6_icmp_table_template[] = { struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net) { @@ -93217,7 +94569,7 @@ index 7cfc8d2..c5394b6 100644 table = kmemdup(ipv6_icmp_table_template, sizeof(ipv6_icmp_table_template), diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c -index 8bc717b..76fbb5d 100644 +index bf4a9a0..e5f6ac5 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -74,7 +74,7 @@ struct ip6gre_net { @@ -93229,7 +94581,7 @@ index 8bc717b..76fbb5d 100644 static int ip6gre_tunnel_init(struct net_device *dev); static void ip6gre_tunnel_setup(struct net_device *dev); static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t); -@@ -1288,7 +1288,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev) +@@ -1286,7 +1286,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev) } @@ -93257,10 +94609,10 @@ index 8bc717b..76fbb5d 100644 .maxtype = IFLA_GRE_MAX, .policy = ip6gre_policy, diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c -index cf5d490..30946f0 100644 +index c1e11b5..568e633 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c -@@ -88,7 +88,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2) +@@ -89,7 +89,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2) static int ip6_tnl_dev_init(struct net_device *dev); static void ip6_tnl_dev_setup(struct net_device *dev); @@ -93269,7 +94621,7 @@ index cf5d490..30946f0 100644 static int ip6_tnl_net_id __read_mostly; struct ip6_tnl_net { -@@ -1678,7 +1678,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = { +@@ -1699,7 +1699,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = { [IFLA_IPTUN_PROTO] = { .type = NLA_U8 }, }; @@ -93341,7 +94693,7 @@ index 44400c2..8e11f52 100644 case IP6T_SO_GET_ENTRIES: diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c -index dffdc1a..ccc6678 100644 +index 253566a..9fa50c7 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = { @@ -93383,10 +94735,10 @@ index dffdc1a..ccc6678 100644 return -ENOMEM; } diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c -index ab92a36..bb4a528 100644 +index 827f795..7e28e82 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c -@@ -8,8 +8,8 @@ +@@ -9,8 +9,8 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) { @@ -93397,7 +94749,7 @@ index ab92a36..bb4a528 100644 #if IS_ENABLED(CONFIG_IPV6) if (rt && !(rt->dst.flags & DST_NOPEER)) { -@@ -25,13 +25,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) +@@ -26,13 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) } } #endif @@ -93416,10 +94768,10 @@ index ab92a36..bb4a528 100644 EXPORT_SYMBOL(ipv6_select_ident); diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c -index 18f19df..b46ada1 100644 +index 7856e96..75ebc7f 100644 --- a/net/ipv6/ping.c +++ b/net/ipv6/ping.c -@@ -245,6 +245,22 @@ static struct pernet_operations ping_v6_net_ops = { +@@ -246,6 +246,22 @@ static struct pernet_operations ping_v6_net_ops = { }; #endif @@ -93442,7 +94794,7 @@ index 18f19df..b46ada1 100644 int __init pingv6_init(void) { #ifdef CONFIG_PROC_FS -@@ -252,11 +268,7 @@ int __init pingv6_init(void) +@@ -253,11 +269,7 @@ int __init pingv6_init(void) if (ret) return ret; #endif @@ -93455,7 +94807,7 @@ index 18f19df..b46ada1 100644 return inet6_register_protosw(&pingv6_protosw); } -@@ -265,11 +277,7 @@ int __init pingv6_init(void) +@@ -266,11 +278,7 @@ int __init pingv6_init(void) */ void pingv6_exit(void) { @@ -93469,19 +94821,10 @@ index 18f19df..b46ada1 100644 unregister_pernet_subsys(&ping_v6_net_ops); #endif diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c -index cdaed47..515edde9 100644 +index 430067c..4adf088 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c -@@ -108,7 +108,7 @@ found: - */ - static int icmpv6_filter(const struct sock *sk, const struct sk_buff *skb) - { -- struct icmp6hdr *_hdr; -+ struct icmp6hdr _hdr; - const struct icmp6hdr *hdr; - - hdr = skb_header_pointer(skb, skb_transport_offset(skb), -@@ -378,7 +378,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb) +@@ -385,7 +385,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb) { if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) && skb_checksum_complete(skb)) { @@ -93490,7 +94833,7 @@ index cdaed47..515edde9 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -406,7 +406,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) +@@ -413,7 +413,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) struct raw6_sock *rp = raw6_sk(sk); if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) { @@ -93499,7 +94842,7 @@ index cdaed47..515edde9 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -430,7 +430,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) +@@ -437,7 +437,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) if (inet->hdrincl) { if (skb_checksum_complete(skb)) { @@ -93508,7 +94851,7 @@ index cdaed47..515edde9 100644 kfree_skb(skb); return NET_RX_DROP; } -@@ -602,7 +602,7 @@ out: +@@ -607,7 +607,7 @@ out: return err; } @@ -93517,7 +94860,7 @@ index cdaed47..515edde9 100644 struct flowi6 *fl6, struct dst_entry **dstp, unsigned int flags) { -@@ -915,12 +915,15 @@ do_confirm: +@@ -920,12 +920,15 @@ do_confirm: static int rawv6_seticmpfilter(struct sock *sk, int level, int optname, char __user *optval, int optlen) { @@ -93534,7 +94877,7 @@ index cdaed47..515edde9 100644 return 0; default: return -ENOPROTOOPT; -@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, +@@ -938,6 +941,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, char __user *optval, int __user *optlen) { int len; @@ -93542,7 +94885,7 @@ index cdaed47..515edde9 100644 switch (optname) { case ICMPV6_FILTER: -@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, +@@ -949,7 +953,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname, len = sizeof(struct icmp6_filter); if (put_user(len, optlen)) return -EFAULT; @@ -93595,10 +94938,10 @@ index 1aeb473..bea761c 100644 return -ENOMEM; } diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 8d9a93ed..cd89616 100644 +index 77308af..36ed509 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -2926,7 +2926,7 @@ struct ctl_table ipv6_route_table_template[] = { +@@ -3009,7 +3009,7 @@ struct ctl_table ipv6_route_table_template[] = { struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) { @@ -93608,7 +94951,7 @@ index 8d9a93ed..cd89616 100644 table = kmemdup(ipv6_route_table_template, sizeof(ipv6_route_table_template), diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c -index 86f639b..71e355e 100644 +index b433884..3875266 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev); @@ -93620,9 +94963,9 @@ index 86f639b..71e355e 100644 static int sit_net_id __read_mostly; struct sit_net { -@@ -1601,7 +1601,7 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = { - #endif - }; +@@ -1603,7 +1603,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head) + unregister_netdevice_queue(dev, head); + } -static struct rtnl_link_ops sit_link_ops __read_mostly = { +static struct rtnl_link_ops sit_link_ops = { @@ -93643,7 +94986,7 @@ index 107b2f1..72741a9 100644 struct ctl_table *ipv6_icmp_table; int err; diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c -index 6e1649d..75ddb4c 100644 +index 5c71501..7e8d5d3 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) @@ -93657,7 +95000,7 @@ index 6e1649d..75ddb4c 100644 static void tcp_v6_hash(struct sock *sk) { if (sk->sk_state != TCP_CLOSE) { -@@ -1399,6 +1403,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) +@@ -1397,6 +1401,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) return 0; reset: @@ -93667,16 +95010,7 @@ index 6e1649d..75ddb4c 100644 tcp_v6_send_reset(sk, skb); discard: if (opt_skb) -@@ -1427,7 +1434,7 @@ ipv6_pktoptions: - if (np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) - np->mcast_hops = ipv6_hdr(opt_skb)->hop_limit; - if (np->rxopt.bits.rxtclass) -- np->rcv_tclass = ipv6_get_dsfield(ipv6_hdr(skb)); -+ np->rcv_tclass = ipv6_get_dsfield(ipv6_hdr(opt_skb)); - if (ipv6_opt_accepted(sk, opt_skb)) { - skb_set_owner_r(opt_skb, sk); - opt_skb = xchg(&np->pktoptions, opt_skb); -@@ -1481,12 +1488,20 @@ static int tcp_v6_rcv(struct sk_buff *skb) +@@ -1479,12 +1486,20 @@ static int tcp_v6_rcv(struct sk_buff *skb) TCP_SKB_CB(skb)->sacked = 0; sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest); @@ -93699,7 +95033,7 @@ index 6e1649d..75ddb4c 100644 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) { NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP); -@@ -1538,6 +1553,10 @@ csum_error: +@@ -1536,6 +1551,10 @@ csum_error: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -93711,7 +95045,7 @@ index 6e1649d..75ddb4c 100644 } diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c -index f405815..45a68a6 100644 +index 3d2758d..626c422 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -53,6 +53,10 @@ @@ -93725,7 +95059,7 @@ index f405815..45a68a6 100644 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) { const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; -@@ -420,7 +424,7 @@ try_again: +@@ -417,7 +421,7 @@ try_again: if (unlikely(err)) { trace_kfree_skb(skb, udpv6_recvmsg); if (!peeked) { @@ -93734,7 +95068,7 @@ index f405815..45a68a6 100644 if (is_udp4) UDP_INC_STATS_USER(sock_net(sk), UDP_MIB_INERRORS, -@@ -666,7 +670,7 @@ csum_error: +@@ -665,7 +669,7 @@ csum_error: UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite); drop: UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite); @@ -93743,7 +95077,7 @@ index f405815..45a68a6 100644 kfree_skb(skb); return -1; } -@@ -724,7 +728,7 @@ static void flush_stack(struct sock **stack, unsigned int count, +@@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count, if (likely(skb1 == NULL)) skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); if (!skb1) { @@ -93752,7 +95086,7 @@ index f405815..45a68a6 100644 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk)); UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, -@@ -864,6 +868,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, +@@ -863,6 +867,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, goto csum_error; UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -93763,10 +95097,10 @@ index f405815..45a68a6 100644 kfree_skb(skb); diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c -index 23ed03d..6532e67 100644 +index 550b195..6acea83 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c -@@ -207,11 +207,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse) +@@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse) } } @@ -93780,7 +95114,7 @@ index 23ed03d..6532e67 100644 return dst_entries_get_fast(ops) > ops->gc_thresh * 2; } -@@ -324,19 +324,19 @@ static struct ctl_table xfrm6_policy_table[] = { +@@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = { static int __net_init xfrm6_net_init(struct net *net) { @@ -93805,7 +95139,7 @@ index 23ed03d..6532e67 100644 if (!hdr) goto err_reg; -@@ -344,8 +344,7 @@ static int __net_init xfrm6_net_init(struct net *net) +@@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net) return 0; err_reg: @@ -93891,7 +95225,7 @@ index 41ac7938..75e3bb1 100644 seq_printf(m, "Max header size: %d\n", self->max_header_size); diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c -index 168aff5..9d43132 100644 +index c4b7218..3e83259 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c @@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk) @@ -93921,20 +95255,10 @@ index cd5b8ec..f205e6b 100644 }; diff --git a/net/key/af_key.c b/net/key/af_key.c -index ab8bd2c..3a3eb81 100644 +index 545f047..9757a9d 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c -@@ -1098,7 +1098,8 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, - - x->id.proto = proto; - x->id.spi = sa->sadb_sa_spi; -- x->props.replay_window = sa->sadb_sa_replay; -+ x->props.replay_window = min_t(unsigned int, sa->sadb_sa_replay, -+ (sizeof(x->replay.bitmap) * 8)); - if (sa->sadb_sa_flags & SADB_SAFLAGS_NOECN) - x->props.flags |= XFRM_STATE_NOECN; - if (sa->sadb_sa_flags & SADB_SAFLAGS_DECAP_DSCP) -@@ -3048,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc +@@ -3041,10 +3041,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc static u32 get_acqseq(void) { u32 res; @@ -93947,98 +95271,11 @@ index ab8bd2c..3a3eb81 100644 } while (!res); return res; } -diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c -index feae495..aedaa2c 100644 ---- a/net/l2tp/l2tp_core.c -+++ b/net/l2tp/l2tp_core.c -@@ -496,6 +496,7 @@ out: - static inline int l2tp_verify_udp_checksum(struct sock *sk, - struct sk_buff *skb) - { -+ struct l2tp_tunnel *tunnel = (struct l2tp_tunnel *)sk->sk_user_data; - struct udphdr *uh = udp_hdr(skb); - u16 ulen = ntohs(uh->len); - __wsum psum; -@@ -504,7 +505,7 @@ static inline int l2tp_verify_udp_checksum(struct sock *sk, - return 0; - - #if IS_ENABLED(CONFIG_IPV6) -- if (sk->sk_family == PF_INET6) { -+ if (sk->sk_family == PF_INET6 && !tunnel->v4mapped) { - if (!uh->check) { - LIMIT_NETDEBUG(KERN_INFO "L2TP: IPv6: checksum is 0\n"); - return 1; -@@ -1128,7 +1129,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, - /* Queue the packet to IP for output */ - skb->local_df = 1; - #if IS_ENABLED(CONFIG_IPV6) -- if (skb->sk->sk_family == PF_INET6) -+ if (skb->sk->sk_family == PF_INET6 && !tunnel->v4mapped) - error = inet6_csk_xmit(skb, NULL); - else - #endif -@@ -1255,7 +1256,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len - - /* Calculate UDP checksum if configured to do so */ - #if IS_ENABLED(CONFIG_IPV6) -- if (sk->sk_family == PF_INET6) -+ if (sk->sk_family == PF_INET6 && !tunnel->v4mapped) - l2tp_xmit_ipv6_csum(sk, skb, udp_len); - else - #endif -@@ -1704,6 +1705,24 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 - if (cfg != NULL) - tunnel->debug = cfg->debug; - -+#if IS_ENABLED(CONFIG_IPV6) -+ if (sk->sk_family == PF_INET6) { -+ struct ipv6_pinfo *np = inet6_sk(sk); -+ -+ if (ipv6_addr_v4mapped(&np->saddr) && -+ ipv6_addr_v4mapped(&np->daddr)) { -+ struct inet_sock *inet = inet_sk(sk); -+ -+ tunnel->v4mapped = true; -+ inet->inet_saddr = np->saddr.s6_addr32[3]; -+ inet->inet_rcv_saddr = np->rcv_saddr.s6_addr32[3]; -+ inet->inet_daddr = np->daddr.s6_addr32[3]; -+ } else { -+ tunnel->v4mapped = false; -+ } -+ } -+#endif -+ - /* Mark socket as an encapsulation socket. See net/ipv4/udp.c */ - tunnel->encap = encap; - if (encap == L2TP_ENCAPTYPE_UDP) { -@@ -1712,7 +1731,7 @@ int l2tp_tunnel_create(struct net *net, int fd, int version, u32 tunnel_id, u32 - udp_sk(sk)->encap_rcv = l2tp_udp_encap_recv; - udp_sk(sk)->encap_destroy = l2tp_udp_encap_destroy; - #if IS_ENABLED(CONFIG_IPV6) -- if (sk->sk_family == PF_INET6) -+ if (sk->sk_family == PF_INET6 && !tunnel->v4mapped) - udpv6_encap_enable(); - else - #endif -diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h -index 66a559b..6f251cb 100644 ---- a/net/l2tp/l2tp_core.h -+++ b/net/l2tp/l2tp_core.h -@@ -194,6 +194,9 @@ struct l2tp_tunnel { - struct sock *sock; /* Parent socket */ - int fd; /* Parent fd, if tunnel socket - * was created by userspace */ -+#if IS_ENABLED(CONFIG_IPV6) -+ bool v4mapped; -+#endif - - struct work_struct del_work; - diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c -index 43dd752..63a23bc 100644 +index 629dee7..4bdd2c8 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -820,7 +820,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy, +@@ -826,7 +826,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy, ret = ieee80211_vif_use_channel(sdata, chandef, IEEE80211_CHANCTX_EXCLUSIVE); } @@ -94047,7 +95284,7 @@ index 43dd752..63a23bc 100644 local->_oper_chandef = *chandef; ieee80211_hw_config(local, 0); } -@@ -2941,7 +2941,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, +@@ -3125,7 +3125,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, else local->probe_req_reg--; @@ -94056,7 +95293,7 @@ index 43dd752..63a23bc 100644 break; ieee80211_queue_work(&local->hw, &local->reconfig_filter); -@@ -3404,8 +3404,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy, +@@ -3588,8 +3588,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy, if (chanctx_conf) { *chandef = chanctx_conf->def; ret = 0; @@ -94068,7 +95305,7 @@ index 43dd752..63a23bc 100644 if (local->use_chanctx) *chandef = local->monitor_chandef; diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h -index 8412a30..6e00181 100644 +index 611abfc..8c2c7e4 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -28,6 +28,7 @@ @@ -94079,7 +95316,7 @@ index 8412a30..6e00181 100644 #include "key.h" #include "sta_info.h" #include "debug.h" -@@ -907,7 +908,7 @@ struct ieee80211_local { +@@ -945,7 +946,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -94089,10 +95326,10 @@ index 8412a30..6e00181 100644 /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll, diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c -index cc11759..11d5541 100644 +index fcecd63..a404454 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -511,7 +511,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) +@@ -519,7 +519,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) break; } @@ -94101,7 +95338,7 @@ index cc11759..11d5541 100644 res = drv_start(local); if (res) goto err_del_bss; -@@ -558,7 +558,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) +@@ -566,7 +566,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) res = drv_add_interface(local, sdata); if (res) goto err_stop; @@ -94110,7 +95347,7 @@ index cc11759..11d5541 100644 res = ieee80211_add_virtual_monitor(local); if (res) goto err_stop; -@@ -666,7 +666,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) +@@ -675,7 +675,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) atomic_inc(&local->iff_promiscs); if (coming_up) @@ -94119,7 +95356,7 @@ index cc11759..11d5541 100644 if (hw_reconf_flags) ieee80211_hw_config(local, hw_reconf_flags); -@@ -704,7 +704,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) +@@ -713,7 +713,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) err_del_interface: drv_remove_interface(local, sdata); err_stop: @@ -94128,7 +95365,7 @@ index cc11759..11d5541 100644 drv_stop(local); err_del_bss: sdata->bss = NULL; -@@ -841,7 +841,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -852,7 +852,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, } if (going_down) @@ -94137,7 +95374,7 @@ index cc11759..11d5541 100644 switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: -@@ -908,7 +908,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -919,7 +919,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, } spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); @@ -94146,7 +95383,7 @@ index cc11759..11d5541 100644 ieee80211_clear_tx_pending(local); /* -@@ -948,7 +948,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ieee80211_recalc_ps(local, -1); @@ -94155,7 +95392,7 @@ index cc11759..11d5541 100644 ieee80211_stop_device(local); /* no reconfiguring after stop! */ -@@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, +@@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ieee80211_configure_filter(local); ieee80211_hw_config(local, hw_reconf_flags); @@ -94165,10 +95402,10 @@ index cc11759..11d5541 100644 } diff --git a/net/mac80211/main.c b/net/mac80211/main.c -index 091088a..daf43c7 100644 +index 21d5d44..4fee18a 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -181,7 +181,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) +@@ -172,7 +172,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL | IEEE80211_CONF_CHANGE_POWER); @@ -94209,10 +95446,10 @@ index 3401262..d5cd68d 100644 suspend: diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c -index 30d58d2..449ac8e 100644 +index e126605..73d2c39 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c -@@ -718,7 +718,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, +@@ -725,7 +725,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local, ASSERT_RTNL(); @@ -94235,10 +95472,10 @@ index c97a065..ff61928 100644 return p; diff --git a/net/mac80211/util.c b/net/mac80211/util.c -index 2265445..ba14971 100644 +index 69e4ef5..e8e4b92 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -1452,7 +1452,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) +@@ -1470,7 +1470,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) } #endif /* everything else happens only if HW was up & running */ @@ -94247,7 +95484,7 @@ index 2265445..ba14971 100644 goto wake_up; /* -@@ -1677,7 +1677,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) +@@ -1695,7 +1695,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) local->in_reconfig = false; barrier(); @@ -94257,10 +95494,10 @@ index 2265445..ba14971 100644 /* diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig -index 56d22ca..87c778f 100644 +index 6e839b6..002a233 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -958,6 +958,16 @@ config NETFILTER_XT_MATCH_ESP +@@ -950,6 +950,16 @@ config NETFILTER_XT_MATCH_ESP To compile it as a module, choose M here. If unsure, say N. @@ -94278,7 +95515,7 @@ index 56d22ca..87c778f 100644 tristate '"hashlimit" match support' depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n) diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile -index a1abf87..dbcb7ee 100644 +index c3a0a12..90b587f 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o @@ -94290,10 +95527,10 @@ index a1abf87..dbcb7ee 100644 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c -index f771390..145b765 100644 +index f2e30fb..f131862 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c -@@ -1820,7 +1820,7 @@ done: +@@ -1819,7 +1819,7 @@ done: return ret; } @@ -94334,10 +95571,10 @@ index 4c8e5c0..5a79b4d 100644 if (!todrop_rate[i]) return 0; diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c -index 4f69e83..da2d8bf 100644 +index 3581736..c0453e9 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c -@@ -559,7 +559,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, +@@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, ret = cp->packet_xmit(skb, cp, pd->pp, iph); /* do not touch skb anymore */ @@ -94346,7 +95583,7 @@ index 4f69e83..da2d8bf 100644 ip_vs_conn_put(cp); return ret; } -@@ -1711,7 +1711,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) +@@ -1706,7 +1706,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) if (cp->flags & IP_VS_CONN_F_ONE_PACKET) pkts = sysctl_sync_threshold(ipvs); else @@ -94356,10 +95593,10 @@ index 4f69e83..da2d8bf 100644 if (ipvs->sync_state & IP_VS_STATE_MASTER) ip_vs_sync_conn(net, cp, pkts); diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c -index c8148e4..eff604f 100644 +index a3df9bd..895ae09 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c -@@ -789,7 +789,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, +@@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, */ ip_vs_rs_hash(ipvs, dest); } @@ -94367,8 +95604,8 @@ index c8148e4..eff604f 100644 + atomic_set_unchecked(&dest->conn_flags, conn_flags); /* bind the service */ - if (!dest->svc) { -@@ -1657,7 +1657,7 @@ proc_do_sync_ports(struct ctl_table *table, int write, + old_svc = rcu_dereference_protected(dest->svc, 1); +@@ -1641,7 +1641,7 @@ proc_do_sync_ports(struct ctl_table *table, int write, * align with netns init in ip_vs_control_net_init() */ @@ -94377,7 +95614,7 @@ index c8148e4..eff604f 100644 { .procname = "amemthresh", .maxlen = sizeof(int), -@@ -2078,7 +2078,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) +@@ -2062,7 +2062,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) " %-7s %-6d %-10d %-10d\n", &dest->addr.in6, ntohs(dest->port), @@ -94386,7 +95623,7 @@ index c8148e4..eff604f 100644 atomic_read(&dest->weight), atomic_read(&dest->activeconns), atomic_read(&dest->inactconns)); -@@ -2089,7 +2089,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) +@@ -2073,7 +2073,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v) "%-7s %-6d %-10d %-10d\n", ntohl(dest->addr.ip), ntohs(dest->port), @@ -94395,7 +95632,7 @@ index c8148e4..eff604f 100644 atomic_read(&dest->weight), atomic_read(&dest->activeconns), atomic_read(&dest->inactconns)); -@@ -2567,7 +2567,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get, +@@ -2551,7 +2551,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get, entry.addr = dest->addr.ip; entry.port = dest->port; @@ -94404,7 +95641,7 @@ index c8148e4..eff604f 100644 entry.weight = atomic_read(&dest->weight); entry.u_threshold = dest->u_threshold; entry.l_threshold = dest->l_threshold; -@@ -3110,7 +3110,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest) +@@ -3094,7 +3094,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest) if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) || nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) || nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD, @@ -94413,7 +95650,7 @@ index c8148e4..eff604f 100644 IP_VS_CONN_F_FWD_MASK)) || nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight)) || -@@ -3700,7 +3700,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net) +@@ -3684,7 +3684,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net) { int idx; struct netns_ipvs *ipvs = net_ipvs(net); @@ -94423,7 +95660,7 @@ index c8148e4..eff604f 100644 atomic_set(&ipvs->dropentry, 0); spin_lock_init(&ipvs->dropentry_lock); diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c -index 1383b0e..a486da1 100644 +index eff13c9..c1aab3e 100644 --- a/net/netfilter/ipvs/ip_vs_lblc.c +++ b/net/netfilter/ipvs/ip_vs_lblc.c @@ -118,7 +118,7 @@ struct ip_vs_lblc_table { @@ -94436,10 +95673,10 @@ index 1383b0e..a486da1 100644 .procname = "lblc_expiration", .data = NULL, diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c -index 3cd85b2..dfab2b8 100644 +index 0b85500..8513fa5 100644 --- a/net/netfilter/ipvs/ip_vs_lblcr.c +++ b/net/netfilter/ipvs/ip_vs_lblcr.c -@@ -299,7 +299,7 @@ struct ip_vs_lblcr_table { +@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table { * IPVS LBLCR sysctl table */ @@ -94515,10 +95752,10 @@ index 2d3030a..7ba1c0a 100644 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table), GFP_KERNEL); diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c -index 0283bae..5febcb0 100644 +index 5d892fe..d2fc9d8 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -1614,6 +1614,10 @@ void nf_conntrack_init_end(void) +@@ -1600,6 +1600,10 @@ void nf_conntrack_init_end(void) #define DYING_NULLS_VAL ((1<<30)+1) #define TEMPLATE_NULLS_VAL ((1<<30)+2) @@ -94529,7 +95766,7 @@ index 0283bae..5febcb0 100644 int nf_conntrack_init_net(struct net *net) { int ret; -@@ -1628,7 +1632,11 @@ int nf_conntrack_init_net(struct net *net) +@@ -1614,7 +1618,11 @@ int nf_conntrack_init_net(struct net *net) goto err_stat; } @@ -94568,7 +95805,7 @@ index 974a2a4..52cc6ff 100644 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table), GFP_KERNEL); diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c -index 0ab9636..cea3c6a 100644 +index ce30041..3861b5d 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net, @@ -94824,10 +96061,10 @@ index 4fe4fb4..87a89e5 100644 return 0; } diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c -index 0c61b59..941bddd 100644 +index 6135635..5bdc54a 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -219,7 +219,7 @@ static void netlink_overrun(struct sock *sk) +@@ -249,7 +249,7 @@ static void netlink_overrun(struct sock *sk) sk->sk_error_report(sk); } } @@ -94836,9 +96073,9 @@ index 0c61b59..941bddd 100644 } static void netlink_rcv_wake(struct sock *sk) -@@ -2925,7 +2925,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v) +@@ -2940,7 +2940,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v) sk_wmem_alloc_get(s), - nlk->cb, + nlk->cb_running, atomic_read(&s->sk_refcnt), - atomic_read(&s->sk_drops), + atomic_read_unchecked(&s->sk_drops), @@ -94888,7 +96125,7 @@ index 0c741ce..f8c8ca7 100644 } } diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c -index 698814b..7cfde4e 100644 +index 53c19a3..b0ac04a 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr, @@ -94900,10 +96137,10 @@ index 698814b..7cfde4e 100644 *uaddr_len = sizeof(struct sockaddr_ax25); } diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 75c8bbf..ee9be59 100644 +index ba2548b..1a4e98e 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1681,7 +1681,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -1699,7 +1699,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, spin_lock(&sk->sk_receive_queue.lock); po->stats.stats1.tp_packets++; @@ -94912,7 +96149,7 @@ index 75c8bbf..ee9be59 100644 __skb_queue_tail(&sk->sk_receive_queue, skb); spin_unlock(&sk->sk_receive_queue.lock); sk->sk_data_ready(sk, skb->len); -@@ -1690,7 +1690,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -1708,7 +1708,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, drop_n_acct: spin_lock(&sk->sk_receive_queue.lock); po->stats.stats1.tp_drops++; @@ -94921,26 +96158,7 @@ index 75c8bbf..ee9be59 100644 spin_unlock(&sk->sk_receive_queue.lock); drop_n_restore: -@@ -2640,6 +2640,7 @@ out: - - static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len) - { -+ struct sock_extended_err ee; - struct sock_exterr_skb *serr; - struct sk_buff *skb, *skb2; - int copied, err; -@@ -2661,8 +2662,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len) - sock_recv_timestamp(msg, sk, skb); - - serr = SKB_EXT_ERR(skb); -+ ee = serr->ee; - put_cmsg(msg, SOL_PACKET, PACKET_TX_TIMESTAMP, -- sizeof(serr->ee), &serr->ee); -+ sizeof ee, &ee); - - msg->msg_flags |= MSG_ERRQUEUE; - err = copied; -@@ -3283,7 +3285,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, +@@ -3261,7 +3261,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, case PACKET_HDRLEN: if (len > sizeof(int)) len = sizeof(int); @@ -94949,7 +96167,7 @@ index 75c8bbf..ee9be59 100644 return -EFAULT; switch (val) { case TPACKET_V1: -@@ -3326,7 +3328,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, +@@ -3304,7 +3304,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname, len = lv; if (put_user(len, optlen)) return -EFAULT; @@ -94990,7 +96208,7 @@ index e774117..900b8b7 100644 break; } diff --git a/net/phonet/socket.c b/net/phonet/socket.c -index 1afd138..0b42453 100644 +index 77e38f7..f4ef5c3 100644 --- a/net/phonet/socket.c +++ b/net/phonet/socket.c @@ -612,7 +612,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v) @@ -95442,10 +96660,10 @@ index f226709..0e735a8 100644 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len); diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c -index 547a461e..ea606e3 100644 +index e7b2d4f..bb1efd0 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c -@@ -968,7 +968,7 @@ static const struct inet6_protocol sctpv6_protocol = { +@@ -962,7 +962,7 @@ static const struct inet6_protocol sctpv6_protocol = { .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL, }; @@ -95454,7 +96672,7 @@ index 547a461e..ea606e3 100644 .sa_family = AF_INET6, .sctp_xmit = sctp_v6_xmit, .setsockopt = ipv6_setsockopt, -@@ -1000,7 +1000,7 @@ static struct sctp_af sctp_af_inet6 = { +@@ -994,7 +994,7 @@ static struct sctp_af sctp_af_inet6 = { #endif }; @@ -95463,7 +96681,7 @@ index 547a461e..ea606e3 100644 .event_msgname = sctp_inet6_event_msgname, .skb_msgname = sctp_inet6_skb_msgname, .af_supported = sctp_inet6_af_supported, -@@ -1025,7 +1025,7 @@ void sctp_v6_pf_init(void) +@@ -1019,7 +1019,7 @@ void sctp_v6_pf_init(void) void sctp_v6_pf_exit(void) { @@ -95472,25 +96690,11 @@ index 547a461e..ea606e3 100644 } /* Initialize IPv6 support and register with socket layer. */ -diff --git a/net/sctp/proc.c b/net/sctp/proc.c -index 62526c4..36a13c5 100644 ---- a/net/sctp/proc.c -+++ b/net/sctp/proc.c -@@ -343,7 +343,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) - seq_printf(seq, - "%8pK %8pK %-3d %-3d %-2d %-4d " - "%4d %8d %8d %7d %5lu %-5d %5d ", -- assoc, sk, sctp_sk(sk)->type, sk->sk_state, -+ assoc, sk, -+ sctp_sk(sk)->type, sk->sk_state, - assoc->state, hash, - assoc->assoc_id, - assoc->sndbuf_used, diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c -index 4a17494d..f7e3fa0 100644 +index 5e17092..19be1d4 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c -@@ -838,8 +838,10 @@ int sctp_register_af(struct sctp_af *af) +@@ -832,8 +832,10 @@ int sctp_register_af(struct sctp_af *af) return 0; } @@ -95502,7 +96706,7 @@ index 4a17494d..f7e3fa0 100644 return 1; } -@@ -969,7 +971,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb, +@@ -963,7 +965,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb, static struct sctp_af sctp_af_inet; @@ -95511,7 +96715,7 @@ index 4a17494d..f7e3fa0 100644 .event_msgname = sctp_inet_event_msgname, .skb_msgname = sctp_inet_skb_msgname, .af_supported = sctp_inet_af_supported, -@@ -1040,7 +1042,7 @@ static const struct net_protocol sctp_protocol = { +@@ -1034,7 +1036,7 @@ static const struct net_protocol sctp_protocol = { }; /* IPv4 address related functions. */ @@ -95520,7 +96724,7 @@ index 4a17494d..f7e3fa0 100644 .sa_family = AF_INET, .sctp_xmit = sctp_v4_xmit, .setsockopt = ip_setsockopt, -@@ -1125,7 +1127,7 @@ static void sctp_v4_pf_init(void) +@@ -1119,7 +1121,7 @@ static void sctp_v4_pf_init(void) static void sctp_v4_pf_exit(void) { @@ -95530,10 +96734,10 @@ index 4a17494d..f7e3fa0 100644 static int sctp_v4_protosw_init(void) diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c -index 9da6885..7571898 100644 +index 1a6eef3..17e898f 100644 --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c -@@ -446,7 +446,7 @@ static void sctp_generate_sack_event(unsigned long data) +@@ -440,7 +440,7 @@ static void sctp_generate_sack_event(unsigned long data) sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK); } @@ -95543,10 +96747,10 @@ index 9da6885..7571898 100644 sctp_generate_t1_cookie_event, sctp_generate_t1_init_event, diff --git a/net/sctp/socket.c b/net/sctp/socket.c -index cf6c6b0..b978b65 100644 +index 911b71b..90ade0a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c -@@ -2159,11 +2159,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval, +@@ -2153,11 +2153,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval, { struct sctp_association *asoc; struct sctp_ulpevent *event; @@ -95561,7 +96765,7 @@ index cf6c6b0..b978b65 100644 /* * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT, -@@ -4219,13 +4221,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len, +@@ -4213,13 +4215,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len, static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval, int __user *optlen) { @@ -95579,7 +96783,7 @@ index cf6c6b0..b978b65 100644 return -EFAULT; return 0; } -@@ -4243,6 +4248,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval, +@@ -4237,6 +4242,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval, */ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen) { @@ -95588,7 +96792,7 @@ index cf6c6b0..b978b65 100644 /* Applicable to UDP-style socket only */ if (sctp_style(sk, TCP)) return -EOPNOTSUPP; -@@ -4251,7 +4258,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv +@@ -4245,7 +4252,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv len = sizeof(int); if (put_user(len, optlen)) return -EFAULT; @@ -95598,7 +96802,7 @@ index cf6c6b0..b978b65 100644 return -EFAULT; return 0; } -@@ -4623,12 +4631,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len, +@@ -4617,12 +4625,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len, */ static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen) { @@ -95615,7 +96819,7 @@ index cf6c6b0..b978b65 100644 return -EFAULT; return 0; } -@@ -4669,6 +4680,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, +@@ -4663,6 +4674,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len, addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len; if (space_left < addrlen) return -ENOMEM; @@ -95625,10 +96829,10 @@ index cf6c6b0..b978b65 100644 return -EFAULT; to += addrlen; diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c -index 9a5c4c9..46e4b29 100644 +index 6b36561..4f21064 100644 --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c -@@ -307,7 +307,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, +@@ -301,7 +301,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, { struct net *net = current->nsproxy->net_ns; char tmp[8]; @@ -95637,7 +96841,7 @@ index 9a5c4c9..46e4b29 100644 int ret; int changed = 0; char *none = "none"; -@@ -350,7 +350,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, +@@ -344,7 +344,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int sctp_sysctl_net_register(struct net *net) { @@ -95647,7 +96851,7 @@ index 9a5c4c9..46e4b29 100644 table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL); diff --git a/net/socket.c b/net/socket.c -index b2d7c62..441a7ef 100644 +index e83c416..17afbfa 100644 --- a/net/socket.c +++ b/net/socket.c @@ -88,6 +88,7 @@ @@ -95676,7 +96880,7 @@ index b2d7c62..441a7ef 100644 /* * Statistics counters of the socket lists -@@ -327,7 +330,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type, +@@ -328,7 +331,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type, &sockfs_dentry_operations, SOCKFS_MAGIC); } @@ -95685,7 +96889,7 @@ index b2d7c62..441a7ef 100644 static struct file_system_type sock_fs_type = { .name = "sockfs", -@@ -1263,6 +1266,8 @@ int __sock_create(struct net *net, int family, int type, int protocol, +@@ -1255,6 +1258,8 @@ int __sock_create(struct net *net, int family, int type, int protocol, return -EAFNOSUPPORT; if (type < 0 || type >= SOCK_MAX) return -EINVAL; @@ -95694,7 +96898,7 @@ index b2d7c62..441a7ef 100644 /* Compatibility. -@@ -1283,6 +1288,20 @@ int __sock_create(struct net *net, int family, int type, int protocol, +@@ -1275,6 +1280,20 @@ int __sock_create(struct net *net, int family, int type, int protocol, if (err) return err; @@ -95715,7 +96919,7 @@ index b2d7c62..441a7ef 100644 /* * Allocate the socket and allow the family to set things up. if * the protocol is 0, the family is instructed to select an appropriate -@@ -1521,6 +1540,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) +@@ -1513,6 +1532,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) if (sock) { err = move_addr_to_kernel(umyaddr, addrlen, &address); if (err >= 0) { @@ -95730,7 +96934,7 @@ index b2d7c62..441a7ef 100644 err = security_socket_bind(sock, (struct sockaddr *)&address, addrlen); -@@ -1529,6 +1556,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) +@@ -1521,6 +1548,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen) (struct sockaddr *) &address, addrlen); } @@ -95738,7 +96942,7 @@ index b2d7c62..441a7ef 100644 fput_light(sock->file, fput_needed); } return err; -@@ -1552,10 +1580,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) +@@ -1544,10 +1572,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) if ((unsigned int)backlog > somaxconn) backlog = somaxconn; @@ -95759,7 +96963,7 @@ index b2d7c62..441a7ef 100644 fput_light(sock->file, fput_needed); } return err; -@@ -1599,6 +1637,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, +@@ -1591,6 +1629,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, newsock->type = sock->type; newsock->ops = sock->ops; @@ -95778,7 +96982,7 @@ index b2d7c62..441a7ef 100644 /* * We don't need try_module_get here, as the listening socket (sock) * has the protocol module (sock->ops->owner) held. -@@ -1644,6 +1694,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, +@@ -1636,6 +1686,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, fd_install(newfd, newfile); err = newfd; @@ -95787,7 +96991,7 @@ index b2d7c62..441a7ef 100644 out_put: fput_light(sock->file, fput_needed); out: -@@ -1676,6 +1728,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, +@@ -1668,6 +1720,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, int, addrlen) { struct socket *sock; @@ -95795,7 +96999,7 @@ index b2d7c62..441a7ef 100644 struct sockaddr_storage address; int err, fput_needed; -@@ -1686,6 +1739,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, +@@ -1678,6 +1731,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, if (err < 0) goto out_put; @@ -95813,7 +97017,7 @@ index b2d7c62..441a7ef 100644 err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -@@ -1767,6 +1831,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr, +@@ -1759,6 +1823,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr, * the protocol. */ @@ -95822,7 +97026,7 @@ index b2d7c62..441a7ef 100644 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len, unsigned int, flags, struct sockaddr __user *, addr, int, addr_len) -@@ -1833,7 +1899,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, +@@ -1825,7 +1891,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size, struct socket *sock; struct iovec iov; struct msghdr msg; @@ -95831,7 +97035,7 @@ index b2d7c62..441a7ef 100644 int err, err2; int fput_needed; -@@ -2040,7 +2106,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, +@@ -2047,7 +2113,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg, * checking falls down on this. */ if (copy_from_user(ctl_buf, @@ -95840,7 +97044,7 @@ index b2d7c62..441a7ef 100644 ctl_len)) goto out_freectl; msg_sys->msg_control = ctl_buf; -@@ -2191,7 +2257,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, +@@ -2198,7 +2264,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, int err, total_len, len; /* kernel mode address */ @@ -95849,16 +97053,7 @@ index b2d7c62..441a7ef 100644 /* user mode address pointers */ struct sockaddr __user *uaddr; -@@ -2219,7 +2285,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg, - * kernel msghdr to use the kernel address space) - */ - -- uaddr = (__force void __user *)msg_sys->msg_name; -+ uaddr = (void __force_user *)msg_sys->msg_name; - uaddr_len = COMPAT_NAMELEN(msg); - if (MSG_CMSG_COMPAT & flags) { - err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE); -@@ -2974,7 +3040,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd, +@@ -2985,7 +3051,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd, old_fs = get_fs(); set_fs(KERNEL_DS); err = dev_ioctl(net, cmd, @@ -95867,7 +97062,7 @@ index b2d7c62..441a7ef 100644 set_fs(old_fs); return err; -@@ -3083,7 +3149,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd, +@@ -3094,7 +3160,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd, old_fs = get_fs(); set_fs(KERNEL_DS); @@ -95876,8 +97071,8 @@ index b2d7c62..441a7ef 100644 set_fs(old_fs); if (cmd == SIOCGIFMAP && !err) { -@@ -3188,7 +3254,7 @@ static int routing_ioctl(struct net *net, struct socket *sock, - ret |= __get_user(rtdev, &(ur4->rt_dev)); +@@ -3199,7 +3265,7 @@ static int routing_ioctl(struct net *net, struct socket *sock, + ret |= get_user(rtdev, &(ur4->rt_dev)); if (rtdev) { ret |= copy_from_user(devname, compat_ptr(rtdev), 15); - r4.rt_dev = (char __user __force *)devname; @@ -95885,7 +97080,7 @@ index b2d7c62..441a7ef 100644 devname[15] = 0; } else r4.rt_dev = NULL; -@@ -3414,8 +3480,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname, +@@ -3425,8 +3491,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname, int __user *uoptlen; int err; @@ -95896,7 +97091,7 @@ index b2d7c62..441a7ef 100644 set_fs(KERNEL_DS); if (level == SOL_SOCKET) -@@ -3435,7 +3501,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname, +@@ -3446,7 +3512,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname, char __user *uoptval; int err; @@ -95928,10 +97123,10 @@ index 09fb638..2e6a5c5 100644 /* make a copy for the caller */ *handle = ctxh; diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c -index ecbc4e3..ad25df8 100644 +index 941d19f..c85ff07 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c -@@ -1304,7 +1304,9 @@ call_start(struct rpc_task *task) +@@ -1319,7 +1319,9 @@ call_start(struct rpc_task *task) (RPC_IS_ASYNC(task) ? "async" : "sync")); /* Increment call count */ @@ -95943,11 +97138,11 @@ index ecbc4e3..ad25df8 100644 task->tk_action = call_reserve; } diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c -index 93a7a4e..3b98b9f 100644 +index ff3cc4b..7612a9e 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word) - #ifdef RPC_DEBUG + #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS) static void rpc_task_set_debuginfo(struct rpc_task *task) { - static atomic_t rpc_pid; @@ -95973,6 +97168,28 @@ index b974571..678ed90 100644 /* Initialize storage for argp and resp */ memset(rqstp->rq_argp, 0, procp->pc_argsize); +diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c +index 621ca7b..59421dd 100644 +--- a/net/sunrpc/svcauth_unix.c ++++ b/net/sunrpc/svcauth_unix.c +@@ -414,7 +414,7 @@ struct unix_gid { + struct group_info *gi; + }; + +-static int unix_gid_hash(kuid_t uid) ++static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid) + { + return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS); + } +@@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd, + (*bpp)[-1] = '\n'; + } + +-static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid); ++static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid); + + static int unix_gid_parse(struct cache_detail *cd, + char *mesg, int mlen) diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c index c1b6270..05089c1 100644 --- a/net/sunrpc/xprtrdma/svc_rdma.c @@ -96239,7 +97456,7 @@ index d38bb45..4fd6ac6 100644 sub->evt.event = htohl(event, sub->swap); diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c -index c4ce243..2be7c59 100644 +index 01625cc..d486b64 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -784,6 +784,12 @@ static struct sock *unix_find_other(struct net *net, @@ -96288,7 +97505,7 @@ index c4ce243..2be7c59 100644 done_path_create(&path, dentry); return err; } -@@ -2325,9 +2344,13 @@ static int unix_seq_show(struct seq_file *seq, void *v) +@@ -2328,9 +2347,13 @@ static int unix_seq_show(struct seq_file *seq, void *v) seq_puts(seq, "Num RefCount Protocol Flags Type St " "Inode Path\n"); else { @@ -96303,7 +97520,7 @@ index c4ce243..2be7c59 100644 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu", s, -@@ -2354,8 +2377,10 @@ static int unix_seq_show(struct seq_file *seq, void *v) +@@ -2357,8 +2380,10 @@ static int unix_seq_show(struct seq_file *seq, void *v) } for ( ; i < len; i++) seq_putc(seq, u->addr->name->sun_path[i]); @@ -96316,18 +97533,6 @@ index c4ce243..2be7c59 100644 seq_putc(seq, '\n'); } -diff --git a/net/unix/diag.c b/net/unix/diag.c -index d591091..86fa0f3 100644 ---- a/net/unix/diag.c -+++ b/net/unix/diag.c -@@ -124,6 +124,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r - rep->udiag_family = AF_UNIX; - rep->udiag_type = sk->sk_type; - rep->udiag_state = sk->sk_state; -+ rep->pad = 0; - rep->udiag_ino = sk_ino; - sock_diag_save_cookie(sk, rep->udiag_cookie); - diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index b3d5150..ff3a837 100644 --- a/net/unix/sysctl_net_unix.c @@ -96379,52 +97584,28 @@ index c8717c1..08539f5 100644 iwp->length += essid_compat; diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c -index f77c371..b0cb010 100644 +index 76e1873..4a12664 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c -@@ -332,9 +332,10 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) +@@ -332,7 +332,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) { policy->walk.dead = 1; - atomic_inc(&policy->genid); + atomic_inc_unchecked(&policy->genid); -- del_timer(&policy->polq.hold_timer); -+ if (del_timer(&policy->polq.hold_timer)) -+ xfrm_pol_put(policy); - xfrm_queue_purge(&policy->polq.hold_queue); - - if (del_timer(&policy->timer)) -@@ -589,7 +590,8 @@ static void xfrm_policy_requeue(struct xfrm_policy *old, - - spin_lock_bh(&pq->hold_queue.lock); - skb_queue_splice_init(&pq->hold_queue, &list); -- del_timer(&pq->hold_timer); -+ if (del_timer(&pq->hold_timer)) -+ xfrm_pol_put(old); - spin_unlock_bh(&pq->hold_queue.lock); - - if (skb_queue_empty(&list)) -@@ -600,7 +602,8 @@ static void xfrm_policy_requeue(struct xfrm_policy *old, - spin_lock_bh(&pq->hold_queue.lock); - skb_queue_splice(&list, &pq->hold_queue); - pq->timeout = XFRM_QUEUE_TMO_MIN; -- mod_timer(&pq->hold_timer, jiffies); -+ if (!mod_timer(&pq->hold_timer, jiffies)) -+ xfrm_pol_hold(new); - spin_unlock_bh(&pq->hold_queue.lock); - } - -@@ -657,7 +660,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) + if (del_timer(&policy->polq.hold_timer)) + xfrm_pol_put(policy); +@@ -660,7 +660,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) hlist_add_head(&policy->bydst, chain); xfrm_pol_hold(policy); net->xfrm.policy_count[dir]++; - atomic_inc(&flow_cache_genid); + atomic_inc_unchecked(&flow_cache_genid); - rt_genid_bump(net); - if (delpol) { - xfrm_policy_requeue(delpol, policy); -@@ -1627,7 +1630,7 @@ free_dst: + + /* After previous checking, family can either be AF_INET or AF_INET6 */ + if (policy->family == AF_INET) +@@ -1636,7 +1636,7 @@ free_dst: goto out; } @@ -96433,7 +97614,7 @@ index f77c371..b0cb010 100644 xfrm_dst_alloc_copy(void **target, const void *src, int size) { if (!*target) { -@@ -1639,7 +1642,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size) +@@ -1648,7 +1648,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size) return 0; } @@ -96442,7 +97623,7 @@ index f77c371..b0cb010 100644 xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel) { #ifdef CONFIG_XFRM_SUB_POLICY -@@ -1651,7 +1654,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel) +@@ -1660,7 +1660,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel) #endif } @@ -96451,7 +97632,7 @@ index f77c371..b0cb010 100644 xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl) { #ifdef CONFIG_XFRM_SUB_POLICY -@@ -1745,7 +1748,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols, +@@ -1754,7 +1754,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols, xdst->num_pols = num_pols; memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols); @@ -96460,69 +97641,7 @@ index f77c371..b0cb010 100644 return xdst; } -@@ -1763,6 +1766,10 @@ static void xfrm_policy_queue_process(unsigned long arg) - - spin_lock(&pq->hold_queue.lock); - skb = skb_peek(&pq->hold_queue); -+ if (!skb) { -+ spin_unlock(&pq->hold_queue.lock); -+ goto out; -+ } - dst = skb_dst(skb); - sk = skb->sk; - xfrm_decode_session(skb, &fl, dst->ops->family); -@@ -1781,8 +1788,9 @@ static void xfrm_policy_queue_process(unsigned long arg) - goto purge_queue; - - pq->timeout = pq->timeout << 1; -- mod_timer(&pq->hold_timer, jiffies + pq->timeout); -- return; -+ if (!mod_timer(&pq->hold_timer, jiffies + pq->timeout)) -+ xfrm_pol_hold(pol); -+ goto out; - } - - dst_release(dst); -@@ -1813,11 +1821,14 @@ static void xfrm_policy_queue_process(unsigned long arg) - err = dst_output(skb); - } - -+out: -+ xfrm_pol_put(pol); - return; - - purge_queue: - pq->timeout = 0; - xfrm_queue_purge(&pq->hold_queue); -+ xfrm_pol_put(pol); - } - - static int xdst_queue_output(struct sk_buff *skb) -@@ -1825,7 +1836,8 @@ static int xdst_queue_output(struct sk_buff *skb) - unsigned long sched_next; - struct dst_entry *dst = skb_dst(skb); - struct xfrm_dst *xdst = (struct xfrm_dst *) dst; -- struct xfrm_policy_queue *pq = &xdst->pols[0]->polq; -+ struct xfrm_policy *pol = xdst->pols[0]; -+ struct xfrm_policy_queue *pq = &pol->polq; - - if (pq->hold_queue.qlen > XFRM_MAX_QUEUE_LEN) { - kfree_skb(skb); -@@ -1844,10 +1856,12 @@ static int xdst_queue_output(struct sk_buff *skb) - if (del_timer(&pq->hold_timer)) { - if (time_before(pq->hold_timer.expires, sched_next)) - sched_next = pq->hold_timer.expires; -+ xfrm_pol_put(pol); - } - - __skb_queue_tail(&pq->hold_queue, skb); -- mod_timer(&pq->hold_timer, sched_next); -+ if (!mod_timer(&pq->hold_timer, sched_next)) -+ xfrm_pol_hold(pol); - - spin_unlock_bh(&pq->hold_queue.lock); - -@@ -2557,11 +2571,12 @@ void xfrm_garbage_collect(struct net *net) +@@ -2575,11 +2575,12 @@ void xfrm_garbage_collect(struct net *net) } EXPORT_SYMBOL(xfrm_garbage_collect); @@ -96536,7 +97655,7 @@ index f77c371..b0cb010 100644 static void xfrm_init_pmtu(struct dst_entry *dst) { -@@ -2611,7 +2626,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first) +@@ -2629,7 +2630,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first) if (xdst->xfrm_genid != dst->xfrm->genid) return 0; if (xdst->num_pols > 0 && @@ -96545,7 +97664,7 @@ index f77c371..b0cb010 100644 return 0; mtu = dst_mtu(dst->child); -@@ -2699,8 +2714,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) +@@ -2717,8 +2718,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo) dst_ops->link_failure = xfrm_link_failure; if (likely(dst_ops->neigh_lookup == NULL)) dst_ops->neigh_lookup = xfrm_neigh_lookup; @@ -96554,7 +97673,7 @@ index f77c371..b0cb010 100644 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo); } spin_unlock(&xfrm_policy_afinfo_lock); -@@ -2754,7 +2767,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo) +@@ -2772,7 +2771,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo) dst_ops->check = NULL; dst_ops->negative_advice = NULL; dst_ops->link_failure = NULL; @@ -96562,7 +97681,7 @@ index f77c371..b0cb010 100644 } return err; } -@@ -3137,7 +3149,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, +@@ -3155,7 +3153,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol, sizeof(pol->xfrm_vec[i].saddr)); pol->xfrm_vec[i].encap_family = mp->new_family; /* flush bundles */ @@ -96571,98 +97690,8 @@ index f77c371..b0cb010 100644 } } -diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c -index 8dafe6d3..dab57da 100644 ---- a/net/xfrm/xfrm_replay.c -+++ b/net/xfrm/xfrm_replay.c -@@ -61,9 +61,9 @@ static void xfrm_replay_notify(struct xfrm_state *x, int event) - - switch (event) { - case XFRM_REPLAY_UPDATE: -- if (x->replay_maxdiff && -- (x->replay.seq - x->preplay.seq < x->replay_maxdiff) && -- (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff)) { -+ if (!x->replay_maxdiff || -+ ((x->replay.seq - x->preplay.seq < x->replay_maxdiff) && -+ (x->replay.oseq - x->preplay.oseq < x->replay_maxdiff))) { - if (x->xflags & XFRM_TIME_DEFER) - event = XFRM_REPLAY_TIMEOUT; - else -@@ -129,8 +129,7 @@ static int xfrm_replay_check(struct xfrm_state *x, - return 0; - - diff = x->replay.seq - seq; -- if (diff >= min_t(unsigned int, x->props.replay_window, -- sizeof(x->replay.bitmap) * 8)) { -+ if (diff >= x->props.replay_window) { - x->stats.replay_window++; - goto err; - } -@@ -302,9 +301,10 @@ static void xfrm_replay_notify_bmp(struct xfrm_state *x, int event) - - switch (event) { - case XFRM_REPLAY_UPDATE: -- if (x->replay_maxdiff && -- (replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) && -- (replay_esn->oseq - preplay_esn->oseq < x->replay_maxdiff)) { -+ if (!x->replay_maxdiff || -+ ((replay_esn->seq - preplay_esn->seq < x->replay_maxdiff) && -+ (replay_esn->oseq - preplay_esn->oseq -+ < x->replay_maxdiff))) { - if (x->xflags & XFRM_TIME_DEFER) - event = XFRM_REPLAY_TIMEOUT; - else -@@ -353,28 +353,30 @@ static void xfrm_replay_notify_esn(struct xfrm_state *x, int event) - - switch (event) { - case XFRM_REPLAY_UPDATE: -- if (!x->replay_maxdiff) -- break; -- -- if (replay_esn->seq_hi == preplay_esn->seq_hi) -- seq_diff = replay_esn->seq - preplay_esn->seq; -- else -- seq_diff = ~preplay_esn->seq + replay_esn->seq + 1; -- -- if (replay_esn->oseq_hi == preplay_esn->oseq_hi) -- oseq_diff = replay_esn->oseq - preplay_esn->oseq; -- else -- oseq_diff = ~preplay_esn->oseq + replay_esn->oseq + 1; -- -- if (seq_diff < x->replay_maxdiff && -- oseq_diff < x->replay_maxdiff) { -+ if (x->replay_maxdiff) { -+ if (replay_esn->seq_hi == preplay_esn->seq_hi) -+ seq_diff = replay_esn->seq - preplay_esn->seq; -+ else -+ seq_diff = ~preplay_esn->seq + replay_esn->seq -+ + 1; - -- if (x->xflags & XFRM_TIME_DEFER) -- event = XFRM_REPLAY_TIMEOUT; -+ if (replay_esn->oseq_hi == preplay_esn->oseq_hi) -+ oseq_diff = replay_esn->oseq -+ - preplay_esn->oseq; - else -- return; -+ oseq_diff = ~preplay_esn->oseq -+ + replay_esn->oseq + 1; -+ -+ if (seq_diff >= x->replay_maxdiff || -+ oseq_diff >= x->replay_maxdiff) -+ break; - } - -+ if (x->xflags & XFRM_TIME_DEFER) -+ event = XFRM_REPLAY_TIMEOUT; -+ else -+ return; -+ - break; - - case XFRM_REPLAY_TIMEOUT: diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c -index 54c0acd..56814bd 100644 +index b9c3f9e..4767526 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -174,12 +174,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family) @@ -96756,7 +97785,7 @@ index 54c0acd..56814bd 100644 module_put(mode->afinfo->owner); err = 0; } -@@ -1483,10 +1490,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq); +@@ -1486,10 +1493,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq); u32 xfrm_get_acqseq(void) { u32 res; @@ -96782,29 +97811,6 @@ index 05a6e3d..6716ec9 100644 __xfrm_sysctl_init(net); -diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c -index 3f565e4..f964d4c 100644 ---- a/net/xfrm/xfrm_user.c -+++ b/net/xfrm/xfrm_user.c -@@ -446,7 +446,8 @@ static void copy_from_user_state(struct xfrm_state *x, struct xfrm_usersa_info * - memcpy(&x->sel, &p->sel, sizeof(x->sel)); - memcpy(&x->lft, &p->lft, sizeof(x->lft)); - x->props.mode = p->mode; -- x->props.replay_window = p->replay_window; -+ x->props.replay_window = min_t(unsigned int, p->replay_window, -+ sizeof(x->replay.bitmap) * 8); - x->props.reqid = p->reqid; - x->props.family = p->family; - memcpy(&x->props.saddr, &p->saddr, sizeof(x->props.saddr)); -@@ -1856,7 +1857,7 @@ static int xfrm_new_ae(struct sk_buff *skb, struct nlmsghdr *nlh, - if (x->km.state != XFRM_STATE_VALID) - goto out; - -- err = xfrm_replay_verify_len(x->replay_esn, rp); -+ err = xfrm_replay_verify_len(x->replay_esn, re); - if (err) - goto out; - diff --git a/scripts/Makefile.build b/scripts/Makefile.build index d5d859c..781cbcb 100644 --- a/scripts/Makefile.build @@ -96986,10 +97992,21 @@ index 5de5660..d3deb89 100644 -e 's@^#include @@' \ -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh -index 0149949..d482a0d 100644 +index 32b10f5..64eeb30 100644 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh -@@ -158,7 +158,7 @@ else +@@ -82,7 +82,9 @@ kallsyms() + kallsymopt="${kallsymopt} --all-symbols" + fi + +- kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET" ++ if [ -z "${CONFIG_X86_32}" ] || [ -z "${CONFIG_PAX_KERNEXEC}" ]; then ++ kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET" ++ fi + + local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ + ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" +@@ -160,7 +162,7 @@ else fi; # final build of init/ @@ -97066,10 +98083,10 @@ index 2370863..212fbca 100644 sprintf(alias, "dmi*"); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 6216434..050cf89 100644 +index 8247979..815ec76 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -930,6 +930,7 @@ enum mismatch { +@@ -931,6 +931,7 @@ enum mismatch { ANY_INIT_TO_ANY_EXIT, ANY_EXIT_TO_ANY_INIT, EXPORT_TO_INIT_EXIT, @@ -97077,7 +98094,7 @@ index 6216434..050cf89 100644 }; struct sectioncheck { -@@ -1016,6 +1017,12 @@ const struct sectioncheck sectioncheck[] = { +@@ -1017,6 +1018,12 @@ const struct sectioncheck sectioncheck[] = { .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL }, .mismatch = EXPORT_TO_INIT_EXIT, .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL }, @@ -97090,7 +98107,7 @@ index 6216434..050cf89 100644 } }; -@@ -1136,10 +1143,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr, +@@ -1137,10 +1144,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr, continue; if (ELF_ST_TYPE(sym->st_info) == STT_SECTION) continue; @@ -97103,7 +98120,7 @@ index 6216434..050cf89 100644 if (d < 0) d = addr - sym->st_value; if (d < distance) { -@@ -1417,6 +1424,14 @@ static void report_sec_mismatch(const char *modname, +@@ -1418,6 +1425,14 @@ static void report_sec_mismatch(const char *modname, tosym, prl_to, prl_to, tosym); free(prl_to); break; @@ -97118,7 +98135,7 @@ index 6216434..050cf89 100644 } fprintf(stderr, "\n"); } -@@ -1651,7 +1666,7 @@ static void section_rel(const char *modname, struct elf_info *elf, +@@ -1652,7 +1667,7 @@ static void section_rel(const char *modname, struct elf_info *elf, static void check_sec_ref(struct module *mod, const char *modname, struct elf_info *elf) { @@ -97127,7 +98144,7 @@ index 6216434..050cf89 100644 Elf_Shdr *sechdrs = elf->sechdrs; /* Walk through all sections */ -@@ -1770,7 +1785,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf, +@@ -1771,7 +1786,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf, va_end(ap); } @@ -97136,7 +98153,7 @@ index 6216434..050cf89 100644 { if (buf->size - buf->pos < len) { buf->size += len + SZ; -@@ -1989,7 +2004,7 @@ static void write_if_changed(struct buffer *b, const char *fname) +@@ -1990,7 +2005,7 @@ static void write_if_changed(struct buffer *b, const char *fname) if (fstat(fileno(file), &st) < 0) goto close_write; @@ -97197,13 +98214,13 @@ index 0865b3e..7235dd4 100644 __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) } __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) } diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index acb8650..b8c5f02 100644 +index 90e521f..e9eaf8f 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb -@@ -246,6 +246,7 @@ fi +@@ -281,6 +281,7 @@ fi (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles") - (cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") + (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles") destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" @@ -97256,10 +98273,10 @@ index f5eb43d..1814de8 100644 shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff)); shstrtab_sec = shdr + r2(&ehdr->e_shstrndx); diff --git a/security/Kconfig b/security/Kconfig -index e9c6ac7..c5d45c8 100644 +index e9c6ac7..031a726 100644 --- a/security/Kconfig +++ b/security/Kconfig -@@ -4,6 +4,959 @@ +@@ -4,6 +4,960 @@ menu "Security options" @@ -97294,6 +98311,7 @@ index e9c6ac7..c5d45c8 100644 + select PROC_FS + select STOP_MACHINE + select TTY ++ select DEBUG_LIST + help + If you say Y here, you will be able to configure many features + that will enhance the security of your system. It is highly @@ -98185,14 +99203,14 @@ index e9c6ac7..c5d45c8 100644 + headers explicitly in addition to the normal gcc package. + +config PAX_LATENT_ENTROPY -+ bool "Generate some entropy during boot" ++ bool "Generate some entropy during boot and runtime" + default y if GRKERNSEC_CONFIG_AUTO + help -+ By saying Y here the kernel will instrument early boot code to ++ By saying Y here the kernel will instrument some kernel code to + extract some entropy from both original and artificially created + program state. This will help especially embedded systems where + there is little 'natural' source of entropy normally. The cost -+ is some slowdown of the boot process. ++ is some slowdown of the boot process and fork and irq processing. + + When pax_extra_latent_entropy is passed on the kernel command line, + entropy will be extracted from up to the first 4GB of RAM while the @@ -98219,7 +99237,7 @@ index e9c6ac7..c5d45c8 100644 source security/keys/Kconfig config SECURITY_DMESG_RESTRICT -@@ -103,7 +1056,7 @@ config INTEL_TXT +@@ -103,7 +1057,7 @@ config INTEL_TXT config LSM_MMAP_MIN_ADDR int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX @@ -98228,277 +99246,11 @@ index e9c6ac7..c5d45c8 100644 default 65536 help This is the portion of low virtual memory which should be protected -diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig -index 9b9013b..51ebf96 100644 ---- a/security/apparmor/Kconfig -+++ b/security/apparmor/Kconfig -@@ -29,3 +29,12 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE - boot. - - If you are unsure how to answer this question, answer 1. -+ -+config SECURITY_APPARMOR_COMPAT_24 -+ bool "Enable AppArmor 2.4 compatability" -+ depends on SECURITY_APPARMOR -+ default y -+ help -+ This option enables compatability with AppArmor 2.4. It is -+ recommended if compatability with older versions of AppArmor -+ is desired. -diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c -index 16c15ec..42b7c9f 100644 ---- a/security/apparmor/apparmorfs.c -+++ b/security/apparmor/apparmorfs.c -@@ -182,6 +182,234 @@ const struct file_operations aa_fs_seq_file_ops = { - .release = single_release, - }; - -+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24 -+/** -+ * __next_namespace - find the next namespace to list -+ * @root: root namespace to stop search at (NOT NULL) -+ * @ns: current ns position (NOT NULL) -+ * -+ * Find the next namespace from @ns under @root and handle all locking needed -+ * while switching current namespace. -+ * -+ * Returns: next namespace or NULL if at last namespace under @root -+ * NOTE: will not unlock root->lock -+ */ -+static struct aa_namespace *__next_namespace(struct aa_namespace *root, -+ struct aa_namespace *ns) -+{ -+ struct aa_namespace *parent; -+ -+ /* is next namespace a child */ -+ if (!list_empty(&ns->sub_ns)) { -+ struct aa_namespace *next; -+ next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list); -+ read_lock(&next->lock); -+ return next; -+ } -+ -+ /* check if the next ns is a sibling, parent, gp, .. */ -+ parent = ns->parent; -+ while (parent) { -+ read_unlock(&ns->lock); -+ list_for_each_entry_continue(ns, &parent->sub_ns, base.list) { -+ read_lock(&ns->lock); -+ return ns; -+ } -+ if (parent == root) -+ return NULL; -+ ns = parent; -+ parent = parent->parent; -+ } -+ -+ return NULL; -+} -+ -+/** -+ * __first_profile - find the first profile in a namespace -+ * @root: namespace that is root of profiles being displayed (NOT NULL) -+ * @ns: namespace to start in (NOT NULL) -+ * -+ * Returns: unrefcounted profile or NULL if no profile -+ */ -+static struct aa_profile *__first_profile(struct aa_namespace *root, -+ struct aa_namespace *ns) -+{ -+ for ( ; ns; ns = __next_namespace(root, ns)) { -+ if (!list_empty(&ns->base.profiles)) -+ return list_first_entry(&ns->base.profiles, -+ struct aa_profile, base.list); -+ } -+ return NULL; -+} -+ -+/** -+ * __next_profile - step to the next profile in a profile tree -+ * @profile: current profile in tree (NOT NULL) -+ * -+ * Perform a depth first taversal on the profile tree in a namespace -+ * -+ * Returns: next profile or NULL if done -+ * Requires: profile->ns.lock to be held -+ */ -+static struct aa_profile *__next_profile(struct aa_profile *p) -+{ -+ struct aa_profile *parent; -+ struct aa_namespace *ns = p->ns; -+ -+ /* is next profile a child */ -+ if (!list_empty(&p->base.profiles)) -+ return list_first_entry(&p->base.profiles, typeof(*p), -+ base.list); -+ -+ /* is next profile a sibling, parent sibling, gp, subling, .. */ -+ parent = p->parent; -+ while (parent) { -+ list_for_each_entry_continue(p, &parent->base.profiles, -+ base.list) -+ return p; -+ p = parent; -+ parent = parent->parent; -+ } -+ -+ /* is next another profile in the namespace */ -+ list_for_each_entry_continue(p, &ns->base.profiles, base.list) -+ return p; -+ -+ return NULL; -+} -+ -+/** -+ * next_profile - step to the next profile in where ever it may be -+ * @root: root namespace (NOT NULL) -+ * @profile: current profile (NOT NULL) -+ * -+ * Returns: next profile or NULL if there isn't one -+ */ -+static struct aa_profile *next_profile(struct aa_namespace *root, -+ struct aa_profile *profile) -+{ -+ struct aa_profile *next = __next_profile(profile); -+ if (next) -+ return next; -+ -+ /* finished all profiles in namespace move to next namespace */ -+ return __first_profile(root, __next_namespace(root, profile->ns)); -+} -+ -+/** -+ * p_start - start a depth first traversal of profile tree -+ * @f: seq_file to fill -+ * @pos: current position -+ * -+ * Returns: first profile under current namespace or NULL if none found -+ * -+ * acquires first ns->lock -+ */ -+static void *p_start(struct seq_file *f, loff_t *pos) -+ __acquires(root->lock) -+{ -+ struct aa_profile *profile = NULL; -+ struct aa_namespace *root = aa_current_profile()->ns; -+ loff_t l = *pos; -+ f->private = aa_get_namespace(root); -+ -+ -+ /* find the first profile */ -+ read_lock(&root->lock); -+ profile = __first_profile(root, root); -+ -+ /* skip to position */ -+ for (; profile && l > 0; l--) -+ profile = next_profile(root, profile); -+ -+ return profile; -+} -+ -+/** -+ * p_next - read the next profile entry -+ * @f: seq_file to fill -+ * @p: profile previously returned -+ * @pos: current position -+ * -+ * Returns: next profile after @p or NULL if none -+ * -+ * may acquire/release locks in namespace tree as necessary -+ */ -+static void *p_next(struct seq_file *f, void *p, loff_t *pos) -+{ -+ struct aa_profile *profile = p; -+ struct aa_namespace *root = f->private; -+ (*pos)++; -+ -+ return next_profile(root, profile); -+} -+ -+/** -+ * p_stop - stop depth first traversal -+ * @f: seq_file we are filling -+ * @p: the last profile writen -+ * -+ * Release all locking done by p_start/p_next on namespace tree -+ */ -+static void p_stop(struct seq_file *f, void *p) -+ __releases(root->lock) -+{ -+ struct aa_profile *profile = p; -+ struct aa_namespace *root = f->private, *ns; -+ -+ if (profile) { -+ for (ns = profile->ns; ns && ns != root; ns = ns->parent) -+ read_unlock(&ns->lock); -+ } -+ read_unlock(&root->lock); -+ aa_put_namespace(root); -+} -+ -+/** -+ * seq_show_profile - show a profile entry -+ * @f: seq_file to file -+ * @p: current position (profile) (NOT NULL) -+ * -+ * Returns: error on failure -+ */ -+static int seq_show_profile(struct seq_file *f, void *p) -+{ -+ struct aa_profile *profile = (struct aa_profile *)p; -+ struct aa_namespace *root = f->private; -+ -+ if (profile->ns != root) -+ seq_printf(f, ":%s://", aa_ns_name(root, profile->ns)); -+ seq_printf(f, "%s (%s)\n", profile->base.hname, -+ COMPLAIN_MODE(profile) ? "complain" : "enforce"); -+ -+ return 0; -+} -+ -+static const struct seq_operations aa_fs_profiles_op = { -+ .start = p_start, -+ .next = p_next, -+ .stop = p_stop, -+ .show = seq_show_profile, -+}; -+ -+static int profiles_open(struct inode *inode, struct file *file) -+{ -+ return seq_open(file, &aa_fs_profiles_op); -+} -+ -+static int profiles_release(struct inode *inode, struct file *file) -+{ -+ return seq_release(inode, file); -+} -+ -+const struct file_operations aa_fs_profiles_fops = { -+ .open = profiles_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = profiles_release, -+}; -+#endif /* CONFIG_SECURITY_APPARMOR_COMPAT_24 */ -+ - /** Base file system setup **/ - - static struct aa_fs_entry aa_fs_entry_file[] = { -@@ -210,6 +438,9 @@ static struct aa_fs_entry aa_fs_entry_apparmor[] = { - AA_FS_FILE_FOPS(".load", 0640, &aa_fs_profile_load), - AA_FS_FILE_FOPS(".replace", 0640, &aa_fs_profile_replace), - AA_FS_FILE_FOPS(".remove", 0640, &aa_fs_profile_remove), -+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24 -+ AA_FS_FILE_FOPS("profiles", 0640, &aa_fs_profiles_fops), -+#endif - AA_FS_DIR("features", aa_fs_entry_features), - { } - }; diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c -index 2e2a0dd..a0cbc44 100644 +index fb99e18..b3e0bbb 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c -@@ -613,7 +613,7 @@ static int apparmor_task_setrlimit(struct task_struct *task, +@@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task, return error; } @@ -98508,7 +99260,7 @@ index 2e2a0dd..a0cbc44 100644 .ptrace_access_check = apparmor_ptrace_access_check, diff --git a/security/commoncap.c b/security/commoncap.c -index c44b6fe..932df30 100644 +index b9d613e..f68305c 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -424,6 +424,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data @@ -98782,7 +99534,7 @@ index f728728..6457a0c 100644 /* diff --git a/security/security.c b/security/security.c -index 94b35ae..f4e7751 100644 +index 4dc31f4..eabcf41 100644 --- a/security/security.c +++ b/security/security.c @@ -33,8 +33,8 @@ @@ -98809,7 +99561,7 @@ index 94b35ae..f4e7751 100644 static int __init choose_lsm(char *str) { diff --git a/security/selinux/avc.c b/security/selinux/avc.c -index dad36a6..7e5ffbf 100644 +index fc3e662..7844c60 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -59,7 +59,7 @@ struct avc_node { @@ -98840,19 +99592,10 @@ index dad36a6..7e5ffbf 100644 lock = &avc_cache.slots_lock[hvalue]; diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index c956390..1899f06 100644 +index 5b52310..da3bf8e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c -@@ -97,8 +97,6 @@ - - #define NUM_SEL_MNT_OPTS 5 - --extern struct security_operations *security_ops; -- - /* SECMARK reference count */ - static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0); - -@@ -5609,7 +5607,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) +@@ -5603,7 +5603,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer) #endif @@ -98861,7 +99604,7 @@ index c956390..1899f06 100644 .name = "selinux", .ptrace_access_check = selinux_ptrace_access_check, -@@ -5961,6 +5959,9 @@ static void selinux_nf_ip_exit(void) +@@ -5955,6 +5955,9 @@ static void selinux_nf_ip_exit(void) #ifdef CONFIG_SECURITY_SELINUX_DISABLE static int selinux_disabled; @@ -98871,7 +99614,7 @@ index c956390..1899f06 100644 int selinux_disable(void) { if (ss_initialized) { -@@ -5978,7 +5979,9 @@ int selinux_disable(void) +@@ -5972,7 +5975,9 @@ int selinux_disable(void) selinux_disabled = 1; selinux_enabled = 0; @@ -98883,23 +99626,23 @@ index c956390..1899f06 100644 /* Try to destroy the avc node cache */ avc_disable(); diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h -index 65f67cb..3f141ef 100644 +index 6713f04..c57ecef 100644 --- a/security/selinux/include/xfrm.h +++ b/security/selinux/include/xfrm.h -@@ -50,7 +50,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall); - - static inline void selinux_xfrm_notify_policyload(void) +@@ -52,7 +52,7 @@ static inline void selinux_xfrm_notify_policyload(void) { + struct net *net; + - atomic_inc(&flow_cache_genid); + atomic_inc_unchecked(&flow_cache_genid); - rt_genid_bump(&init_net); - } - #else + rtnl_lock(); + for_each_net(net) + rt_genid_bump_all(net); diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c -index eefbd10..9f10ddb 100644 +index 8825375..97a623b 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c -@@ -3711,7 +3711,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen) +@@ -3726,7 +3726,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen) return 0; } @@ -99459,10 +100202,10 @@ index 7d8803a..559f8d0 100644 list_add(&s->list, &cs4297a_devs); diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c -index 8a005f0..4fe3059 100644 +index e938a68..2a728ad 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c -@@ -918,14 +918,10 @@ find_codec_preset(struct hda_codec *codec) +@@ -976,14 +976,10 @@ find_codec_preset(struct hda_codec *codec) mutex_unlock(&preset_mutex); if (mod_requested < HDA_MODREQ_MAX_COUNT) { @@ -99537,10 +100280,10 @@ index d591c15..8cb8f94 100644 chip->pci = pci; chip->irq = -1; diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c -index 2f2d837..3e3f1f6 100644 +index 6b81d0c..031c056 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c -@@ -656,7 +656,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) +@@ -864,7 +864,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) { struct fsl_ssi_private *ssi_private; int ret = 0; @@ -99549,6 +100292,23 @@ index 2f2d837..3e3f1f6 100644 struct device_node *np = pdev->dev.of_node; const char *p, *sprop; const uint32_t *iprop; +diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c +index 1a38be0..66809d1 100644 +--- a/sound/soc/soc-core.c ++++ b/sound/soc/soc-core.c +@@ -2248,8 +2248,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops, + if (ret) + return ret; + +- ops->warm_reset = snd_soc_ac97_warm_reset; +- ops->reset = snd_soc_ac97_reset; ++ pax_open_kernel(); ++ *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset; ++ *(void **)&ops->reset = snd_soc_ac97_reset; ++ pax_close_kernel(); + + snd_ac97_rst_cfg = cfg; + return 0; diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore new file mode 100644 index 0000000..50f2f2f @@ -99944,10 +100704,10 @@ index 0000000..414fe5e +} diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c new file mode 100644 -index 0000000..c17312d +index 0000000..ba59e50 --- /dev/null +++ b/tools/gcc/constify_plugin.c -@@ -0,0 +1,560 @@ +@@ -0,0 +1,558 @@ +/* + * Copyright 2011 by Emese Revfy + * Copyright 2011-2013 by PaX Team @@ -99994,7 +100754,7 @@ index 0000000..c17312d +int plugin_is_GPL_compatible; + +static struct plugin_info const_plugin_info = { -+ .version = "201305231310", ++ .version = "201312032345", + .help = "no-constify\tturn off constification\n", +}; + @@ -100159,17 +100919,17 @@ index 0000000..c17312d + + *no_add_attrs = true; + if (TREE_CODE(*node) == FUNCTION_DECL) { -+ error("%qE attribute does not apply to functions", name); ++ error("%qE attribute does not apply to functions (%qF)", name, *node); + return NULL_TREE; + } + + if (TREE_CODE(*node) == PARM_DECL) { -+ error("%qE attribute does not apply to function parameters", name); ++ error("%qE attribute does not apply to function parameters (%qD)", name, *node); + return NULL_TREE; + } + + if (TREE_CODE(*node) == VAR_DECL) { -+ error("%qE attribute does not apply to variables", name); ++ error("%qE attribute does not apply to variables (%qD)", name, *node); + return NULL_TREE; + } + @@ -100182,18 +100942,18 @@ index 0000000..c17312d + } + + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) { -+ error("%qE attribute applies to struct and union types only", name); ++ error("%qE attribute used on %qT applies to struct and union types only", name, type); + return NULL_TREE; + } + + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) { -+ error("%qE attribute is already applied to the type", name); ++ error("%qE attribute is already applied to the type %qT", name, type); + return NULL_TREE; + } + + if (TYPE_P(*node)) { + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) -+ error("%qE attribute is incompatible with 'do_const'", name); ++ error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type); + return NULL_TREE; + } + @@ -100204,7 +100964,7 @@ index 0000000..c17312d + return NULL_TREE; + } + -+ error("%qE attribute used on type that is not constified", name); ++ error("%qE attribute used on type %qT that is not constified", name, type); + return NULL_TREE; +} + @@ -100220,22 +100980,22 @@ index 0000000..c17312d +{ + *no_add_attrs = true; + if (!TYPE_P(*node)) { -+ error("%qE attribute applies to types only", name); ++ error("%qE attribute applies to types only (%qD)", name, *node); + return NULL_TREE; + } + + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) { -+ error("%qE attribute applies to struct and union types only", name); ++ error("%qE attribute used on %qT applies to struct and union types only", name, *node); + return NULL_TREE; + } + + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) { -+ error("%qE attribute is already applied to the type", name); ++ error("%qE attribute used on %qT is already applied to the type", name, *node); + return NULL_TREE; + } + + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) { -+ error("%qE attribute is incompatible with 'no_const'", name); ++ error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node); + return NULL_TREE; + } + @@ -100293,30 +101053,29 @@ index 0000000..c17312d + + constifiable(type, &cinfo); + -+ if (TYPE_READONLY(type) && C_TYPE_FIELDS_READONLY(type)) { -+ if (!lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) -+ return; -+ if (cinfo.has_writable_field) -+ return; -+ error("'do_const' attribute used on type that is%sconstified", cinfo.has_fptr_field ? " " : " not "); -+ return; -+ } -+ + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) { + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) { + deconstify_type(type); + TYPE_CONSTIFY_VISITED(type) = 1; + } else -+ error("'no_const' attribute used on type that is not constified"); ++ error("'no_const' attribute used on type %qT that is not constified", type); + return; + } + + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) { ++ if (!cinfo.has_writable_field) { ++ error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not "); ++ return; ++ } + constify_type(type); + return; + } + + if (cinfo.has_fptr_field && !cinfo.has_writable_field) { ++ if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) { ++ error("'do_const' attribute used on type %qT that is constified", type); ++ return; ++ } + constify_type(type); + return; + } @@ -100404,7 +101163,6 @@ index 0000000..c17312d + return check_local_variables(); +} + -+ unsigned int ret = 0; +static struct gimple_opt_pass pass_local_variable = { + { + .type = GIMPLE_PASS, @@ -101263,10 +102021,10 @@ index 0000000..698da67 +} diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c new file mode 100644 -index 0000000..cd6c242 +index 0000000..679b9ef --- /dev/null +++ b/tools/gcc/latent_entropy_plugin.c -@@ -0,0 +1,321 @@ +@@ -0,0 +1,335 @@ +/* + * Copyright 2012-2013 by the PaX Team + * Licensed under the GPL v2 @@ -101346,12 +102104,34 @@ index 0000000..cd6c242 + } +}; + ++static unsigned HOST_WIDE_INT seed; ++static unsigned HOST_WIDE_INT get_random_const(void) ++{ ++ seed = (seed >> 1U) ^ (-(seed & 1ULL) & 0xD800000000000000ULL); ++ return seed; ++} ++ +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs) +{ -+ if (TREE_CODE(*node) != FUNCTION_DECL) { ++ switch (TREE_CODE(*node)) { ++ default: + *no_add_attrs = true; -+ error("%qE attribute only applies to functions", name); ++ error("%qE attribute only applies to functions and variables", name); ++ break; ++ ++ case VAR_DECL: ++ if (DECL_INITIAL(*node)) { ++ *no_add_attrs = true; ++ error("variable %qD with %qE attribute must not be initialized", *node, name); ++ break; ++ } ++ DECL_INITIAL(*node) = build_int_cstu(long_long_unsigned_type_node, get_random_const()); ++ break; ++ ++ case FUNCTION_DECL: ++ break; + } ++ + return NULL_TREE; +} + @@ -101381,13 +102161,6 @@ index 0000000..cd6c242 + return latent_entropy_attr != NULL_TREE; +} + -+static unsigned HOST_WIDE_INT seed; -+static unsigned HOST_WIDE_INT get_random_const(void) -+{ -+ seed = (seed >> 1U) ^ (-(seed & 1ULL) & 0xD800000000000000ULL); -+ return seed; -+} -+ +static enum tree_code get_op(tree *rhs) +{ + static enum tree_code op; @@ -101559,7 +102332,6 @@ index 0000000..cd6c242 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1; + DECL_EXTERNAL(latent_entropy_decl) = 1; + DECL_ARTIFICIAL(latent_entropy_decl) = 1; -+ DECL_INITIAL(latent_entropy_decl) = build_int_cstu(long_long_unsigned_type_node, get_random_const()); + lang_hooks.decls.pushdecl(latent_entropy_decl); +// DECL_ASSEMBLER_NAME(latent_entropy_decl); +// varpool_finalize_decl(latent_entropy_decl); @@ -101590,11 +102362,12 @@ index 0000000..cd6c242 +} diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data new file mode 100644 -index 0000000..b04803b +index 0000000..3a5b4b5 --- /dev/null +++ b/tools/gcc/size_overflow_hash.data -@@ -0,0 +1,6350 @@ +@@ -0,0 +1,7687 @@ +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL ++ocfs2_get_refcount_tree_3 ocfs2_get_refcount_tree 0 3 NULL +batadv_orig_node_del_if_4 batadv_orig_node_del_if 2 4 NULL +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL @@ -101607,112 +102380,134 @@ index 0000000..b04803b +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL +load_msg_95 load_msg 2 95 NULL +device_flush_iotlb_115 device_flush_iotlb 2-3 115 NULL ++ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL nohasharray ++write_all_supers_117 write_all_supers 0 117 &ipath_verbs_send_117 +init_q_132 init_q 4 132 NULL ++ocfs2_local_alloc_slide_window_134 ocfs2_local_alloc_slide_window 0 134 NULL +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL -+tracing_trace_options_write_153 tracing_trace_options_write 3 153 NULL ++ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL ++ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray ++tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153 +nvme_create_queue_170 nvme_create_queue 3 170 NULL +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL -+virtblk_add_req_197 virtblk_add_req 2-3 197 NULL -+proc_scsi_write_proc_267 proc_scsi_write_proc 3 267 NULL ++device_add_bin_attributes_205 device_add_bin_attributes 0 205 NULL +br_port_info_size_268 br_port_info_size 0 268 NULL +generic_file_direct_write_291 generic_file_direct_write 0 291 NULL +read_file_war_stats_292 read_file_war_stats 3 292 NULL +SYSC_connect_304 SYSC_connect 3 304 NULL +syslog_print_307 syslog_print 2 307 NULL -+platform_device_add_data_310 platform_device_add_data 3 310 NULL +dn_setsockopt_314 dn_setsockopt 5 314 NULL -+next_node_allowed_318 next_node_allowed 1 318 NULL -+compat_sys_ioctl_333 compat_sys_ioctl 3 333 NULL -+btmrvl_txdnldready_read_413 btmrvl_txdnldready_read 3 413 NULL ++next_node_allowed_318 next_node_allowed 1-0 318 NULL ++mlx5_core_access_reg_361 mlx5_core_access_reg 5-3 361 NULL ++xfs_get_blocks_364 xfs_get_blocks 2 364 NULL ++get_more_blocks_367 get_more_blocks 0 367 NULL ++sysfs_create_dir_398 sysfs_create_dir 0 398 NULL ++hw_device_state_409 hw_device_state 0 409 NULL ++aio_read_events_ring_410 aio_read_events_ring 3 410 NULL +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL -+_alloc_get_attr_desc_470 _alloc_get_attr_desc 2 470 NULL -+dccp_manip_pkt_476 dccp_manip_pkt 4 476 NULL ++sparse_index_init_482 sparse_index_init 2 482 NULL ++cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL -+pidlist_resize_496 pidlist_resize 2 496 NULL -+read_vbt_r0_503 read_vbt_r0 1 503 NULL ++iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL ++_snd_pcm_hw_param_first_516 _snd_pcm_hw_param_first 0 516 NULL +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL -+zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0 537 NULL ++zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL -+dle_count_543 dle_count 0 543 NULL -+devres_alloc_551 devres_alloc 2 551 NULL ++sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL ++lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL +dev_hard_header_565 dev_hard_header 0 565 NULL nohasharray +start_isoc_chain_565 start_isoc_chain 2 565 &dev_hard_header_565 -+compat_sys_preadv_583 compat_sys_preadv 3 583 NULL ++ocfs2_refcounted_xattr_delete_need_584 ocfs2_refcounted_xattr_delete_need 0 584 NULL +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL ++cl_page_own0_599 cl_page_own0 0 599 NULL ++btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL -+compat_sys_shmat_620 compat_sys_shmat 3 620 NULL -+isp1760_register_628 isp1760_register 1-2 628 NULL ++ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL ++viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL ++ocfs2_num_free_extents_632 ocfs2_num_free_extents 0 632 NULL +clone_split_bio_633 clone_split_bio 6 633 NULL +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL +remap_to_cache_640 remap_to_cache 3 640 NULL -+drbd_bm_find_next_643 drbd_bm_find_next 2 643 NULL -+unlink_queued_645 unlink_queued 3-4 645 NULL ++cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL nohasharray ++drbd_bm_find_next_643 drbd_bm_find_next 2 643 &cfs_hash_bkt_size_643 ++unlink_queued_645 unlink_queued 4 645 NULL +dtim_interval_read_654 dtim_interval_read 3 654 NULL ++div_u64_rem_672 div_u64_rem 0 672 NULL +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL -+rtl8169_try_rx_copy_705 rtl8169_try_rx_copy 3 705 NULL +persistent_ram_vmap_709 persistent_ram_vmap 1-2 709 NULL +ipath_resize_cq_712 ipath_resize_cq 2 712 NULL +disk_max_parts_719 disk_max_parts 0 719 NULL +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL +dvb_video_write_754 dvb_video_write 3 754 NULL ++cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL ++jbd2_journal_dirty_metadata_784 jbd2_journal_dirty_metadata 0 784 NULL ++ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL ++__vmalloc_node_range_811 __vmalloc_node_range 7 811 NULL nohasharray ++snd_pcm_drain_811 snd_pcm_drain 0 811 &__vmalloc_node_range_811 +if_writecmd_815 if_writecmd 2 815 NULL +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL -+read_fifo_826 read_fifo 3 826 NULL ++SyS_write_846 SyS_write 3 846 NULL +um_idi_read_850 um_idi_read 3 850 NULL -+ieee80211_if_fmt_rc_rateidx_mcs_mask_5ghz_856 ieee80211_if_fmt_rc_rateidx_mcs_mask_5ghz 3 856 NULL ++error_state_read_859 error_state_read 6 859 NULL +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879 ++intel_alloc_iova_883 intel_alloc_iova 3 883 NULL +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL -+btmrvl_hsstate_read_920 btmrvl_hsstate_read 3 920 NULL ++readw_931 readw 0 931 NULL +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL -+get_ramdisk_size_954 get_ramdisk_size 0 954 NULL +__nodes_weight_956 __nodes_weight 2-0 956 NULL -+sys_msgrcv_959 sys_msgrcv 3 959 NULL -+pte_prefetch_gfn_to_pfn_997 pte_prefetch_gfn_to_pfn 2 997 NULL nohasharray -+hdlcdev_rx_997 hdlcdev_rx 3 997 &pte_prefetch_gfn_to_pfn_997 ++bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL ++memcmp_990 memcmp 0 990 NULL ++pte_prefetch_gfn_to_pfn_997 pte_prefetch_gfn_to_pfn 2 997 NULL ++free_ind_block_999 free_ind_block 0 999 NULL +dm_cache_set_dirty_1016 dm_cache_set_dirty 2 1016 NULL ++readreg_1017 readreg 0-1 1017 NULL +_do_truncate_1019 _do_truncate 2 1019 NULL +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL -+Read_hfc16_1070 Read_hfc16 0 1070 NULL +mce_request_packet_1073 mce_request_packet 3 1073 NULL +agp_create_memory_1075 agp_create_memory 1 1075 NULL ++ext4_orphan_add_1080 ext4_orphan_add 0 1080 NULL +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL -+nfs_pgarray_set_1085 nfs_pgarray_set 2 1085 NULL +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL ++inode_ref_info_1094 inode_ref_info 0 1094 NULL nohasharray ++llc_mac_hdr_init_1094 llc_mac_hdr_init 0 1094 &inode_ref_info_1094 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL -+sys_mremap_1107 sys_mremap 5-1-2 1107 NULL ++utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL ++__btrfs_cow_block_1125 __btrfs_cow_block 7-0 1125 NULL nohasharray ++__ext4_journal_stop_1125 __ext4_journal_stop 0 1125 &__btrfs_cow_block_1125 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL +vmalloc_32_1135 vmalloc_32 1 1135 NULL -+dec_zcache_eph_zpages_1138 dec_zcache_eph_zpages 1 1138 NULL +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL ++find_free_extent_1173 find_free_extent 4-0 1173 NULL +ipc_alloc_1192 ipc_alloc 1 1192 NULL +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL ++pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL +i2cdev_read_1206 i2cdev_read 3 1206 NULL -+ipw_packet_received_skb_1230 ipw_packet_received_skb 2 1230 NULL ++lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL +acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL +nested_get_page_1252 nested_get_page 2 1252 NULL +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL +batadv_tt_prepare_packet_buff_1280 batadv_tt_prepare_packet_buff 4 1280 NULL ++SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL -+wm_adsp_buf_alloc_1317 wm_adsp_buf_alloc 2 1317 NULL -+compat_put_u64_1319 compat_put_u64 1 1319 NULL ++ocfs2_append_rec_to_path_1321 ocfs2_append_rec_to_path 0 1321 NULL +ffs_1322 ffs 0 1322 NULL -+qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL -+carl9170_rx_stream_1334 carl9170_rx_stream 3 1334 NULL ++qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL nohasharray ++push_node_left_1327 push_node_left 0 1327 &qlcnic_pci_sriov_configure_1327 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL +gen_pool_best_fit_1348 gen_pool_best_fit 2-3-4 1348 NULL -+io_mapping_create_wc_1354 io_mapping_create_wc 1-2 1354 NULL ++btrfs_alloc_logged_file_extent_1354 btrfs_alloc_logged_file_extent 0 1354 NULL +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL +iov_num_pages_1364 iov_num_pages 0 1364 NULL @@ -101720,8 +102515,12 @@ index 0000000..b04803b +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL +do_msgsnd_1387 do_msgsnd 4 1387 NULL ++SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL +zone_page_state_1393 zone_page_state 0 1393 NULL +file_read_actor_1401 file_read_actor 4 1401 NULL ++vb2_vmalloc_alloc_1402 vb2_vmalloc_alloc 2 1402 NULL ++cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL ++init_rs_internal_1436 init_rs_internal 1 1436 NULL +vb2_dc_get_user_pages_1442 vb2_dc_get_user_pages 1-3 1442 NULL +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL @@ -101729,370 +102528,445 @@ index 0000000..b04803b +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL +posix_acl_permission_1495 posix_acl_permission 0 1495 NULL ++fpregs_set_1497 fpregs_set 4 1497 NULL ++ocfs2_alloc_dinode_update_counts_1507 ocfs2_alloc_dinode_update_counts 0 1507 NULL +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL -+__vfio_dma_map_1523 __vfio_dma_map 3 1523 NULL +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL ++extent_from_logical_1585 extent_from_logical 0 1585 NULL +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL -+fc_frame_alloc_1596 fc_frame_alloc 2 1596 NULL ++ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL -+btmrvl_hsmode_read_1647 btmrvl_hsmode_read 3 1647 NULL ++run_delayed_extent_op_1637 run_delayed_extent_op 0 1637 NULL +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL ++qgroup_rescan_init_1664 qgroup_rescan_init 0 1664 NULL +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL -+netdev_feature_string_1667 netdev_feature_string 0 1667 NULL -+compat_x25_ioctl_1674 compat_x25_ioctl 3 1674 NULL +rmap_add_1677 rmap_add 3 1677 NULL +configfs_read_file_1683 configfs_read_file 3 1683 NULL -+coda_psdev_write_1711 coda_psdev_write 3 1711 NULL ++pdu_write_u_1710 pdu_write_u 3 1710 NULL ++coda_psdev_write_1711 coda_psdev_write 3 1711 NULL nohasharray ++gfn_to_hva_prot_1711 gfn_to_hva_prot 2 1711 &coda_psdev_write_1711 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL +dma_memcpy_pg_to_iovec_1725 dma_memcpy_pg_to_iovec 6 1725 NULL ++internal_create_group_1733 internal_create_group 0 1733 NULL ++dev_irnet_read_1741 dev_irnet_read 3 1741 NULL +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL -+compat_cdrom_generic_command_1756 compat_cdrom_generic_command 4 1756 NULL -+ieee80211_new_mesh_header_1761 ieee80211_new_mesh_header 0 1761 NULL +ebt_size_mwt_1768 ebt_size_mwt 0 1768 NULL +cosa_write_1774 cosa_write 3 1774 NULL -+update_macheader_1775 update_macheader 7 1775 NULL -+dec_zcache_pers_zbytes_1779 dec_zcache_pers_zbytes 1 1779 NULL +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL -+__nodelist_scnprintf_1815 __nodelist_scnprintf 0-2-4 1815 NULL -+alloc_pages_exact_1892 alloc_pages_exact 1 1892 NULL ++__nodelist_scnprintf_1815 __nodelist_scnprintf 4-2-0 1815 NULL ++sb_issue_zeroout_1884 sb_issue_zeroout 3-0 1884 NULL +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL +SyS_add_key_1900 SyS_add_key 4 1900 NULL -+isku_sysfs_write_keys_media_1910 isku_sysfs_write_keys_media 6 1910 NULL ++uhid_char_read_1920 uhid_char_read 3 1920 NULL +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL -+memblock_alloc_base_1938 memblock_alloc_base 1-2 1938 NULL ++bdev_erase_1933 bdev_erase 3 1933 NULL ++ext3_fiemap_1936 ext3_fiemap 4 1936 NULL +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL +read_swap_header_1957 read_swap_header 0 1957 NULL +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL -+__alloc_bootmem_node_1992 __alloc_bootmem_node 2-3 1992 NULL ++gpio_power_write_1991 gpio_power_write 3 1991 NULL ++__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL +atomic_read_unchecked_1995 atomic_read_unchecked 0 1995 NULL ++sb_min_blocksize_2004 sb_min_blocksize 0-2 2004 NULL +batadv_tt_commit_changes_2008 batadv_tt_commit_changes 4 2008 NULL +sep_prepare_input_dma_table_2009 sep_prepare_input_dma_table 2-3 2009 NULL +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL ++ksm_madvise_2012 ksm_madvise 0 2012 NULL +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL -+BcmCopySection_2035 BcmCopySection 5 2035 NULL -+devm_ioremap_nocache_2036 devm_ioremap_nocache 2-3 2036 NULL ++BcmCopySection_2035 BcmCopySection 5-0 2035 NULL +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL -+subbuf_read_actor_2071 subbuf_read_actor 3 2071 NULL ++__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL ++diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL nohasharray ++alloc_retstack_tasklist_2077 alloc_retstack_tasklist 0 2077 &diva_set_driver_dbg_mask_2077 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL ++get_unaligned_le32_2092 get_unaligned_le32 0 2092 NULL +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL -+audit_expand_2098 audit_expand 2 2098 NULL ++audit_expand_2098 audit_expand 0 2098 NULL +num_pages_spanned_2105 num_pages_spanned 0 2105 NULL ++shrd128_2106 shrd128 0-1-3-2 2106 NULL +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL -+__find_xattr_2117 __find_xattr 6 2117 NULL nohasharray -+enable_read_2117 enable_read 3 2117 &__find_xattr_2117 ++enable_read_2117 enable_read 3 2117 NULL +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL ++snd_interval_refine_last_2127 snd_interval_refine_last 0 2127 NULL +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL +lp_gpio_irq_map_2149 lp_gpio_irq_map 2 2149 NULL -+mlx4_init_icm_table_2151 mlx4_init_icm_table 5-4 2151 NULL +iov_iter_count_2152 iov_iter_count 0 2152 NULL -+_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL ++__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL ++ocfs2_et_sanity_check_2164 ocfs2_et_sanity_check 0 2164 NULL ++_ore_get_io_state_2166 _ore_get_io_state 5-3-4 2166 NULL +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL -+ssb_bus_ssbbus_register_2217 ssb_bus_ssbbus_register 2 2217 NULL ++picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 NULL nohasharray +u32_array_read_2219 u32_array_read 3 2219 &mei_dbgfs_read_meclients_2219 +vhci_write_2224 vhci_write 3 2224 NULL -+efx_tsoh_page_count_2225 efx_tsoh_page_count 0 2225 NULL -+lowpan_get_mac_header_length_2231 lowpan_get_mac_header_length 0 2231 NULL ++__ocfs2_journal_access_2241 __ocfs2_journal_access 0 2241 NULL +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL +do_update_counters_2259 do_update_counters 4 2259 NULL +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL -+kvm_clear_guest_page_2308 kvm_clear_guest_page 4-2 2308 NULL ++ocfs2_shift_tree_depth_2292 ocfs2_shift_tree_depth 0 2292 NULL ++kvm_clear_guest_page_2308 kvm_clear_guest_page 2-4 2308 NULL +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL -+picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL -+gart_map_page_2325 gart_map_page 3-4 2325 NULL ++picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL nohasharray ++hfsplus_find_init_2318 hfsplus_find_init 0 2318 &picolcd_fb_write_2318 ++gart_map_page_2325 gart_map_page 4-3 2325 NULL +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL +zr364xx_read_2354 zr364xx_read 3 2354 NULL +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL -+SyS_mremap_2367 SyS_mremap 1-2-5 2367 NULL -+xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL ++SyS_mremap_2367 SyS_mremap 2-3-1-5 2367 NULL ++xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray ++rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL -+rtl_port_map_2385 rtl_port_map 1-2 2385 NULL +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL -+SYSC_mlock_2415 SYSC_mlock 1 2415 NULL ++SYSC_mlock_2415 SYSC_mlock 1-2 2415 NULL +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL +raid1_size_2419 raid1_size 0-2 2419 NULL -+roccat_common2_send_2422 roccat_common2_send 4 2422 NULL -+hfcpci_empty_fifo_2427 hfcpci_empty_fifo 4 2427 NULL -+ioremap_nocache_2439 ioremap_nocache 1-2 2439 NULL ++timespec_to_jiffies_timeout_2428 timespec_to_jiffies_timeout 0 2428 NULL +tty_buffer_find_2443 tty_buffer_find 2 2443 NULL -+ath6kl_usb_bmi_write_2454 ath6kl_usb_bmi_write 3 2454 NULL +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL -+update_pmkid_2481 update_pmkid 4 2481 NULL +wiphy_new_2482 wiphy_new 2 2482 NULL +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL ++hfsplus_user_setxattr_2485 hfsplus_user_setxattr 4 2485 NULL +lookup_cache_entry_2494 lookup_cache_entry 2 2494 NULL +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL -+dm_write_2513 dm_write 3 2513 NULL +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL -+i915_next_seqno_write_2572 i915_next_seqno_write 3 2572 NULL +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL ++mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL +slot_bytes_2609 slot_bytes 0 2609 NULL +smk_write_logging_2618 smk_write_logging 3 2618 NULL ++switch_status_2629 switch_status 5 2629 NULL ++tlv_put_string_2631 tlv_put_string 0 2631 NULL +kvm_gfn_to_hva_cache_init_2636 kvm_gfn_to_hva_cache_init 3 2636 NULL -+lro_gen_skb_2644 lro_gen_skb 6 2644 NULL ++tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL ++osc_build_ppga_2670 osc_build_ppga 2 2670 NULL ++ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL ++ocfs2_rotate_subtree_right_2674 ocfs2_rotate_subtree_right 0 2674 NULL ++oti6858_write_2692 oti6858_write 4 2692 NULL +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL -+memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL -+__xip_file_write_2733 __xip_file_write 4-3 2733 NULL -+hid_report_raw_event_2762 hid_report_raw_event 4 2762 NULL ++memcpy_fromiovecend_2707 memcpy_fromiovecend 4-3 2707 NULL ++SyS_pwrite64_2708 SyS_pwrite64 3 2708 NULL nohasharray ++lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 &SyS_pwrite64_2708 ++__xip_file_write_2733 __xip_file_write 3-4 2733 NULL ++can_nocow_extent_2744 can_nocow_extent 3 2744 NULL ++xfs_readdir_2767 xfs_readdir 3 2767 NULL +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL nohasharray +bictcp_update_2771 bictcp_update 2 2771 &mon_bin_ioctl_2771 -+__next_cpu_2782 __next_cpu 1 2782 NULL ++__next_cpu_2782 __next_cpu 1-0 2782 NULL +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL ++device_add_attrs_2789 device_add_attrs 0 2789 NULL ++iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL -+vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL ++vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL nohasharray ++snd_pcm_reset_2829 snd_pcm_reset 0 2829 &vb2_dc_get_userptr_2829 ++sock_create_2838 sock_create 0 2838 NULL +wait_for_avail_2847 wait_for_avail 0 2847 NULL +ufs_free_fragments_2857 ufs_free_fragments 2 2857 NULL +sfq_alloc_2861 sfq_alloc 1 2861 NULL ++irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL +mq_map_2871 mq_map 2 2871 NULL ++__swab64p_2875 __swab64p 0 2875 NULL +nla_padlen_2883 nla_padlen 1 2883 NULL +cmm_write_2896 cmm_write 3 2896 NULL +alloc_page_cgroup_2919 alloc_page_cgroup 1 2919 NULL ++osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL ++i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL -+ppp_cp_event_2965 ppp_cp_event 6 2965 NULL ++free_area_init_core_2962 free_area_init_core 2-3 2962 NULL +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL ++ocfs2_find_branch_target_2989 ocfs2_find_branch_target 0 2989 NULL +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL ++lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL ++btrfs_add_block_group_cache_3016 btrfs_add_block_group_cache 0 3016 NULL +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL +depth_write_3021 depth_write 3 3021 NULL +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL ++kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL -+iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 NULL ++lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray ++iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL -+__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL ++__blk_end_bidi_request_3070 __blk_end_bidi_request 4-3 3070 NULL +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL ++read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL +free_coherent_3082 free_coherent 4-2 3082 NULL ++ocfs2_get_right_path_3097 ocfs2_get_right_path 0 3097 NULL +clone_bio_3100 clone_bio 6 3100 NULL nohasharray +ttusb2_msg_3100 ttusb2_msg 4 3100 &clone_bio_3100 +rb_alloc_3102 rb_alloc 1 3102 NULL -+simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL ++simple_write_to_buffer_3122 simple_write_to_buffer 2-5 3122 NULL +print_time_3132 print_time 0 3132 NULL +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL ++find_free_extent_3153 find_free_extent 5 3153 NULL +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL +compat_sys_migrate_pages_3157 compat_sys_migrate_pages 2 3157 NULL ++i915_gem_obj_ggtt_offset_3162 i915_gem_obj_ggtt_offset 0 3162 NULL +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 NULL +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL -+mempool_create_node_3191 mempool_create_node 1 3191 NULL ++wait_table_bits_3187 wait_table_bits 1 3187 NULL ++mempool_create_node_3191 mempool_create_node 1-6 3191 NULL +alloc_context_3194 alloc_context 1 3194 NULL -+shmem_pread_slow_3198 shmem_pread_slow 3 3198 NULL ++shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL ++codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL +SyS_sendto_3219 SyS_sendto 6 3219 NULL ++btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL ++btrfs_next_leaf_3232 btrfs_next_leaf 0 3232 NULL +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL ++write_adapter_mem_3234 write_adapter_mem 3 3234 NULL +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL +key_key_read_3241 key_key_read 3 3241 NULL -+number_3243 number 0 3243 NULL -+check_vendor_extension_3254 check_vendor_extension 1 3254 NULL ++mmap_piobufs_3244 mmap_piobufs 4 3244 NULL ++did_overwrite_first_ref_3259 did_overwrite_first_ref 0 3259 NULL +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL -+arvo_sysfs_write_3311 arvo_sysfs_write 6 3311 NULL ++__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL +compat_sys_setsockopt_3326 compat_sys_setsockopt 5 3326 NULL -+aac_rkt_ioremap_3333 aac_rkt_ioremap 2 3333 NULL +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL ++sysfs_create_group_3339 sysfs_create_group 0 3339 NULL +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL +scnprintf_3360 scnprintf 0-2 3360 NULL ++ReadByteAmd7930_3365 ReadByteAmd7930 0 3365 NULL ++sr_read_3366 sr_read 3 3366 NULL ++count_inode_refs_3375 count_inode_refs 0 3375 NULL +x86_emulate_instruction_3389 x86_emulate_instruction 2 3389 NULL +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL +send_stream_3397 send_stream 4 3397 NULL +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL -+msix_map_region_3411 msix_map_region 3 3411 NULL +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL ++zone_to_nid_3415 zone_to_nid 0 3415 NULL +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL ++send_unlink_3438 send_unlink 0 3438 NULL +pipe_iov_copy_to_user_3447 pipe_iov_copy_to_user 3 3447 NULL -+percpu_modalloc_3448 percpu_modalloc 2-3 3448 NULL -+map_single_3449 map_single 0-2 3449 NULL ++map_single_3449 map_single 0 3449 NULL ++softsynth_write_3455 softsynth_write 3 3455 NULL +jffs2_acl_setxattr_3464 jffs2_acl_setxattr 4 3464 NULL nohasharray -+snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 4-2-5 3464 &jffs2_acl_setxattr_3464 -+alloc_skb_fclone_3467 alloc_skb_fclone 1 3467 NULL ++snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 &jffs2_acl_setxattr_3464 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL -+kvm_handle_bad_page_3503 kvm_handle_bad_page 2 3503 NULL -+mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL nohasharray -+ieee80211_wx_set_gen_ie_rsl_3521 ieee80211_wx_set_gen_ie_rsl 3 3521 &mem_tx_free_mem_blks_read_3521 ++run_one_delayed_ref_3503 run_one_delayed_ref 0 3503 NULL nohasharray ++kvm_handle_bad_page_3503 kvm_handle_bad_page 2 3503 &run_one_delayed_ref_3503 ++mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL ++SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL +SyS_readv_3539 SyS_readv 3 3539 NULL +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL -+b43legacy_read16_3561 b43legacy_read16 0 3561 NULL ++iommu_map_3554 iommu_map 3-2 3554 NULL ++btrfs_delayed_update_inode_3557 btrfs_delayed_update_inode 0 3557 NULL ++i915_gem_execbuffer_reserve_3558 i915_gem_execbuffer_reserve 0 3558 NULL +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL +evtchn_read_3569 evtchn_read 3 3569 NULL -+vc_resize_3585 vc_resize 2-3 3585 NULL -+compat_sys_semtimedop_3606 compat_sys_semtimedop 3 3606 NULL ++ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL ++vc_resize_3585 vc_resize 3-2 3585 NULL ++kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL -+x86_swiotlb_alloc_coherent_3649 x86_swiotlb_alloc_coherent 2 3649 NULL nohasharray -+cm_copy_private_data_3649 cm_copy_private_data 2 3649 &x86_swiotlb_alloc_coherent_3649 ++x86_swiotlb_alloc_coherent_3649 x86_swiotlb_alloc_coherent 2 3649 NULL +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL ++replace_pin_at_irq_node_3687 replace_pin_at_irq_node 2 3687 NULL ++ntfs_attr_make_non_resident_3694 ntfs_attr_make_non_resident 0 3694 NULL +snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL nohasharray -+create_irq_3703 create_irq 0 3703 &snd_m3_assp_read_3703 nohasharray -+btmrvl_psmode_write_3703 btmrvl_psmode_write 3 3703 &create_irq_3703 ++create_irq_3703 create_irq 0 3703 &snd_m3_assp_read_3703 +videobuf_pages_to_sg_3708 videobuf_pages_to_sg 2 3708 NULL +ci_ll_write_3740 ci_ll_write 4 3740 NULL nohasharray +ath6kl_mgmt_tx_3740 ath6kl_mgmt_tx 7 3740 &ci_ll_write_3740 ++uar_index2pfn_3741 uar_index2pfn 0-2 3741 NULL +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL ++btrfs_alloc_chunk_3808 btrfs_alloc_chunk 0 3808 NULL +ncp_file_write_3813 ncp_file_write 3 3813 NULL -+read_file_tx_chainmask_3829 read_file_tx_chainmask 3 3829 NULL ++llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL ++btrfs_uuid_iter_rem_3831 btrfs_uuid_iter_rem 0 3831 NULL ++hfsplus_direct_IO_3835 hfsplus_direct_IO 4 3835 NULL +stringify_nodemap_3842 stringify_nodemap 2 3842 NULL +ubi_eba_read_leb_3847 ubi_eba_read_leb 0 3847 NULL +create_one_cdev_3852 create_one_cdev 2 3852 NULL +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL +get_fd_set_3866 get_fd_set 1 3866 NULL ++apei_res_sub_3873 apei_res_sub 0 3873 NULL +garp_attr_create_3883 garp_attr_create 3 3883 NULL -+uea_send_modem_cmd_3888 uea_send_modem_cmd 3 3888 NULL +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL +nvram_write_3894 nvram_write 3 3894 NULL +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL +vcs_write_3910 vcs_write 3 3910 NULL ++SyS_move_pages_3920 SyS_move_pages 2 3920 NULL ++hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL -+atalk_compat_ioctl_3991 atalk_compat_ioctl 3 3991 NULL ++mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL +do_add_counters_3992 do_add_counters 3 3992 NULL ++obd_alloc_memmd_4002 obd_alloc_memmd 0 4002 NULL +userspace_status_4004 userspace_status 4 4004 NULL +mei_write_4005 mei_write 3 4005 NULL nohasharray +xfs_check_block_4005 xfs_check_block 4 4005 &mei_write_4005 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL -+mm_populate_4016 mm_populate 1 4016 NULL ++mm_populate_4016 mm_populate 1-2 4016 NULL nohasharray ++i915_gem_object_unbind_4016 i915_gem_object_unbind 0 4016 &mm_populate_4016 +blk_end_request_4024 blk_end_request 3 4024 NULL +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL -+usbnet_write_cmd_async_4035 usbnet_write_cmd_async 7 4035 NULL ++mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL ++i915_gpu_idle_4062 i915_gpu_idle 0 4062 NULL +read_file_queues_4078 read_file_queues 3 4078 NULL +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL ++btrfs_inc_ref_4084 btrfs_inc_ref 0 4084 NULL +da9052_free_irq_4090 da9052_free_irq 2 4090 NULL -+C_SYSC_rt_sigpending_4114 C_SYSC_rt_sigpending 2 4114 NULL -+ntb_netdev_change_mtu_4147 ntb_netdev_change_mtu 2 4147 NULL +tm6000_read_4151 tm6000_read 3 4151 NULL +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL +msg_bits_4158 msg_bits 0-3-4 4158 NULL +get_alua_req_4166 get_alua_req 3 4166 NULL +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL +read_file_bool_4180 read_file_bool 3 4180 NULL ++ocfs2_find_cpos_for_right_leaf_4194 ocfs2_find_cpos_for_right_leaf 0 4194 NULL +f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL ++ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL ++msb_do_write_request_4286 msb_do_write_request 2 4286 NULL +paging32_page_fault_4288 paging32_page_fault 2 4288 NULL +xt_compat_add_offset_4289 xt_compat_add_offset 0 4289 NULL +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 3-2-5 4303 NULL ++__pool_find_4308 __pool_find 3 4308 NULL ++count_strings_4315 count_strings 0 4315 NULL +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL -+__copy_from_user_inatomic_4365 __copy_from_user_inatomic 3 4365 NULL -+sys_setdomainname_4373 sys_setdomainname 2 4373 NULL ++kvm_apic_get_reg_4354 kvm_apic_get_reg 0 4354 NULL ++__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray ++lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365 ++btrfs_set_disk_extent_flags_4374 btrfs_set_disk_extent_flags 0 4374 NULL +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL -+access_process_vm_4412 access_process_vm 0-2-4 4412 NULL nohasharray ++access_process_vm_4412 access_process_vm 0-4-2 4412 NULL nohasharray +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL ++rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL +do_pages_stat_4437 do_pages_stat 2 4437 NULL +memparse_4444 memparse 0 4444 NULL ++tcp_dma_try_early_copy_4457 tcp_dma_try_early_copy 3 4457 NULL +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL -+snd_seq_expand_var_event_4481 snd_seq_expand_var_event 0-5 4481 NULL -+sys_semtimedop_4486 sys_semtimedop 3 4486 NULL ++snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL ++ocfs2_grow_tree_4492 ocfs2_grow_tree 0 4492 NULL +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL +set_link_security_4502 set_link_security 4 4502 NULL +dm_cache_remove_mapping_4513 dm_cache_remove_mapping 2 4513 NULL -+__gfn_to_pfn_memslot_4530 __gfn_to_pfn_memslot 2 4530 NULL -+sys_llistxattr_4532 sys_llistxattr 3 4532 NULL ++__gfn_to_pfn_memslot_4530 __gfn_to_pfn_memslot 2-0 4530 NULL ++ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL +da9052_group_write_4534 da9052_group_write 2-3 4534 NULL +tty_register_device_4544 tty_register_device 2 4544 NULL +videobuf_vmalloc_to_sg_4548 videobuf_vmalloc_to_sg 2 4548 NULL +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL ++iommu_map_page_4588 iommu_map_page 5 4588 NULL +bch_alloc_4593 bch_alloc 1 4593 NULL ++ocfs2_refcount_lock_4595 ocfs2_refcount_lock 0 4595 NULL +__wb_force_remove_mapping_4622 __wb_force_remove_mapping 2 4622 NULL ++ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL ++ext3_orphan_add_4665 ext3_orphan_add 0 4665 NULL +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL +kone_receive_4690 kone_receive 4 4690 NULL -+round_pipe_size_4701 round_pipe_size 0 4701 NULL ++link_to_fixup_dir_4699 link_to_fixup_dir 0 4699 NULL +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL +konepure_sysfs_read_4709 konepure_sysfs_read 6 4709 NULL -+btmrvl_gpiogap_read_4718 btmrvl_gpiogap_read 3 4718 NULL +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray +show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722 ++gfs2_bit_search_4728 gfs2_bit_search 0-2 4728 NULL ++ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray ++bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736 +__find_free_cblock_4741 __find_free_cblock 2 4741 NULL -+memblock_find_in_range_4759 memblock_find_in_range 3-4 4759 NULL -+pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL -+create_subvol_4791 create_subvol 4 4791 NULL ++lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL ++find_next_best_node_4774 find_next_best_node 1-0 4774 NULL nohasharray ++pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 &find_next_best_node_4774 ++btrfs_del_items_4791 btrfs_del_items 0 4791 NULL nohasharray ++create_subvol_4791 create_subvol 4 4791 &btrfs_del_items_4791 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL -+repair_io_failure_4815 repair_io_failure 4 4815 NULL ++repair_io_failure_4815 repair_io_failure 4-3 4815 NULL ++comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL -+ocfs2_defrag_extent_4873 ocfs2_defrag_extent 3 4873 NULL ++get_new_location_4866 get_new_location 0 4866 NULL ++ocfs2_defrag_extent_4873 ocfs2_defrag_extent 3-2 4873 NULL +hid_register_field_4874 hid_register_field 2-3 4874 NULL +vga_arb_read_4886 vga_arb_read 3 4886 NULL -+sys_ipc_4889 sys_ipc 3 4889 NULL -+sys_process_vm_writev_4928 sys_process_vm_writev 3-5 4928 NULL -+ntfs_rl_insert_4931 ntfs_rl_insert 2-4 4931 NULL ++ntfs_rl_insert_4931 ntfs_rl_insert 4-2 4931 NULL +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL -+devm_kzalloc_4966 devm_kzalloc 2 4966 NULL ++ocfs2_should_refresh_lock_res_4958 ocfs2_should_refresh_lock_res 0 4958 NULL +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL ++do_sync_read_4977 do_sync_read 0 4977 NULL +vmw_surface_define_size_4993 vmw_surface_define_size 0 4993 NULL -+compat_SyS_ipc_5000 compat_SyS_ipc 3-4-5-6 5000 NULL -+qla82xx_pci_mem_write_direct_5008 qla82xx_pci_mem_write_direct 2 5008 NULL -+do_mincore_5018 do_mincore 0-1 5018 NULL -+mtd_device_parse_register_5024 mtd_device_parse_register 5 5024 NULL -+ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 2-3 5066 NULL ++compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL ++do_mincore_5018 do_mincore 0-2-1 5018 NULL ++btrfs_punch_hole_5041 btrfs_punch_hole 2 5041 NULL ++cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL ++ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL +get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray -+kfifo_copy_from_user_5091 kfifo_copy_from_user 3 5091 &get_random_bytes_5091 nohasharray ++kfifo_copy_from_user_5091 kfifo_copy_from_user 4-3-0 5091 &get_random_bytes_5091 nohasharray +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091 -+mpol_to_str_5093 mpol_to_str 2 5093 NULL +sound_write_5102 sound_write 3 5102 NULL +clear_dirty_5105 clear_dirty 3 5105 NULL ++i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL ++qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL +ufs_add_fragments_5144 ufs_add_fragments 2 5144 NULL -+compat_ptr_5159 compat_ptr 0-1 5159 NULL ++ocfs2_inode_lock_full_nested_5148 ocfs2_inode_lock_full_nested 0 5148 NULL +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL -+sfi_map_memory_5183 sfi_map_memory 1-2 5183 NULL -+skb_network_header_5203 skb_network_header 0 5203 NULL -+pipe_set_size_5204 pipe_set_size 2 5204 NULL -+ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL ++ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL nohasharray ++r600_mip_minify_5214 r600_mip_minify 2-1-0 5214 &ppp_cp_parse_cr_5214 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL -+ssb_ioremap_5228 ssb_ioremap 2 5228 NULL nohasharray -+konepure_sysfs_write_5228 konepure_sysfs_write 6 5228 &ssb_ioremap_5228 -+isdn_ppp_skb_push_5236 isdn_ppp_skb_push 2 5236 NULL -+do_atmif_sioc_5247 do_atmif_sioc 3 5247 NULL ++nouveau_fb_create__5244 nouveau_fb_create_ 5 5244 NULL +gfn_to_hva_memslot_5265 gfn_to_hva_memslot 2 5265 NULL ++btrfs_alloc_reserved_file_extent_5274 btrfs_alloc_reserved_file_extent 0 5274 NULL ++iommu_domain_identity_map_5284 iommu_domain_identity_map 2-3 5284 NULL +alloc_cache_blocks_with_hash_5285 alloc_cache_blocks_with_hash 2 5285 NULL ++usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL +__gfn_to_hva_memslot_5304 __gfn_to_hva_memslot 0-2 5304 NULL ++r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL +allocate_cnodes_5329 allocate_cnodes 1 5329 NULL ++vm_insert_pfn_5341 vm_insert_pfn 3-0 5341 NULL ++cq_free_res_5355 cq_free_res 5 5355 NULL +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL -+cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL -+kvm_pin_pages_5369 kvm_pin_pages 2 5369 NULL ++cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 2-3 5368 NULL ++kvm_pin_pages_5369 kvm_pin_pages 2-0 5369 NULL +bitmap_fold_5396 bitmap_fold 4 5396 NULL ++security_inode_init_security_5408 security_inode_init_security 0 5408 NULL ++__resolve_indirect_refs_5409 __resolve_indirect_refs 0 5409 NULL +nilfs_palloc_entries_per_group_5418 nilfs_palloc_entries_per_group 0 5418 NULL -+sfi_map_table_5462 sfi_map_table 1 5462 NULL ++check_item_in_log_5440 check_item_in_log 0 5440 NULL ++__split_bvec_across_targets_5454 __split_bvec_across_targets 3 5454 NULL +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL +ubi_leb_write_5478 ubi_leb_write 4-5 5478 NULL @@ -102101,242 +102975,298 @@ index 0000000..b04803b +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL -+spidev_message_5518 spidev_message 3 5518 NULL +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL ++iommu_prepare_identity_map_5540 iommu_prepare_identity_map 2-3 5540 NULL +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL -+brcmu_pkt_buf_get_skb_5556 brcmu_pkt_buf_get_skb 1 5556 NULL +le_readq_5557 le_readq 0 5557 NULL +inw_5558 inw 0 5558 NULL -+fir16_create_5574 fir16_create 3 5574 NULL +bioset_create_5580 bioset_create 1 5580 NULL -+oz_ep_alloc_5587 oz_ep_alloc 2 5587 NULL -+usb_dump_device_descriptor_5599 usb_dump_device_descriptor 0 5599 NULL ++domain_sg_mapping_5586 domain_sg_mapping 4 5586 NULL ++oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL +ldm_frag_add_5611 ldm_frag_add 2 5611 NULL +compat_copy_entries_5617 compat_copy_entries 0 5617 NULL ++SYSC_init_module_5626 SYSC_init_module 2 5626 NULL ++iterate_extent_inodes_5631 iterate_extent_inodes 0 5631 NULL +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL +posix_clock_register_5662 posix_clock_register 2 5662 NULL -+mthca_map_reg_5664 mthca_map_reg 2-3 5664 NULL -+__videobuf_alloc_vb_5665 __videobuf_alloc_vb 1 5665 NULL ++kgdb_arch_pc_5673 kgdb_arch_pc 0 5673 NULL +wb_clear_dirty_5684 wb_clear_dirty 2 5684 NULL +get_arg_5694 get_arg 3 5694 NULL +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL ++ntfs_attr_record_resize_5720 ntfs_attr_record_resize 0 5720 NULL +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL -+reexecute_instruction_5733 reexecute_instruction 2 5733 NULL +rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL -+ubi_cdev_compat_ioctl_5746 ubi_cdev_compat_ioctl 3 5746 NULL -+sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL nohasharray -+qlcnic_83xx_sysfs_flash_read_handler_5775 qlcnic_83xx_sysfs_flash_read_handler 6 5775 &sctp_setsockopt_autoclose_5775 -+compat_sys_writev_5784 compat_sys_writev 3 5784 NULL ++ubi_calc_fm_size_5749 ubi_calc_fm_size 0 5749 NULL ++sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL ++nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL -+autofs4_root_compat_ioctl_5838 autofs4_root_compat_ioctl 3 5838 NULL +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL -+ixgb_check_copybreak_5847 ixgb_check_copybreak 3 5847 NULL +setup_req_5848 setup_req 3 5848 NULL ++ria_page_count_5849 ria_page_count 0 5849 NULL +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL -+compat_sys_move_pages_5861 compat_sys_move_pages 2 5861 NULL nohasharray -+uinput_compat_ioctl_5861 uinput_compat_ioctl 3 5861 &compat_sys_move_pages_5861 ++config_buf_5862 config_buf 0 5862 NULL ++ext4_ext_correct_indexes_5865 ext4_ext_correct_indexes 0 5865 NULL +paging64_walk_addr_5887 paging64_walk_addr 3 5887 NULL ++scan_bitmap_5888 scan_bitmap 3 5888 NULL ++lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL +port_show_regs_5904 port_show_regs 3 5904 NULL +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL -+qla82xx_pci_mem_read_2M_5912 qla82xx_pci_mem_read_2M 2 5912 NULL -+ttm_bo_kmap_ttm_5922 ttm_bo_kmap_ttm 3 5922 NULL +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL -+tipc_subseq_alloc_5957 tipc_subseq_alloc 1 5957 NULL ++find_parent_nodes_5948 find_parent_nodes 0 5948 NULL ++ll_statahead_one_5962 ll_statahead_one 3 5962 NULL +__apu_get_register_5967 __apu_get_register 0 5967 NULL +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL +native_pte_val_5978 native_pte_val 0 5978 NULL -+SyS_semop_5980 SyS_semop 3 5980 NULL -+ntfs_rl_append_6037 ntfs_rl_append 2-4 6037 NULL -+da9052_request_irq_6058 da9052_request_irq 2 6058 NULL ++jbd2_journal_stop_5979 jbd2_journal_stop 0 5979 NULL ++ntfs_rl_append_6037 ntfs_rl_append 4-2 6037 NULL ++da9052_request_irq_6058 da9052_request_irq 2 6058 NULL nohasharray ++device_add_attributes_6058 device_add_attributes 0 6058 &da9052_request_irq_6058 ++alloc_msg_6072 alloc_msg 1 6072 NULL +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL +rts51x_ms_rw_multi_sector_6076 rts51x_ms_rw_multi_sector 3-4 6076 NULL +md_trim_bio_6078 md_trim_bio 2 6078 NULL ++finish_inode_if_needed_6098 finish_inode_if_needed 0 6098 NULL +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL -+matrix_keypad_build_keymap_6129 matrix_keypad_build_keymap 3 6129 NULL +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL ++__btrfs_commit_inode_delayed_items_6150 __btrfs_commit_inode_delayed_items 0 6150 NULL +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL +vdma_mem_alloc_6171 vdma_mem_alloc 1 6171 NULL +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL +paging64_walk_addr_generic_6180 paging64_walk_addr_generic 4 6180 NULL ++SyS_setgroups_6182 SyS_setgroups 1 6182 NULL ++__add_pin_to_irq_node_6188 __add_pin_to_irq_node 2 6188 NULL +qp_host_get_user_memory_6189 qp_host_get_user_memory 1-2 6189 NULL ++cl_sync_io_wait_6196 cl_sync_io_wait 0 6196 NULL ++i915_gem_execbuffer_move_to_gpu_6197 i915_gem_execbuffer_move_to_gpu 0 6197 NULL +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL +f_hidg_read_6238 f_hidg_read 3 6238 NULL ++changed_ref_6242 changed_ref 0 6242 NULL +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL ++ext4_ext_split_6249 ext4_ext_split 0 6249 NULL +pcpu_next_pop_6277 pcpu_next_pop 4 6277 NULL +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL -+snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3 6282 NULL nohasharray ++snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL +paging64_gva_to_gpa_nested_6287 paging64_gva_to_gpa_nested 2 6287 NULL -+nf_nat_ipv6_manip_pkt_6289 nf_nat_ipv6_manip_pkt 2 6289 NULL -+nf_nat_sack_adjust_6297 nf_nat_sack_adjust 2 6297 NULL -+mid_get_vbt_data_r10_6308 mid_get_vbt_data_r10 2 6308 NULL +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL -+SyS_mincore_6329 SyS_mincore 1 6329 NULL ++exclude_super_stripes_6326 exclude_super_stripes 0 6326 NULL ++SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray ++hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL ++regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL +_proc_do_string_6376 _proc_do_string 2 6376 NULL +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL -+isku_sysfs_write_light_6406 isku_sysfs_write_light 6 6406 NULL ++msb_write_block_6379 msb_write_block 3 6379 NULL ++BcmFlash2xBulkRead_6395 BcmFlash2xBulkRead 0 6395 NULL +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL ++add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL -+__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2-3 6432 NULL ++__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL ++add_to_list_6433 add_to_list 0 6433 NULL +paging32_gva_to_gpa_nested_6442 paging32_gva_to_gpa_nested 2 6442 NULL -+mlx4_ib_reg_user_mr_6471 mlx4_ib_reg_user_mr 2-3 6471 NULL nohasharray -+ext4_compat_ioctl_6471 ext4_compat_ioctl 3 6471 &mlx4_ib_reg_user_mr_6471 ++i915_gem_object_wait_rendering_6446 i915_gem_object_wait_rendering 0 6446 NULL ++mlx4_ib_reg_user_mr_6471 mlx4_ib_reg_user_mr 2-3 6471 NULL +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL -+qp_memcpy_from_queue_6479 qp_memcpy_from_queue 4-5 6479 NULL ++qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL +mei_read_6507 mei_read 3 6507 NULL -+read_file_disable_ani_6536 read_file_disable_ani 3 6536 NULL ++__start_delalloc_inodes_6528 __start_delalloc_inodes 0 6528 NULL +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL +wdm_read_6549 wdm_read 3 6549 NULL -+isku_sysfs_write_keys_easyzone_6553 isku_sysfs_write_keys_easyzone 6 6553 NULL ++dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL +SyS_fcntl64_6582 SyS_fcntl64 3 6582 NULL ++snd_pcm_hw_refine_old_user_6586 snd_pcm_hw_refine_old_user 0 6586 NULL ++btrfs_start_all_delalloc_inodes_6596 btrfs_start_all_delalloc_inodes 0 6596 NULL +snmp_mib_init_6604 snmp_mib_init 2-3 6604 NULL +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL -+compat_SyS_shmat_6642 compat_SyS_shmat 2 6642 NULL -+virtscsi_alloc_tgt_6643 virtscsi_alloc_tgt 2 6643 NULL -+aac_srcv_ioremap_6659 aac_srcv_ioremap 2 6659 NULL ++xfs_do_div_6649 xfs_do_div 0-2 6649 NULL ++journal_dirty_metadata_6658 journal_dirty_metadata 0 6658 NULL +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL -+ql_process_mac_rx_skb_6689 ql_process_mac_rx_skb 4 6689 NULL -+btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2 6696 NULL ++btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3-0 6696 NULL +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL +mpeg_read_6708 mpeg_read 3 6708 NULL ++ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL +set_orig_insn_6712 set_orig_insn 3 6712 NULL +video_proc_write_6724 video_proc_write 3 6724 NULL +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL -+rds_rdma_pages_6735 rds_rdma_pages 0 6735 NULL -+sfi_check_table_6772 sfi_check_table 1 6772 NULL ++ocfs2_insert_extent_6737 ocfs2_insert_extent 0 6737 NULL ++btrfs_inode_delayed_dir_index_count_6759 btrfs_inode_delayed_dir_index_count 0 6759 NULL ++kobject_add_varg_6781 kobject_add_varg 0 6781 NULL +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL ++zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL ++ocfs2_calc_refcount_meta_credits_6802 ocfs2_calc_refcount_meta_credits 0 6802 NULL ++lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL +make_8259A_irq_6828 make_8259A_irq 1 6828 NULL +calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL +mon_bin_read_6841 mon_bin_read 3 6841 NULL +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL ++ecryptfs_write_lower_6870 ecryptfs_write_lower 4 6870 NULL ++dio_complete_6879 dio_complete 0-2-3 6879 NULL +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 NULL nohasharray +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 &ieee80211_if_fmt_path_refresh_time_6888 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL ++ext4_inode_bitmap_6902 ext4_inode_bitmap 0 6902 NULL +spi_show_regs_6911 spi_show_regs 3 6911 NULL nohasharray +proc_sessionid_read_6911 proc_sessionid_read 3 6911 &spi_show_regs_6911 nohasharray +acm_alloc_minor_6911 acm_alloc_minor 0 6911 &proc_sessionid_read_6911 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL +do_msgrcv_6921 do_msgrcv 3 6921 NULL ++__vxge_hw_mempool_create_6923 __vxge_hw_mempool_create 3-2-6 6923 NULL +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL -+qsfp_cks_6945 qsfp_cks 0-2 6945 NULL ++ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL ++qsfp_cks_6945 qsfp_cks 2-0 6945 NULL ++tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL +videobuf_dma_init_kernel_6963 videobuf_dma_init_kernel 3 6963 NULL -+rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 NULL ++i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray ++rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973 +crypto_authenc_esn_setkey_6985 crypto_authenc_esn_setkey 3 6985 NULL +request_key_async_6990 request_key_async 4 6990 NULL +tpl_write_6998 tpl_write 3 6998 NULL +r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL ++log_wait_commit_7005 log_wait_commit 0 7005 NULL +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL ++ld_usb_write_7022 ld_usb_write 3 7022 NULL +wimax_msg_7030 wimax_msg 4 7030 NULL +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL ++hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL +event_enable_read_7074 event_enable_read 3 7074 NULL ++ip_vs_sync_conn_7075 ip_vs_sync_conn 3 7075 NULL +beacon_interval_read_7091 beacon_interval_read 3 7091 NULL -+lp_compat_ioctl_7098 lp_compat_ioctl 3 7098 NULL +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL +check_header_7108 check_header 0 7108 NULL ++osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL ++qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL ++kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL ++ipv6_recv_rxpmtu_7142 ipv6_recv_rxpmtu 3 7142 NULL +qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL ++ocfs2_get_left_path_7159 ocfs2_get_left_path 0 7159 NULL ++core_alua_write_tpg_metadata_7168 core_alua_write_tpg_metadata 3 7168 NULL ++ext3_xattr_ibody_list_7201 ext3_xattr_ibody_list 3-0 7201 NULL +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL -+batadv_check_unicast_ttvn_7206 batadv_check_unicast_ttvn 3 7206 NULL -+sys32_ipc_7238 sys32_ipc 3-5-6 7238 NULL +get_param_h_7247 get_param_h 0 7247 NULL -+af_alg_make_sg_7254 af_alg_make_sg 3 7254 NULL ++af_alg_make_sg_7254 af_alg_make_sg 3-0 7254 NULL ++hdlc_loop_7255 hdlc_loop 0 7255 NULL +vm_mmap_pgoff_7259 vm_mmap_pgoff 0 7259 NULL -+dma_ops_alloc_addresses_7272 dma_ops_alloc_addresses 3-4-5 7272 NULL ++snd_mask_refine_7267 snd_mask_refine 0 7267 NULL ++f_midi_start_ep_7270 f_midi_start_ep 0 7270 NULL ++dma_ops_alloc_addresses_7272 dma_ops_alloc_addresses 3-4-5-0 7272 NULL +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL -+isku_sysfs_write_macro_7293 isku_sysfs_write_macro 6 7293 NULL ++get_string_7302 get_string 0 7302 NULL +wb_remove_mapping_7307 wb_remove_mapping 2 7307 NULL ++wait_on_sync_kiocb_7327 wait_on_sync_kiocb 0 7327 NULL +mgmt_control_7349 mgmt_control 3 7349 NULL -+ext3_free_blocks_7362 ext3_free_blocks 3-4 7362 NULL ++max8998_irq_domain_map_7359 max8998_irq_domain_map 2 7359 NULL ++i915_gem_do_execbuffer_7362 i915_gem_do_execbuffer 0 7362 NULL nohasharray ++ext3_free_blocks_7362 ext3_free_blocks 3-4 7362 &i915_gem_do_execbuffer_7362 ++at_est2timeout_7365 at_est2timeout 0-1 7365 NULL +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL -+hweight_long_7388 hweight_long 0-1 7388 NULL -+vhost_scsi_compat_ioctl_7393 vhost_scsi_compat_ioctl 3 7393 NULL ++schedule_timeout_7371 schedule_timeout 0 7371 NULL ++ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL ++hweight_long_7388 hweight_long 1-0 7388 NULL +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL ++_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL +readb_7401 readb 0 7401 NULL +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL -+numa_emulation_7466 numa_emulation 2 7466 NULL -+__mutex_lock_common_7469 __mutex_lock_common 0 7469 NULL -+garp_request_join_7471 garp_request_join 4 7471 NULL -+compat_sys_msgrcv_7482 compat_sys_msgrcv 2 7482 NULL ++rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL ++l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL ++ReadHSCX_7471 ReadHSCX 0 7471 NULL nohasharray ++garp_request_join_7471 garp_request_join 4 7471 &ReadHSCX_7471 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL ++iwl_mvm_power_dbgfs_read_7502 iwl_mvm_power_dbgfs_read 0 7502 NULL +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 NULL nohasharray +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 &sdhci_alloc_host_7509 -+array_zalloc_7519 array_zalloc 1-2 7519 NULL ++array_zalloc_7519 array_zalloc 2-1 7519 NULL ++btrfs_insert_xattr_item_7545 btrfs_insert_xattr_item 0 7545 NULL +goal_in_my_reservation_7553 goal_in_my_reservation 3 7553 NULL +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL -+btrfs_block_rsv_add_7579 btrfs_block_rsv_add 3 7579 NULL -+ext3_try_to_allocate_7590 ext3_try_to_allocate 5-3 7590 NULL -+groups_alloc_7614 groups_alloc 1 7614 NULL -+sg_virt_7616 sg_virt 0 7616 NULL -+skb_copy_expand_7685 skb_copy_expand 2-3 7685 NULL nohasharray -+acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 &skb_copy_expand_7685 ++cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL ++ext4_ext_insert_extent_7576 ext4_ext_insert_extent 0 7576 NULL ++btrfs_block_rsv_add_7579 btrfs_block_rsv_add 3-0 7579 NULL ++ext3_try_to_allocate_7590 ext3_try_to_allocate 5-3-0 7590 NULL ++ocfs2_lock_create_7612 ocfs2_lock_create 0 7612 NULL ++create_dir_7614 create_dir 0 7614 NULL nohasharray ++groups_alloc_7614 groups_alloc 1 7614 &create_dir_7614 ++_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL ++fault_inject_write_7662 fault_inject_write 3 7662 NULL ++acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 1-2 7685 NULL +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL +dev_write_7708 dev_write 3 7708 NULL +unmap_region_7709 unmap_region 1 7709 NULL -+brcmf_sdcard_send_buf_7713 brcmf_sdcard_send_buf 6 7713 NULL -+set_bypass_pwup_pfs_7742 set_bypass_pwup_pfs 3 7742 NULL ++dbg_check_cats_7713 dbg_check_cats 0 7713 NULL ++pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL +vxge_device_register_7752 vxge_device_register 4 7752 NULL -+osdv2_attr_list_elem_size_7763 osdv2_attr_list_elem_size 0-1 7763 NULL +ubi_io_read_vid_hdr_7766 ubi_io_read_vid_hdr 0 7766 NULL -+ioread32be_7773 ioread32be 0 7773 NULL ++paths_from_inode_7774 paths_from_inode 0 7774 NULL +alloc_candev_7776 alloc_candev 1-2 7776 NULL +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL -+bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL -+diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL ++bnx2_nvram_write_7790 bnx2_nvram_write 2-4 7790 NULL ++diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray ++lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792 +ubifs_leb_read_7828 ubifs_leb_read 0 7828 NULL ++cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL ++tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL ++btrfs_find_space_for_alloc_7876 btrfs_find_space_for_alloc 2 7876 NULL ++config_desc_7878 config_desc 0 7878 NULL +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL -+gfs2_tune_get_i_7903 gfs2_tune_get_i 0 7903 NULL +ext3_group_extend_7911 ext3_group_extend 3 7911 NULL +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL +f_hidg_write_7932 f_hidg_write 3 7932 NULL -+io_apic_setup_irq_pin_once_7934 io_apic_setup_irq_pin_once 1 7934 NULL ++io_apic_setup_irq_pin_once_7934 io_apic_setup_irq_pin_once 1-2 7934 NULL ++compare_refs_7938 compare_refs 0 7938 NULL ++fsnotify_7943 fsnotify 0 7943 NULL +hash_netiface6_expire_7944 hash_netiface6_expire 3 7944 NULL +integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL -+sys_mbind_7990 sys_mbind 5 7990 NULL ++bch_btree_to_text_7960 bch_btree_to_text 2 7960 NULL ++fixup_inode_link_count_8002 fixup_inode_link_count 0 8002 NULL ++extend_or_restart_transaction_8008 extend_or_restart_transaction 0 8008 NULL +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL +vcs_read_8017 vcs_read 3 8017 NULL -+normalize_up_8037 normalize_up 0-1-2 8037 NULL +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL +ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL +leb_read_lock_8070 leb_read_lock 0 8070 NULL ++spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL +alloc_targets_8074 alloc_targets 2 8074 NULL nohasharray +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 &alloc_targets_8074 ++ext4_ext_map_blocks_8078 ext4_ext_map_blocks 0 8078 NULL +venus_lookup_8121 venus_lookup 4 8121 NULL +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL -+dma_map_area_8178 dma_map_area 5-2-3 8178 NULL ++xfs_iomap_prealloc_size_8141 xfs_iomap_prealloc_size 3 8141 NULL ++dma_map_area_8178 dma_map_area 3-2-5-0 8178 NULL +ore_truncate_8181 ore_truncate 3 8181 NULL +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL ++update_cowonly_root_8200 update_cowonly_root 0 8200 NULL +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL ++__ocfs2_lock_refcount_tree_8207 __ocfs2_lock_refcount_tree 0 8207 NULL +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL +play_iframe_8219 play_iframe 3 8219 NULL @@ -102346,45 +103276,51 @@ index 0000000..b04803b +ceph_sync_write_8233 ceph_sync_write 4 8233 NULL +bnx2x_iov_get_max_queue_count_8235 bnx2x_iov_get_max_queue_count 0 8235 NULL +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL -+add_rx_skb_8257 add_rx_skb 3 8257 NULL +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL +init_cdev_8274 init_cdev 1 8274 NULL +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL ++snd_pcm_update_state_8320 snd_pcm_update_state 0 8320 NULL +construct_key_and_link_8321 construct_key_and_link 4 8321 NULL +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL -+isku_sysfs_write_talk_8360 isku_sysfs_write_talk 6 8360 NULL nohasharray -+ping_getfrag_8360 ping_getfrag 4-3 8360 &isku_sysfs_write_talk_8360 -+uvc_v4l2_compat_ioctl32_8375 uvc_v4l2_compat_ioctl32 3 8375 NULL ++generic_write_sync_8358 generic_write_sync 0 8358 NULL ++ping_getfrag_8360 ping_getfrag 4-3 8360 NULL ++ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL ++ocfs2_decrease_refcount_rec_8385 ocfs2_decrease_refcount_rec 0 8385 NULL +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411 +pca953x_gpio_to_irq_8424 pca953x_gpio_to_irq 2 8424 NULL -+snd_usb_ctl_msg_8436 snd_usb_ctl_msg 8 8436 NULL -+irq_create_mapping_8437 irq_create_mapping 2 8437 NULL ++irq_create_mapping_8437 irq_create_mapping 2-0 8437 NULL ++generic_bin_search_8440 generic_bin_search 0 8440 NULL ++ring_wait_for_space_8457 ring_wait_for_space 0 8457 NULL ++dir_changed_8471 dir_changed 0 8471 NULL +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL ++fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL +dev_config_8506 dev_config 3 8506 NULL +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL -+pnp_resource_len_8532 pnp_resource_len 0 8532 NULL +alloc_pg_vec_8533 alloc_pg_vec 2 8533 NULL +ocfs2_read_virt_blocks_8538 ocfs2_read_virt_blocks 2-3 8538 NULL +user_on_off_8552 user_on_off 2 8552 NULL +profile_remove_8556 profile_remove 3 8556 NULL ++remove_extent_backref_8559 remove_extent_backref 0 8559 NULL +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL -+mga_ioremap_8571 mga_ioremap 1-2 8571 NULL +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL +tower_write_8580 tower_write 3 8580 NULL -+rtllib_MFIE_rate_len_8606 rtllib_MFIE_rate_len 0 8606 NULL ++ocfs2_reserve_local_alloc_bits_8581 ocfs2_reserve_local_alloc_bits 0 8581 NULL ++cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL ++iommu_unmap_8624 iommu_unmap 2-0 8624 NULL +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL +fuse_send_write_pages_8636 fuse_send_write_pages 0-5 8636 NULL +generic_acl_set_8658 generic_acl_set 4 8658 NULL ++mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL +tc3589x_gpio_irq_unmap_8680 tc3589x_gpio_irq_unmap 2 8680 NULL @@ -102393,139 +103329,175 @@ index 0000000..b04803b +arcfb_write_8702 arcfb_write 3 8702 NULL +i_size_read_8703 i_size_read 0 8703 NULL nohasharray +init_header_8703 init_header 0 8703 &i_size_read_8703 -+ctrl_out_8712 ctrl_out 3-5 8712 NULL ++HDLC_irq_8709 HDLC_irq 2 8709 NULL ++ctrl_out_8712 ctrl_out 5-3 8712 NULL ++__create_free_space_inode_8724 __create_free_space_inode 0 8724 NULL ++tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL +f_dupfd_8730 f_dupfd 1 8730 NULL -+__create_irqs_8733 __create_irqs 2-1 8733 NULL ++__create_irqs_8733 __create_irqs 2-1-0-3 8733 NULL +pca953x_gpio_irq_map_8737 pca953x_gpio_irq_map 2 8737 NULL +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL ++compound_order_8750 compound_order 0 8750 NULL ++ocfs2_find_path_8754 ocfs2_find_path 0 8754 NULL ++yurex_write_8761 yurex_write 3 8761 NULL +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL -+sys_prctl_8766 sys_prctl 4 8766 NULL -+x32_arch_ptrace_8767 x32_arch_ptrace 3-4 8767 NULL ++x32_arch_ptrace_8767 x32_arch_ptrace 3 8767 NULL ++kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 3-4 8785 NULL ++aligned_nrpages_8791 aligned_nrpages 0-1-2 8791 NULL +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL +cpuset_common_file_read_8800 cpuset_common_file_read 5 8800 NULL ++intel_ring_begin_8808 intel_ring_begin 0 8808 NULL +metronomefb_write_8823 metronomefb_write 3 8823 NULL -+icmpv6_manip_pkt_8833 icmpv6_manip_pkt 4 8833 NULL nohasharray -+get_queue_depth_8833 get_queue_depth 0 8833 &icmpv6_manip_pkt_8833 ++SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL ++get_queue_depth_8833 get_queue_depth 0 8833 NULL +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL +clear_bitset_8840 clear_bitset 2 8840 NULL +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL ++sk_memory_allocated_8882 sk_memory_allocated 0 8882 NULL +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL -+tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 NULL ++ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray ++tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890 ++xfs_contig_bits_8904 xfs_contig_bits 3-0 8904 NULL +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL ++sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL ++write_file_ani_8918 write_file_ani 3 8918 NULL +layout_commit_8926 layout_commit 3 8926 NULL +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL +driver_stats_read_8944 driver_stats_read 3 8944 NULL ++lookup_zone_8956 lookup_zone 2 8956 NULL +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL +seq_bitmap_list_8963 seq_bitmap_list 3 8963 NULL +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL +venus_mkdir_8967 venus_mkdir 4 8967 NULL -+vol_cdev_read_8968 vol_cdev_read 3 8968 NULL nohasharray -+seq_open_net_8968 seq_open_net 4 8968 &vol_cdev_read_8968 ++seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray ++vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL -+btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3 8986 NULL ++btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3-8 8986 NULL ++jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL ++il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL ++sparse_index_alloc_9021 sparse_index_alloc 1 9021 NULL +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL -+__pskb_copy_9038 __pskb_copy 2 9038 NULL ++fd_ioctl_9028 fd_ioctl 3 9028 NULL +nla_put_9042 nla_put 3 9042 NULL -+snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL ++offset_il_node_9059 offset_il_node 0 9059 NULL ++snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 5-3 9061 NULL +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL -+string_9080 string 0 9080 NULL -+create_queues_9088 create_queues 2-3 9088 NULL ++create_queues_9088 create_queues 3-2 9088 NULL +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL ++adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL ++alloc_slabmgmt_9109 alloc_slabmgmt 5 9109 NULL +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL nohasharray -+gfn_to_rmap_9110 gfn_to_rmap 2-3 9110 &caif_stream_sendmsg_9110 ++gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 &caif_stream_sendmsg_9110 ++udf_direct_IO_9111 udf_direct_IO 4 9111 NULL +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL -+isku_sysfs_write_keys_macro_9120 isku_sysfs_write_keys_macro 6 9120 NULL +mq_remove_mapping_9124 mq_remove_mapping 2 9124 NULL +mlx4_alloc_resize_umem_9132 mlx4_alloc_resize_umem 3 9132 NULL +ext4_list_backups_9138 ext4_list_backups 0 9138 NULL ++apei_resources_merge_9149 apei_resources_merge 0 9149 NULL ++vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL ++__btrfs_add_delayed_deletion_item_9177 __btrfs_add_delayed_deletion_item 0 9177 NULL +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL -+alloc_group_attrs_9194 alloc_group_attrs 2 9194 NULL nohasharray -+altera_swap_ir_9194 altera_swap_ir 2 9194 &alloc_group_attrs_9194 -+gx1_gx_base_9198 gx1_gx_base 0 9198 NULL ++altera_swap_ir_9194 altera_swap_ir 2 9194 NULL +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL +get_pfn_9207 get_pfn 1 9207 NULL -+virtqueue_add_9217 virtqueue_add 5-4 9217 NULL ++virtqueue_add_9217 virtqueue_add 4-5 9217 NULL +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL -+ocfs2_clear_ext_refcount_9256 ocfs2_clear_ext_refcount 4 9256 NULL -+tcf_csum_ipv4_icmp_9258 tcf_csum_ipv4_icmp 3 9258 NULL ++ext4_mark_iloc_dirty_9239 ext4_mark_iloc_dirty 0 9239 NULL ++ocfs2_clear_ext_refcount_9256 ocfs2_clear_ext_refcount 4-0 9256 NULL ++hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL ++btrfs_search_slot_9264 btrfs_search_slot 0 9264 NULL ++ocfs2_merge_rec_right_9267 ocfs2_merge_rec_right 0 9267 NULL +sparse_early_usemaps_alloc_node_9269 sparse_early_usemaps_alloc_node 4 9269 NULL +hdpvr_read_9273 hdpvr_read 3 9273 NULL +flakey_status_9274 flakey_status 5 9274 NULL -+qla82xx_pci_set_window_9303 qla82xx_pci_set_window 0-2 9303 NULL +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL -+memblock_find_in_range_node_9328 memblock_find_in_range_node 0-3-4 9328 NULL +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL ++ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL ++of_node_to_nid_9367 of_node_to_nid 0 9367 NULL +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL ++get_request_type_9393 get_request_type 0 9393 NULL nohasharray ++mlx4_bitmap_init_9393 mlx4_bitmap_init 5-2 9393 &get_request_type_9393 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL +read_9397 read 3 9397 NULL -+nf_nat_sip_expect_9418 nf_nat_sip_expect 8 9418 NULL ++btrfs_drop_extents_9423 btrfs_drop_extents 4-0 9423 NULL +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL -+kmalloc_array_9444 kmalloc_array 1-2 9444 NULL +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL -+mcs_unwrap_mir_9455 mcs_unwrap_mir 3 9455 NULL +ext3_xattr_set_acl_9467 ext3_xattr_set_acl 4 9467 NULL -+agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL -+__alloc_preds_9492 __alloc_preds 2 9492 NULL nohasharray -+crypt_status_9492 crypt_status 5 9492 &__alloc_preds_9492 ++agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL nohasharray ++get_registers_9470 get_registers 4 9470 &agp_generic_alloc_user_9470 ++btrfs_csum_file_blocks_9491 btrfs_csum_file_blocks 0 9491 NULL ++crypt_status_9492 crypt_status 5 9492 NULL ++lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL ++btrfs_add_delayed_data_ref_9508 btrfs_add_delayed_data_ref 0 9508 NULL +lp_write_9511 lp_write 3 9511 NULL -+xen_remap_exchanged_ptes_9513 xen_remap_exchanged_ptes 1 9513 NULL ++mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL ++ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL +read_file_dma_9530 read_file_dma 3 9530 NULL +ext3_alloc_branch_9534 ext3_alloc_branch 5 9534 NULL -+audit_log_n_untrustedstring_9548 audit_log_n_untrustedstring 3 9548 NULL ++iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL ++il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL ++compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL ++readl_9557 readl 0 9557 NULL +fw_node_create_9559 fw_node_create 2 9559 NULL +ipath_get_user_pages_9561 ipath_get_user_pages 1-2 9561 NULL -+kobj_map_9566 kobj_map 2-3 9566 NULL ++kobj_map_9566 kobj_map 3-2 9566 NULL +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL -+biovec_create_pools_9575 biovec_create_pools 2 9575 NULL -+ieee80211_tdls_mgmt_9581 ieee80211_tdls_mgmt 8 9581 NULL +use_block_rsv_9597 use_block_rsv 3 9597 NULL -+do_sync_9604 do_sync 1 9604 NULL +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL ++ocfs2_claim_suballoc_bits_9615 ocfs2_claim_suballoc_bits 0 9615 NULL ++lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL -+ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL -+compat_sys_keyctl_9639 compat_sys_keyctl 4-2-3 9639 NULL ++ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 3-4 9635 NULL ++acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL ++compat_sys_keyctl_9639 compat_sys_keyctl 4 9639 NULL ++ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL -+uvc_alloc_buffers_9656 uvc_alloc_buffers 2-3 9656 NULL +queue_received_packet_9657 queue_received_packet 5 9657 NULL +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL -+ks8842_read16_9676 ks8842_read16 0 9676 NULL nohasharray -+dns_query_9676 dns_query 3 9676 &ks8842_read16_9676 ++dns_query_9676 dns_query 3 9676 NULL +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL -+is_hole_9694 is_hole 2 9694 NULL nohasharray -+x25_asy_compat_ioctl_9694 x25_asy_compat_ioctl 4 9694 &is_hole_9694 -+fnb_9703 fnb 2-3 9703 NULL ++vx_transfer_end_9701 vx_transfer_end 0 9701 NULL ++fnb_9703 fnb 2-3-0 9703 NULL +fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray +ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705 ++cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL ++btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL ++SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL +nla_get_u8_9736 nla_get_u8 0 9736 NULL +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL -+ddb_input_read_9743 ddb_input_read 3 9743 NULL ++shmem_replace_page_9740 shmem_replace_page 0 9740 NULL ++ddb_input_read_9743 ddb_input_read 3-0 9743 NULL +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 NULL ++ni_calculate_power_boost_limit_9757 ni_calculate_power_boost_limit 3 9757 NULL +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL -+__alloc_percpu_9764 __alloc_percpu 1-2 9764 NULL ++__alloc_percpu_9764 __alloc_percpu 2-1 9764 NULL ++btrfs_write_and_wait_transaction_9768 btrfs_write_and_wait_transaction 0 9768 NULL +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL +snd_mem_proc_write_9786 snd_mem_proc_write 3 9786 NULL ++kvm_age_hva_9795 kvm_age_hva 2 9795 NULL ++parse_uac2_sample_rate_range_9801 parse_uac2_sample_rate_range 0 9801 NULL ++tpm_data_in_9802 tpm_data_in 0 9802 NULL +ttm_bo_fbdev_io_9805 ttm_bo_fbdev_io 4 9805 NULL -+ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 NULL -+pnp_mem_start_9817 pnp_mem_start 0 9817 NULL -+kernel_physical_mapping_init_9818 kernel_physical_mapping_init 0-2-1 9818 NULL ++udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 NULL nohasharray ++ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 &udpv6_recvmsg_9813 ++svc_pool_map_get_node_9817 svc_pool_map_get_node 0 9817 NULL +dvb_dvr_set_buffer_size_9840 dvb_dvr_set_buffer_size 2 9840 NULL -+cfg80211_send_deauth_9862 cfg80211_send_deauth 3 9862 NULL +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL +btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL +f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL @@ -102533,51 +103505,57 @@ index 0000000..b04803b +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL +bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray +snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893 -+snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 3-5 9895 NULL ++snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 5-3 9895 NULL +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL -+gen6_get_total_gtt_size_9913 gen6_get_total_gtt_size 0-1 9913 NULL ++ext4_map_blocks_9916 ext4_map_blocks 0 9916 NULL ++root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL ++tc3589x_reg_read_9940 tc3589x_reg_read 0 9940 NULL +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL +read_file_misc_9948 read_file_misc 3 9948 NULL -+set_rxd_buffer_pointer_9950 set_rxd_buffer_pointer 8 9950 NULL -+ext2_new_blocks_9954 ext2_new_blocks 2 9954 NULL -+csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL ++ext2_new_blocks_9954 ext2_new_blocks 2-0 9954 NULL ++csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 4-3 9957 NULL ++SyS_gethostname_9964 SyS_gethostname 2 9964 NULL +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL -+btrfs_add_link_9973 btrfs_add_link 5 9973 NULL -+ath6kl_usb_submit_ctrl_out_9978 ath6kl_usb_submit_ctrl_out 6 9978 NULL ++btrfs_add_link_9973 btrfs_add_link 5-0 9973 NULL +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL -+handle_request_10024 handle_request 9 10024 NULL +batadv_orig_hash_add_if_10033 batadv_orig_hash_add_if 2 10033 NULL -+ieee80211_probereq_get_10040 ieee80211_probereq_get 4-5 10040 NULL -+xen_destroy_contiguous_region_10054 xen_destroy_contiguous_region 1 10054 NULL -+vfio_pci_write_10063 vfio_pci_write 3 10063 NULL ++iterate_inodes_from_logical_10037 iterate_inodes_from_logical 0 10037 NULL ++vm_iomap_memory_10038 vm_iomap_memory 2 10038 NULL +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL +ufs_bitmap_search_10105 ufs_bitmap_search 0-3 10105 NULL +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110 -+jbd_alloc_10112 jbd_alloc 0 10112 NULL nohasharray -+gfs2_meta_read_10112 gfs2_meta_read 0 10112 &jbd_alloc_10112 -+offset_to_bit_10134 offset_to_bit 0 10134 NULL ++gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL ++SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL nohasharray ++offset_to_bit_10134 offset_to_bit 0-2-1-3 10134 &SyS_migrate_pages_10134 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL nohasharray +ol_chunk_entries_10159 ol_chunk_entries 0 10159 &hidg_alloc_ep_req_10159 +stmpe_irq_unmap_10164 stmpe_irq_unmap 2 10164 NULL +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL ++kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL -+do_ioctl_trans_10194 do_ioctl_trans 3 10194 NULL ++register_ftrace_function_10218 register_ftrace_function 0 10218 NULL ++hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL ++mutex_lock_killable_10244 mutex_lock_killable 0 10244 NULL ++insert_orphan_item_10249 insert_orphan_item 0 10249 NULL +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL ++gpiochip_add_to_list_10262 gpiochip_add_to_list 0 10262 NULL +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL -+ubi_leb_change_10289 ubi_leb_change 4 10289 NULL ++ubi_leb_change_10289 ubi_leb_change 0-4 10289 NULL +read_emulate_10310 read_emulate 2-4 10310 NULL +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL +ttm_object_device_init_10321 ttm_object_device_init 2 10321 NULL ++compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL +ubi_leb_read_10328 ubi_leb_read 0 10328 NULL +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL +get_dump_page_10338 get_dump_page 1 10338 NULL +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL ++whci_add_cap_10350 whci_add_cap 0 10350 NULL +dbAllocAny_10354 dbAllocAny 0 10354 NULL +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL +ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL @@ -102586,26 +103564,32 @@ index 0000000..b04803b +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL +fwtty_rx_10434 fwtty_rx 3 10434 NULL +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL -+ca91cx42_alloc_resource_10502 ca91cx42_alloc_resource 2 10502 NULL ++ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL +sel_write_disable_10511 sel_write_disable 3 10511 NULL +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL nohasharray +hash_netiface4_expire_10519 hash_netiface4_expire 3 10519 &qlcnic_pci_sriov_enable_10519 ++snd_pcm_hw_params_user_10520 snd_pcm_hw_params_user 0 10520 NULL +ocfs2_add_refcounted_extent_10526 ocfs2_add_refcounted_extent 6 10526 NULL -+get_vm_area_caller_10527 get_vm_area_caller 1 10527 NULL -+snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 NULL -+ieee80211_send_probe_req_10539 ieee80211_send_probe_req 4-6 10539 NULL ++snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 NULL nohasharray ++kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 &snd_pcm_lib_read_10536 ++SYSC_read_10545 SYSC_read 3 10545 NULL +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL -+otp_read_10594 otp_read 2-4-5 10594 NULL ++otp_read_10594 otp_read 5-4-2 10594 NULL +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL +alloc_coherent_10632 alloc_coherent 2 10632 NULL -+nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL ++ubi_io_write_vid_hdr_10660 ubi_io_write_vid_hdr 0 10660 NULL nohasharray ++nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 &ubi_io_write_vid_hdr_10660 ++efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL +dtf_read_device_10663 dtf_read_device 3 10663 NULL +parport_write_10669 parport_write 0 10669 NULL ++alloc_vmap_area_10682 alloc_vmap_area 5 10682 NULL ++edge_write_10692 edge_write 4 10692 NULL ++ubi_wl_get_peb_10699 ubi_wl_get_peb 0 10699 NULL +inl_10708 inl 0 10708 NULL nohasharray +selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 &inl_10708 +pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray @@ -102613,38 +103597,46 @@ index 0000000..b04803b +spi_sync_10731 spi_sync 0 10731 NULL +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737 -+compat_sys_msgsnd_10738 compat_sys_msgsnd 2 10738 NULL -+sys_syslog_10746 sys_syslog 3 10746 NULL +alloc_one_pg_vec_page_10747 alloc_one_pg_vec_page 1 10747 NULL ++ttm_ref_object_add_10748 ttm_ref_object_add 0 10748 NULL ++SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL -+kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4-2 10765 NULL ++kvm_read_guest_atomic_10765 kvm_read_guest_atomic 2-4 10765 NULL +wb_set_dirty_10778 wb_set_dirty 2 10778 NULL +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL -+sys_bind_10799 sys_bind 3 10799 NULL -+compat_put_int_10828 compat_put_int 1 10828 NULL ++i915_gem_wait_for_error_10791 i915_gem_wait_for_error 0 10791 NULL ++snd_mask_value_10794 snd_mask_value 0 10794 NULL ++diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL -+ida_get_new_above_10853 ida_get_new_above 2 10853 NULL ++ida_get_new_above_10853 ida_get_new_above 2-0 10853 NULL +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL +ol_chunk_blocks_10864 ol_chunk_blocks 0 10864 NULL +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL -+mid_get_vbt_data_r0_10876 mid_get_vbt_data_r0 2 10876 NULL -+bl_mark_for_commit_10879 bl_mark_for_commit 2-3 10879 NULL ++drm_ht_insert_item_10877 drm_ht_insert_item 0 10877 NULL ++wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL +get_scq_10897 get_scq 2 10897 NULL +cgroup_write_string_10900 cgroup_write_string 5 10900 NULL +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL -+__copy_from_user_10918 __copy_from_user 3 10918 NULL ++lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL ++__copy_from_user_10918 __copy_from_user 3-0 10918 NULL ++kobject_add_10919 kobject_add 0 10919 NULL +da9052_map_irq_10952 da9052_map_irq 2 10952 NULL +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL +bm_entry_read_10976 bm_entry_read 3 10976 NULL -+i915_min_freq_write_10981 i915_min_freq_write 3 10981 NULL +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL +__hci_num_ctrl_10985 __hci_num_ctrl 0 10985 NULL ++lz4_compress_10986 lz4_compress 2 10986 NULL ++do_switch_10994 do_switch 0 10994 NULL +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL ++btrfs_add_delayed_extent_op_11000 btrfs_add_delayed_extent_op 0 11000 NULL +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL +SetLineNumber_11023 SetLineNumber 0 11023 NULL -+mb_find_next_bit_11037 mb_find_next_bit 2-3-0 11037 NULL ++btrfs_find_space_for_alloc_11028 btrfs_find_space_for_alloc 2 11028 NULL ++mb_find_next_bit_11037 mb_find_next_bit 0-2-3 11037 NULL +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL ++insert_inline_extent_backref_11063 insert_inline_extent_backref 8-0 11063 NULL +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL ++snd_pcm_delay_11081 snd_pcm_delay 0 11081 NULL +count_argc_11083 count_argc 0 11083 NULL +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL +stmpe_gpio_to_irq_11110 stmpe_gpio_to_irq 2 11110 NULL @@ -102652,202 +103644,238 @@ index 0000000..b04803b +page_offset_11120 page_offset 0 11120 NULL +tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL nohasharray +cea_db_payload_len_11124 cea_db_payload_len 0 11124 &tracing_buffers_read_11124 -+alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL -+acpi_os_map_memory_11161 acpi_os_map_memory 1-2 11161 NULL -+ioat2_alloc_ring_11172 ioat2_alloc_ring 2 11172 NULL nohasharray -+snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 3-4 11172 &ioat2_alloc_ring_11172 -+__swab16p_11220 __swab16p 0 11220 NULL ++alloc_alien_cache_11127 alloc_alien_cache 2-1 11127 NULL ++eb_lookup_objects_11163 eb_lookup_objects 0 11163 NULL ++snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 4-3 11172 NULL +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL ++comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL +mmap_region_11247 mmap_region 0-2 11247 NULL +ubifs_write_node_11258 ubifs_write_node 5-3 11258 NULL +dm_cache_discard_bitset_resize_11262 dm_cache_discard_bitset_resize 3 11262 NULL +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL -+cru_detect_11272 cru_detect 1 11272 NULL ++ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL ++__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL ++split_vma_11312 split_vma 0 11312 NULL ++btrfs_update_inode_fallback_11313 btrfs_update_inode_fallback 0 11313 NULL +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL -+tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 NULL ++sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray ++tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316 ++shmem_radix_tree_replace_11325 shmem_radix_tree_replace 0 11325 NULL +construct_key_11329 construct_key 3 11329 NULL nohasharray +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329 +next_segment_11330 next_segment 0-2-1 11330 NULL -+persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL ++persistent_ram_buffer_map_11332 persistent_ram_buffer_map 2-1 11332 NULL +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL -+i915_max_freq_write_11350 i915_max_freq_write 3 11350 NULL -+sel_write_create_11353 sel_write_create 3 11353 NULL -+handle_unit_11355 handle_unit 0-1 11355 NULL -+batadv_skb_head_push_11360 batadv_skb_head_push 2 11360 NULL ++nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 NULL nohasharray ++sel_write_create_11353 sel_write_create 3 11353 &nl80211_send_mgmt_11353 +drm_vblank_init_11362 drm_vblank_init 2 11362 NULL +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL -+___alloc_bootmem_11410 ___alloc_bootmem 1-2 11410 NULL ++__btrfs_add_delayed_insertion_item_11400 __btrfs_add_delayed_insertion_item 0 11400 NULL ++lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL ++___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL +str_to_user_11411 str_to_user 2 11411 NULL +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL ++relocate_entry_gtt_11416 relocate_entry_gtt 0 11416 NULL +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL +trace_options_read_11419 trace_options_read 3 11419 NULL -+xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 NULL ++i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL ++__irq_set_trigger_11422 __irq_set_trigger 0 11422 NULL nohasharray ++xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 &__irq_set_trigger_11422 +prepare_image_11424 prepare_image 0 11424 NULL -+vring_size_11426 vring_size 0-1-2 11426 NULL ++ext3_xattr_block_list_11428 ext3_xattr_block_list 3 11428 NULL +bttv_read_11432 bttv_read 3 11432 NULL +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL ++do_blockdev_direct_IO_11455 do_blockdev_direct_IO 0-6 11455 NULL +swp_offset_11475 swp_offset 0 11475 NULL -+sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL ++st_sensors_write_data_with_mask_11476 st_sensors_write_data_with_mask 3 11476 NULL ++pci_set_power_state_11479 pci_set_power_state 0 11479 NULL nohasharray ++sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 &pci_set_power_state_11479 +xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4 11492 NULL +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL ++ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL +twl_direction_in_11527 twl_direction_in 2 11527 NULL +setup_IO_APIC_irq_extra_11537 setup_IO_APIC_irq_extra 1 11537 NULL -+skb_cow_data_11565 skb_cow_data 0-2 11565 NULL -+mlx4_init_cmpt_table_11569 mlx4_init_cmpt_table 3 11569 NULL ++radix_tree_extend_11555 radix_tree_extend 0 11555 NULL ++skb_cow_data_11565 skb_cow_data 0 11565 NULL ++posix_acl_create_masq_11567 posix_acl_create_masq 0 11567 NULL ++qgroup_account_ref_step2_11575 qgroup_account_ref_step2 0 11575 NULL ++lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL ++btrfs_uuid_tree_add_11598 btrfs_uuid_tree_add 0 11598 NULL +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL ++i915_gem_object_pin_11630 i915_gem_object_pin 0 11630 NULL +add_new_bitmap_11644 add_new_bitmap 3 11644 NULL +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL +nla_total_size_11658 nla_total_size 0-1 11658 NULL ++slab_ksize_11664 slab_ksize 0 11664 NULL ++__btrfs_run_delayed_items_11671 __btrfs_run_delayed_items 0 11671 NULL +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL -+compat_SyS_msgsnd_11675 compat_SyS_msgsnd 2-3 11675 NULL ++compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL +dsp_buffer_alloc_11684 dsp_buffer_alloc 2 11684 NULL +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL +split_11691 split 2 11691 NULL +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 NULL +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL -+tcf_csum_ipv6_icmp_11738 tcf_csum_ipv6_icmp 4 11738 NULL -+nfsd4_get_drc_mem_11748 nfsd4_get_drc_mem 0-1-2 11748 NULL +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL ++intel_map_page_11762 intel_map_page 4-3 11762 NULL ++ocfs2_relink_block_group_11769 ocfs2_relink_block_group 0 11769 NULL +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL +ebt_buf_add_11779 ebt_buf_add 0 11779 NULL +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL -+pcpu_fc_alloc_11818 pcpu_fc_alloc 2-3 11818 NULL ++rtw_alloc_etherdev_11792 rtw_alloc_etherdev 1 11792 NULL ++pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL ++umc_device_register_11824 umc_device_register 0 11824 NULL +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL -+nf_nat_sdp_media_11863 nf_nat_sdp_media 9 11863 NULL +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL -+kmalloc_slab_11917 kmalloc_slab 1 11917 NULL ++mdc_rename_11899 mdc_rename 4-6 11899 NULL ++xstateregs_get_11906 xstateregs_get 4 11906 NULL ++ti_write_11916 ti_write 4 11916 NULL +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL +bitmap_remap_11929 bitmap_remap 5 11929 NULL +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL -+dccp_feat_clone_sp_val_11942 dccp_feat_clone_sp_val 3 11942 NULL ++r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL +f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL -+atmel_read16_11981 atmel_read16 0 11981 NULL ++usc_InReg_11976 usc_InReg 0 11976 NULL nohasharray ++split_node_11976 split_node 0 11976 &usc_InReg_11976 ++BeceemFlashBulkRead_11979 BeceemFlashBulkRead 0 11979 NULL +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL ++i40e_pci_sriov_configure_12011 i40e_pci_sriov_configure 2 12011 NULL ++intel_init_ring_buffer_12016 intel_init_ring_buffer 0 12016 NULL +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL ++did_overwrite_ref_12046 did_overwrite_ref 0 12046 NULL +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL +ubifs_recover_log_leb_12079 ubifs_recover_log_leb 3 12079 NULL +pse36_gfn_delta_12087 pse36_gfn_delta 0-1 12087 NULL ++rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL ++twl6030_irq_map_12105 twl6030_irq_map 2 12105 NULL ++i915_gem_evict_something_12118 i915_gem_evict_something 0 12118 NULL +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL +set_powered_12129 set_powered 4 12129 NULL -+nfs_writedata_alloc_12133 nfs_writedata_alloc 2 12133 NULL +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL -+batadv_add_packet_12136 batadv_add_packet 3 12136 NULL +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL +vmw_fifo_reserve_12141 vmw_fifo_reserve 2 12141 NULL ++rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL +get_idx_gc_leb_12148 get_idx_gc_leb 0 12148 NULL +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL ++ocfs2_local_alloc_new_window_12153 ocfs2_local_alloc_new_window 0 12153 NULL +vmbus_open_12154 vmbus_open 2-3 12154 NULL -+wil_rxdesc_phy_length_12165 wil_rxdesc_phy_length 0 12165 NULL +dma_memcpy_to_iovec_12173 dma_memcpy_to_iovec 5 12173 NULL ++LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL -+bl_is_sector_init_12199 bl_is_sector_init 2 12199 NULL -+scaled_div_12201 scaled_div 1-2 12201 NULL -+free_initrd_mem_12203 free_initrd_mem 1 12203 NULL -+receive_copy_12216 receive_copy 3 12216 NULL ++scaled_div_12201 scaled_div 2-1-0 12201 NULL +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221 -+__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1-2 12235 NULL ++__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL ++kvirt_to_pa_12247 kvirt_to_pa 0 12247 NULL +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL -+ath_descdma_setup_12257 ath_descdma_setup 5 12257 NULL +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL +note_last_dentry_12285 note_last_dentry 3 12285 NULL -+roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL nohasharray -+il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288 -+vxge_get_num_vfs_12302 vxge_get_num_vfs 0 12302 NULL ++il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 NULL nohasharray ++roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 &il_dbgfs_nvm_read_12288 +wrap_min_12303 wrap_min 0-1-2 12303 NULL -+tipc_msg_build_12326 tipc_msg_build 4 12326 NULL ++bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL ++btrfs_lookup_file_extent_12341 btrfs_lookup_file_extent 0 12341 NULL +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL +paging32_walk_addr_12359 paging32_walk_addr 3 12359 NULL +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL -+btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 NULL ++btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 NULL nohasharray ++populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391 ++ntfs_get_size_for_mapping_pairs_12413 ntfs_get_size_for_mapping_pairs 0 12413 NULL nohasharray ++ext4_bg_num_gdb_nometa_12413 ext4_bg_num_gdb_nometa 0 12413 &ntfs_get_size_for_mapping_pairs_12413 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL ++cfs_array_alloc_12441 cfs_array_alloc 2 12441 NULL +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL -+qla4_82xx_pci_mem_write_direct_12479 qla4_82xx_pci_mem_write_direct 2 12479 NULL +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL -+rtllib_auth_challenge_12493 rtllib_auth_challenge 3 12493 NULL +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL -+nfs_readdir_make_qstr_12509 nfs_readdir_make_qstr 3 12509 NULL +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL ++xfs_get_extsz_hint_12531 xfs_get_extsz_hint 0 12531 NULL +kvm_setup_async_pf_12555 kvm_setup_async_pf 3 12555 NULL +ib_umem_get_12557 ib_umem_get 2-3 12557 NULL ++ceph_osdc_wait_request_12572 ceph_osdc_wait_request 0 12572 NULL +hvc_alloc_12579 hvc_alloc 4 12579 NULL +snd_pcm_plugin_alloc_12580 snd_pcm_plugin_alloc 2 12580 NULL -+macvtap_compat_ioctl_12587 macvtap_compat_ioctl 3 12587 NULL +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL -+ipv6_get_l4proto_12600 ipv6_get_l4proto 2 12600 NULL ++tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL +vhci_put_user_12604 vhci_put_user 4 12604 NULL -+fc_fcp_frame_alloc_12624 fc_fcp_frame_alloc 2 12624 NULL ++ipath_mmap_mem_12625 ipath_mmap_mem 3 12625 NULL ++sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL -+ctrl_cdev_compat_ioctl_12634 ctrl_cdev_compat_ioctl 3 12634 NULL +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL ++nr_recvmsg_12649 nr_recvmsg 4 12649 NULL +wb_create_12651 wb_create 1 12651 NULL ++rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669 ++ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL ++ext4_bg_num_gdb_meta_12702 ext4_bg_num_gdb_meta 0 12702 NULL ++iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL +ivtv_write_12721 ivtv_write 3 12721 NULL +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL -+__videobuf_alloc_cached_12740 __videobuf_alloc_cached 1 12740 NULL ++run_delayed_data_ref_12749 run_delayed_data_ref 0 12749 NULL +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL +listxattr_12769 listxattr 3 12769 NULL +sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL -+ieee80211_rx_mgmt_beacon_12780 ieee80211_rx_mgmt_beacon 3 12780 NULL -+platform_create_bundle_12785 platform_create_bundle 4-6 12785 NULL -+btrfs_remove_free_space_12793 btrfs_remove_free_space 2 12793 NULL ++btrfs_remove_free_space_12793 btrfs_remove_free_space 2-0 12793 NULL +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL ++tlv_put_uuid_12824 tlv_put_uuid 0 12824 NULL +readq_12825 readq 0 12825 NULL ++SyS_add_key_12834 SyS_add_key 4 12834 NULL +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL -+spidev_sync_12842 spidev_sync 0 12842 NULL nohasharray -+ath6kl_wmi_add_wow_pattern_cmd_12842 ath6kl_wmi_add_wow_pattern_cmd 4 12842 &spidev_sync_12842 ++spidev_sync_12842 spidev_sync 0 12842 NULL +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL +ocfs2_hamming_encode_block_12904 ocfs2_hamming_encode_block 2 12904 NULL +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL ++free_tind_blocks_12926 free_tind_blocks 0 12926 NULL +ci_ll_init_12930 ci_ll_init 3 12930 NULL ++SYSC_sendfile_12936 SYSC_sendfile 4 12936 NULL +do_inode_permission_12946 do_inode_permission 0 12946 NULL +bm_status_write_12964 bm_status_write 3 12964 NULL -+_drbd_md_first_sector_12984 _drbd_md_first_sector 0 12984 NULL +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL -+acpi_tb_install_table_12988 acpi_tb_install_table 1 12988 NULL +TransmitTcb_12989 TransmitTcb 4 12989 NULL +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL ++btrfs_write_dirty_block_groups_13030 btrfs_write_dirty_block_groups 0 13030 NULL +generic_segment_checks_13041 generic_segment_checks 0 13041 NULL ++SyS_sendfile64_13043 SyS_sendfile64 4 13043 NULL +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL -+__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL ++ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 NULL nohasharray ++__dn_setsockopt_13060 __dn_setsockopt 5 13060 &ptlrpc_lprocfs_threads_min_seq_write_13060 +biovec_create_pool_13079 biovec_create_pool 2 13079 NULL ++_ocfs2_free_suballoc_bits_13085 _ocfs2_free_suballoc_bits 0 13085 NULL +irq_set_chip_and_handler_13088 irq_set_chip_and_handler 1 13088 NULL +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL -+blk_rq_map_sg_13092 blk_rq_map_sg 0 13092 NULL -+mb_find_next_zero_bit_13100 mb_find_next_zero_bit 2-3 13100 NULL -+ubifs_compat_ioctl_13108 ubifs_compat_ioctl 3 13108 NULL ++mb_find_next_zero_bit_13100 mb_find_next_zero_bit 2-3-0 13100 NULL ++ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL ++SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL +xen_allocate_irq_dynamic_13116 xen_allocate_irq_dynamic 0 13116 NULL +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL @@ -102857,223 +103885,266 @@ index 0000000..b04803b +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL -+compat_put_ulong_13186 compat_put_ulong 1 13186 NULL +__cmpxchg64_13187 __cmpxchg64 0 13187 NULL +comedi_read_13199 comedi_read 3 13199 NULL +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL +__nodes_fold_13215 __nodes_fold 4 13215 NULL ++get_unaligned_le64_13219 get_unaligned_le64 0 13219 NULL +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL -+fw_download_code_13249 fw_download_code 3 13249 NULL nohasharray -+kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 &fw_download_code_13249 ++kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 NULL +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL -+hostap_80211_get_hdrlen_13255 hostap_80211_get_hdrlen 0 13255 NULL +bio_integrity_trim_13259 bio_integrity_trim 3 13259 NULL ++simple_attr_write_13260 simple_attr_write 3 13260 NULL +c4iw_reg_user_mr_13269 c4iw_reg_user_mr 2-3 13269 NULL -+carl9170_rx_13272 carl9170_rx 3 13272 NULL +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL -+platform_device_add_resources_13289 platform_device_add_resources 3 13289 NULL -+i915_drop_caches_write_13308 i915_drop_caches_write 3 13308 NULL ++sd_major_13294 sd_major 0-1 13294 NULL ++kempld_read16_13297 kempld_read16 0 13297 NULL +reexecute_instruction_13321 reexecute_instruction 2 13321 NULL -+us122l_ctl_msg_13330 us122l_ctl_msg 8 13330 NULL +__clone_and_map_data_bio_13334 __clone_and_map_data_bio 4-8 13334 NULL +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5-2 13337 NULL -+cache_ctr_13364 cache_ctr 2 13364 NULL -+mthca_alloc_mtt_range_13371 mthca_alloc_mtt_range 2 13371 NULL ++get_bits_13353 get_bits 0-2 13353 NULL ++hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377 -+dis_bypass_write_13388 dis_bypass_write 3 13388 NULL -+carl9170_rx_untie_data_13405 carl9170_rx_untie_data 3 13405 NULL -+sky2_receive_13407 sky2_receive 2 13407 NULL ++ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL ++lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray ++dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388 ++BcmSetActiveSection_13389 BcmSetActiveSection 0 13389 NULL ++ocfs2_inode_lock_update_13414 ocfs2_inode_lock_update 0 13414 NULL +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL ++compat_SyS_sendfile64_13420 compat_SyS_sendfile64 4 13420 NULL +keyring_read_13438 keyring_read 3 13438 NULL -+sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL nohasharray -+set_tap_pwup_pfs_13440 set_tap_pwup_pfs 3 13440 &sctp_setsockopt_peer_primary_addr_13440 ++sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 8-9-7 13443 NULL -+mthca_buddy_alloc_13454 mthca_buddy_alloc 2 13454 NULL -+ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2 13512 NULL ++sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL ++data_read_13494 data_read 3 13494 NULL ++i915_switch_context_13498 i915_switch_context 0 13498 NULL ++ioat_chansts_32_13506 ioat_chansts_32 0 13506 NULL ++ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2-0 13512 NULL +core_status_13515 core_status 4 13515 NULL +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL +bm_init_13529 bm_init 2 13529 NULL -+non_atomic_pte_lookup_13540 non_atomic_pte_lookup 2 13540 NULL nohasharray -+SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1 13540 &non_atomic_pte_lookup_13540 ++kvm_get_cr8_13538 kvm_get_cr8 0 13538 NULL ++SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1-2 13540 NULL nohasharray ++non_atomic_pte_lookup_13540 non_atomic_pte_lookup 2 13540 &SYSC_remap_file_pages_13540 ++__btrfs_alloc_chunk_13554 __btrfs_alloc_chunk 0 13554 NULL ++llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL +ubifs_get_idx_gc_leb_13566 ubifs_get_idx_gc_leb 0 13566 NULL -+sys_madvise_13569 sys_madvise 1 13569 NULL +read_file_antenna_13574 read_file_antenna 3 13574 NULL +cache_write_13589 cache_write 3 13589 NULL -+mpt_lan_receive_post_turbo_13592 mpt_lan_receive_post_turbo 2 13592 NULL -+aac_sa_ioremap_13596 aac_sa_ioremap 2 13596 NULL nohasharray -+irias_new_octseq_value_13596 irias_new_octseq_value 2 13596 &aac_sa_ioremap_13596 -+usb_dump_interface_descriptor_13603 usb_dump_interface_descriptor 0 13603 NULL ++Rd_Indx_13602 Rd_Indx 3-2 13602 NULL +swap_cgroup_swapon_13614 swap_cgroup_swapon 2 13614 NULL +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL -+iio_device_add_event_sysfs_13627 iio_device_add_event_sysfs 0 13627 NULL +packet_snd_13634 packet_snd 3 13634 NULL +blk_msg_write_13655 blk_msg_write 3 13655 NULL +cache_downcall_13666 cache_downcall 3 13666 NULL ++ext3_xattr_list_entries_13682 ext3_xattr_list_entries 0-4 13682 NULL ++nv94_aux_13689 nv94_aux 2-5 13689 NULL ++usb_get_string_13693 usb_get_string 0 13693 NULL ++atomic_cmpxchg_13700 atomic_cmpxchg 0 13700 NULL +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL ++ocfs2_cache_block_dealloc_13731 ocfs2_cache_block_dealloc 0 13731 NULL ++netdev_queue_numa_node_read_13732 netdev_queue_numa_node_read 0 13732 NULL +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL +ufs_dtog_13750 ufs_dtog 0-2 13750 NULL +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL +fb_sys_read_13778 fb_sys_read 3 13778 NULL +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL +random_read_13815 random_read 3 13815 NULL ++mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL -+evdev_ioctl_compat_13851 evdev_ioctl_compat 2-3 13851 NULL -+compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL nohasharray -+alloc_trace_uprobe_13870 alloc_trace_uprobe 3 13870 &compat_ip_setsockopt_13870 -+qp_memcpy_to_queue_13886 qp_memcpy_to_queue 2-5 13886 NULL ++enc_pools_insert_13849 enc_pools_insert 3 13849 NULL ++evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL ++compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL ++btrfs_insert_empty_item_13885 btrfs_insert_empty_item 0 13885 NULL ++qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL nohasharray ++__fsnotify_parent_13886 __fsnotify_parent 0 13886 &qp_memcpy_to_queue_13886 ++window_alignment_13895 window_alignment 0 13895 NULL +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL ++is_inode_existent_13913 is_inode_existent 0 13913 NULL ++cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL -+compat_chaninfo_13945 compat_chaninfo 2 13945 NULL +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL ++qib_mmap_mem_13947 qib_mmap_mem 3 13947 NULL +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL ++osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL ++ocfs2_refresh_slot_info_13957 ocfs2_refresh_slot_info 0 13957 NULL +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL -+com90xx_found_13974 com90xx_found 3 13974 NULL +qcam_read_13977 qcam_read 3 13977 NULL +dsp_read_13980 dsp_read 2 13980 NULL +bm_block_bits_13981 bm_block_bits 0 13981 NULL nohasharray +dvb_demux_read_13981 dvb_demux_read 3 13981 &bm_block_bits_13981 ++create_files_14003 create_files 0 14003 NULL ++sddr09_write_data_14014 sddr09_write_data 3 14014 NULL +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL -+_rtl92s_firmware_downloadcode_14021 _rtl92s_firmware_downloadcode 3 14021 NULL +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL +read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL -+i915_drop_caches_read_14060 i915_drop_caches_read 3 14060 NULL ++ovs_flow_actions_alloc_14072 ovs_flow_actions_alloc 1 14072 NULL ++lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL +compat_sys_pselect6_14105 compat_sys_pselect6 1 14105 NULL -+nlmsg_len_14115 nlmsg_len 0 14115 NULL -+vfio_fops_compat_ioctl_14130 vfio_fops_compat_ioctl 3 14130 NULL -+ntfs_rl_replace_14136 ntfs_rl_replace 2-4 14136 NULL ++intel_ring_wait_seqno_14107 intel_ring_wait_seqno 0 14107 NULL ++ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL ++ntfs_rl_replace_14136 ntfs_rl_replace 4-2 14136 NULL ++qfq_ffs_14139 qfq_ffs 2 14139 NULL +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL +em_canid_change_14150 em_canid_change 3 14150 NULL +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL +print_input_mask_14168 print_input_mask 3-0 14168 NULL ++ocfs2_split_and_insert_14171 ocfs2_split_and_insert 0 14171 NULL +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL ++datafab_read_data_14186 datafab_read_data 4 14186 NULL ++do_splice_14196 do_splice 5 14196 NULL ++hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL +alloc_async_14208 alloc_async 1 14208 NULL -+sys_kexec_load_14222 sys_kexec_load 2 14222 NULL ++ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL -+dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4-2 14244 NULL ++dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL +snd_soc_hw_bulk_write_raw_14245 snd_soc_hw_bulk_write_raw 2-4 14245 NULL -+reiserfs_compat_ioctl_14265 reiserfs_compat_ioctl 3 14265 NULL -+ath6kl_connect_event_14267 ath6kl_connect_event 8-9-7 14267 NULL -+add_numbered_child_14273 add_numbered_child 5 14273 NULL -+OS_mem_token_alloc_14276 OS_mem_token_alloc 1 14276 NULL -+snd_seq_oss_readq_new_14283 snd_seq_oss_readq_new 2 14283 NULL ++ext4_journal_restart_14251 ext4_journal_restart 0 14251 NULL ++will_overwrite_ref_14252 will_overwrite_ref 0 14252 NULL ++ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL ++numa_mem_id_14279 numa_mem_id 0 14279 NULL +rr_status_14293 rr_status 5 14293 NULL +read_default_ldt_14302 read_default_ldt 2 14302 NULL ++__readl_14308 __readl 0 14308 NULL ++send_chown_14309 send_chown 0 14309 NULL ++i915_gem_object_finish_gpu_14312 i915_gem_object_finish_gpu 0 14312 NULL +oo_objects_14319 oo_objects 0 14319 NULL ++ww_mutex_deadlock_injection_14321 ww_mutex_deadlock_injection 0 14321 NULL ++ll_get_user_pages_14328 ll_get_user_pages 2-3-0 14328 NULL ++down_write_failed_14331 down_write_failed 2 14331 NULL +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL -+scsi2int_14358 scsi2int 0 14358 NULL ++alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL ++btrfs_set_inode_index_14379 btrfs_set_inode_index 0 14379 NULL +acpi_get_override_irq_14381 acpi_get_override_irq 1 14381 NULL +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL ++first_logical_byte_14403 first_logical_byte 0 14403 NULL +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL +get_kcore_size_14425 get_kcore_size 0 14425 NULL ++qib_user_sdma_page_length_14432 qib_user_sdma_page_length 0-2-1 14432 NULL +check_lpt_crc_14442 check_lpt_crc 0 14442 NULL +block_size_14443 block_size 0 14443 NULL -+ci13xxx_add_device_14456 ci13xxx_add_device 3 14456 NULL ++lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL ++lustre_msg_size_v2_14470 lustre_msg_size_v2 0 14470 NULL ++dma_transfer_size_14473 dma_transfer_size 0 14473 NULL +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL -+ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL ++efx_mdio_check_mmds_14486 efx_mdio_check_mmds 2 14486 NULL nohasharray ++ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 &efx_mdio_check_mmds_14486 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL -+dataflash_read_user_otp_14536 dataflash_read_user_otp 2-3 14536 NULL nohasharray -+ep0_write_14536 ep0_write 3 14536 &dataflash_read_user_otp_14536 ++ep0_write_14536 ep0_write 3 14536 NULL nohasharray ++dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 &ep0_write_14536 ++register_trace_sched_switch_14545 register_trace_sched_switch 0 14545 NULL +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL +drm_vmalloc_dma_14550 drm_vmalloc_dma 1 14550 NULL -+usb_dump_desc_14553 usb_dump_desc 0 14553 NULL +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL +remap_to_origin_then_cache_14583 remap_to_origin_then_cache 3 14583 NULL +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL ++ocfs2_steal_meta_14602 ocfs2_steal_meta 0 14602 NULL +ocfs2_trim_group_14641 ocfs2_trim_group 4-3 14641 NULL +dbJoin_14644 dbJoin 0 14644 NULL +profile_replace_14652 profile_replace 3 14652 NULL ++add_to_page_cache_locked_14668 add_to_page_cache_locked 0 14668 NULL ++min_bytes_needed_14675 min_bytes_needed 0 14675 NULL ++nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL -+tsi148_master_set_14685 tsi148_master_set 4 14685 NULL +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL +u_audio_playback_14709 u_audio_playback 3 14709 NULL ++rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL ++cgroup_path_14713 cgroup_path 3 14713 NULL +get_bio_block_14714 get_bio_block 0 14714 NULL +vfd_write_14717 vfd_write 3 14717 NULL ++SyS_sendfile_14718 SyS_sendfile 4 14718 NULL +__blk_end_request_14729 __blk_end_request 3 14729 NULL +raid1_resize_14740 raid1_resize 2 14740 NULL ++i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL -+qla82xx_pci_mem_write_2M_14765 qla82xx_pci_mem_write_2M 2 14765 NULL +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL +sta_dev_read_14782 sta_dev_read 3 14782 NULL ++keys_proc_write_14792 keys_proc_write 3 14792 NULL +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL ++__kfifo_in_14797 __kfifo_in 3-0 14797 NULL +hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray +snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801 -+bcma_scan_read32_14802 bcma_scan_read32 0 14802 NULL ++changed_cb_14819 changed_cb 0 14819 NULL +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL -+__mutex_fastpath_lock_retval_14844 __mutex_fastpath_lock_retval 0 14844 NULL +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL -+lcd_write_14857 lcd_write 3 14857 NULL nohasharray -+__krealloc_14857 __krealloc 2 14857 &lcd_write_14857 ++lcd_write_14857 lcd_write 3 14857 NULL +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL -+sriov_enable_migration_14889 sriov_enable_migration 2 14889 NULL ++gmux_index_read8_14890 gmux_index_read8 0 14890 NULL +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL -+unifi_read_14899 unifi_read 3 14899 NULL +SYSC_readv_14901 SYSC_readv 3 14901 NULL -+krealloc_14908 krealloc 2 14908 NULL -+regmap_irq_get_virq_14910 regmap_irq_get_virq 2 14910 NULL ++regmap_irq_get_virq_14910 regmap_irq_get_virq 2-0 14910 NULL +__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray -+qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 2-5 14923 &__arch_hweight64_14923 ++qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL ++range_to_mtrr_14940 range_to_mtrr 2 14940 NULL +queue_cnt_14951 queue_cnt 0 14951 NULL ++unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL ++i915_vma_unbind_14954 i915_vma_unbind 0 14954 NULL +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL +setkey_14987 setkey 3 14987 NULL nohasharray +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987 +xfs_dinode_size_14996 xfs_dinode_size 0 14996 NULL -+vmap_15025 vmap 2 15025 NULL +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL -+irq_get_next_irq_15053 irq_get_next_irq 1 15053 NULL ++irq_get_next_irq_15053 irq_get_next_irq 1-0 15053 NULL +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL -+ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5 15072 NULL -+compat_SyS_preadv_15105 compat_SyS_preadv 3 15105 NULL ++ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL ++pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL ++ceph_calc_ceph_pg_15075 ceph_calc_ceph_pg 0 15075 NULL ++perf_trace_sched_stat_runtime_15115 perf_trace_sched_stat_runtime 3 15115 NULL +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL +start_port_15124 start_port 0 15124 NULL -+memchr_15126 memchr 0 15126 NULL +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL ++iwl_dbgfs_sta_drain_write_15167 iwl_dbgfs_sta_drain_write 3 15167 NULL +self_check_not_bad_15175 self_check_not_bad 0 15175 NULL +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL +reserve_resources_15194 reserve_resources 3 15194 NULL ++mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL ++iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL +div64_u64_15263 div64_u64 0-1-2 15263 NULL -+compat_raw_ioctl_15290 compat_raw_ioctl 3 15290 NULL -+sys_connect_15291 sys_connect 3 15291 NULL nohasharray -+xlate_dev_mem_ptr_15291 xlate_dev_mem_ptr 1 15291 &sys_connect_15291 ++simple_strtol_15273 simple_strtol 0 15273 NULL ++fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL +arch_enable_uv_irq_15294 arch_enable_uv_irq 2 15294 NULL +acpi_ev_create_gpe_block_15297 acpi_ev_create_gpe_block 5 15297 NULL -+tpm_tis_init_15304 tpm_tis_init 2-3 15304 NULL -+fcoe_ctlr_send_keep_alive_15308 fcoe_ctlr_send_keep_alive 3 15308 NULL -+__ocfs2_remove_xattr_range_15330 __ocfs2_remove_xattr_range 4-5-3 15330 NULL ++ocfs2_read_refcount_block_15305 ocfs2_read_refcount_block 0 15305 NULL ++__ocfs2_remove_xattr_range_15330 __ocfs2_remove_xattr_range 4-3-5 15330 NULL ++bfloat_mantissa_15334 bfloat_mantissa 0 15334 NULL ++xlog_ticket_alloc_15335 xlog_ticket_alloc 2 15335 NULL +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL +ioread16_15342 ioread16 0 15342 NULL -+alloc_ring_15345 alloc_ring 2-4 15345 NULL ++ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL ++count_inode_extrefs_15366 count_inode_extrefs 0 15366 NULL ++ext4_direct_IO_15369 ext4_direct_IO 4 15369 NULL +graph_depth_read_15371 graph_depth_read 3 15371 NULL +compat_sys_process_vm_readv_15374 compat_sys_process_vm_readv 3-5 15374 NULL +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL @@ -103082,67 +104153,73 @@ index 0000000..b04803b +btrfs_level_size_15392 btrfs_level_size 0 15392 NULL +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL +get_modalias_15406 get_modalias 2 15406 NULL ++blockdev_direct_IO_15408 blockdev_direct_IO 0-5 15408 NULL +dm_cache_resize_15422 dm_cache_resize 2 15422 NULL -+__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4 15423 NULL -+tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2 15438 NULL ++__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL ++tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL +memweight_15450 memweight 2 15450 NULL +vmalloc_15464 vmalloc 1 15464 NULL ++__mutex_lock_killable_slowpath_15472 __mutex_lock_killable_slowpath 0 15472 NULL ++insert_old_idx_znode_15500 insert_old_idx_znode 0 15500 NULL +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL ++ifx_spi_write_15531 ifx_spi_write 3 15531 NULL +da9052_bat_irq_15533 da9052_bat_irq 1 15533 NULL +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL -+ql_process_mac_rx_page_15543 ql_process_mac_rx_page 4 15543 NULL -+ieee80211_amsdu_to_8023s_15561 ieee80211_amsdu_to_8023s 5 15561 NULL ++xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL ++snd_pcm_channel_info_15572 snd_pcm_channel_info 0 15572 NULL +persistent_status_15574 persistent_status 4 15574 NULL +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL ++cl_io_submit_sync_15579 cl_io_submit_sync 0 15579 NULL +vme_user_write_15587 vme_user_write 3 15587 NULL -+ocfs2_truncate_rec_15595 ocfs2_truncate_rec 7 15595 NULL ++ocfs2_truncate_rec_15595 ocfs2_truncate_rec 7-0 15595 NULL +sx150x_install_irq_chip_15609 sx150x_install_irq_chip 3 15609 NULL +iommu_device_max_index_15620 iommu_device_max_index 0-3-2-1 15620 NULL nohasharray +compat_fillonedir_15620 compat_fillonedir 3 15620 &iommu_device_max_index_15620 -+set_dis_tap_pfs_15621 set_dis_tap_pfs 3 15621 NULL +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL -+tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray ++tomoyo_scan_bprm_15642 tomoyo_scan_bprm 4-2 15642 NULL nohasharray +sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &tomoyo_scan_bprm_15642 nohasharray +pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &sk_memory_allocated_add_15642 -+fs_path_add_15648 fs_path_add 3 15648 NULL ++joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL ++fs_path_add_15648 fs_path_add 3-0 15648 NULL +xsd_read_15653 xsd_read 3 15653 NULL -+compat_sys_fcntl_15654 compat_sys_fcntl 3 15654 NULL +unix_bind_15668 unix_bind 3 15668 NULL -+dm_read_15674 dm_read 3 15674 NULL ++SyS_connect_15674 SyS_connect 3 15674 NULL nohasharray ++dm_read_15674 dm_read 3 15674 &SyS_connect_15674 +pstore_mkfile_15675 pstore_mkfile 6 15675 NULL -+uf_sme_queue_message_15697 uf_sme_queue_message 3 15697 NULL -+ocfs2_split_tree_15716 ocfs2_split_tree 5 15716 NULL ++i915_gem_object_set_to_cpu_domain_15705 i915_gem_object_set_to_cpu_domain 0 15705 NULL nohasharray ++uncore_alloc_box_15705 uncore_alloc_box 2 15705 &i915_gem_object_set_to_cpu_domain_15705 ++ocfs2_split_tree_15716 ocfs2_split_tree 5-0 15716 NULL ++tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL -+bitmap_search_next_usable_block_15762 bitmap_search_next_usable_block 3-1 15762 NULL -+do_test_15766 do_test 1 15766 NULL -+set_std_nic_pfs_15792 set_std_nic_pfs 3 15792 NULL ++ftrace_profile_init_cpu_15761 ftrace_profile_init_cpu 0 15761 NULL ++bitmap_search_next_usable_block_15762 bitmap_search_next_usable_block 3-1-0 15762 NULL ++i915_gem_init_seqno_15793 i915_gem_init_seqno 0 15793 NULL +smk_read_direct_15803 smk_read_direct 3 15803 NULL -+snd_pcm_ioctl_compat_15804 snd_pcm_ioctl_compat 3 15804 NULL -+gx1_read_conf_reg_15817 gx1_read_conf_reg 0 15817 NULL nohasharray -+nameseq_list_15817 nameseq_list 3 15817 &gx1_read_conf_reg_15817 nohasharray ++nameseq_list_15817 nameseq_list 3-0 15817 NULL nohasharray +gnttab_expand_15817 gnttab_expand 1 15817 &nameseq_list_15817 -+afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL nohasharray -+firmware_upload_15822 firmware_upload 3 15822 &afs_proc_rootcell_write_15822 ++afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL +brcmf_sdbrcm_died_dump_15841 brcmf_sdbrcm_died_dump 3 15841 NULL +table_size_15851 table_size 0-1-2 15851 NULL -+ubi_io_write_15870 ubi_io_write 5-4 15870 NULL nohasharray ++ubi_io_write_15870 ubi_io_write 0-5-4 15870 NULL nohasharray +media_entity_init_15870 media_entity_init 2-4 15870 &ubi_io_write_15870 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL ++profile_pc_15887 profile_pc 0 15887 NULL +nfs_map_group_to_gid_15892 nfs_map_group_to_gid 3 15892 NULL +native_read_msr_15905 native_read_msr 0 15905 NULL +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL +power_read_15939 power_read 3 15939 NULL +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL -+snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 4-2-5 15952 NULL -+remap_pci_mem_15966 remap_pci_mem 1-2 15966 NULL -+tfrc_calc_x_15975 tfrc_calc_x 1-2 15975 NULL ++snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL ++tfrc_calc_x_15975 tfrc_calc_x 2-1 15975 NULL +frame_alloc_15981 frame_alloc 4 15981 NULL -+alloc_vm_area_15989 alloc_vm_area 1 15989 NULL +hdpvr_register_videodev_16010 hdpvr_register_videodev 3 16010 NULL +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL -+got_frame_16028 got_frame 2 16028 NULL ++i915_gem_object_pin_16032 i915_gem_object_pin 0 16032 NULL ++dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL ++si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL ++ocfs2_sync_local_to_main_16076 ocfs2_sync_local_to_main 0 16076 NULL +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 NULL nohasharray +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 &dma_tx_requested_read_16110 @@ -103150,101 +104227,136 @@ index 0000000..b04803b +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL +compat_sys_select_16131 compat_sys_select 1 16131 NULL +fsm_init_16134 fsm_init 2 16134 NULL -+hysdn_rx_netpkt_16136 hysdn_rx_netpkt 3 16136 NULL +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL -+bnx2i_get_cid_num_16166 bnx2i_get_cid_num 0 16166 NULL ++update_block_group_16155 update_block_group 0 16155 NULL ++optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL +mapping_level_16188 mapping_level 2 16188 NULL ++i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL ++tcp_syn_options_16197 tcp_syn_options 0 16197 NULL ++ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL +create_table_16213 create_table 2 16213 NULL +atomic_read_file_16227 atomic_read_file 3 16227 NULL +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL -+swiotlb_sync_single_for_device_16247 swiotlb_sync_single_for_device 2 16247 NULL nohasharray -+btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 &swiotlb_sync_single_for_device_16247 -+mark_written_sectors_16262 mark_written_sectors 2 16262 NULL ++lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL ++i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL nohasharray ++btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 &i40e_dbg_dump_read_16247 ++il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL ++SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL -+set_disc_pfs_16270 set_disc_pfs 3 16270 NULL +mq_force_mapping_16277 mq_force_mapping 2 16277 NULL +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL +drbd_setsockopt_16280 drbd_setsockopt 5 16280 NULL nohasharray -+nand_bch_init_16280 nand_bch_init 3-2 16280 &drbd_setsockopt_16280 -+account_16283 account 0-2-4 16283 NULL nohasharray ++nand_bch_init_16280 nand_bch_init 2-3 16280 &drbd_setsockopt_16280 ++account_16283 account 0-4-2 16283 NULL nohasharray +mirror_status_16283 mirror_status 5 16283 &account_16283 +retry_instruction_16285 retry_instruction 2 16285 NULL ++jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL ++mo_xattr_get_16288 mo_xattr_get 0 16288 NULL +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL +tfrc_invert_loss_event_rate_16295 tfrc_invert_loss_event_rate 1 16295 NULL +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL +wb_map_16301 wb_map 2 16301 NULL ++kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL +ext4_blocks_count_16320 ext4_blocks_count 0 16320 NULL +vmw_cursor_update_image_16332 vmw_cursor_update_image 3-4 16332 NULL ++btrfs_insert_item_16357 btrfs_insert_item 0 16357 NULL ++sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL -+nl80211_send_unprot_deauth_16378 nl80211_send_unprot_deauth 4 16378 NULL +diva_os_malloc_16406 diva_os_malloc 2 16406 NULL +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL ++__bio_add_page_16435 __bio_add_page 0-4 16435 NULL ++btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 0 16452 NULL ++ocfs2_expand_refcount_tree_16455 ocfs2_expand_refcount_tree 0 16455 NULL +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL ++alloc_disk_node_16458 alloc_disk_node 2 16458 NULL ++req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL ++ocfs2_block_group_set_bits_16488 ocfs2_block_group_set_bits 0 16488 NULL ++add_qgroup_item_16492 add_qgroup_item 0 16492 NULL +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL ++filemap_write_and_wait_16506 filemap_write_and_wait 0 16506 NULL ++start_this_handle_16519 start_this_handle 0 16519 NULL +snd_interval_max_16529 snd_interval_max 0 16529 NULL +raid10_resize_16537 raid10_resize 2 16537 NULL -+tcp_manip_pkt_16563 tcp_manip_pkt 4 16563 NULL +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL ++perf_event_set_period_16574 perf_event_set_period 2-3 16574 NULL +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL -+virt_to_scatterlist_16582 virt_to_scatterlist 2 16582 NULL ++lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0 16589 NULL ++btrfs_insert_orphan_item_16602 btrfs_insert_orphan_item 0 16602 NULL ++gmux_index_read32_16604 gmux_index_read32 0 16604 NULL ++btrfs_end_transaction_16610 btrfs_end_transaction 0 16610 NULL +palmas_irq_get_virq_16613 palmas_irq_get_virq 2 16613 NULL ++btrfs_wait_marked_extents_16615 btrfs_wait_marked_extents 0 16615 NULL ++rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL -+mfd_add_devices_16668 mfd_add_devices 4 16668 NULL -+ax88179_write_cmd_async_16671 ax88179_write_cmd_async 5 16671 NULL ++packet_recv_error_16669 packet_recv_error 3 16669 NULL ++__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL ++__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL -+compat_blkdev_driver_ioctl_16769 compat_blkdev_driver_ioctl 4 16769 NULL +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL +get_server_iovec_16804 get_server_iovec 2 16804 NULL +tipc_send2name_16809 tipc_send2name 6 16809 NULL +dm_vcalloc_16814 dm_vcalloc 1-2 16814 NULL ++cache_grow_16818 cache_grow 3 16818 NULL +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL -+vfio_pci_rw_16861 vfio_pci_rw 3 16861 NULL +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL +st_write_16874 st_write 3 16874 NULL +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL -+idx_to_pfn_16919 idx_to_pfn 0 16919 NULL ++transport_init_session_tags_16878 transport_init_session_tags 1-2 16878 NULL ++ext4_ext_zeroout_16895 ext4_ext_zeroout 0 16895 NULL +psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray +snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926 -+_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL ++_sp2d_alloc_16944 _sp2d_alloc 3-2-1 16944 NULL +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL -+cfg80211_send_unprot_disassoc_16951 cfg80211_send_unprot_disassoc 3 16951 NULL ++wrm_16966 wrm 0 16966 NULL +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL ++ocfs2_read_quota_phys_block_16990 ocfs2_read_quota_phys_block 0 16990 NULL +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL ++snd_mask_refine_first_17026 snd_mask_refine_first 0 17026 NULL +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL ++btrfs_unlink_inode_17043 btrfs_unlink_inode 0 17043 NULL +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL ++__copy_user_nocache_17065 __copy_user_nocache 0 17065 NULL ++sddr55_read_data_17072 sddr55_read_data 4 17072 NULL +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL -+__kmalloc_reserve_17080 __kmalloc_reserve 1 17080 NULL ++__kmalloc_reserve_17080 __kmalloc_reserve 3 17080 NULL +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL -+mac_address_string_17091 mac_address_string 0 17091 NULL +entry_length_17093 entry_length 0 17093 NULL -+sys_preadv_17100 sys_preadv 3 17100 NULL ++ocfs2_get_refcount_cpos_end_17113 ocfs2_get_refcount_cpos_end 0 17113 NULL ++write_mem_17114 write_mem 3 17114 NULL +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL -+mwifiex_get_common_rates_17131 mwifiex_get_common_rates 3 17131 NULL ++wrmaltWithLock_17139 wrmaltWithLock 0 17139 NULL +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL ++jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL +sep_read_17161 sep_read 3 17161 NULL +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL +UniStrnlen_17169 UniStrnlen 0 17169 NULL -+access_remote_vm_17189 access_remote_vm 0-2-4 17189 NULL ++ocfs2_flock_handle_signal_17189 ocfs2_flock_handle_signal 0 17189 NULL nohasharray ++access_remote_vm_17189 access_remote_vm 0-4-2 17189 &ocfs2_flock_handle_signal_17189 nohasharray ++iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189 +driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194 ++sync_request_17208 sync_request 2 17208 NULL +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL ++send_write_or_clone_17241 send_write_or_clone 0 17241 NULL +to_oblock_17254 to_oblock 0-1 17254 NULL +unpack_value_17259 unpack_value 1 17259 NULL -+__be16_to_cpup_17261 __be16_to_cpup 0 17261 NULL ++lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL ++alloc_reserved_file_extent_17267 alloc_reserved_file_extent 0 17267 NULL +alloc_ep_17269 alloc_ep 1 17269 NULL ++hw_test_and_write_17271 hw_test_and_write 3 17271 NULL +pg_read_17276 pg_read 3 17276 NULL +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL +hmac_sha256_17278 hmac_sha256 2 17278 NULL @@ -103252,106 +104364,120 @@ index 0000000..b04803b +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL +install_breakpoint_17292 install_breakpoint 4 17292 NULL +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL -+skb_pad_17302 skb_pad 2 17302 NULL +mb_cache_create_17307 mb_cache_create 2 17307 NULL +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL -+ata_host_alloc_pinfo_17325 ata_host_alloc_pinfo 3 17325 NULL ++SYSC_pread64_17337 SYSC_pread64 3 17337 NULL +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL -+_fd_dma_mem_free_17406 _fd_dma_mem_free 1 17406 NULL ++mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL ++compat_sys_ppoll_17430 compat_sys_ppoll 2 17430 NULL +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL +SYSC_fcntl_17441 SYSC_fcntl 3 17441 NULL ++libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL +nla_get_u32_17455 nla_get_u32 0 17455 NULL +__ref_totlen_17461 __ref_totlen 0 17461 NULL -+compat_cmd_17465 compat_cmd 2 17465 NULL -+probe_bios_17467 probe_bios 1 17467 NULL +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL -+__alloc_session_17485 __alloc_session 2-1 17485 NULL +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL ++lookup_tree_block_ref_17494 lookup_tree_block_ref 0 17494 NULL +bitmap_pos_to_ord_17503 bitmap_pos_to_ord 3 17503 NULL -+__copy_to_user_17551 __copy_to_user 0-3 17551 NULL -+copy_from_user_17559 copy_from_user 3 17559 NULL ++lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL ++qp_free_res_17541 qp_free_res 5 17541 NULL ++xlog_do_log_recovery_17550 xlog_do_log_recovery 3 17550 NULL ++__copy_to_user_17551 __copy_to_user 3-0 17551 NULL ++copy_from_user_17559 copy_from_user 3-0 17559 NULL ++snd_pcm_action_lock_irq_17569 snd_pcm_action_lock_irq 0 17569 NULL +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL -+rts51x_write_mem_17598 rts51x_write_mem 4 17598 NULL -+iwl_dump_nic_event_log_17601 iwl_dump_nic_event_log 0 17601 NULL ++__inode_info_17603 __inode_info 0 17603 NULL +wm8994_gpio_to_irq_17604 wm8994_gpio_to_irq 2 17604 NULL +osst_execute_17607 osst_execute 7-6 17607 NULL +ocfs2_mark_extent_written_17615 ocfs2_mark_extent_written 6 17615 NULL +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL ++dma_map_page_17628 dma_map_page 0 17628 NULL ++ocfs2_rotate_subtree_left_17634 ocfs2_rotate_subtree_left 0 17634 NULL +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL +packet_setsockopt_17662 packet_setsockopt 5 17662 NULL nohasharray +ubi_io_read_data_17662 ubi_io_read_data 0 17662 &packet_setsockopt_17662 ++kernel_write_17665 kernel_write 3 17665 NULL +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL -+gfn_to_pfn_memslot_17693 gfn_to_pfn_memslot 2 17693 NULL -+__einj_error_trigger_17707 __einj_error_trigger 1 17707 NULL nohasharray -+venus_rename_17707 venus_rename 5-4 17707 &__einj_error_trigger_17707 -+isku_sysfs_write_keys_function_17726 isku_sysfs_write_keys_function 6 17726 NULL ++filemap_fdatawait_17688 filemap_fdatawait 0 17688 NULL ++gfn_to_pfn_memslot_17693 gfn_to_pfn_memslot 2-0 17693 NULL ++__einj_error_trigger_17707 __einj_error_trigger 0 17707 NULL nohasharray ++venus_rename_17707 venus_rename 4-5 17707 &__einj_error_trigger_17707 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL +mark_unsafe_pages_17759 mark_unsafe_pages 0 17759 NULL -+brcmf_usb_attach_17766 brcmf_usb_attach 2-3 17766 NULL ++dgap_do_fep_load_17765 dgap_do_fep_load 3 17765 NULL +dtf_read_run_17768 dtf_read_run 3 17768 NULL +brcmf_sdio_chip_verifynvram_17776 brcmf_sdio_chip_verifynvram 4 17776 NULL +hash_ipport6_expire_17784 hash_ipport6_expire 3 17784 NULL +perf_clock_17787 perf_clock 0 17787 NULL -+ubifs_leb_change_17789 ubifs_leb_change 4 17789 NULL ++ubifs_leb_change_17789 ubifs_leb_change 0-4 17789 NULL ++get_unaligned_be64_17794 get_unaligned_be64 0 17794 NULL nohasharray ++shrink_slab_node_17794 shrink_slab_node 3-4 17794 &get_unaligned_be64_17794 ++bkey_to_cacheline_17811 bkey_to_cacheline 0 17811 NULL +_snd_pcm_lib_alloc_vmalloc_buffer_17820 _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 NULL +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL -+count_leafs_17842 count_leafs 0 17842 NULL ++dm_stats_message_17863 dm_stats_message 5 17863 NULL +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL -+orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL ++orinoco_set_key_17878 orinoco_set_key 7-5 17878 NULL nohasharray ++i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878 +init_per_cpu_17880 init_per_cpu 1 17880 NULL +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL -+compat_sys_pwritev_17886 compat_sys_pwritev 3 17886 NULL +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL +ocfs2_clusters_to_blocks_17896 ocfs2_clusters_to_blocks 0-2 17896 NULL +recover_head_17904 recover_head 3 17904 NULL -+dccp_feat_register_sp_17914 dccp_feat_register_sp 5 17914 NULL +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL -+srp_iu_pool_alloc_17920 srp_iu_pool_alloc 2 17920 NULL +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL -+ufs_free_blocks_17963 ufs_free_blocks 2-3 17963 NULL ++__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL ++beacon_interval_write_17952 beacon_interval_write 3 17952 NULL ++ufs_free_blocks_17963 ufs_free_blocks 3-2 17963 NULL nohasharray ++tlv_put_u64_17963 tlv_put_u64 0 17963 &ufs_free_blocks_17963 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL ++ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL +ext4_num_overhead_clusters_18001 ext4_num_overhead_clusters 2 18001 NULL +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL +alloc_rx_desc_ring_18016 alloc_rx_desc_ring 2 18016 NULL +fill_read_18019 fill_read 0 18019 NULL -+o2hb_highest_node_18034 o2hb_highest_node 2 18034 NULL -+cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL -+find_next_inuse_18051 find_next_inuse 2-3 18051 NULL ++o2hb_highest_node_18034 o2hb_highest_node 2-0 18034 NULL ++__posix_lock_file_18035 __posix_lock_file 0 18035 NULL ++ocfs2_cache_cluster_dealloc_18043 ocfs2_cache_cluster_dealloc 0 18043 NULL ++cryptd_alloc_instance_18048 cryptd_alloc_instance 3-2 18048 NULL ++find_next_inuse_18051 find_next_inuse 2-3-0 18051 NULL +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL -+hex_byte_pack_18064 hex_byte_pack 0 18064 NULL -+packet_came_18072 packet_came 3 18072 NULL ++fpregs_get_18066 fpregs_get 4 18066 NULL +kvm_read_guest_page_18074 kvm_read_guest_page 5-2 18074 NULL +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL -+get_vm_area_18080 get_vm_area 1 18080 NULL +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL +mpi_alloc_18094 mpi_alloc 1 18094 NULL ++hfs_direct_IO_18104 hfs_direct_IO 4 18104 NULL +dfs_file_read_18116 dfs_file_read 3 18116 NULL +svc_getnl_18120 svc_getnl 0 18120 NULL -+paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-1-2 18131 NULL ++paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL +vmw_surface_dma_size_18132 vmw_surface_dma_size 0 18132 NULL +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL -+_has_tag_18169 _has_tag 2 18169 NULL ++is_idx_node_in_use_18165 is_idx_node_in_use 0 18165 NULL +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL ++snd_pcm_hw_refine_user_18204 snd_pcm_hw_refine_user 0 18204 NULL +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL +gsm_control_message_18209 gsm_control_message 4 18209 NULL ++ocfs2_divide_leaf_refcount_block_18214 ocfs2_divide_leaf_refcount_block 0 18214 NULL +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL -+snd_ctl_ioctl_compat_18250 snd_ctl_ioctl_compat 3 18250 NULL ++rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL ++__sysfs_add_one_18258 __sysfs_add_one 0 18258 NULL +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL -+alloc_ring_18278 alloc_ring 2-4 18278 NULL ++alloc_ring_18278 alloc_ring 4-2 18278 NULL +find_dirty_idx_leb_18280 find_dirty_idx_leb 0 18280 NULL +nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 NULL nohasharray +bio_phys_segments_18281 bio_phys_segments 0 18281 &nouveau_subdev_create__18281 @@ -103359,140 +104485,179 @@ index 0000000..b04803b +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL +um_idi_write_18293 um_idi_write 3 18293 NULL +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL -+ip6ip6_err_18308 ip6ip6_err 5 18308 NULL +vga_r_18310 vga_r 0 18310 NULL ++class_add_profile_18315 class_add_profile 1-3-5 18315 NULL ++csio_mem_read_18319 csio_mem_read 3 18319 NULL ++alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL ++__inorder_to_tree_18329 __inorder_to_tree 0-3-1 18329 NULL ++lcd_proc_write_18351 lcd_proc_write 3 18351 NULL +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL +xlbd_reserve_minors_18365 xlbd_reserve_minors 1-2 18365 NULL -+SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL ++SyS_process_vm_readv_18366 SyS_process_vm_readv 5-3 18366 NULL +ep_io_18367 ep_io 0 18367 NULL +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL -+ci_role_write_18388 ci_role_write 3 18388 NULL ++ci_role_write_18388 ci_role_write 3 18388 NULL nohasharray ++irq_find_mapping_18388 irq_find_mapping 0-2 18388 &ci_role_write_18388 ++btrfs_update_inode_18394 btrfs_update_inode 0 18394 NULL ++hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL +__video_register_device_18399 __video_register_device 3 18399 NULL +hash_ip4_expire_18402 hash_ip4_expire 3 18402 NULL nohasharray +adis16136_show_serial_18402 adis16136_show_serial 3 18402 &hash_ip4_expire_18402 ++btrfs_rmap_block_18403 btrfs_rmap_block 0 18403 NULL +crystalhd_user_data_18407 crystalhd_user_data 3 18407 NULL -+usbnet_write_cmd_nopm_18426 usbnet_write_cmd_nopm 7 18426 NULL +batadv_orig_node_add_if_18433 batadv_orig_node_add_if 2 18433 NULL nohasharray +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 &batadv_orig_node_add_if_18433 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL ++btrfs_uuid_tree_lookup_18451 btrfs_uuid_tree_lookup 0 18451 NULL ++flash_dev_cache_miss_18454 flash_dev_cache_miss 4 18454 NULL +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL +regset_tls_set_18459 regset_tls_set 4 18459 NULL ++pcibios_window_alignment_18460 pcibios_window_alignment 0 18460 NULL +dma_alloc_from_contiguous_18466 dma_alloc_from_contiguous 3-2 18466 NULL -+pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL -+udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL ++pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray ++mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479 ++r600_texture_size_18487 r600_texture_size 4-5-6 18487 NULL nohasharray ++udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 &r600_texture_size_18487 ++btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL nohasharray ++remap_pmd_range_18501 remap_pmd_range 3-4-5 18501 &btrfs_fiemap_18501 ++i915_gem_object_wait_fence_18508 i915_gem_object_wait_fence 0 18508 NULL ++__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL ++snd_vx_inb_18514 snd_vx_inb 0 18514 NULL +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL -+nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 5-6-9 18530 NULL ++nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL +acpi_register_gsi_ioapic_18550 acpi_register_gsi_ioapic 2 18550 NULL +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL ++vb2_streamon_18562 vb2_streamon 0 18562 NULL +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL +debug_output_18575 debug_output 3 18575 NULL ++is_extent_unchanged_18576 is_extent_unchanged 0 18576 NULL +check_lpt_type_18577 check_lpt_type 0 18577 NULL -+__netdev_alloc_skb_18595 __netdev_alloc_skb 2 18595 NULL ++numa_node_id_18596 numa_node_id 0 18596 NULL +filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray +slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600 +iowarrior_write_18604 iowarrior_write 3 18604 NULL -+batadv_arp_get_type_18609 batadv_arp_get_type 3 18609 NULL ++audio_get_endpoint_req_18624 audio_get_endpoint_req 0 18624 NULL +from_buffer_18625 from_buffer 3 18625 NULL +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL +unmap_page_18665 unmap_page 2-3 18665 NULL +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL ++__alloc_skb_head_18683 __alloc_skb_head 2 18683 NULL ++echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL +replay_log_leb_18704 replay_log_leb 3 18704 NULL -+unlocked_compat_ipmi_ioctl_18708 unlocked_compat_ipmi_ioctl 3 18708 NULL nohasharray -+iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 &unlocked_compat_ipmi_ioctl_18708 ++iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL -+ocfs2_trim_extent_18711 ocfs2_trim_extent 4-3 18711 NULL -+compat_SyS_writev_18712 compat_SyS_writev 3 18712 NULL ++ocfs2_trim_extent_18711 ocfs2_trim_extent 3-4 18711 NULL +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL ++byt_gpio_to_irq_18721 byt_gpio_to_irq 2 18721 NULL ++ext4_es_insert_extent_18729 ext4_es_insert_extent 0 18729 NULL +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL +wep_packets_read_18751 wep_packets_read 3 18751 NULL -+md_compat_ioctl_18764 md_compat_ioctl 4 18764 NULL +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL +ffs_epfile_read_18775 ffs_epfile_read 3 18775 NULL +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL -+fat_compat_dir_ioctl_18800 fat_compat_dir_ioctl 3 18800 NULL -+ieee80211_auth_challenge_18810 ieee80211_auth_challenge 3 18810 NULL ++prealloc_18800 prealloc 0 18800 NULL +madvise_hwpoison_18812 madvise_hwpoison 2 18812 NULL +setup_ioapic_irq_18813 setup_ioapic_irq 1 18813 NULL ++dm_stats_print_18815 dm_stats_print 7 18815 NULL +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL +mtf_test_write_18844 mtf_test_write 3 18844 NULL ++iterate_inode_refs_18846 iterate_inode_refs 0 18846 NULL +drm_ht_create_18853 drm_ht_create 2 18853 NULL +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL -+ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL ++ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL nohasharray ++heads_to_leaves_18869 heads_to_leaves 2-0 18869 &ieee80211_if_read_element_ttl_18869 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL -+___alloc_bootmem_node_18882 ___alloc_bootmem_node 2-3 18882 NULL +width_to_agaw_18883 width_to_agaw 0-1 18883 NULL ++overwrite_item_18896 overwrite_item 0 18896 NULL ++kmem_cache_alloc_node_18899 kmem_cache_alloc_node 3 18899 NULL +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL -+mangle_packet_18920 mangle_packet 7-9 18920 NULL ++ext4_block_in_group_18922 ext4_block_in_group 2 18922 NULL ++ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL ++create_pending_snapshot_18936 create_pending_snapshot 0 18936 NULL +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL -+regcache_sync_block_18963 regcache_sync_block 3-4 18963 NULL ++regcache_sync_block_18963 regcache_sync_block 4-3 18963 NULL +__nla_reserve_18974 __nla_reserve 3 18974 NULL ++__blockdev_direct_IO_18977 __blockdev_direct_IO 0-6 18977 NULL +gfn_to_pfn_atomic_18981 gfn_to_pfn_atomic 2 18981 NULL -+find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL ++get_inode_path_18988 get_inode_path 0 18988 NULL ++find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL nohasharray ++test_check_exists_19001 test_check_exists 2 19001 &find_dirtiest_idx_leb_19001 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL +huge_page_size_19008 huge_page_size 0 19008 NULL -+usbdev_compat_ioctl_19026 usbdev_compat_ioctl 3 19026 NULL ++push_leaf_right_19017 push_leaf_right 0 19017 NULL +prepare_highmem_image_19028 prepare_highmem_image 0 19028 NULL ++ocfs2_steal_resource_19036 ocfs2_steal_resource 0 19036 NULL +revalidate_19043 revalidate 2 19043 NULL -+drm_fb_helper_init_19044 drm_fb_helper_init 3-4 19044 NULL ++afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL ++osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL +ieee80211_key_alloc_19065 ieee80211_key_alloc 3 19065 NULL -+msix_map_region_19072 msix_map_region 2 19072 NULL +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL -+sys_process_vm_readv_19090 sys_process_vm_readv 3-5 19090 NULL nohasharray -+brcmf_usbdev_qinit_19090 brcmf_usbdev_qinit 2 19090 &sys_process_vm_readv_19090 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL -+skb_gro_offset_19123 skb_gro_offset 0 19123 NULL ++ATOMIC_SUB_RETURN_19115 ATOMIC_SUB_RETURN 2 19115 NULL +ext4_inode_table_19125 ext4_inode_table 0 19125 NULL +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL ++btrfs_run_delayed_refs_19137 btrfs_run_delayed_refs 0 19137 NULL +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL ++ext3_reserve_inode_write_19163 ext3_reserve_inode_write 0 19163 NULL +smk_write_access2_19170 smk_write_access2 3 19170 NULL +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL +vmw_unlocked_ioctl_19212 vmw_unlocked_ioctl 2 19212 NULL -+__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3 19214 NULL ++__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3-0 19214 NULL +dev_counters_read_19216 dev_counters_read 3 19216 NULL +wbcir_tx_19219 wbcir_tx 3 19219 NULL +gsi_to_irq_19220 gsi_to_irq 0-1 19220 NULL +snd_mask_max_19224 snd_mask_max 0 19224 NULL ++snd_pcm_capture_rewind_19229 snd_pcm_capture_rewind 0-2 19229 NULL +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL -+sys_fcntl_19267 sys_fcntl 3 19267 NULL ++ucma_query_19260 ucma_query 4 19260 NULL ++write_one_cache_group_19261 write_one_cache_group 0 19261 NULL +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL -+io_mapping_map_wc_19284 io_mapping_map_wc 2 19284 NULL ++cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 NULL ++____cache_alloc_node_19297 ____cache_alloc_node 3 19297 NULL +qc_capture_19298 qc_capture 3 19298 NULL -+ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 3-4 19303 NULL ++ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL +gfn_to_gpa_19320 gfn_to_gpa 0-1 19320 NULL +debug_read_19322 debug_read 3 19322 NULL -+cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL ++SYSC_sendfile64_19327 SYSC_sendfile64 4 19327 NULL ++cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL nohasharray ++lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 &cfg80211_inform_bss_19332 +closure_sub_19359 closure_sub 2 19359 NULL ++firmware_data_write_19360 firmware_data_write 6-5 19360 NULL +read_zero_19366 read_zero 3 19366 NULL +interpret_user_input_19393 interpret_user_input 2 19393 NULL +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL ++get_unaligned_be16_19400 get_unaligned_be16 0 19400 NULL +get_n_events_by_type_19401 get_n_events_by_type 0 19401 NULL ++pep_recvmsg_19402 pep_recvmsg 4 19402 NULL +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL +__phys_addr_19434 __phys_addr 0 19434 NULL +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL -+hpet_compat_ioctl_19455 hpet_compat_ioctl 3 19455 NULL +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL +sky2_read16_19475 sky2_read16 0 19475 NULL -+efivar_create_sysfs_entry_19485 efivar_create_sysfs_entry 2 19485 NULL ++__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL ++kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL -+skb_realloc_headroom_19516 skb_realloc_headroom 2 19516 NULL -+dev_alloc_skb_19517 dev_alloc_skb 1 19517 NULL ++cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL nohasharray ++apei_exec_pre_map_gars_19529 apei_exec_pre_map_gars 0 19529 &cfc_write_array_to_buffer_19529 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL ++howmany_64_19548 howmany_64 2 19548 NULL ++btrfs_xattr_security_init_19553 btrfs_xattr_security_init 0 19553 NULL +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL ++kernel_read_19559 kernel_read 4-0 19559 NULL +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL -+ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 NULL nohasharray -+wlcore_hw_get_rx_packet_len_19565 wlcore_hw_get_rx_packet_len 0 19565 &ieee80211_if_read_tkip_mic_test_19565 ++ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 NULL +nfsd_read_19568 nfsd_read 5 19568 NULL +cgroup_read_s64_19570 cgroup_read_s64 5 19570 NULL +bm_status_read_19583 bm_status_read 3 19583 NULL @@ -103501,17 +104666,21 @@ index 0000000..b04803b +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL +usbvision_rvmalloc_19655 usbvision_rvmalloc 1 19655 NULL +LoadBitmap_19658 LoadBitmap 2 19658 NULL -+usbnet_write_cmd_19679 usbnet_write_cmd 7 19679 NULL ++i915_gem_object_bind_to_gtt_19682 i915_gem_object_bind_to_gtt 0 19682 NULL +bio_detain_19690 bio_detain 2 19690 NULL ++btrfs_del_inode_extref_19692 btrfs_del_inode_extref 0 19692 NULL +mem_cgroup_swappiness_19718 mem_cgroup_swappiness 0 19718 NULL ++btrfs_write_marked_extents_19720 btrfs_write_marked_extents 0 19720 NULL +read_reg_19723 read_reg 0 19723 NULL -+wm8350_block_write_19727 wm8350_block_write 3-2 19727 NULL -+memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL ++wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL ++memcpy_toiovecend_19736 memcpy_toiovecend 3-4-0 19736 NULL +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL -+p9_client_read_19750 p9_client_read 5 19750 NULL ++p9_client_read_19750 p9_client_read 0-5 19750 NULL +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL ++readhscx_19769 readhscx 0 19769 NULL ++ocfs2_read_group_descriptor_19771 ocfs2_read_group_descriptor 0 19771 NULL +__set_print_fmt_19776 __set_print_fmt 0 19776 NULL +saa7146_vmalloc_build_pgtable_19780 saa7146_vmalloc_build_pgtable 2 19780 NULL +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL @@ -103521,23 +104690,39 @@ index 0000000..b04803b +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL +__nla_put_19857 __nla_put 3 19857 NULL -+ip6gre_err_19869 ip6gre_err 5 19869 NULL +mrp_request_join_19882 mrp_request_join 4 19882 NULL ++blk_alloc_queue_node_19887 blk_alloc_queue_node 2 19887 NULL +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL ++mangle_name_19923 mangle_name 0 19923 NULL +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL ++guest_read_tsc_19931 guest_read_tsc 0 19931 NULL +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL ++cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL ++alloc_elfnotes_buf_19974 alloc_elfnotes_buf 1 19974 NULL ++get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL ++rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL ++lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL ++mlx5_ib_db_map_user_20037 mlx5_ib_db_map_user 2 20037 NULL ++btrfs_block_rsv_migrate_20050 btrfs_block_rsv_migrate 0 20050 NULL ++__be32_to_cpup_20056 __be32_to_cpup 0 20056 NULL +alloc_ieee80211_20063 alloc_ieee80211 1 20063 NULL ++iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 4 20067 NULL +btrfs_pin_extent_for_log_replay_20069 btrfs_pin_extent_for_log_replay 2 20069 NULL ++target_message_20072 target_message 2 20072 NULL +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL ++aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL +team_options_register_20091 team_options_register 3 20091 NULL +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL ++read_int_20098 read_int 0 20098 NULL ++root_nfs_copy_20111 root_nfs_copy 3 20111 NULL +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL ++self_check_vid_hdr_20131 self_check_vid_hdr 0 20131 NULL +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL @@ -103548,27 +104733,32 @@ index 0000000..b04803b +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL +pcpu_alloc_20255 pcpu_alloc 1-2 20255 NULL -+_rtl92s_get_h2c_cmdlen_20312 _rtl92s_get_h2c_cmdlen 0 20312 NULL ++resource_size_20256 resource_size 0 20256 NULL ++r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL ++dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL ++vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL ++ocfs2_et_insert_check_20341 ocfs2_et_insert_check 0 20341 NULL +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL -+qla82xx_pci_mem_read_direct_20368 qla82xx_pci_mem_read_direct 2 20368 NULL ++snd_pcm_stop_20376 snd_pcm_stop 0 20376 NULL +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL -+u64_to_uptr_20384 u64_to_uptr 1 20384 NULL -+snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL -+__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL -+xen_create_contiguous_region_20457 xen_create_contiguous_region 1 20457 NULL ++block_read_full_page_20380 block_read_full_page 0 20380 NULL ++snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL nohasharray ++read_7220_creg32_20394 read_7220_creg32 0 20394 &snd_nm256_readl_20394 ++__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL nohasharray ++SyS_get_mempolicy_20399 SyS_get_mempolicy 3-4 20399 &__kfifo_from_user_20399 ++btrfs_set_acl_20440 btrfs_set_acl 0 20440 NULL +nfs3_setxattr_20458 nfs3_setxattr 4 20458 NULL -+dec_zcache_pers_zpages_20465 dec_zcache_pers_zpages 1 20465 NULL +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL +read_buf_20469 read_buf 2 20469 NULL +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL +fast_user_write_20494 fast_user_write 5 20494 NULL -+ocfs2_db_frozen_trigger_20503 ocfs2_db_frozen_trigger 4 20503 NULL nohasharray -+hidraw_report_event_20503 hidraw_report_event 3 20503 &ocfs2_db_frozen_trigger_20503 ++ocfs2_db_frozen_trigger_20503 ocfs2_db_frozen_trigger 4 20503 NULL +pcpu_alloc_area_20511 pcpu_alloc_area 0-3 20511 NULL -+pcpu_depopulate_chunk_20517 pcpu_depopulate_chunk 2-3 20517 NULL ++link_free_space_20512 link_free_space 0 20512 NULL ++pcpu_depopulate_chunk_20517 pcpu_depopulate_chunk 3-2 20517 NULL +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL @@ -103576,30 +104766,34 @@ index 0000000..b04803b +venus_create_20555 venus_create 4 20555 NULL +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL -+i915_max_freq_read_20581 i915_max_freq_read 3 20581 NULL -+batadv_tt_append_diff_20588 batadv_tt_append_diff 4 20588 NULL ++batadv_tt_append_diff_20588 batadv_tt_append_diff 4 20588 NULL nohasharray ++ocfs2_cluster_lock_20588 ocfs2_cluster_lock 0 20588 &batadv_tt_append_diff_20588 ++kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL +lirc_write_20604 lirc_write 3 20604 NULL -+qib_qsfp_write_20614 qib_qsfp_write 0-4-2 20614 NULL ++qib_qsfp_write_20614 qib_qsfp_write 0-2-4 20614 NULL +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL -+kfifo_copy_to_user_20646 kfifo_copy_to_user 3 20646 NULL -+cpulist_scnprintf_20648 cpulist_scnprintf 0-2 20648 NULL ++get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL ++kfifo_copy_to_user_20646 kfifo_copy_to_user 4-3 20646 NULL ++cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL -+snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL ++snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL nohasharray ++btrfs_qgroup_reserve_20676 btrfs_qgroup_reserve 0 20676 &snd_hdsp_playback_copy_20676 +get_user_page_nowait_20682 get_user_page_nowait 3 20682 NULL nohasharray +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 &get_user_page_nowait_20682 +cpumask_size_20683 cpumask_size 0 20683 NULL +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL +gru_vtop_20689 gru_vtop 2 20689 NULL +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL ++i915_gem_obj_ggtt_pin_20698 i915_gem_obj_ggtt_pin 0 20698 NULL +__maestro_read_20700 __maestro_read 0 20700 NULL +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL -+vring_add_indirect_20737 vring_add_indirect 3-4 20737 NULL +io_apic_set_pci_routing_20740 io_apic_set_pci_routing 2 20740 NULL ++fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL @@ -103608,55 +104802,65 @@ index 0000000..b04803b +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL +iommu_range_alloc_20794 iommu_range_alloc 3 20794 NULL +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL -+sys_sendto_20809 sys_sendto 6 20809 NULL -+cfv_alloc_and_copy_skb_20812 cfv_alloc_and_copy_skb 4 20812 NULL ++ext4_convert_unwritten_extents_endio_20812 ext4_convert_unwritten_extents_endio 0 20812 NULL +strndup_user_20819 strndup_user 2 20819 NULL -+calc_layout_20829 calc_layout 3 20829 NULL +dtf_read_channel_20831 dtf_read_channel 3 20831 NULL +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL +uvc_alloc_entity_20836 uvc_alloc_entity 3-4 20836 NULL ++btrfs_orphan_add_20840 btrfs_orphan_add 0 20840 NULL ++p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL ++nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL ++get_name_20855 get_name 4 20855 NULL ++iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL ++srq_free_res_20868 srq_free_res 5 20868 NULL +ocfs2_bmap_20874 ocfs2_bmap 2 20874 NULL -+skb_tail_pointer_20878 skb_tail_pointer 0 20878 NULL ++cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL ++rb_simple_write_20890 rb_simple_write 3 20890 NULL +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL -+compat_sys_readv_20911 compat_sys_readv 3 20911 NULL ++lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL +htable_bits_20933 htable_bits 0 20933 NULL ++check_eofblocks_fl_20942 check_eofblocks_fl 0 20942 NULL +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL ++rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL -+brcmf_tx_frame_20978 brcmf_tx_frame 3 20978 NULL +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL -+ocfs2_free_clusters_21001 ocfs2_free_clusters 4 21001 NULL -+ceph_osdc_new_request_21017 ceph_osdc_new_request 14-4 21017 NULL ++qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL ++ocfs2_free_clusters_21001 ocfs2_free_clusters 4-0 21001 NULL +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL ++reiserfs_direct_IO_21051 reiserfs_direct_IO 4 21051 NULL +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL ++btrfs_insert_root_21061 btrfs_insert_root 0 21061 NULL ++qdisc_get_default_21072 qdisc_get_default 2 21072 NULL +event_calibration_read_21083 event_calibration_read 3 21083 NULL -+compat_sock_ioctl_trans_21092 compat_sock_ioctl_trans 4 21092 NULL -+multipath_status_21094 multipath_status 5 21094 NULL -+__cfg80211_send_disassoc_21096 __cfg80211_send_disassoc 3 21096 NULL ++bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray ++multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094 +ext2_valid_block_bitmap_21101 ext2_valid_block_bitmap 3 21101 NULL +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL +bitset_size_in_bytes_21124 bitset_size_in_bytes 0-1 21124 NULL +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL +tps6586x_irq_init_21144 tps6586x_irq_init 3 21144 NULL ++chunk_size_21146 chunk_size 0 21146 NULL +ocfs2_block_check_validate_21149 ocfs2_block_check_validate 2 21149 NULL +alloc_pg_vec_21159 alloc_pg_vec 3 21159 NULL ++btrfs_add_root_ref_21186 btrfs_add_root_ref 0 21186 NULL +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL -+_ocfs2_free_clusters_21220 _ocfs2_free_clusters 4 21220 NULL ++_ocfs2_free_clusters_21220 _ocfs2_free_clusters 4-0 21220 NULL +get_numpages_21227 get_numpages 0-1-2 21227 NULL -+SyS_mlock_21238 SyS_mlock 1 21238 NULL ++SyS_mlock_21238 SyS_mlock 1-2 21238 NULL +input_ff_create_21240 input_ff_create 2 21240 NULL +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL ++fru_length_21257 fru_length 0 21257 NULL ++rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL +ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL -+ip_vs_icmp_xmit_21269 ip_vs_icmp_xmit 4 21269 NULL -+make_alloc_exact_21279 make_alloc_exact 1-3 21279 NULL +vmw_gmr2_bind_21305 vmw_gmr2_bind 3 21305 NULL +do_msg_fill_21307 do_msg_fill 3 21307 NULL +add_res_range_21310 add_res_range 4 21310 NULL @@ -103665,6 +104869,7 @@ index 0000000..b04803b +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL +max77693_irq_domain_map_21357 max77693_irq_domain_map 2 21357 NULL +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL ++split_leaf_21378 split_leaf 0 21378 NULL +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL +video_ioctl2_21380 video_ioctl2 2 21380 NULL +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL @@ -103674,242 +104879,295 @@ index 0000000..b04803b +tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL -+concat_writev_21451 concat_writev 3 21451 NULL ++ReadISAR_21453 ReadISAR 0 21453 NULL +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL +read_file_xmit_21487 read_file_xmit 3 21487 NULL +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL ++dma_skb_copy_datagram_iovec_21516 dma_skb_copy_datagram_iovec 3-5 21516 NULL +btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL ++snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL -+compat_SyS_pwritev64_21606 compat_SyS_pwritev64 3 21606 NULL ++filemap_get_page_21606 filemap_get_page 2 21606 NULL ++xlog_do_recovery_pass_21618 xlog_do_recovery_pass 3 21618 NULL ++pci_cardbus_resource_alignment_21625 pci_cardbus_resource_alignment 0 21625 NULL ++add_pin_to_irq_node_21628 add_pin_to_irq_node 2 21628 NULL ++ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL +validate_nnode_21638 validate_nnode 0 21638 NULL -+__irq_alloc_descs_21639 __irq_alloc_descs 2-1-3 21639 NULL -+carl9170_rx_copy_data_21656 carl9170_rx_copy_data 2 21656 NULL ++__irq_alloc_descs_21639 __irq_alloc_descs 2-1-0-3-4 21639 NULL ++ocfs2_lock_refcount_allocators_21646 ocfs2_lock_refcount_allocators 0 21646 NULL +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL -+regmap_register_patch_21681 regmap_register_patch 3 21681 NULL -+rtllib_alloc_txb_21687 rtllib_alloc_txb 1-2 21687 NULL ++rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL -+reiserfs_allocate_list_bitmaps_21732 reiserfs_allocate_list_bitmaps 3 21732 NULL -+vm_brk_21739 vm_brk 1 21739 NULL -+__nf_nat_mangle_tcp_packet_21744 __nf_nat_mangle_tcp_packet 8-6 21744 NULL ++btrfs_find_all_leafs_21712 btrfs_find_all_leafs 0 21712 NULL ++unix_skb_len_21722 unix_skb_len 0 21722 NULL ++lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL ++ocfs2_remove_rightmost_path_21729 ocfs2_remove_rightmost_path 0 21729 NULL ++reiserfs_allocate_list_bitmaps_21732 reiserfs_allocate_list_bitmaps 3 21732 NULL nohasharray ++ext4_split_extent_at_21732 ext4_split_extent_at 0 21732 &reiserfs_allocate_list_bitmaps_21732 ++vm_brk_21739 vm_brk 1-2 21739 NULL +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL -+gen_pool_add_21776 gen_pool_add 3 21776 NULL ++usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL ++gen_pool_add_21776 gen_pool_add 3-4 21776 NULL ++SyS_sendfile_21777 SyS_sendfile 4 21777 NULL ++atomic64_cmpxchg_21782 atomic64_cmpxchg 0 21782 NULL +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL -+__ioremap_caller_21800 __ioremap_caller 1-2 21800 NULL -+min_odd_21802 min_odd 0 21802 NULL +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL ++__ocfs2_cluster_lock_21812 __ocfs2_cluster_lock 0 21812 NULL +wm8994_request_irq_21822 wm8994_request_irq 2 21822 NULL +oom_adj_read_21847 oom_adj_read 3 21847 NULL -+acpi_tb_check_xsdt_21862 acpi_tb_check_xsdt 1 21862 NULL ++gen_unique_name_21852 gen_unique_name 0 21852 NULL +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL -+sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL nohasharray -+tcp_cookie_size_check_21873 tcp_cookie_size_check 0-1 21873 &sisusbcon_bmove_21873 -+xen_swiotlb_map_page_21886 xen_swiotlb_map_page 3 21886 NULL -+__alloc_reserved_percpu_21895 __alloc_reserved_percpu 1-2 21895 NULL ++sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL ++ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL ++__alloc_reserved_percpu_21895 __alloc_reserved_percpu 2-1 21895 NULL +rio_destid_first_21900 rio_destid_first 0 21900 NULL +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL -+security_mmap_addr_21970 security_mmap_addr 0 21970 NULL ++ast_ttm_tt_create_21917 ast_ttm_tt_create 2 21917 NULL ++__ocfs2_claim_clusters_21936 __ocfs2_claim_clusters 0 21936 NULL +alloc_ldt_21972 alloc_ldt 2 21972 NULL +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL +rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3 22001 NULL nohasharray -+compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 0-3 22001 &rxpipe_descr_host_int_trig_rx_data_read_22001 ++compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 3-0 22001 &rxpipe_descr_host_int_trig_rx_data_read_22001 ++ocfs2_reserve_cluster_bitmap_bits_22016 ocfs2_reserve_cluster_bitmap_bits 0 22016 NULL +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL ++i915_gem_evict_something_22028 i915_gem_evict_something 0 22028 NULL +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL ++atalk_recvmsg_22053 atalk_recvmsg 4 22053 NULL +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL -+btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2 22077 NULL ++btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL +write_opcode_22082 write_opcode 2 22082 NULL +mem_rw_22085 mem_rw 3 22085 NULL -+is_swbp_at_addr_22089 is_swbp_at_addr 2 22089 NULL -+lowpan_fragment_xmit_22095 lowpan_fragment_xmit 3-4 22095 NULL ++snd_pcm_xrun_22088 snd_pcm_xrun 0 22088 NULL +sched_clock_cpu_22098 sched_clock_cpu 0 22098 NULL -+qlcnic_sriov_pf_enable_22103 qlcnic_sriov_pf_enable 2 22103 NULL -+sys_remap_file_pages_22124 sys_remap_file_pages 1 22124 NULL -+__bitmap_size_22138 __bitmap_size 0 22138 NULL -+compat_insn_22142 compat_insn 2 22142 NULL ++rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL ++shmem_add_to_page_cache_22121 shmem_add_to_page_cache 0 22121 NULL ++snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL ++SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL -+__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL ++remap_pud_range_22164 remap_pud_range 3-4-5 22164 NULL ++__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL nohasharray ++vmci_qp_broker_map_22173 vmci_qp_broker_map 3 22173 &__kfifo_alloc_22173 +fls_22210 fls 0 22210 NULL ++rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL nohasharray ++bitmap_clear_bits_22227 bitmap_clear_bits 3 22227 &rfcomm_sock_recvmsg_22227 +mem_write_22232 mem_write 3 22232 NULL +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL ++fsnotify_parent_22243 fsnotify_parent 0 22243 NULL +atomic64_xchg_22246 atomic64_xchg 0 22246 NULL +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL ++ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL ++add_res_tree_22263 add_res_tree 7 22263 NULL +__btrfs_direct_write_22273 __btrfs_direct_write 4 22273 NULL +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL ++i915_gem_execbuffer_relocate_22294 i915_gem_execbuffer_relocate 0 22294 NULL +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 NULL nohasharray +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 &pci_vpd_srdt_size_22300 -+extend_brk_22301 extend_brk 0 22301 NULL +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL -+C_SYSC_msgrcv_22320 C_SYSC_msgrcv 2-3 22320 NULL -+get_segment_base_22324 get_segment_base 0 22324 NULL -+radix_tree_find_next_bit_22334 radix_tree_find_next_bit 2-3 22334 NULL ++lov_setstripe_22307 lov_setstripe 2 22307 NULL ++udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL ++C_SYSC_msgrcv_22320 C_SYSC_msgrcv 3 22320 NULL ++radix_tree_find_next_bit_22334 radix_tree_find_next_bit 3-2-0 22334 NULL +atomic_read_22342 atomic_read 0 22342 NULL ++ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL +mlx4_db_alloc_22358 mlx4_db_alloc 3 22358 NULL +irq_reserve_irq_22360 irq_reserve_irq 1 22360 NULL nohasharray +memcg_size_22360 memcg_size 0 22360 &irq_reserve_irq_22360 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL +tps6586x_gpio_to_irq_22365 tps6586x_gpio_to_irq 2 22365 NULL +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL -+alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL -+btmrvl_psmode_read_22395 btmrvl_psmode_read 3 22395 NULL -+crash_shrink_memory_22401 crash_shrink_memory 1 22401 NULL ++alloc_large_system_hash_22391 alloc_large_system_hash 2-8-9 22391 NULL ++ocfs2_assign_bh_22392 ocfs2_assign_bh 0 22392 NULL +zoran_write_22404 zoran_write 3 22404 NULL ++ATOMIC_ADD_RETURN_22413 ATOMIC_ADD_RETURN 2 22413 NULL +queue_reply_22416 queue_reply 3 22416 NULL +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL +queue_max_segments_22441 queue_max_segments 0 22441 NULL ++_rtw_vmalloc_22444 _rtw_vmalloc 1 22444 NULL +handle_received_packet_22457 handle_received_packet 3 22457 NULL +mem_cgroup_read_22461 mem_cgroup_read 5 22461 NULL -+batadv_check_unicast_packet_22468 batadv_check_unicast_packet 3 22468 NULL -+dtf_write_device_22471 dtf_write_device 3 22471 NULL ++btrfs_write_out_cache_22471 btrfs_write_out_cache 0 22471 NULL nohasharray ++dtf_write_device_22471 dtf_write_device 3 22471 &btrfs_write_out_cache_22471 ++source_sink_start_ep_22472 source_sink_start_ep 0 22472 NULL ++alloc_desc_22487 alloc_desc 2 22487 NULL ++ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL ++qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL +mp_find_ioapic_pin_22499 mp_find_ioapic_pin 0-2 22499 NULL +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL -+ip4_addr_string_22511 ip4_addr_string 0 22511 NULL -+swiotlb_tbl_unmap_single_22522 swiotlb_tbl_unmap_single 2 22522 NULL nohasharray -+usb_dump_config_descriptor_22522 usb_dump_config_descriptor 0 22522 &swiotlb_tbl_unmap_single_22522 -+pskb_may_pull_22546 pskb_may_pull 2 22546 NULL ++__btrfs_add_delayed_item_22511 __btrfs_add_delayed_item 0 22511 NULL ++trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL -+atomic_long_read_unchecked_22551 atomic_long_read_unchecked 0 22551 NULL +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL ++snd_pcm_hw_params_choose_22560 snd_pcm_hw_params_choose 0 22560 NULL +dbFindCtl_22587 dbFindCtl 0 22587 NULL +snapshot_read_22601 snapshot_read 3 22601 NULL ++ocfs2_get_refcount_block_22610 ocfs2_get_refcount_block 0 22610 NULL +remove_breakpoint_22628 remove_breakpoint 3 22628 NULL +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL ++sysfs_attr_ns_22645 sysfs_attr_ns 0 22645 NULL +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL -+compat_SyS_msgrcv_22661 compat_SyS_msgrcv 2-3 22661 NULL -+ubifs_leb_write_22679 ubifs_leb_write 4-5 22679 NULL -+qlcnic_83xx_sysfs_flash_write_handler_22680 qlcnic_83xx_sysfs_flash_write_handler 6 22680 NULL ++compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL ++ubifs_leb_write_22679 ubifs_leb_write 4-5 22679 NULL nohasharray ++ext4_ext_direct_IO_22679 ext4_ext_direct_IO 4 22679 &ubifs_leb_write_22679 ++fill_gap_22681 fill_gap 0 22681 NULL nohasharray ++l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 &fill_gap_22681 ++bch_dump_read_22685 bch_dump_read 3 22685 NULL ++reg_umr_22686 reg_umr 5 22686 NULL +ocfs2_get_block_22687 ocfs2_get_block 2 22687 NULL -+compat_fd_ioctl_22694 compat_fd_ioctl 4 22694 NULL -+map_22700 map 2 22700 NULL ++map_22700 map 2 22700 NULL nohasharray ++btrfs_del_inode_ref_in_log_22700 btrfs_del_inode_ref_in_log 0 22700 &map_22700 +alloc_libipw_22708 alloc_libipw 1 22708 NULL -+brcmf_sdbrcm_read_control_22721 brcmf_sdbrcm_read_control 3 22721 NULL -+cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4 22735 NULL ++ecryptfs_write_metadata_to_contents_22721 ecryptfs_write_metadata_to_contents 3 22721 NULL ++cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL +print_frame_22769 print_frame 0 22769 NULL +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL -+compat_blkdev_ioctl_22841 compat_blkdev_ioctl 3 22841 NULL ++ocfs2_block_group_alloc_22774 ocfs2_block_group_alloc 0 22774 NULL ++pla_ocp_write_22802 pla_ocp_write 4 22802 NULL ++__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL +clone_bio_integrity_22842 clone_bio_integrity 4 22842 NULL +read_file_rcstat_22854 read_file_rcstat 3 22854 NULL -+do_atm_iobuf_22857 do_atm_iobuf 3 22857 NULL +create_attr_set_22861 create_attr_set 1 22861 NULL +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL +policy_emit_config_values_22900 policy_emit_config_values 3 22900 NULL ++__btrfs_add_free_space_22917 __btrfs_add_free_space 0 22917 NULL ++xstateregs_set_22932 xstateregs_set 4 22932 NULL +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL -+alloc_sglist_22960 alloc_sglist 1-2-3 22960 NULL ++alloc_sglist_22960 alloc_sglist 3-2 22960 NULL +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL +vme_get_size_22964 vme_get_size 0 22964 NULL +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL -+page_table_range_init_count_22977 page_table_range_init_count 0 22977 NULL ++cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL +usb_get_langid_22983 usb_get_langid 0 22983 NULL +set_msr_hyperv_22985 set_msr_hyperv 3 22985 NULL +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL +brcmf_sdio_chip_exit_download_23001 brcmf_sdio_chip_exit_download 4 23001 NULL +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL ++ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 0-6-7 23029 NULL +st_status_23032 st_status 5 23032 NULL +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL -+reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL ++comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL ++reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray ++unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062 +mei_cl_send_23068 mei_cl_send 3 23068 NULL ++filp_close_23071 filp_close 0 23071 NULL +kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL -+vm_map_ram_23078 vm_map_ram 2 23078 NULL nohasharray ++vm_map_ram_23078 vm_map_ram 3 23078 NULL nohasharray +raw_sendmsg_23078 raw_sendmsg 4 23078 &vm_map_ram_23078 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL -+qla4_82xx_pci_mem_read_2M_23081 qla4_82xx_pci_mem_read_2M 2 23081 NULL +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL +lnw_gpio_irq_map_23087 lnw_gpio_irq_map 2 23087 NULL +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL ++__add_prelim_ref_23095 __add_prelim_ref 0 23095 NULL +fls_long_23096 fls_long 0 23096 NULL -+ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL ++ntfs_ucstonls_23097 ntfs_ucstonls 5-3 23097 NULL +pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL ++dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL ++ip_recv_error_23109 ip_recv_error 3 23109 NULL +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 NULL -+__clear_user_23118 __clear_user 0 23118 NULL -+dm_write_async_23120 dm_write_async 3 23120 NULL ++__clear_user_23118 __clear_user 0-2 23118 NULL +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL -+ca91cx42_master_set_23146 ca91cx42_master_set 4 23146 NULL ++ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL ++ext3_listxattr_23137 ext3_listxattr 3 23137 NULL +read_file_ani_23161 read_file_ani 3 23161 NULL -+ioremap_23172 ioremap 1-2 23172 NULL +tg_get_cfs_quota_23176 tg_get_cfs_quota 0 23176 NULL +usblp_write_23178 usblp_write 3 23178 NULL +msnd_fifo_alloc_23179 msnd_fifo_alloc 2 23179 NULL +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL -+ieee80211_get_mesh_hdrlen_23183 ieee80211_get_mesh_hdrlen 0 23183 NULL +fix_unclean_leb_23188 fix_unclean_leb 3 23188 NULL +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL +convert_ip_to_linear_23198 convert_ip_to_linear 0 23198 NULL -+pm80x_free_irq_23210 pm80x_free_irq 2 23210 NULL nohasharray -+compat_rawv6_ioctl_23210 compat_rawv6_ioctl 3 23210 &pm80x_free_irq_23210 -+tty_buffer_request_room_23228 tty_buffer_request_room 2 23228 NULL -+xlog_get_bp_23229 xlog_get_bp 2 23229 NULL ++pm80x_free_irq_23210 pm80x_free_irq 2 23210 NULL ++tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL ++__read_status_pci_23229 __read_status_pci 0 23229 NULL nohasharray ++xlog_get_bp_23229 xlog_get_bp 2 23229 &__read_status_pci_23229 ++ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL -+__gfn_to_rmap_23240 __gfn_to_rmap 1-2 23240 NULL ++__gfn_to_rmap_23240 __gfn_to_rmap 2-1 23240 NULL ++sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL -+ipv6_skip_exthdr_23283 ipv6_skip_exthdr 0-2 23283 NULL -+doc_probe_23285 doc_probe 1 23285 NULL +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL -+perf_mmap_free_page_23302 perf_mmap_free_page 1 23302 NULL ++gru_preload_tlb_23305 gru_preload_tlb 7-4 23305 NULL +i2cdev_write_23310 i2cdev_write 3 23310 NULL -+mc13xxx_get_num_regulators_dt_23344 mc13xxx_get_num_regulators_dt 0 23344 NULL ++__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL ++__es_remove_extent_23323 __es_remove_extent 0 23323 NULL +page_readlink_23346 page_readlink 3 23346 NULL ++kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL +get_dst_timing_23358 get_dst_timing 0 23358 NULL +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL +vga_mm_r_23419 vga_mm_r 0 23419 NULL -+vzalloc_node_23424 vzalloc_node 1 23424 NULL ++vzalloc_node_23424 vzalloc_node 1-2 23424 NULL ++__ctzsi2_23444 __ctzsi2 1 23444 NULL +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL -+linear_conf_23485 linear_conf 2 23485 NULL nohasharray -+divasa_remap_pci_bar_23485 divasa_remap_pci_bar 3-4 23485 &linear_conf_23485 ++__ata_change_queue_depth_23484 __ata_change_queue_depth 3-0 23484 NULL ++linear_conf_23485 linear_conf 2 23485 NULL ++copy_module_from_user_23492 copy_module_from_user 2 23492 NULL +event_filter_read_23494 event_filter_read 3 23494 NULL ++ext4_remove_blocks_23497 ext4_remove_blocks 0 23497 NULL ++lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL +__gfn_to_hva_many_23508 __gfn_to_hva_many 0-2 23508 NULL ++devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL ++__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL ++__es_insert_extent_23543 __es_insert_extent 0 23543 NULL +xen_allocate_irq_gsi_23546 xen_allocate_irq_gsi 1-0 23546 NULL +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL -+dbg_leb_change_23555 dbg_leb_change 4 23555 NULL -+venus_symlink_23570 venus_symlink 4-6 23570 NULL ++dbg_leb_change_23555 dbg_leb_change 0-4 23555 NULL ++btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL ++venus_symlink_23570 venus_symlink 6-4 23570 NULL +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL ++xfpregs_get_23586 xfpregs_get 4 23586 NULL +snd_interval_min_23590 snd_interval_min 0 23590 NULL +do_mmap_pgoff_23600 do_mmap_pgoff 0 23600 NULL -+_alloc_cdb_cont_23609 _alloc_cdb_cont 2 23609 NULL +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL ++ocfs2_journal_access_23616 ocfs2_journal_access 0 23616 NULL ++alloc_pte_23642 alloc_pte 3 23642 NULL +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL -+ext3_compat_ioctl_23659 ext3_compat_ioctl 3 23659 NULL +sInW_23663 sInW 0 23663 NULL +SyS_connect_23669 SyS_connect 3 23669 NULL -+proc_ioctl_compat_23682 proc_ioctl_compat 2 23682 NULL -+nftl_partscan_23688 nftl_partscan 0 23688 NULL +cx18_read_23699 cx18_read 3 23699 NULL -+isku_sysfs_write_control_23718 isku_sysfs_write_control 6 23718 NULL ++btrfs_insert_delayed_item_23705 btrfs_insert_delayed_item 0 23705 NULL ++at_get_23708 at_get 0 23708 NULL ++snd_pcm_hw_refine_23721 snd_pcm_hw_refine 0 23721 NULL +mp_config_acpi_gsi_23728 mp_config_acpi_gsi 2 23728 NULL -+pack_sg_list_p_23739 pack_sg_list_p 0-2 23739 NULL +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL -+__build_packet_message_23778 __build_packet_message 10-4 23778 NULL ++svc_prepare_thread_23772 svc_prepare_thread 3 23772 NULL ++__build_packet_message_23778 __build_packet_message 4-10 23778 NULL +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL ++cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL ++mpt_free_res_23793 mpt_free_res 5 23793 NULL ++map_write_23795 map_write 3 23795 NULL +diva_alloc_dma_map_23798 diva_alloc_dma_map 2 23798 NULL +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL -+__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2-3 23824 NULL -+ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 3-4 23829 NULL ++ocfs2_replace_cow_23803 ocfs2_replace_cow 0 23803 NULL ++__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL ++lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL ++ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 0-4-3 23829 NULL +tfrc_binsearch_23833 tfrc_binsearch 0 23833 NULL -+xfs_dir2_leaf_getdents_23841 xfs_dir2_leaf_getdents 3 23841 NULL +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL +p54_init_common_23850 p54_init_common 1 23850 NULL @@ -103918,179 +105176,229 @@ index 0000000..b04803b +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL +nes_alloc_resource_23891 nes_alloc_resource 3 23891 NULL -+tipc_snprintf_23893 tipc_snprintf 2 23893 NULL ++_rtw_zvmalloc_23892 _rtw_zvmalloc 1 23892 NULL ++tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL ++usbg_prepare_w_request_23895 usbg_prepare_w_request 0 23895 NULL +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911 ++device_create_bin_file_23914 device_create_bin_file 0 23914 NULL +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918 -+kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL -+__alloc_skb_23940 __alloc_skb 1 23940 NULL ++kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL nohasharray ++intel_ring_alloc_seqno_23928 intel_ring_alloc_seqno 0 23928 &kvm_read_guest_23928 ++__alloc_skb_23940 __alloc_skb 4 23940 NULL +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL ++size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL ++vfs_write_23971 vfs_write 0-3 23971 NULL ++sddr55_write_data_23983 sddr55_write_data 4 23983 NULL +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL -+dgrp_send_24028 dgrp_send 0-2 24028 NULL ++intel_ring_idle_24014 intel_ring_idle 0 24014 NULL ++give_pages_24021 give_pages 3 24021 NULL +ocfs2_mark_extent_refcounted_24035 ocfs2_mark_extent_refcounted 6 24035 NULL +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL ++hmac_setkey_24043 hmac_setkey 3 24043 NULL +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL -+brcmf_sdio_ramrw_24074 brcmf_sdio_ramrw 5 24074 NULL +blkcipher_copy_iv_24075 blkcipher_copy_iv 3 24075 NULL +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL ++ocfs2_cannibalize_resv_24090 ocfs2_cannibalize_resv 3 24090 NULL +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL -+mpu401_read_24126 mpu401_read 3 24126 NULL ++lov_brw_24122 lov_brw 4 24122 NULL ++mpu401_read_24126 mpu401_read 3-0 24126 NULL ++_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL ++SyS_sethostname_24150 SyS_sethostname 2 24150 NULL +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL +set_discard_24162 set_discard 2 24162 NULL ++__copy_user_zeroing_intel_nocache_24163 __copy_user_zeroing_intel_nocache 0-3 24163 NULL +adu_read_24177 adu_read 3 24177 NULL +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL ++shrink_tnc_24190 shrink_tnc 0 24190 NULL ++irq_remapping_setup_msi_irqs_24194 irq_remapping_setup_msi_irqs 2 24194 NULL +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL +efx_vf_size_24213 efx_vf_size 0 24213 NULL ++SyS_sendfile64_24220 SyS_sendfile64 4 24220 NULL +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL -+pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 1-2-3 24224 NULL nohasharray ++pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray +mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224 +pci_num_vf_24235 pci_num_vf 0 24235 NULL +sel_read_bool_24236 sel_read_bool 3 24236 NULL +dm_cache_save_hint_24257 dm_cache_save_hint 2 24257 NULL +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL ++calculate_sizes_24273 calculate_sizes 2 24273 NULL +thin_status_24278 thin_status 5 24278 NULL -+compat_sys_preadv64_24283 compat_sys_preadv64 3 24283 NULL +msg_size_24288 msg_size 0 24288 NULL -+ext2_free_blocks_24292 ext2_free_blocks 2-3 24292 NULL ++ext2_free_blocks_24292 ext2_free_blocks 3-2 24292 NULL ++i2c_smbus_check_pec_24297 i2c_smbus_check_pec 0 24297 NULL +map_page_24298 map_page 3-4 24298 NULL ++gserial_connect_24302 gserial_connect 0 24302 NULL +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL -+reserve_metadata_bytes_24313 reserve_metadata_bytes 3 24313 NULL ++reserve_metadata_bytes_24313 reserve_metadata_bytes 3-0 24313 NULL +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL +ocfs2_direct_IO_get_blocks_24333 ocfs2_direct_IO_get_blocks 2 24333 NULL +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL -+C_SYSC_pwritev_24345 C_SYSC_pwritev 3 24345 NULL -+kzalloc_node_24352 kzalloc_node 1 24352 NULL ++kzalloc_node_24352 kzalloc_node 1-3 24352 NULL +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL +igetword_24373 igetword 0 24373 NULL ++max_io_len_24384 max_io_len 0-1 24384 NULL ++mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL ++osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 NULL nohasharray -+getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398 ++getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398 nohasharray ++__btrfs_write_out_cache_24398 __btrfs_write_out_cache 0 24398 &getxattr_24398 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL ++nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL -+iwl_nvm_read_section_24438 iwl_nvm_read_section 0 24438 NULL -+ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL -+smk_user_access_24440 smk_user_access 3 24440 NULL -+page_address_24444 page_address 0 24444 NULL ++xenbus_file_read_24427 xenbus_file_read 3 24427 NULL ++ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL ++copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL ++ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 6-4 24439 NULL ++smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray ++rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440 ++__push_leaf_left_24456 __push_leaf_left 0 24456 NULL +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL -+ocfs2_write_cluster_by_desc_24466 ocfs2_write_cluster_by_desc 5-6 24466 NULL ++lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL ++skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL nohasharray ++ocfs2_write_cluster_by_desc_24466 ocfs2_write_cluster_by_desc 6-5 24466 &skb_copy_and_csum_datagram_iovec_24466 ++snd_pcm_hw_param_first_24487 snd_pcm_hw_param_first 0 24487 NULL +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL ++i915_gem_obj_offset_24494 i915_gem_obj_offset 0 24494 NULL ++push_nodes_for_insert_24496 push_nodes_for_insert 0 24496 NULL +pd_video_read_24510 pd_video_read 3 24510 NULL +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL -+named_prepare_buf_24532 named_prepare_buf 2 24532 NULL +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL +write_cache_pages_24562 write_cache_pages 0 24562 NULL -+tsi148_alloc_resource_24563 tsi148_alloc_resource 2 24563 NULL ++SyS_pselect6_24582 SyS_pselect6 1 24582 NULL +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL -+count_preds_24600 count_preds 0 24600 NULL -+sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL ++sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray ++lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605 ++SyS_poll_24620 SyS_poll 2 24620 NULL +kvm_pv_enable_async_pf_24637 kvm_pv_enable_async_pf 2 24637 NULL +context_alloc_24645 context_alloc 3 24645 NULL +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL -+unifi_net_data_malloc_24716 unifi_net_data_malloc 3 24716 NULL -+read_fs_24717 read_fs 0 24717 NULL ++btrfs_check_data_free_space_24692 btrfs_check_data_free_space 0 24692 NULL ++datafab_write_data_24696 datafab_write_data 4 24696 NULL ++intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL +simple_attr_read_24738 simple_attr_read 3 24738 NULL +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL -+ath_rxbuf_alloc_24745 ath_rxbuf_alloc 2 24745 NULL +get_dma_residue_24749 get_dma_residue 0 24749 NULL ++ocfs2_cow_file_pos_24751 ocfs2_cow_file_pos 3 24751 NULL +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL -+nfsd4_sanitize_slot_size_24756 nfsd4_sanitize_slot_size 0-1 24756 NULL -+i915_cache_sharing_read_24775 i915_cache_sharing_read 3 24775 NULL ++kempld_read8_24756 kempld_read8 0 24756 NULL +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL -+skb_make_writable_24783 skb_make_writable 2 24783 NULL +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL +cache_read_24790 cache_read 3 24790 NULL -+unpack_str_24798 unpack_str 0 24798 NULL ++__xfs_get_blocks_24791 __xfs_get_blocks 2 24791 NULL ++i915_gem_check_wedge_24793 i915_gem_check_wedge 0 24793 NULL ++user_regset_copyout_24796 user_regset_copyout 7 24796 NULL ++kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL +__next_cpu_nr_24805 __next_cpu_nr 1 24805 NULL ++sb_set_blocksize_24807 sb_set_blocksize 0-2 24807 NULL ++ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL +comedi_buf_alloc_24822 comedi_buf_alloc 3 24822 NULL ++net2272_read_24825 net2272_read 0 24825 NULL +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL ++btrfs_next_old_item_24843 btrfs_next_old_item 0 24843 NULL ++xfs_free_file_space_24853 xfs_free_file_space 2-3 24853 NULL +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869 +setup_buffering_24872 setup_buffering 3 24872 NULL -+bnx2fc_cmd_mgr_alloc_24873 bnx2fc_cmd_mgr_alloc 3-2 24873 NULL -+queues_read_24877 queues_read 3 24877 NULL nohasharray -+symbol_string_24877 symbol_string 0 24877 &queues_read_24877 ++queues_read_24877 queues_read 3 24877 NULL ++__vxge_hw_vp_initialize_24885 __vxge_hw_vp_initialize 2 24885 NULL +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL -+v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL -+next_token_24929 next_token 0 24929 NULL -+uf_create_device_nodes_24948 uf_create_device_nodes 2 24948 NULL -+ocfs2_fiemap_24949 ocfs2_fiemap 3-4 24949 NULL ++__btrfs_free_extent_24927 __btrfs_free_extent 7-0 24927 NULL nohasharray ++v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 &__btrfs_free_extent_24927 ++ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL -+sys_rt_sigpending_24961 sys_rt_sigpending 2 24961 NULL +ensure_wear_leveling_24971 ensure_wear_leveling 0 24971 NULL +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL -+nf_nat_sdp_port_24977 nf_nat_sdp_port 7 24977 NULL +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL ++btrfs_update_delayed_inode_24988 btrfs_update_delayed_inode 0 24988 NULL +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL ++twl6030_irq_unmap_25014 twl6030_irq_unmap 2 25014 NULL +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL ++load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL ++btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL ++ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL -+ceph_osdc_writepages_25085 ceph_osdc_writepages 5 25085 NULL ++iwl_dbgfs_tx_flush_write_25091 iwl_dbgfs_tx_flush_write 3 25091 NULL ++gfs2_iter_unstuffed_25099 gfs2_iter_unstuffed 0 25099 NULL nohasharray ++blkg_path_25099 blkg_path 3 25099 &gfs2_iter_unstuffed_25099 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL -+sys_fgetxattr_25166 sys_fgetxattr 4 25166 NULL -+ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL ++fs32_to_cpu_25143 fs32_to_cpu 0 25143 NULL ++record_new_ref_25154 record_new_ref 0 25154 NULL ++ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL nohasharray ++btrfs_delete_delayed_items_25167 btrfs_delete_delayed_items 0 25167 &ipath_init_qp_table_25167 ++kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL -+ks8851_rdreg32_25187 ks8851_rdreg32 0 25187 NULL ++res_counter_read_u64_25180 res_counter_read_u64 0 25180 NULL ++send_create_inode_if_needed_25211 send_create_inode_if_needed 0 25211 NULL ++security_socket_post_create_25221 security_socket_post_create 0 25221 NULL +ocfs2_block_check_compute_25223 ocfs2_block_check_compute 2 25223 NULL -+free_memcg_kmem_pages_25228 free_memcg_kmem_pages 1 25228 NULL +dtf_write_string_25232 dtf_write_string 5 25232 NULL +mon_stat_read_25238 mon_stat_read 3 25238 NULL -+tcf_csum_ipv6_udp_25241 tcf_csum_ipv6_udp 4 25241 NULL -+nilfs_palloc_find_available_slot_25245 nilfs_palloc_find_available_slot 3-5 25245 NULL ++nilfs_palloc_find_available_slot_25245 nilfs_palloc_find_available_slot 5-3 25245 NULL +stripe_status_25259 stripe_status 5 25259 NULL +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL +vfs_writev_25278 vfs_writev 3 25278 NULL +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL -+snd_seq_ioctl_compat_25307 snd_seq_ioctl_compat 3 25307 NULL -+help_25316 help 5 25316 NULL nohasharray -+ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 &help_25316 ++ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL -+rio_destid_next_25368 rio_destid_next 2 25368 NULL nohasharray ++rio_destid_next_25368 rio_destid_next 2-0 25368 NULL nohasharray +unix_mkname_25368 unix_mkname 0-2 25368 &rio_destid_next_25368 +sel_read_mls_25369 sel_read_mls 3 25369 NULL +tc3589x_gpio_to_irq_25371 tc3589x_gpio_to_irq 2 25371 NULL ++orphanize_inode_25382 orphanize_inode 0 25382 NULL ++SyS_splice_25390 SyS_splice 5 25390 NULL ++btrfs_update_reserved_bytes_25393 btrfs_update_reserved_bytes 0 25393 NULL ++vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL +ebt_buf_add_pad_25413 ebt_buf_add_pad 0 25413 NULL +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL -+ath6kl_wmi_beginscan_cmd_25462 ath6kl_wmi_beginscan_cmd 8 25462 NULL +generic_file_buffered_write_25464 generic_file_buffered_write 4 25464 NULL ++ipath_decode_err_25468 ipath_decode_err 3 25468 NULL +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL +ocfs2_hamming_encode_25501 ocfs2_hamming_encode 3 25501 NULL -+ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4 25502 NULL ++ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL ++evm_init_hmac_25504 evm_init_hmac 0 25504 NULL +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL +sb_permission_25523 sb_permission 0 25523 NULL ++down_read_failed_25532 down_read_failed 2 25532 NULL +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL ++mgag200_ttm_tt_create_25550 mgag200_ttm_tt_create 2 25550 NULL +ht_print_chan_25556 ht_print_chan 0 25556 NULL +skb_tailroom_25567 skb_tailroom 0 25567 NULL -+find_extend_vma_25597 find_extend_vma 2 25597 NULL -+__devres_alloc_25598 __devres_alloc 2 25598 NULL ++ping_recvmsg_25597 ping_recvmsg 4 25597 NULL nohasharray ++find_extend_vma_25597 find_extend_vma 2 25597 &ping_recvmsg_25597 +copy_user_generic_25611 copy_user_generic 0 25611 NULL +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL +__get_user_pages_25628 __get_user_pages 0-3-4 25628 NULL nohasharray +befs_utf2nls_25628 befs_utf2nls 3 25628 &__get_user_pages_25628 -+__direct_map_25647 __direct_map 5-6 25647 NULL -+ext2_try_to_allocate_25667 ext2_try_to_allocate 4-2 25667 NULL ++__direct_map_25647 __direct_map 6-5 25647 NULL ++ext2_try_to_allocate_25667 ext2_try_to_allocate 4-2-0 25667 NULL +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL ++lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL +ebitmap_start_positive_25703 ebitmap_start_positive 0 25703 NULL -+rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL ++wl1271_tx_enabled_rates_get_25712 wl1271_tx_enabled_rates_get 0 25712 NULL nohasharray ++rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 &wl1271_tx_enabled_rates_get_25712 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL ++ttm_tt_init_25717 ttm_tt_init 3 25717 NULL +sel_write_context_25726 sel_write_context 3 25726 NULL nohasharray -+__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2-3 25726 &sel_write_context_25726 -+mcs_unwrap_fir_25733 mcs_unwrap_fir 3 25733 NULL ++__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 &sel_write_context_25726 +ext2_find_near_25734 ext2_find_near 0 25734 NULL +__set_clear_dirty_25744 __set_clear_dirty 2 25744 NULL +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL @@ -104099,17 +105407,17 @@ index 0000000..b04803b +sg_read_25799 sg_read 3 25799 NULL +system_enable_read_25815 system_enable_read 3 25815 NULL +realloc_buffer_25816 realloc_buffer 2 25816 NULL ++ftrace_profile_init_25821 ftrace_profile_init 0 25821 NULL +mthca_map_user_db_25823 mthca_map_user_db 5 25823 NULL +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL +parport_read_25855 parport_read 0 25855 NULL +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL -+uf_ap_process_data_pdu_25860 uf_ap_process_data_pdu 7 25860 NULL +key_attr_size_25865 key_attr_size 0 25865 NULL +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL -+run_delalloc_nocow_25896 run_delalloc_nocow 3 25896 NULL ++run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL -+nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7 25908 NULL ++nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL +rcname_read_25919 rcname_read 3 25919 NULL +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL @@ -104118,331 +105426,402 @@ index 0000000..b04803b +flush_25957 flush 2 25957 NULL +video_register_device_25971 video_register_device 3 25971 NULL +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL ++lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL +ebt_compat_entry_padsize_26001 ebt_compat_entry_padsize 0 26001 NULL -+lpfc_sli_probe_sriov_nr_virtfn_26004 lpfc_sli_probe_sriov_nr_virtfn 2 26004 NULL ++blk_init_queue_node_26015 blk_init_queue_node 3 26015 NULL ++SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL +irq_create_strict_mappings_26025 irq_create_strict_mappings 2-4 26025 NULL +xfs_xattr_acl_set_26028 xfs_xattr_acl_set 4 26028 NULL -+skb_mac_header_26034 skb_mac_header 0 26034 NULL +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL +tun_do_read_26047 tun_do_read 5 26047 NULL -+__alloc_memory_core_early_26053 __alloc_memory_core_early 2-3 26053 NULL ++make_bfloat_26056 make_bfloat 2 26056 NULL +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL -+skb_cow_26138 skb_cow 2 26138 NULL -+usb_dump_device_strings_26146 usb_dump_device_strings 0 26146 NULL -+copy_oldmem_page_26164 copy_oldmem_page 3-1 26164 NULL ++__add_inline_refs_26096 __add_inline_refs 0 26096 NULL ++dup_ref_26100 dup_ref 0 26100 NULL ++intel_wrap_ring_buffer_26117 intel_wrap_ring_buffer 0 26117 NULL ++read_sb_page_26119 read_sb_page 5 26119 NULL ++__fswab64_26155 __fswab64 0 26155 NULL ++copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL +gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray +ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166 -+perf_adjust_period_26168 perf_adjust_period 2-3 26168 NULL -+mid_get_vbt_data_r1_26170 mid_get_vbt_data_r1 2 26170 NULL +disk_devt_26180 disk_devt 0 26180 NULL -+get_registers_26187 get_registers 3 26187 NULL +cgroup_setxattr_26188 cgroup_setxattr 4 26188 NULL +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL +mce_write_26201 mce_write 3 26201 NULL ++SyS_splice_26206 SyS_splice 5 26206 NULL ++mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL ++rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL +bio_split_26235 bio_split 2 26235 NULL ++btrfs_delayed_inode_reserve_metadata_26236 btrfs_delayed_inode_reserve_metadata 0 26236 NULL ++ecryptfs_read_lower_page_segment_26244 ecryptfs_read_lower_page_segment 4 26244 NULL ++do_setxattr_26264 do_setxattr 0 26264 NULL +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL ++apei_resources_request_26279 apei_resources_request 0 26279 NULL +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL +ext2_find_goal_26306 ext2_find_goal 0 26306 NULL +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL nohasharray +pax_get_random_long_26309 pax_get_random_long 0 26309 &snd_pcm_plug_client_channels_buf_26309 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL -+efx_rx_mk_skb_26342 efx_rx_mk_skb 5 26342 NULL -+ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 5 26357 NULL ++check_can_nocow_26336 check_can_nocow 2 26336 NULL ++snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL ++ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 5-0-6-3 26357 NULL +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL -+dup_to_netobj_26363 dup_to_netobj 3 26363 NULL +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL -+dma_declare_contiguous_26455 dma_declare_contiguous 2 26455 NULL ++ntty_write_26404 ntty_write 3 26404 NULL ++pagemap_read_26441 pagemap_read 3 26441 NULL ++tower_read_26461 tower_read 3 26461 NULL nohasharray ++enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461 nohasharray ++numa_cpu_node_26461 numa_cpu_node 0 26461 &enc_pools_add_pages_26461 ++memory_present_26470 memory_present 1 26470 NULL +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL +ulong_write_file_26485 ulong_write_file 3 26485 NULL +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL ++vfio_pin_pages_26494 vfio_pin_pages 1 26494 NULL +read_vmcore_26501 read_vmcore 3 26501 NULL -+vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 3-4 26507 NULL ++uhid_char_write_26502 uhid_char_write 3 26502 NULL ++vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL ++SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL ++rds_message_inc_copy_to_user_26540 rds_message_inc_copy_to_user 3 26540 NULL +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL -+ip6_addr_string_26568 ip6_addr_string 0 26568 NULL ++qgroup_account_ref_step3_26558 qgroup_account_ref_step3 0 26558 NULL ++dio_new_bio_26562 dio_new_bio 0 26562 NULL +kvm_iommu_put_pages_26571 kvm_iommu_put_pages 2 26571 NULL -+rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL nohasharray -+batadv_receive_server_sync_packet_26577 batadv_receive_server_sync_packet 3 26577 &rts51x_read_mem_26577 -+cirrusfb_get_memsize_26597 cirrusfb_get_memsize 0 26597 NULL ++rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL +regcache_set_reg_present_26598 regcache_set_reg_present 2 26598 NULL +__unmap_single_26604 __unmap_single 2-3 26604 NULL ++dev_to_node_26617 dev_to_node 0 26617 NULL +iommu_alloc_26621 iommu_alloc 4 26621 NULL +pack_value_26625 pack_value 1 26625 NULL +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL ++drm_ht_find_item_26637 drm_ht_find_item 0 26637 NULL ++process_extent_26646 process_extent 0 26646 NULL nohasharray ++btrfs_lookup_inode_26646 btrfs_lookup_inode 0 26646 &process_extent_26646 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL nohasharray +inb_p_26650 inb_p 0 26650 &irq_alloc_generic_chip_26650 ++usb_reset_device_26661 usb_reset_device 0 26661 NULL +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL -+__alloc_pred_stack_26687 __alloc_pred_stack 2 26687 NULL -+rtllib_authentication_req_26713 rtllib_authentication_req 3 26713 NULL -+aty_ld_le32_26720 aty_ld_le32 0 26720 NULL +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL +SyS_fcntl_26737 SyS_fcntl 3 26737 NULL +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL -+srp_ring_alloc_26760 srp_ring_alloc 2 26760 NULL ++bos_desc_26752 bos_desc 0 26752 NULL +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL ++dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL ++cache_save_setup_26783 cache_save_setup 0 26783 NULL +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL +smk_write_load_26829 smk_write_load 3 26829 NULL -+sizeof_pwm_leds_priv_26830 sizeof_pwm_leds_priv 0-1 26830 NULL -+slgt_compat_ioctl_26834 slgt_compat_ioctl 3 26834 NULL ++ept_get_level1_sp_gpa_26831 ept_get_level1_sp_gpa 0 26831 NULL +__nodes_onto_26838 __nodes_onto 4 26838 NULL -+scnprint_id_26842 scnprint_id 3 26842 NULL ++scnprint_id_26842 scnprint_id 3-0 26842 NULL +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL -+netxen_nic_hw_read_wx_128M_26858 netxen_nic_hw_read_wx_128M 2 26858 NULL ++tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL ++ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL -+ext2_compat_ioctl_26883 ext2_compat_ioctl 3 26883 NULL -+slhc_uncompress_26905 slhc_uncompress 0-3 26905 NULL ++cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL +compat_mtw_from_user_26932 compat_mtw_from_user 0 26932 NULL +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 NULL nohasharray +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 &pwr_ps_enter_read_26935 -+carl9170_handle_mpdu_26940 carl9170_handle_mpdu 3 26940 NULL nohasharray -+create_bm_block_list_26940 create_bm_block_list 0 26940 &carl9170_handle_mpdu_26940 ++remove_from_bitmap_26939 remove_from_bitmap 0 26939 NULL ++create_bm_block_list_26940 create_bm_block_list 0 26940 NULL +hecubafb_write_26942 hecubafb_write 3 26942 NULL +extract_entropy_user_26952 extract_entropy_user 3 26952 NULL nohasharray +do_trimming_26952 do_trimming 3 26952 &extract_entropy_user_26952 ++xlog_grant_push_ail_26972 xlog_grant_push_ail 2 26972 NULL ++do_direct_IO_26979 do_direct_IO 0 26979 NULL +pcf857x_irq_domain_map_26998 pcf857x_irq_domain_map 2 26998 NULL -+swiotlb_bounce_27046 swiotlb_bounce 2-1 27046 NULL ++i2c_smbus_xfer_27006 i2c_smbus_xfer 0 27006 NULL ++omfs_allocate_range_27034 omfs_allocate_range 3 27034 NULL +ufs_alloc_fragments_27059 ufs_alloc_fragments 3-0-2 27059 NULL +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL ++ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3-0 27064 NULL +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL ++snd_mixer_oss_set_recsrc_27080 snd_mixer_oss_set_recsrc 2 27080 NULL +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL -+compat_SyS_rt_sigpending_27084 compat_SyS_rt_sigpending 2 27084 NULL +find_first_bit_27088 find_first_bit 0-2 27088 NULL +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL +nes_reg_user_mr_27106 nes_reg_user_mr 2-3 27106 NULL +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL -+SYSC_ipc_27123 SYSC_ipc 3 27123 NULL ++i915_gem_execbuffer_relocate_slow_27116 i915_gem_execbuffer_relocate_slow 0 27116 NULL +get_kernel_page_27133 get_kernel_page 0 27133 NULL ++__ext4_handle_dirty_metadata_27137 __ext4_handle_dirty_metadata 0 27137 NULL +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL +pms_capture_27142 pms_capture 4 27142 NULL +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL -+i2400m_net_rx_27170 i2400m_net_rx 5 27170 NULL +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL -+mmc_blk_compat_ioctl_27194 mmc_blk_compat_ioctl 4 27194 NULL ++get_unaligned_be32_27184 get_unaligned_be32 0 27184 NULL ++__intel_ring_begin_27197 __intel_ring_begin 0 27197 NULL ++__sg_alloc_table_27198 __sg_alloc_table 0 27198 NULL ++ocfs2_read_blocks_sync_27210 ocfs2_read_blocks_sync 0 27210 NULL ++write_kmem_27225 write_kmem 3 27225 NULL +dbAllocAG_27228 dbAllocAG 0 27228 NULL +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL -+cfpkt_add_trail_27260 cfpkt_add_trail 3 27260 NULL ++ocfs2_journal_access_path_27243 ocfs2_journal_access_path 0 27243 NULL ++ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL ++qfq_unblock_groups_27269 qfq_unblock_groups 2 27269 NULL ++comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL +__dma_map_cont_27289 __dma_map_cont 5 27289 NULL -+hpi_read_reg_27302 hpi_read_reg 0 27302 NULL -+copy_from_buf_27308 copy_from_buf 4-2 27308 NULL -+virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL nohasharray -+ath6kl_wmi_test_cmd_27312 ath6kl_wmi_test_cmd 3 27312 &virtqueue_add_inbuf_27312 ++copy_from_buf_27308 copy_from_buf 2-4 27308 NULL ++virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL ++write_buf_27316 write_buf 0-3 27316 NULL +ocfs2_blocks_to_clusters_27327 ocfs2_blocks_to_clusters 0-2 27327 NULL +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL +afs_cell_create_27346 afs_cell_create 2 27346 NULL -+compat_SyS_semctl_27349 compat_SyS_semctl 4 27349 NULL ++iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL +pcbit_stat_27364 pcbit_stat 2 27364 NULL -+init_memory_mapping_27395 init_memory_mapping 0 27395 NULL -+phys_pte_init_27411 phys_pte_init 0-3-2 27411 NULL ++lz4_compress_crypto_27387 lz4_compress_crypto 3 27387 NULL ++seq_read_27411 seq_read 3 27411 NULL +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL -+acpi_os_get_root_pointer_27416 acpi_os_get_root_pointer 0 27416 NULL nohasharray -+ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 &acpi_os_get_root_pointer_27416 -+pack_sg_list_27425 pack_sg_list 0-2 27425 NULL ++ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL ++ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 0-3-4 27422 NULL nohasharray ++evm_inode_init_security_27422 evm_inode_init_security 0 27422 &ocfs2_refcount_cal_cow_clusters_27422 ++cypress_write_27423 cypress_write 4 27423 NULL ++sddr09_read_data_27447 sddr09_read_data 3 27447 NULL +ktime_to_us_27455 ktime_to_us 0 27455 NULL ++sk_extract_addr_27474 sk_extract_addr 0 27474 NULL +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL -+set_tpl_pfs_27490 set_tpl_pfs 3 27490 NULL +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL +qib_create_cq_27497 qib_create_cq 2 27497 NULL +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL -+__usbnet_write_cmd_27500 __usbnet_write_cmd 7 27500 NULL ++ept_walk_addr_generic_27501 ept_walk_addr_generic 4 27501 NULL +garmin_read_process_27509 garmin_read_process 3 27509 NULL ++oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL -+libipw_alloc_txb_27579 libipw_alloc_txb 1-2-3 27579 NULL ++sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL ++libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL +read_flush_procfs_27642 read_flush_procfs 3 27642 NULL nohasharray +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642 nohasharray -+ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 &nl80211_send_connect_result_27642 ++ocfs2_direct_IO_27642 ocfs2_direct_IO 4 27642 &nl80211_send_connect_result_27642 nohasharray ++ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 &ocfs2_direct_IO_27642 +add_new_gdb_27643 add_new_gdb 3 27643 NULL ++btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL -+set_bypass_pwoff_pfs_27669 set_bypass_pwoff_pfs 3 27669 NULL -+qword_get_27670 qword_get 0 27670 NULL ++record_changed_ref_27665 record_changed_ref 0 27665 NULL ++iommu_pgsize_27677 iommu_pgsize 2-0 27677 NULL +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL -+fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL -+inc_zcache_eph_zbytes_27704 inc_zcache_eph_zbytes 1 27704 NULL ++fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4-0 27702 NULL +evm_write_key_27715 evm_write_key 3 27715 NULL +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL -+reg_w_buf_27724 reg_w_buf 3 27724 NULL +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL -+a4t_cs_init_27734 a4t_cs_init 3 27734 NULL ++macvtap_skb_to_vnet_hdr_27747 macvtap_skb_to_vnet_hdr 0 27747 NULL +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL -+kcalloc_27770 kcalloc 1-2 27770 NULL ++gpiochip_export_27776 gpiochip_export 0 27776 NULL ++__lov_setstripe_27782 __lov_setstripe 2 27782 NULL +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL +DivaSTraceGetMemotyRequirement_27797 DivaSTraceGetMemotyRequirement 0-1 27797 NULL -+ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL ++ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL nohasharray ++SyS_readv_27804 SyS_readv 3 27804 &ttm_object_file_init_27804 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL +fwtty_buffer_rx_27821 fwtty_buffer_rx 3 27821 NULL -+init_header_complete_27833 init_header_complete 0 27833 NULL nohasharray -+sys_listxattr_27833 sys_listxattr 3 27833 &init_header_complete_27833 ++hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL ++init_header_complete_27833 init_header_complete 0 27833 NULL +read_profile_27859 read_profile 3 27859 NULL +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL ++process_all_extents_27879 process_all_extents 0 27879 NULL +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL -+gluebi_write_27905 gluebi_write 3 27905 NULL -+SyS_ptrace_27924 SyS_ptrace 3-4 27924 NULL ++gluebi_write_27905 gluebi_write 3-2 27905 NULL ++SyS_ptrace_27924 SyS_ptrace 3 27924 NULL +bm_find_next_27929 bm_find_next 2 27929 NULL ++check_mapped_name_27943 check_mapped_name 3 27943 NULL ++i915_gem_execbuffer_reserve_object_27956 i915_gem_execbuffer_reserve_object 0 27956 NULL +tracing_clock_write_27961 tracing_clock_write 3 27961 NULL +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL -+mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL ++device_register_27972 device_register 0 27972 NULL nohasharray ++mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 &device_register_27972 ++pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL +f2fs_bio_alloc_27983 f2fs_bio_alloc 2 27983 NULL +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL -+serial8250_port_size_28019 serial8250_port_size 0 28019 NULL ++remove_extent_data_ref_28023 remove_extent_data_ref 0 28023 NULL +alloc_one_pg_vec_page_28031 alloc_one_pg_vec_page 1 28031 NULL ++record_deleted_ref_28039 record_deleted_ref 0 28039 NULL +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL +rts51x_xd_rw_28046 rts51x_xd_rw 3-4 28046 NULL -+cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2 28053 NULL ++p9_fd_write_28050 p9_fd_write 3 28050 NULL ++cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL +pool_status_28055 pool_status 5 28055 NULL ++init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL +ext4_read_block_bitmap_nowait_28078 ext4_read_block_bitmap_nowait 2 28078 NULL -+GetRecvByte_28082 GetRecvByte 0 28082 NULL +platform_get_irq_28088 platform_get_irq 0 28088 NULL -+gdth_init_isa_28091 gdth_init_isa 1 28091 NULL -+mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL ++SyS_brk_28096 SyS_brk 1 28096 NULL ++mmc_test_alloc_mem_28102 mmc_test_alloc_mem 2-3 28102 NULL +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL ++tipc_msg_init_28128 tipc_msg_init 4-2 28128 NULL +video_read_28148 video_read 3 28148 NULL +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL -+vread_28173 vread 0 28173 NULL ++__add_reloc_root_28155 __add_reloc_root 0 28155 NULL ++vread_28173 vread 0-3 28173 NULL +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL -+d_path_28198 d_path 0 28198 NULL ++counter_free_res_28187 counter_free_res 5 28187 NULL ++read_disk_sb_28188 read_disk_sb 2 28188 NULL +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL ++__exclude_logged_extent_28212 __exclude_logged_extent 2-0 28212 NULL +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL -+line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL nohasharray -+set_dis_disc_pfs_28225 set_dis_disc_pfs 3 28225 &line6_alloc_sysex_buffer_28225 ++ocfs2_cow_sync_writeback_28221 ocfs2_cow_sync_writeback 0 28221 NULL ++line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL +amd_nb_num_28228 amd_nb_num 0 28228 NULL +ext4_validate_block_bitmap_28243 ext4_validate_block_bitmap 3 28243 NULL ++fuse_direct_IO_28275 fuse_direct_IO 4 28275 NULL +usemap_size_28281 usemap_size 0 28281 NULL ++inline_xattr_size_28285 inline_xattr_size 0 28285 NULL +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL ++SyS_ppoll_28290 SyS_ppoll 2 28290 NULL ++kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL +acpi_register_gsi_xen_28305 acpi_register_gsi_xen 2 28305 NULL nohasharray +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 &acpi_register_gsi_xen_28305 -+__mlock_vma_pages_range_28315 __mlock_vma_pages_range 2-3 28315 NULL ++create_io_context_28306 create_io_context 2 28306 NULL ++__mlock_vma_pages_range_28315 __mlock_vma_pages_range 2-3-0 28315 NULL +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL +bm_entry_write_28338 bm_entry_write 3 28338 NULL -+snapshot_write_28351 snapshot_write 3 28351 NULL -+sys_writev_28384 sys_writev 3 28384 NULL ++tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL ++cpuset_spread_node_28351 cpuset_spread_node 0 28351 NULL nohasharray ++snapshot_write_28351 snapshot_write 3 28351 &cpuset_spread_node_28351 ++xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL -+set_bypass_pfs_28395 set_bypass_pfs 3 28395 NULL +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL -+__split_large_page_28429 __split_large_page 2 28429 NULL ++get_extent_allocation_hint_28423 get_extent_allocation_hint 0 28423 NULL ++ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL +mpage_readpages_28436 mpage_readpages 3 28436 NULL -+set_memory_uc_28439 set_memory_uc 1 28439 NULL +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL +vmw_du_crtc_cursor_set_28479 vmw_du_crtc_cursor_set 4-5 28479 NULL +ocfs2_backup_super_blkno_28484 ocfs2_backup_super_blkno 0-2 28484 NULL -+max_response_pages_28492 max_response_pages 0 28492 NULL ++__filemap_fdatawrite_28485 __filemap_fdatawrite 0 28485 NULL +clear_discard_28494 clear_discard 2 28494 NULL +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL -+__next_node_28521 __next_node 1 28521 NULL ++__next_node_28521 __next_node 1-0 28521 NULL +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL -+run_delalloc_range_28545 run_delalloc_range 3 28545 NULL nohasharray -+mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &run_delalloc_range_28545 ++run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray ++mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &run_delalloc_range_28545 nohasharray ++aio_read_events_28545 aio_read_events 3 28545 &mptctl_getiocinfo_28545 ++sysfs_create_bin_file_28551 sysfs_create_bin_file 0 28551 NULL +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL ++i2o_msg_post_wait_mem_28558 i2o_msg_post_wait_mem 0 28558 NULL +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL -+phys_pud_init_28574 phys_pud_init 0-3-2 28574 NULL -+cfg80211_send_rx_auth_28580 cfg80211_send_rx_auth 3 28580 NULL +oxygen_read32_28582 oxygen_read32 0 28582 NULL +ocfs2_read_dir_block_28587 ocfs2_read_dir_block 2 28587 NULL -+extract_entropy_28604 extract_entropy 3-5 28604 NULL ++extract_entropy_28604 extract_entropy 5-3 28604 NULL +kfifo_unused_28612 kfifo_unused 0 28612 NULL +mp_override_legacy_irq_28618 mp_override_legacy_irq 4 28618 NULL +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL -+_set_range_28627 _set_range 3 28627 NULL -+v4l2_compat_ioctl32_28630 v4l2_compat_ioctl32 3 28630 NULL +setup_usemap_28636 setup_usemap 3-4 28636 NULL ++qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL ++p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL ++read_nic_io_byte_28654 read_nic_io_byte 0 28654 NULL ++btrfs_previous_item_28667 btrfs_previous_item 0 28667 NULL +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL -+__dev_alloc_skb_28681 __dev_alloc_skb 1 28681 NULL -+nl80211_send_new_peer_candidate_28692 nl80211_send_new_peer_candidate 5 28692 NULL nohasharray -+kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 &nl80211_send_new_peer_candidate_28692 ++__perf_sw_event_28684 __perf_sw_event 2 28684 NULL ++SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL ++kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL ++balance_level_28707 balance_level 0 28707 NULL +drm_plane_init_28731 drm_plane_init 6 28731 NULL ++alloc_irq_cfg_28734 alloc_irq_cfg 2 28734 NULL +spi_execute_28736 spi_execute 5 28736 NULL -+snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL nohasharray -+phantom_compat_ioctl_28738 phantom_compat_ioctl 3 28738 &snd_pcm_aio_write_28738 ++snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL ++rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL ++atomic_inc_return_unchecked_28778 atomic_inc_return_unchecked 0 28778 NULL +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL -+dvb_net_sec_callback_28786 dvb_net_sec_callback 2 28786 NULL +btrfs_block_rsv_refill_28800 btrfs_block_rsv_refill 3 28800 NULL nohasharray +sel_write_member_28800 sel_write_member 3 28800 &btrfs_block_rsv_refill_28800 +cgroup_file_read_28804 cgroup_file_read 3 28804 NULL -+btrfs_ref_to_path_28809 btrfs_ref_to_path 0 28809 NULL +memory_bm_create_28814 memory_bm_create 0 28814 NULL +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL -+C_SYSC_shmat_28843 C_SYSC_shmat 2 28843 NULL +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL ++max_io_len_target_boundary_28879 max_io_len_target_boundary 0-1 28879 NULL +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL +to_cblock_28899 to_cblock 0-1 28899 NULL +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL ++iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL +ocfs2_frozen_trigger_28929 ocfs2_frozen_trigger 4 28929 NULL +push_rx_28939 push_rx 3 28939 NULL -+btrfs_trim_block_group_28963 btrfs_trim_block_group 3 28963 NULL ++btrfs_trim_block_group_28963 btrfs_trim_block_group 4-3 28963 NULL +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL ++remap_pfn_range_28976 remap_pfn_range 3-4-2 28976 NULL +ext4_mb_add_groupinfo_28988 ext4_mb_add_groupinfo 2 28988 NULL ++hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL +bin_uuid_28999 bin_uuid 3 28999 NULL -+offset_to_bitmap_29004 offset_to_bitmap 2 29004 NULL ++fd_execute_rw_29004 fd_execute_rw 3 29004 NULL nohasharray ++offset_to_bitmap_29004 offset_to_bitmap 2 29004 &fd_execute_rw_29004 +xz_dec_init_29029 xz_dec_init 2 29029 NULL -+sys_fcntl64_29031 sys_fcntl64 3 29031 NULL ++i915_gem_object_bind_to_vm_29035 i915_gem_object_bind_to_vm 0 29035 NULL +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL -+rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL ++ProcessGetHostMibs_29049 ProcessGetHostMibs 0 29049 NULL nohasharray ++rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 &ProcessGetHostMibs_29049 ++btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL ++roundup_64_29066 roundup_64 2-0-1 29066 NULL +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL -+memblock_alloc_base_nid_29072 memblock_alloc_base_nid 1-2 29072 NULL +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL -+mark_extents_written_29082 mark_extents_written 2 29082 NULL ++iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL +i915_error_object_create_sized_29091 i915_error_object_create_sized 3 29091 NULL ++init_cache_node_node_29092 init_cache_node_node 1 29092 NULL +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL +snprintf_29125 snprintf 0 29125 NULL +iov_shorten_29130 iov_shorten 0 29130 NULL +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL -+reshape_ring_29147 reshape_ring 2 29147 NULL -+alloc_irqs_from_29152 alloc_irqs_from 1-2 29152 NULL ++alloc_irqs_from_29152 alloc_irqs_from 1-2-0-3 29152 NULL ++kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL -+wusb_prf_256_29203 wusb_prf_256 7 29203 NULL nohasharray -+alloc_group_attrs_29203 alloc_group_attrs 3 29203 &wusb_prf_256_29203 -+__mm_populate_29204 __mm_populate 1 29204 NULL -+comedi_alloc_subdevices_29207 comedi_alloc_subdevices 2 29207 NULL ++wusb_prf_256_29203 wusb_prf_256 7 29203 NULL ++__mm_populate_29204 __mm_populate 1-2 29204 NULL +do_shrinker_shrink_29208 do_shrinker_shrink 0 29208 NULL ++rds_iw_inc_copy_to_user_29214 rds_iw_inc_copy_to_user 3 29214 NULL +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL -+devm_ioremap_29235 devm_ioremap 2-3 29235 NULL +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL -+recover_peb_29238 recover_peb 6-7 29238 NULL ++recover_peb_29238 recover_peb 0-7-6 29238 NULL ++evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL ++rw_verify_area_29243 rw_verify_area 0-4 29243 NULL +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL +block_div_29268 block_div 0-1-2 29268 NULL +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL +bitmap_ord_to_pos_29279 bitmap_ord_to_pos 3 29279 NULL ++ext4_fiemap_29296 ext4_fiemap 4 29296 NULL +sn9c102_read_29305 sn9c102_read 3 29305 NULL ++replace_file_extents_29312 replace_file_extents 0 29312 NULL +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL -+lo_compat_ioctl_29336 lo_compat_ioctl 4 29336 NULL ++lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL ++kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL +tun_put_user_29337 tun_put_user 5 29337 NULL +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL -+alloc_and_copy_ftrace_hash_29368 alloc_and_copy_ftrace_hash 1 29368 NULL ++ide_read_altstatus_29343 ide_read_altstatus 0 29343 NULL ++l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL ++gpiochip_find_base_29366 gpiochip_find_base 0-1 29366 NULL +ktime_us_delta_29375 ktime_us_delta 0 29375 NULL +mwifiex_cfg80211_mgmt_tx_29387 mwifiex_cfg80211_mgmt_tx 7 29387 NULL +pca953x_irq_setup_29407 pca953x_irq_setup 3 29407 NULL ++btrfs_run_delayed_items_29428 btrfs_run_delayed_items 0 29428 NULL +mempool_create_29437 mempool_create 1 29437 NULL +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL -+apei_exec_ctx_get_output_29457 apei_exec_ctx_get_output 0 29457 NULL ++p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL ++ept_page_fault_29450 ept_page_fault 2 29450 NULL ++__kmalloc_node_29455 __kmalloc_node 3 29455 NULL +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL +do_register_entry_29478 do_register_entry 4 29478 NULL @@ -104450,101 +105829,127 @@ index 0000000..b04803b +sched_clock_local_29498 sched_clock_local 0 29498 NULL +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL ++write_file_regidx_29517 write_file_regidx 3 29517 NULL +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL -+_regmap_raw_write_29541 _regmap_raw_write 4-2 29541 NULL -+set_brk_29551 set_brk 1 29551 NULL nohasharray ++_regmap_raw_write_29541 _regmap_raw_write 2-4 29541 NULL ++vfs_read_29543 vfs_read 0-3 29543 NULL ++set_brk_29551 set_brk 1-2 29551 NULL nohasharray +ftrace_write_29551 ftrace_write 3 29551 &set_brk_29551 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL -+leaf_dealloc_29566 leaf_dealloc 3 29566 NULL nohasharray -+alloc_empty_pages_29566 alloc_empty_pages 2 29566 &leaf_dealloc_29566 ++leaf_dealloc_29566 leaf_dealloc 3 29566 NULL ++kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL ++p9_fd_read_29570 p9_fd_read 3 29570 NULL +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL -+pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4 29589 NULL ++iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL ++pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL ++dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL +slots_per_page_29601 slots_per_page 0 29601 NULL -+qla4_82xx_pci_set_window_29605 qla4_82xx_pci_set_window 0-2 29605 NULL -+alloc_low_pages_29623 alloc_low_pages 1 29623 NULL ++osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL +nla_get_u16_29624 nla_get_u16 0 29624 NULL +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL -+lowmem_page_address_29649 lowmem_page_address 0 29649 NULL +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL -+br_send_bpdu_29669 br_send_bpdu 3 29669 NULL +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL -+sd_alloc_ctl_entry_29708 sd_alloc_ctl_entry 1 29708 NULL nohasharray -+posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 &sd_alloc_ctl_entry_29708 ++tracepoint_probe_register_29688 tracepoint_probe_register 0 29688 NULL ++__btrfs_setxattr_29689 __btrfs_setxattr 0 29689 NULL ++jbd2_journal_restart_29692 jbd2_journal_restart 0 29692 NULL ++lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL ++posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL +probes_write_29711 probes_write 3 29711 NULL -+emi62_writememory_29731 emi62_writememory 4 29731 NULL +read_cis_cache_29735 read_cis_cache 4 29735 NULL ++xfs_new_eof_29737 xfs_new_eof 2 29737 NULL +std_nic_write_29752 std_nic_write 3 29752 NULL -+ip_vs_conn_fill_param_sync_29771 ip_vs_conn_fill_param_sync 6 29771 NULL -+tcf_csum_ipv6_icmp_29777 tcf_csum_ipv6_icmp 3 29777 NULL +dbAlloc_29794 dbAlloc 0 29794 NULL +ext4_trim_all_free_29806 ext4_trim_all_free 4-3-2 29806 NULL +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL +scan_bitmap_block_29840 scan_bitmap_block 4 29840 NULL +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL ++count_partial_29850 count_partial 0 29850 NULL ++radeon_ttm_tt_create_29859 radeon_ttm_tt_create 2 29859 NULL +solo_enc_alloc_29860 solo_enc_alloc 3 29860 NULL +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL ++tlv_put_29872 tlv_put 0 29872 NULL +scsi_end_request_29876 scsi_end_request 3 29876 NULL ++changed_extent_29881 changed_extent 0 29881 NULL +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL -+nfc_targets_found_29886 nfc_targets_found 3 29886 NULL ++lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL ++write_file_queue_29922 write_file_queue 3 29922 NULL +ext4_xattr_set_acl_29930 ext4_xattr_set_acl 4 29930 NULL +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL -+irias_add_octseq_attrib_29983 irias_add_octseq_attrib 4 29983 NULL nohasharray -+diva_os_get_context_size_29983 diva_os_get_context_size 0 29983 &irias_add_octseq_attrib_29983 ++diva_os_get_context_size_29983 diva_os_get_context_size 0 29983 NULL +arch_setup_dmar_msi_29992 arch_setup_dmar_msi 1 29992 NULL +vmci_host_setup_notify_30002 vmci_host_setup_notify 2 30002 NULL -+utf32_to_utf8_30028 utf32_to_utf8 0 30028 NULL ++dev_mem_write_30028 dev_mem_write 3 30028 NULL +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 4 30040 NULL -+drp_wmove_30043 drp_wmove 4 30043 NULL ++drp_wmove_30043 drp_wmove 4 30043 NULL nohasharray ++wrmalt_30043 wrmalt 0 30043 &drp_wmove_30043 ++mem_cgroup_charge_common_30047 mem_cgroup_charge_common 0 30047 NULL ++SyS_write_30059 SyS_write 3 30059 NULL +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL -+tg3_run_loopback_30093 tg3_run_loopback 2 30093 NULL -+rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL nohasharray -+dma_to_phys_30098 dma_to_phys 0-2 30098 &rx_filter_data_filter_read_30098 -+skb_pagelen_30113 skb_pagelen 0 30113 NULL ++rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL ++defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL +spi_async_locked_30117 spi_async_locked 0 30117 NULL -+calgary_unmap_page_30130 calgary_unmap_page 2-3 30130 NULL -+_osd_req_sizeof_alist_header_30134 _osd_req_sizeof_alist_header 0 30134 NULL -+u_memcpya_30139 u_memcpya 2-3 30139 NULL ++calgary_unmap_page_30130 calgary_unmap_page 3-2 30130 NULL ++recv_stream_30138 recv_stream 4 30138 NULL ++u_memcpya_30139 u_memcpya 3-2 30139 NULL ++elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL ++alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL ++expand_inode_data_30169 expand_inode_data 2-3 30169 NULL +btrfs_start_transaction_lflush_30178 btrfs_start_transaction_lflush 2 30178 NULL -+cx25821_video_ioctl_30188 cx25821_video_ioctl 2 30188 NULL +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL ++snd_pcm_playback_forward_30201 snd_pcm_playback_forward 0-2 30201 NULL +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL -+nfs_idmap_request_key_30208 nfs_idmap_request_key 3 30208 NULL +read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL -+snd_ac97_pcm_assign_30218 snd_ac97_pcm_assign 2 30218 NULL -+f2fs_compat_ioctl_30261 f2fs_compat_ioctl 3 30261 NULL ++bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL ++shmem_unuse_inode_30263 shmem_unuse_inode 0 30263 NULL ++rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL ++hfsplus_trusted_setxattr_30270 hfsplus_trusted_setxattr 4 30270 NULL +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL +compat_readv_30273 compat_readv 3 30273 NULL +lapic_register_intr_30279 lapic_register_intr 1 30279 NULL +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL ++osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL ++drm_core_get_reg_ofs_30309 drm_core_get_reg_ofs 0 30309 NULL +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL ++i8254_read_30330 i8254_read 0 30330 NULL +generic_ptrace_pokedata_30338 generic_ptrace_pokedata 2 30338 NULL +resource_from_user_30341 resource_from_user 3 30341 NULL -+__vmalloc_node_flags_30352 __vmalloc_node_flags 1 30352 NULL ++o2nm_this_node_30342 o2nm_this_node 0 30342 NULL ++__vmalloc_node_flags_30352 __vmalloc_node_flags 1-2 30352 NULL ++kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL ++inet_getid_30365 inet_getid 2 30365 NULL +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL -+sys_get_mempolicy_30379 sys_get_mempolicy 3-4 30379 NULL -+mangle_sdp_packet_30381 mangle_sdp_packet 10 30381 NULL ++blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3-0 30392 NULL +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL +get_kernel_pages_30397 get_kernel_pages 0 30397 NULL +_drbd_bm_find_next_zero_30415 _drbd_bm_find_next_zero 2 30415 NULL ++ext3_xattr_list_30419 ext3_xattr_list 3 30419 NULL +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL -+mq_create_30425 mq_create 1 30425 NULL ++mq_create_30425 mq_create 1 30425 NULL nohasharray ++lstcon_session_info_30425 lstcon_session_info 6 30425 &mq_create_30425 ++ext4_ext_create_new_leaf_30428 ext4_ext_create_new_leaf 0 30428 NULL +enable_write_30456 enable_write 3 30456 NULL ++pci_resource_alignment_30457 pci_resource_alignment 0 30457 NULL +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL +urandom_read_30462 urandom_read 3 30462 NULL +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL -+ocrdma_reg_user_mr_30474 ocrdma_reg_user_mr 2-3 30474 NULL ++i2c_ctrl_read_30467 i2c_ctrl_read 0 30467 NULL ++send_rmdir_30470 send_rmdir 0 30470 NULL ++i915_mutex_lock_interruptible_30474 i915_mutex_lock_interruptible 0 30474 NULL nohasharray ++ocrdma_reg_user_mr_30474 ocrdma_reg_user_mr 2-3 30474 &i915_mutex_lock_interruptible_30474 +write_head_30481 write_head 4 30481 NULL +adu_write_30487 adu_write 3 30487 NULL ++dtim_interval_write_30489 dtim_interval_write 3 30489 NULL ++btrfs_free_extent_30515 btrfs_free_extent 0 30515 NULL +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL -+debug_debug2_read_30526 debug_debug2_read 3 30526 NULL -+batadv_dat_snoop_incoming_arp_request_30548 batadv_dat_snoop_incoming_arp_request 3 30548 NULL ++debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray ++set_config_30526 set_config 0 30526 &debug_debug2_read_30526 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL +set_le_30581 set_le 4 30581 NULL +from_cblock_30582 from_cblock 0-1 30582 NULL @@ -104555,42 +105960,49 @@ index 0000000..b04803b +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL ++mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL ++SyS_listxattr_30647 SyS_listxattr 3 30647 NULL +agp_remap_30665 agp_remap 2 30665 NULL +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL -+il_free_pages_30692 il_free_pages 2 30692 NULL ++ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL ++lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL ++ocfs2_find_cpos_for_left_leaf_30713 ocfs2_find_cpos_for_left_leaf 0 30713 NULL ++__mutex_lock_common_30717 __mutex_lock_common 0 30717 NULL +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL +snapshot_status_30744 snapshot_status 5 30744 NULL -+tcf_csum_ipv4_udp_30777 tcf_csum_ipv4_udp 4 30777 NULL ++fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL ++SyS_pread64_30778 SyS_pread64 3 30778 NULL ++btrfs_run_ordered_operations_30793 btrfs_run_ordered_operations 0 30793 NULL +smk_read_doi_30813 smk_read_doi 3 30813 NULL ++SYSC_splice_30820 SYSC_splice 5 30820 NULL ++xlog_grant_head_wait_30829 xlog_grant_head_wait 4 30829 NULL +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL +cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL -+hda_hwdep_ioctl_compat_30847 hda_hwdep_ioctl_compat 4 30847 NULL -+trace_probe_nr_files_30882 trace_probe_nr_files 0 30882 NULL ++wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL -+iommu_map_mmio_space_30919 iommu_map_mmio_space 1 30919 NULL ++pn_recvmsg_30887 pn_recvmsg 4 30887 NULL +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL ++find_free_dev_extent_30963 find_free_dev_extent 0 30963 NULL +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL +huge_page_mask_30981 huge_page_mask 0 30981 NULL -+i2400mu_rx_size_grow_30989 i2400mu_rx_size_grow 0 30989 NULL ++read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL -+phys_pmd_init_31024 phys_pmd_init 0-3-2 31024 NULL -+compat_sys_mq_timedsend_31060 compat_sys_mq_timedsend 3 31060 NULL ++do_setup_msi_irqs_31043 do_setup_msi_irqs 2 31043 NULL ++stride_pg_count_31053 stride_pg_count 0-2-1-4-3-5 31053 NULL +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL +find_next_bit_le_31064 find_next_bit_le 0-2-3 31064 NULL -+sys_mincore_31079 sys_mincore 1 31079 NULL -+ttm_bo_ioremap_31082 ttm_bo_ioremap 2-3 31082 NULL +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL -+compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3-4 31109 NULL ++proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL ++compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3 31109 NULL ++si_calculate_power_efficiency_ratio_31111 si_calculate_power_efficiency_ratio 3-2 31111 NULL +depth_read_31112 depth_read 3 31112 NULL -+ssb_read16_31139 ssb_read16 0 31139 NULL +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL -+size_inside_page_31141 size_inside_page 0 31141 NULL ++size_inside_page_31141 size_inside_page 0-1-2 31141 NULL +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL -+acpi_ex_system_memory_space_handler_31192 acpi_ex_system_memory_space_handler 2 31192 NULL +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL +__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL @@ -104598,37 +106010,48 @@ index 0000000..b04803b +cpumask_weight_31215 cpumask_weight 0 31215 NULL +__read_reg_31216 __read_reg 0 31216 NULL +atm_get_addr_31221 atm_get_addr 3 31221 NULL ++ulist_rbtree_insert_31235 ulist_rbtree_insert 0 31235 NULL ++tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL +cyy_readb_31240 cyy_readb 0 31240 NULL +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL +sctp_tsnmap_find_gap_ack_31272 sctp_tsnmap_find_gap_ack 3-2 31272 NULL +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL ++push_leaf_left_31306 push_leaf_left 0 31306 NULL +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL +command_file_write_31318 command_file_write 3 31318 NULL ++ext4_xattr_block_list_31325 ext4_xattr_block_list 3 31325 NULL ++hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL ++radix_tree_insert_31336 radix_tree_insert 0 31336 NULL +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL +__cpu_to_node_31345 __cpu_to_node 0 31345 NULL ++outlen_write_31358 outlen_write 3 31358 NULL ++ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL -+vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL ++vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 2-3 31374 NULL +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL +inb_31388 inb 0 31388 NULL +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL -+mcs7830_set_reg_31413 mcs7830_set_reg 3 31413 NULL ++i915_gem_object_put_fence_31413 i915_gem_object_put_fence 0 31413 NULL ++_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL +acpi_sci_ioapic_setup_31445 acpi_sci_ioapic_setup 4 31445 NULL ++transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL ++register_ftrace_graph_31456 register_ftrace_graph 0 31456 NULL +input_get_new_minor_31464 input_get_new_minor 1 31464 NULL +do_fcntl_31468 do_fcntl 3 31468 NULL +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL ++__ext4_journal_get_write_access_31482 __ext4_journal_get_write_access 0 31482 NULL +alg_setkey_31485 alg_setkey 3 31485 NULL +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL -+__alloc_bootmem_31498 __alloc_bootmem 1-2 31498 NULL -+rmode_tss_base_31510 rmode_tss_base 0 31510 NULL ++__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL ++nouveau_mc_create__31513 nouveau_mc_create_ 5 31513 NULL +hidraw_write_31536 hidraw_write 3 31536 NULL +mtd_div_by_eb_31543 mtd_div_by_eb 0-1 31543 NULL +usbvision_read_31555 usbvision_read 3 31555 NULL -+normalize_31566 normalize 0-1-2 31566 NULL +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL +osst_write_31581 osst_write 3 31581 NULL @@ -104641,166 +106064,199 @@ index 0000000..b04803b +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL +emulator_set_cr_31665 emulator_set_cr 3 31665 NULL +__lgread_31668 __lgread 4 31668 NULL -+symbol_string_31670 symbol_string 0 31670 NULL -+_usb_writeN_sync_31682 _usb_writeN_sync 4 31682 NULL +forced_ps_read_31685 forced_ps_read 3 31685 NULL ++fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL +reiserfs_in_journal_31689 reiserfs_in_journal 3 31689 NULL -+audit_log_n_string_31705 audit_log_n_string 3 31705 NULL -+ath6kl_wmi_send_probe_response_cmd_31728 ath6kl_wmi_send_probe_response_cmd 6 31728 NULL nohasharray -+gfn_to_hva_read_31728 gfn_to_hva_read 2 31728 &ath6kl_wmi_send_probe_response_cmd_31728 -+utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL -+shmem_pwrite_slow_31741 shmem_pwrite_slow 3 31741 NULL ++gfn_to_hva_read_31728 gfn_to_hva_read 2 31728 NULL ++utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL nohasharray ++lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 &utf16s_to_utf8s_31735 ++shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 NULL nohasharray +input_abs_get_max_31742 input_abs_get_max 0 31742 &NCR_700_change_queue_depth_31742 -+muldiv64_31743 muldiv64 2-3 31743 NULL -+bcm_char_read_31750 bcm_char_read 3 31750 NULL ++muldiv64_31743 muldiv64 3-2-0 31743 NULL ++stmpe_set_altfunc_31750 stmpe_set_altfunc 2 31750 NULL nohasharray ++bcm_char_read_31750 bcm_char_read 3 31750 &stmpe_set_altfunc_31750 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL -+set_memory_wb_31761 set_memory_wb 1 31761 NULL ++SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL -+get_count_order_31800 get_count_order 0 31800 NULL +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL ++data_write_31805 data_write 3 31805 NULL ++SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL +strnlen_user_31815 strnlen_user 0-2 31815 NULL +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL ++fsnotify_perm_31843 fsnotify_perm 0 31843 NULL ++SyS_ppoll_31855 SyS_ppoll 2 31855 NULL ++iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL -+ddb_output_write_31902 ddb_output_write 3 31902 NULL ++ddb_output_write_31902 ddb_output_write 3-0 31902 NULL +xattr_permission_31907 xattr_permission 0 31907 NULL ++lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL +new_dir_31919 new_dir 3 31919 NULL +kmem_alloc_31920 kmem_alloc 1 31920 NULL +guestwidth_to_adjustwidth_31937 guestwidth_to_adjustwidth 0-1 31937 NULL ++process_recorded_refs_if_needed_31938 process_recorded_refs_if_needed 0 31938 NULL +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL -+iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4 31942 NULL ++iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4-0 31942 NULL nohasharray ++read_mem_31942 read_mem 3 31942 &iov_iter_copy_from_user_31942 +vb2_write_31948 vb2_write 3 31948 NULL +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL +mtd_add_partition_31971 mtd_add_partition 3 31971 NULL -+find_next_zero_bit_31990 find_next_zero_bit 0-2-3 31990 NULL ++btrfs_insert_empty_inode_31975 btrfs_insert_empty_inode 0 31975 NULL ++vx_read_status_31982 vx_read_status 0 31982 NULL nohasharray ++iblock_execute_rw_31982 iblock_execute_rw 3 31982 &vx_read_status_31982 ++find_next_zero_bit_31990 find_next_zero_bit 3-2-0 31990 NULL +default_setup_hpet_msi_31991 default_setup_hpet_msi 1 31991 NULL ++lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL ++sysfs_create_file_31996 sysfs_create_file 0 31996 NULL +tps6586x_irq_map_32002 tps6586x_irq_map 2 32002 NULL +calc_hmac_32010 calc_hmac 3 32010 NULL +vmcs_read64_32012 vmcs_read64 0 32012 NULL ++resource_alignment_32020 resource_alignment 0 32020 NULL +aead_len_32021 aead_len 0 32021 NULL -+ocfs2_remove_extent_32032 ocfs2_remove_extent 4-3 32032 NULL ++ocfs2_remove_extent_32032 ocfs2_remove_extent 4-3-0 32032 NULL +posix_acl_set_32037 posix_acl_set 4 32037 NULL +stk_read_32038 stk_read 3 32038 NULL +vmw_cursor_update_dmabuf_32045 vmw_cursor_update_dmabuf 3-4 32045 NULL -+sys_sched_setaffinity_32046 sys_sched_setaffinity 2 32046 NULL ++ocfs2_update_edge_lengths_32046 ocfs2_update_edge_lengths 0 32046 NULL +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL -+cfg80211_send_unprot_deauth_32080 cfg80211_send_unprot_deauth 3 32080 NULL ++cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL +bio_alloc_32095 bio_alloc 2 32095 NULL +alloc_pwms_32100 alloc_pwms 1-2 32100 NULL +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL +disk_status_32120 disk_status 4 32120 NULL ++kobject_add_internal_32133 kobject_add_internal 0 32133 NULL ++btrfs_split_item_32164 btrfs_split_item 0 32164 NULL +venus_link_32165 venus_link 5 32165 NULL +do_writepages_32173 do_writepages 0 32173 NULL nohasharray +ntfs_rl_realloc_nofail_32173 ntfs_rl_realloc_nofail 3 32173 &do_writepages_32173 +load_header_32183 load_header 0 32183 NULL +ubi_wl_scrub_peb_32196 ubi_wl_scrub_peb 0 32196 NULL +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL ++__mem_cgroup_try_charge_swapin_32204 __mem_cgroup_try_charge_swapin 0 32204 NULL +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL ++caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL -+fb_compat_ioctl_32265 fb_compat_ioctl 3 32265 NULL +vmalloc_user_32308 vmalloc_user 1 32308 NULL -+hex_string_32310 hex_string 0 32310 NULL ++kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL ++cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL +SyS_select_32319 SyS_select 1 32319 NULL +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL ++apic_get_tmcct_32338 apic_get_tmcct 0 32338 NULL +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL -+dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL -+sel_read_initcon_32362 sel_read_initcon 3 32362 NULL ++dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray ++rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357 ++sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray ++ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362 ++__wait_seqno_32370 __wait_seqno 0 32370 NULL +_drbd_bm_find_next_32372 _drbd_bm_find_next 2 32372 NULL -+usbtmc_read_32377 usbtmc_read 3 32377 NULL ++cpuset_slab_spread_node_32376 cpuset_slab_spread_node 0 32376 NULL ++intel_iommu_map_32384 intel_iommu_map 4-3 32384 NULL +local_clock_32385 local_clock 0 32385 NULL -+qla4_82xx_pci_mem_write_2M_32398 qla4_82xx_pci_mem_write_2M 2 32398 NULL ++ocfs2_cancel_convert_32392 ocfs2_cancel_convert 0 32392 NULL ++ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL -+vmci_qp_alloc_32405 vmci_qp_alloc 3-5 32405 NULL -+log_text_32428 log_text 0 32428 NULL ++__add_missing_keys_32402 __add_missing_keys 0 32402 NULL ++vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL +regmap_irq_map_32429 regmap_irq_map 2 32429 NULL -+hid_input_report_32458 hid_input_report 4 32458 NULL ++__ext4_handle_dirty_super_32458 __ext4_handle_dirty_super 0 32458 NULL ++snd_pcm_sync_ptr_32461 snd_pcm_sync_ptr 0 32461 NULL +cache_status_32462 cache_status 5 32462 NULL -+ieee80211_fill_mesh_addresses_32465 ieee80211_fill_mesh_addresses 0 32465 NULL ++fill_readbuf_32464 fill_readbuf 3 32464 NULL ++dgap_usertoboard_32490 dgap_usertoboard 4 32490 NULL +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL ++mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL ++ocfs2_local_alloc_reserve_for_window_32518 ocfs2_local_alloc_reserve_for_window 0 32518 NULL +disconnect_32521 disconnect 4 32521 NULL -+qsfp_read_32522 qsfp_read 0-4-2 32522 NULL ++qsfp_read_32522 qsfp_read 0-2-4 32522 NULL ++audio_get_intf_req_32524 audio_get_intf_req 0 32524 NULL nohasharray ++ocfs2_refresh_qinfo_32524 ocfs2_refresh_qinfo 0 32524 &audio_get_intf_req_32524 +ilo_read_32531 ilo_read 3 32531 NULL +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL -+gnttab_set_unmap_op_32534 gnttab_set_unmap_op 2 32534 NULL -+ieee80211_send_auth_32543 ieee80211_send_auth 6 32543 NULL +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL +__first_node_32558 __first_node 0 32558 NULL +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL -+pnp_mem_len_32584 pnp_mem_len 0 32584 NULL ++osc_iocontrol_32565 osc_iocontrol 3 32565 NULL +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL +read_file_beacon_32595 read_file_beacon 3 32595 NULL +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL -+sys_set_mempolicy_32608 sys_set_mempolicy 3 32608 NULL ++irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL -+ieee80211_hdrlen_32637 ieee80211_hdrlen 0 32637 NULL +ite_decode_bytes_32642 ite_decode_bytes 3 32642 NULL +kvmalloc_32646 kvmalloc 1 32646 NULL +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL -+generic_readlink_32654 generic_readlink 3 32654 NULL ++generic_readlink_32654 generic_readlink 3 32654 NULL nohasharray ++ftrace_startup_32654 ftrace_startup 0 32654 &generic_readlink_32654 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL -+compat_SyS_pwritev_32680 compat_SyS_pwritev 3 32680 NULL ++apei_res_add_32674 apei_res_add 0 32674 NULL +jfs_readpages_32702 jfs_readpages 4 32702 NULL -+snd_hwdep_ioctl_compat_32736 snd_hwdep_ioctl_compat 3 32736 NULL ++rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL ++i40e_pci_sriov_enable_32742 i40e_pci_sriov_enable 2 32742 NULL +get_arg_page_32746 get_arg_page 2 32746 NULL +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL +stats_read_ul_32751 stats_read_ul 3 32751 NULL -+tty_compat_ioctl_32761 tty_compat_ioctl 3 32761 NULL ++begin_cmd_32766 begin_cmd 0 32766 NULL ++vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL -+firmwareUpload_32794 firmwareUpload 3 32794 NULL ++ocfs2_read_inode_block_full_32790 ocfs2_read_inode_block_full 0 32790 NULL +rproc_name_read_32805 rproc_name_read 3 32805 NULL -+vga_rseq_32848 vga_rseq 0 32848 NULL +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL -+io_apic_setup_irq_pin_32868 io_apic_setup_irq_pin 1 32868 NULL ++io_apic_setup_irq_pin_32868 io_apic_setup_irq_pin 1-2 32868 NULL +ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 NULL nohasharray +cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 &ath6kl_usb_submit_ctrl_in_32880 -+ath6kl_usb_post_recv_transfers_32892 ath6kl_usb_post_recv_transfers 2 32892 NULL -+ext4_get_group_number_32899 ext4_get_group_number 0 32899 NULL ++vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 6-4 32884 NULL ++ext4_get_group_number_32899 ext4_get_group_number 0-2 32899 NULL +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL +rmap_recycle_32938 rmap_recycle 3 32938 NULL +irq_reserve_irqs_32946 irq_reserve_irqs 1-2 32946 NULL +ext4_valid_block_bitmap_32958 ext4_valid_block_bitmap 3 32958 NULL -+arch_ptrace_32981 arch_ptrace 3-4 32981 NULL ++xfs_log_reserve_32959 xfs_log_reserve 2 32959 NULL ++ext4_group_overhead_blocks_32971 ext4_group_overhead_blocks 0 32971 NULL ++arch_ptrace_32981 arch_ptrace 3 32981 NULL +compat_filldir_32999 compat_filldir 3 32999 NULL -+ext3_alloc_blocks_33007 ext3_alloc_blocks 3 33007 NULL nohasharray ++btrfs_lookup_extent_info_33000 btrfs_lookup_extent_info 0 33000 NULL ++ext3_alloc_blocks_33007 ext3_alloc_blocks 3-0 33007 NULL nohasharray +SyS_syslog_33007 SyS_syslog 3 33007 &ext3_alloc_blocks_33007 ++br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL ++write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL ++snd_pcm_prepare_33036 snd_pcm_prepare 0 33036 NULL +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL -+bitmap_resize_33054 bitmap_resize 2 33054 NULL ++bitmap_resize_33054 bitmap_resize 2-3 33054 NULL ++intel_ring_flush_all_caches_33059 intel_ring_flush_all_caches 0 33059 NULL +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL +alloc_tio_33077 alloc_tio 3 33077 NULL +acl_permission_check_33083 acl_permission_check 0 33083 NULL -+ieee80211_fragment_33112 ieee80211_fragment 4 33112 NULL +write_node_33121 write_node 4 33121 NULL -+calc_patch_size_33124 calc_patch_size 0 33124 NULL +fb_sys_write_33130 fb_sys_write 3 33130 NULL +__len_within_target_33132 __len_within_target 0 33132 NULL ++SyS_poll_33152 SyS_poll 2 33152 NULL +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL -+dataflash_read_fact_otp_33204 dataflash_read_fact_otp 2-3 33204 NULL ++dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL +pp_read_33210 pp_read 3 33210 NULL -+xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL -+build_completion_wait_33242 build_completion_wait 2 33242 NULL ++xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL nohasharray ++i915_gem_object_wait_rendering__tail_33234 i915_gem_object_wait_rendering__tail 0 33234 &xfs_file_aio_write_33234 ++__vb2_wait_for_done_vb_33246 __vb2_wait_for_done_vb 0 33246 NULL +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL -+sched_find_first_bit_33270 sched_find_first_bit 0 33270 NULL +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL -+mei_compat_ioctl_33275 mei_compat_ioctl 3 33275 NULL +sync_pt_create_33282 sync_pt_create 2 33282 NULL ++btrfs_delete_one_dir_name_33303 btrfs_delete_one_dir_name 0 33303 NULL +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL -+ath6kl_usb_ctrl_msg_exchange_33327 ath6kl_usb_ctrl_msg_exchange 4 33327 NULL -+gsm_mux_rx_netchar_33336 gsm_mux_rx_netchar 3 33336 NULL ++vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL ++lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356 +read_file_regidx_33370 read_file_regidx 3 33370 NULL @@ -104808,17 +106264,19 @@ index 0000000..b04803b +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL +tg_get_cfs_period_33390 tg_get_cfs_period 0 33390 NULL -+ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 2-3 33394 NULL ++ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL ++cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL +ext4_meta_bg_first_block_no_33408 ext4_meta_bg_first_block_no 2 33408 NULL nohasharray +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 &ext4_meta_bg_first_block_no_33408 +ufs_getfrag_block_33409 ufs_getfrag_block 2 33409 NULL ++filemap_fdatawrite_33415 filemap_fdatawrite 0 33415 NULL +dis_tap_write_33426 dis_tap_write 3 33426 NULL -+ubh_scanc_33436 ubh_scanc 0-4-3 33436 NULL ++ubh_scanc_33436 ubh_scanc 0-3-4 33436 NULL ++message_stats_list_33440 message_stats_list 5 33440 NULL +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL +create_entry_33479 create_entry 2 33479 NULL +ip_setsockopt_33487 ip_setsockopt 5 33487 NULL nohasharray +elf_map_33487 elf_map 0-2 33487 &ip_setsockopt_33487 -+netxen_nic_hw_write_wx_128M_33488 netxen_nic_hw_write_wx_128M 2 33488 NULL +ol_dqblk_chunk_off_33489 ol_dqblk_chunk_off 2 33489 NULL +res_counter_read_33499 res_counter_read 4 33499 NULL +fb_read_33506 fb_read 3 33506 NULL @@ -104827,78 +106285,97 @@ index 0000000..b04803b +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL +acpi_gsi_to_irq_33533 acpi_gsi_to_irq 1 33533 NULL -+tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL -+dup_array_33551 dup_array 3 33551 NULL -+solo_enc_read_33553 solo_enc_read 3 33553 NULL ++osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 NULL nohasharray ++tomoyo_read_self_33539 tomoyo_read_self 3 33539 &osc_max_rpcs_in_flight_seq_write_33539 ++read_symlink_33572 read_symlink 0 33572 NULL +count_subheaders_33591 count_subheaders 0 33591 NULL +scsi_execute_33596 scsi_execute 5 33596 NULL +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL -+xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL nohasharray -+ip6_find_1stfragopt_33608 ip6_find_1stfragopt 0 33608 &xt_compat_target_offset_33608 ++xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL +usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 NULL nohasharray +il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 &usb_gstrings_attach_33615 ++do_sync_write_33624 do_sync_write 0 33624 NULL ++stride_page_count_33641 stride_page_count 2 33641 NULL ++slab_alloc_node_33663 slab_alloc_node 3 33663 NULL +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL +inw_p_33668 inw_p 0 33668 NULL +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL -+ath6kl_wmi_startscan_cmd_33674 ath6kl_wmi_startscan_cmd 8 33674 NULL +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL -+compat_insnlist_33706 compat_insnlist 2 33706 NULL -+sys_keyctl_33708 sys_keyctl 4 33708 NULL nohasharray -+netlink_sendmsg_33708 netlink_sendmsg 4 33708 &sys_keyctl_33708 ++netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL ++ext4_wb_update_i_disksize_33717 ext4_wb_update_i_disksize 2 33717 NULL +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL +ocfs2_extent_map_get_blocks_33720 ocfs2_extent_map_get_blocks 2 33720 NULL ++write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL nohasharray ++ocfs2_lock_allocators_move_extents_33723 ocfs2_lock_allocators_move_extents 0 33723 &write_file_spectral_count_33723 +__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL -+Read_hfc_33755 Read_hfc 0 33755 NULL ++do_munmap_33752 do_munmap 0 33752 NULL +vifs_state_read_33762 vifs_state_read 3 33762 NULL +hashtab_create_33769 hashtab_create 3 33769 NULL -+midibuf_message_length_33770 midibuf_message_length 0 33770 NULL ++btrfs_delayed_refs_qgroup_accounting_33775 btrfs_delayed_refs_qgroup_accounting 0 33775 NULL ++irq_map_generic_chip_33793 irq_map_generic_chip 2 33793 NULL +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL -+find_next_offset_33804 find_next_offset 3 33804 NULL -+sky2_rx_pad_33819 sky2_rx_pad 0 33819 NULL ++find_next_offset_33804 find_next_offset 3-0 33804 NULL ++filter_write_33819 filter_write 3 33819 NULL +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL -+udplite_manip_pkt_33832 udplite_manip_pkt 4 33832 NULL -+usb_dump_endpoint_descriptor_33849 usb_dump_endpoint_descriptor 0 33849 NULL ++ext4_journal_extend_33835 ext4_journal_extend 2-0 33835 NULL ++snd_pcm_action_nonatomic_33844 snd_pcm_action_nonatomic 0 33844 NULL +calgary_alloc_coherent_33851 calgary_alloc_coherent 2 33851 NULL +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL -+cap_mmap_addr_33853 cap_mmap_addr 0 33853 NULL ++bin_string_33884 bin_string 3-5 33884 NULL +get_user_pages_33908 get_user_pages 0-3-4 33908 NULL ++ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL ++atomic64_add_return_33927 atomic64_add_return 0-1 33927 NULL +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL -+read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL ++read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL nohasharray ++btrfs_uuid_tree_rem_33944 btrfs_uuid_tree_rem 0 33944 &read_file_tgt_rx_stats_33944 ++hfsplus_osx_setxattr_33952 hfsplus_osx_setxattr 4 33952 NULL ++__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL ++ocfs2_create_new_meta_bhs_33955 ocfs2_create_new_meta_bhs 0 33955 NULL +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL ++snd_interval_refine_33987 snd_interval_refine 0 33987 NULL +__ntfs_malloc_34022 __ntfs_malloc 1 34022 NULL ++lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL +ppp_write_34034 ppp_write 3 34034 NULL -+tty_insert_flip_string_34042 tty_insert_flip_string 3 34042 NULL ++tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL +__domain_flush_pages_34045 __domain_flush_pages 2-3 34045 NULL +is_trap_at_addr_34047 is_trap_at_addr 2 34047 NULL -+acpi_dev_get_irqresource_34064 acpi_dev_get_irqresource 2 34064 NULL +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL -+read_file_ant_diversity_34071 read_file_ant_diversity 3 34071 NULL -+compat_hdio_ioctl_34088 compat_hdio_ioctl 4 34088 NULL +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL -+proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL ++__irq_domain_add_34101 __irq_domain_add 2 34101 NULL ++i915_gem_object_set_cache_level_34107 i915_gem_object_set_cache_level 0 34107 NULL nohasharray ++proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 &i915_gem_object_set_cache_level_34107 +is_discarded_oblock_34120 is_discarded_oblock 2 34120 NULL +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL -+ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2 34135 NULL -+cdc_mbim_process_dgram_34136 cdc_mbim_process_dgram 3 34136 NULL ++ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL ++ext4_xattr_list_34162 ext4_xattr_list 3 34162 NULL ++ocfs2_xattr_list_entry_34165 ocfs2_xattr_list_entry 0 34165 NULL +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL ++dtf_write_run_34196 dtf_write_run 3 34196 NULL +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL ++i915_gem_execbuffer_reserve_object_34224 i915_gem_execbuffer_reserve_object 0 34224 NULL ++setup_nodes_for_search_34248 setup_nodes_for_search 0 34248 NULL ++numa_migrate_prep_34256 numa_migrate_prep 0 34256 NULL ++btrfs_bitmap_cluster_34257 btrfs_bitmap_cluster 4 34257 NULL +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL ++ocfs2_dlm_lock_34265 ocfs2_dlm_lock 0 34265 NULL +pcf857x_to_irq_34273 pcf857x_to_irq 2 34273 NULL -+zone_spanned_pages_in_node_34299 zone_spanned_pages_in_node 0 34299 NULL ++device_private_init_34279 device_private_init 0 34279 NULL ++get_task_io_context_34316 get_task_io_context 3 34316 NULL ++ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 NULL nohasharray +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 &iov_iter_single_seg_count_34326 ++SYSC_brk_34331 SYSC_brk 1 34331 NULL +__insert_34349 __insert 2-3 34349 NULL -+crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL -+rngapi_reset_34366 rngapi_reset 3 34366 NULL nohasharray -+p54_alloc_skb_34366 p54_alloc_skb 3 34366 &rngapi_reset_34366 -+i2c_hid_get_raw_report_34376 i2c_hid_get_raw_report 0 34376 NULL ++sync_page_io_34363 sync_page_io 3 34363 NULL nohasharray ++crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 &sync_page_io_34363 ++rngapi_reset_34366 rngapi_reset 3 34366 NULL +reiserfs_resize_34377 reiserfs_resize 2 34377 NULL +ea_read_34378 ea_read 0 34378 NULL +fuse_send_read_34379 fuse_send_read 4 34379 NULL @@ -104909,35 +106386,55 @@ index 0000000..b04803b +ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL -+usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL ++security_socket_create_34439 security_socket_create 0 34439 NULL ++usbtest_alloc_urb_34446 usbtest_alloc_urb 5-3 34446 NULL +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL ++ocfs2_block_group_clear_bits_34484 ocfs2_block_group_clear_bits 0 34484 NULL +security_inode_permission_34488 security_inode_permission 0 34488 NULL -+tracing_stats_read_34537 tracing_stats_read 3 34537 NULL -+hugetlbfs_read_actor_34547 hugetlbfs_read_actor 0-2-5-4 34547 NULL ++SyS_pwritev_34494 SyS_pwritev 3 34494 NULL nohasharray ++__ffs64_34494 __ffs64 1-0 34494 &SyS_pwritev_34494 ++qp_alloc_res_34496 qp_alloc_res 5 34496 NULL ++lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL ++snd_pcm_hw_param_value_34525 snd_pcm_hw_param_value 0 34525 NULL ++ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray ++tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537 ++hugetlbfs_read_actor_34547 hugetlbfs_read_actor 4-5-2-0 34547 NULL +dbBackSplit_34561 dbBackSplit 0 34561 NULL -+alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL -+velocity_rx_copy_34583 velocity_rx_copy 2 34583 NULL ++alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL nohasharray ++self_check_peb_ec_hdr_34564 self_check_peb_ec_hdr 0 34564 &alloc_ieee80211_rsl_34564 ++i915_gem_execbuffer_relocate_object_34575 i915_gem_execbuffer_relocate_object 0 34575 NULL ++lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL -+ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL ++ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray ++cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599 ++__add_prelim_ref_34600 __add_prelim_ref 0 34600 NULL +brcmf_cfg80211_mgmt_tx_34608 brcmf_cfg80211_mgmt_tx 7 34608 NULL -+__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL ++__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL nohasharray ++mtd_write_34609 mtd_write 0 34609 &__jffs2_ref_totlen_34609 ++apei_get_nvs_resources_34616 apei_get_nvs_resources 0 34616 NULL +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL +tomoyo_dump_page_34649 tomoyo_dump_page 2 34649 NULL -+nf_nat_mangle_udp_packet_34661 nf_nat_mangle_udp_packet 8-6 34661 NULL ++kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL ++sleep_auth_write_34676 sleep_auth_write 3 34676 NULL +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL +port_print_34704 port_print 3 34704 NULL -+alloc_irq_and_cfg_at_34706 alloc_irq_and_cfg_at 1 34706 NULL ++alloc_irq_and_cfg_at_34706 alloc_irq_and_cfg_at 1-2 34706 NULL ++ext4_listxattr_34712 ext4_listxattr 3 34712 NULL +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL ++lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL ++device_add_34766 device_add 0 34766 NULL +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL -+__copy_in_user_34790 __copy_in_user 3 34790 NULL +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL ++can_nocow_extent_34801 can_nocow_extent 2 34801 NULL +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL ++ll_setxattr_34806 ll_setxattr 4 34806 NULL ++file_page_index_34820 file_page_index 0-2 34820 NULL +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL @@ -104945,47 +106442,54 @@ index 0000000..b04803b +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL +msg_print_text_34889 msg_print_text 0 34889 NULL +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL -+compat_put_uint_34905 compat_put_uint 1 34905 NULL +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL +__inode_permission_34925 __inode_permission 0 34925 NULL nohasharray +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 &__inode_permission_34925 ++ODM_AllocateMemory_34929 ODM_AllocateMemory 3 34929 NULL +ceph_aio_write_34930 ceph_aio_write 4 34930 NULL -+skb_gro_header_slow_34958 skb_gro_header_slow 2 34958 NULL nohasharray -+i2c_transfer_34958 i2c_transfer 0 34958 &skb_gro_header_slow_34958 -+Realloc_34961 Realloc 2 34961 NULL ++sec_flags2str_34933 sec_flags2str 3 34933 NULL ++snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL ++i2c_transfer_34958 i2c_transfer 0 34958 NULL ++do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL +mq_lookup_34990 mq_lookup 2 34990 NULL ++i915_gem_gtt_prepare_object_34991 i915_gem_gtt_prepare_object 0 34991 NULL ++schedule_erase_34996 schedule_erase 0 34996 NULL +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL +dm_cache_insert_mapping_35005 dm_cache_insert_mapping 2-3 35005 NULL +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL -+alloc_p2m_page_35025 alloc_p2m_page 0 35025 NULL ++snd_pcm_hw_params_35020 snd_pcm_hw_params 0 35020 NULL ++process_changed_xattr_35025 process_changed_xattr 0 35025 NULL +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL +brcmf_sdio_chip_writenvram_35042 brcmf_sdio_chip_writenvram 4 35042 NULL -+btmrvl_gpiogap_write_35053 btmrvl_gpiogap_write 3 35053 NULL +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL ++ext4_split_unwritten_extents_35063 ext4_split_unwritten_extents 0 35063 NULL +store_ifalias_35088 store_ifalias 4 35088 NULL +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL +capi_write_35104 capi_write 3 35104 NULL nohasharray +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL -+pointer_35138 pointer 0 35138 NULL -+gntdev_alloc_map_35145 gntdev_alloc_map 2 35145 NULL ++ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL ++message_stats_print_35158 message_stats_print 6 35158 NULL +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL ++relocate_entry_cpu_35176 relocate_entry_cpu 0 35176 NULL +solo_v4l2_init_35179 solo_v4l2_init 2 35179 NULL ++SyS_init_module_35180 SyS_init_module 2 35180 NULL +mlx4_ib_get_cq_umem_35184 mlx4_ib_get_cq_umem 5-6 35184 NULL -+iwl_nvm_read_chunk_35198 iwl_nvm_read_chunk 0 35198 NULL +uprobe_get_swbp_addr_35201 uprobe_get_swbp_addr 0 35201 NULL +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL -+_osd_req_alist_elem_size_35216 _osd_req_alist_elem_size 0-2 35216 NULL -+striped_read_35218 striped_read 0-2-8-3 35218 NULL nohasharray ++striped_read_35218 striped_read 0-3-2 35218 NULL nohasharray +security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218 -+rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL nohasharray -+video_register_device_no_warn_35226 video_register_device_no_warn 3 35226 &rx_rx_cmplt_task_read_35226 -+gfn_to_page_many_atomic_35234 gfn_to_page_many_atomic 2 35234 NULL -+SYSC_madvise_35241 SYSC_madvise 1 35241 NULL ++video_register_device_no_warn_35226 video_register_device_no_warn 3 35226 NULL nohasharray ++rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 &video_register_device_no_warn_35226 ++gfn_to_page_many_atomic_35234 gfn_to_page_many_atomic 2 35234 NULL nohasharray ++may_commit_transaction_35234 may_commit_transaction 0 35234 &gfn_to_page_many_atomic_35234 ++SYSC_madvise_35241 SYSC_madvise 1-2 35241 NULL +set_fd_set_35249 set_fd_set 1 35249 NULL +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL ++alloc_thread_groups_35256 alloc_thread_groups 2 35256 NULL ++jbd2_journal_get_write_access_35263 jbd2_journal_get_write_access 0 35263 NULL +dis_disc_write_35265 dis_disc_write 3 35265 NULL +dma_show_regs_35266 dma_show_regs 3 35266 NULL +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL @@ -104994,45 +106498,58 @@ index 0000000..b04803b +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 NULL nohasharray +__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 &brcmf_sdio_forensic_read_35311 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL -+sys_setsockopt_35320 sys_setsockopt 5 35320 NULL -+irq_domain_disassociate_many_35325 irq_domain_disassociate_many 2-3 35325 NULL +fallback_on_nodma_alloc_35332 fallback_on_nodma_alloc 2 35332 NULL -+pskb_network_may_pull_35336 pskb_network_may_pull 2 35336 NULL +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL -+hpi_alloc_control_cache_35351 hpi_alloc_control_cache 1 35351 NULL ++ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL +compat_filldir64_35354 compat_filldir64 3 35354 NULL ++amd_iommu_map_35355 amd_iommu_map 4 35355 NULL ++read_kmem_35372 read_kmem 3 35372 NULL ++ocfs2_journal_access_di_35393 ocfs2_journal_access_di 0 35393 NULL ++create_pending_snapshots_35402 create_pending_snapshots 0 35402 NULL ++btrfs_search_old_slot_35406 btrfs_search_old_slot 0 35406 NULL +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL ++C_SYSC_sendfile_35432 C_SYSC_sendfile 4 35432 NULL +__set_test_and_free_35436 __set_test_and_free 2 35436 NULL +buffer_to_user_35439 buffer_to_user 3 35439 NULL -+i915_wedged_read_35474 i915_wedged_read 3 35474 NULL -+ecryptfs_get_zeroed_pages_35483 ecryptfs_get_zeroed_pages 0 35483 NULL -+do_atm_ioctl_35519 do_atm_ioctl 3 35519 NULL ++memcg_memory_allocated_read_35469 memcg_memory_allocated_read 0 35469 NULL ++fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL ++btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4-0 35500 NULL +async_setkey_35521 async_setkey 3 35521 NULL ++inet_mask_len_35527 inet_mask_len 1 35527 NULL +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL ++pstore_mkfile_35536 pstore_mkfile 7 35536 NULL +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL ++send_update_extent_35556 send_update_extent 0 35556 NULL ++vb2_dqbuf_35559 vb2_dqbuf 0 35559 NULL ++sysfs_create_subdir_35567 sysfs_create_subdir 0 35567 NULL ++ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL +spk_msg_set_35586 spk_msg_set 3 35586 NULL -+ReadZReg_35604 ReadZReg 0 35604 NULL +kernel_readv_35617 kernel_readv 3 35617 NULL -+ixgbe_pci_sriov_configure_35624 ixgbe_pci_sriov_configure 2 35624 NULL +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL ++ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL ++nv50_vm_create_35643 nv50_vm_create 2-3 35643 NULL +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL -+store_debug_level_35652 store_debug_level 3 35652 NULL +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL -+compat_sys_kexec_load_35674 compat_sys_kexec_load 2 35674 NULL ++ext3_mark_iloc_dirty_35686 ext3_mark_iloc_dirty 0 35686 NULL +dm_table_create_35687 dm_table_create 3 35687 NULL +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL -+pci_enable_sriov_35745 pci_enable_sriov 2 35745 NULL ++md_super_write_35703 md_super_write 4 35703 NULL ++btrfs_commit_transaction_35725 btrfs_commit_transaction 0 35725 NULL ++rtw_IOL_cmd_tx_pkt_buf_dump_35732 rtw_IOL_cmd_tx_pkt_buf_dump 2 35732 NULL ++ext4_truncate_restart_trans_35750 ext4_truncate_restart_trans 0 35750 NULL +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL ++vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL ++changed_xattr_35860 changed_xattr 0 35860 NULL +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL +fls64_35862 fls64 0 35862 NULL +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL @@ -105041,73 +106558,93 @@ index 0000000..b04803b +SyS_set_mempolicy_35909 SyS_set_mempolicy 3 35909 NULL +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL -+vol_cdev_compat_ioctl_35923 vol_cdev_compat_ioctl 3 35923 NULL ++balance_node_right_35920 balance_node_right 0 35920 NULL +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL +ext_rts51x_sd_execute_write_data_35971 ext_rts51x_sd_execute_write_data 9 35971 NULL -+ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL ++ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL nohasharray ++generic_ocp_read_35974 generic_ocp_read 3 35974 &ceph_buffer_new_35974 +acl_alloc_35979 acl_alloc 1 35979 NULL ++device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL +generic_file_aio_read_35987 generic_file_aio_read 0 35987 NULL -+koneplus_sysfs_write_35993 koneplus_sysfs_write 6 35993 NULL ++write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray ++kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998 ++locks_mandatory_area_35999 locks_mandatory_area 0 35999 NULL +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL -+ubi_eba_write_leb_36029 ubi_eba_write_leb 5-6 36029 NULL ++ubi_eba_write_leb_36029 ubi_eba_write_leb 0-6-5 36029 NULL +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL +account_shadowed_36048 account_shadowed 2 36048 NULL +gpio_power_read_36059 gpio_power_read 3 36059 NULL ++snd_pcm_playback_hw_avail_36061 snd_pcm_playback_hw_avail 0 36061 NULL ++did_create_dir_36062 did_create_dir 0 36062 NULL +write_emulate_36065 write_emulate 2-4 36065 NULL ++stack_max_size_write_36068 stack_max_size_write 3 36068 NULL +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL -+ext3_new_blocks_36073 ext3_new_blocks 3 36073 NULL ++ext3_new_blocks_36073 ext3_new_blocks 3-0 36073 NULL +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL ++mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL +vga_arb_write_36112 vga_arb_write 3 36112 NULL +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL -+compat_ptrace_request_36131 compat_ptrace_request 3-4 36131 NULL ++compat_ptrace_request_36131 compat_ptrace_request 3 36131 NULL +vmalloc_exec_36132 vmalloc_exec 1 36132 NULL +max8925_irq_domain_map_36133 max8925_irq_domain_map 2 36133 NULL ++set_flexbg_block_bitmap_36136 set_flexbg_block_bitmap 0-4-5 36136 NULL +ext3_readpages_36144 ext3_readpages 4 36144 NULL -+alloc_vm_area_36149 alloc_vm_area 1 36149 NULL +twl_set_36154 twl_set 2 36154 NULL +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL +btrfs_file_extent_inline_len_36158 btrfs_file_extent_inline_len 0 36158 NULL +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL ++wm8994_edge_irq_map_36170 wm8994_edge_irq_map 2 36170 NULL +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL ++ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL -+SYSC_process_vm_readv_36216 SYSC_process_vm_readv 3-5 36216 NULL ++SYSC_process_vm_readv_36216 SYSC_process_vm_readv 5-3 36216 NULL +ubifs_read_nnode_36221 ubifs_read_nnode 0 36221 NULL +is_dirty_36223 is_dirty 2 36223 NULL -+dma_alloc_attrs_36225 dma_alloc_attrs 0 36225 NULL -+nfqnl_mangle_36226 nfqnl_mangle 4-2 36226 NULL ++ept_walk_addr_36226 ept_walk_addr 3 36226 NULL +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL +rproc_recovery_read_36245 rproc_recovery_read 3 36245 NULL +scrub_stripe_36248 scrub_stripe 5-4 36248 NULL +compat_sys_mbind_36256 compat_sys_mbind 5 36256 NULL -+usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL ++usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL nohasharray ++cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 &usb_buffer_alloc_36276 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL +nouveau_cli_create_36293 nouveau_cli_create 3 36293 NULL +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL ++cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL +fuse_get_user_addr_36312 fuse_get_user_addr 0 36312 NULL +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL +lc_create_36332 lc_create 4 36332 NULL +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL ++ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL nohasharray +xz_dec_lzma2_create_36353 xz_dec_lzma2_create 2 36353 &v9fs_file_readn_36353 +to_sector_36361 to_sector 0-1 36361 NULL ++irq_domain_disassociate_36367 irq_domain_disassociate 2 36367 NULL ++posix_acl_create_36383 posix_acl_create 0 36383 NULL +tunables_read_36385 tunables_read 3 36385 NULL -+afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL ++afs_alloc_flat_call_36399 afs_alloc_flat_call 3-2 36399 NULL ++sierra_write_36402 sierra_write 4 36402 NULL ++msb_update_block_36412 msb_update_block 2 36412 NULL +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL ++ReadW6692B_36445 ReadW6692B 0 36445 NULL +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL -+tcf_csum_ipv6_udp_36457 tcf_csum_ipv6_udp 3 36457 NULL -+SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL ++check_extent_in_eb_36467 check_extent_in_eb 0 36467 NULL ++SyS_process_vm_writev_36476 SyS_process_vm_writev 5-3 36476 NULL +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL -+tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 NULL ++set_var_mtrr_range_36483 set_var_mtrr_range 2 36483 NULL ++ip6_append_data_36490 ip6_append_data 4 36490 NULL nohasharray ++tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 &ip6_append_data_36490 ++cmd_loop_36491 cmd_loop 0 36491 NULL +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL +get_param_l_36518 get_param_l 0 36518 NULL @@ -105115,38 +106652,41 @@ index 0000000..b04803b +lguest_setup_irq_36531 lguest_setup_irq 1 36531 NULL +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL +cpu_type_read_36540 cpu_type_read 3 36540 NULL -+get_entry_len_36549 get_entry_len 0 36549 NULL -+__kfifo_to_user_36555 __kfifo_to_user 3 36555 NULL nohasharray ++__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL nohasharray +macvtap_do_read_36555 macvtap_do_read 4 36555 &__kfifo_to_user_36555 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL -+ssb_bus_scan_36578 ssb_bus_scan 2 36578 NULL +__erst_read_36579 __erst_read 0 36579 NULL +put_cmsg_36589 put_cmsg 4 36589 NULL -+pcnet32_realloc_rx_ring_36598 pcnet32_realloc_rx_ring 3 36598 NULL ++do_sendfile_36610 do_sendfile 4-5 36610 NULL +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL ++i915_gem_execbuffer_relocate_slow_36634 i915_gem_execbuffer_relocate_slow 0 36634 NULL +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL -+format_decode_36638 format_decode 0 36638 NULL ++convert_extent_item_v0_36645 convert_extent_item_v0 4-0 36645 NULL +ced_ioctl_36647 ced_ioctl 2 36647 NULL +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL -+perf_calculate_period_36662 perf_calculate_period 3-2 36662 NULL +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL -+ptr_to_compat_36680 ptr_to_compat 0 36680 NULL -+ext4_mb_discard_group_preallocations_36685 ext4_mb_discard_group_preallocations 2 36685 NULL ++xillybus_read_36678 xillybus_read 3 36678 NULL ++tlv_put_btrfs_timespec_36685 tlv_put_btrfs_timespec 0 36685 NULL nohasharray ++ext4_mb_discard_group_preallocations_36685 ext4_mb_discard_group_preallocations 2 36685 &tlv_put_btrfs_timespec_36685 ++gsmtty_write_36702 gsmtty_write 3 36702 NULL +sched_clock_36717 sched_clock 0 36717 NULL -+extract_icmp6_fields_36732 extract_icmp6_fields 2 36732 NULL -+snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4 36740 NULL -+cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL ++ocfs2_rotate_tree_right_36723 ocfs2_rotate_tree_right 0 36723 NULL ++snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL ++cxgbi_device_register_36746 cxgbi_device_register 2-1 36746 NULL ++fc_exch_mgr_alloc_36751 fc_exch_mgr_alloc 3-4 36751 NULL +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL -+ip4ip6_err_36772 ip4ip6_err 5 36772 NULL ++ext4_ext_convert_to_initialized_36765 ext4_ext_convert_to_initialized 0 36765 NULL +ptp_filter_init_36780 ptp_filter_init 2 36780 NULL ++i40e_init_lan_hmc_36796 i40e_init_lan_hmc 2-3-4-5 36796 NULL +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL -+tcf_csum_ipv6_tcp_36822 tcf_csum_ipv6_tcp 3 36822 NULL ++ocfs2_journal_access_rb_36823 ocfs2_journal_access_rb 0 36823 NULL +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL +cm_write_36858 cm_write 3 36858 NULL ++range_to_mtrr_with_hole_36861 range_to_mtrr_with_hole 2 36861 NULL +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 NULL +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL @@ -105154,72 +106694,107 @@ index 0000000..b04803b +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL +OS_kmalloc_36909 OS_kmalloc 1 36909 NULL ++audio_set_endpoint_req_36918 audio_set_endpoint_req 0 36918 NULL +build_key_36931 build_key 1 36931 NULL +crypto_blkcipher_ivsize_36944 crypto_blkcipher_ivsize 0 36944 NULL -+write_leb_36957 write_leb 5 36957 NULL ++div_u64_36951 div_u64 0 36951 NULL ++write_leb_36957 write_leb 0-5 36957 NULL +ntfs_external_attr_find_36963 ntfs_external_attr_find 0 36963 NULL +sparse_early_mem_maps_alloc_node_36971 sparse_early_mem_maps_alloc_node 4 36971 NULL ++il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL +setxattr_37006 setxattr 4 37006 NULL ++btrfs_update_root_37035 btrfs_update_root 0 37035 NULL ++ocfs2_dlm_unlock_37037 ocfs2_dlm_unlock 0 37037 NULL ++command_file_read_37038 command_file_read 3 37038 NULL ++__hfsplus_brec_find_37048 __hfsplus_brec_find 0 37048 NULL ++figure_loop_size_37051 figure_loop_size 2-3 37051 NULL +qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray +ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL +parse_command_37079 parse_command 2 37079 NULL +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL +tun_get_user_37094 tun_get_user 5 37094 NULL -+has_wrprotected_page_37123 has_wrprotected_page 2-3 37123 NULL ++has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL ++mtt_free_res_37144 mtt_free_res 5 37144 NULL +msg_word_37164 msg_word 0 37164 NULL ++BeceemNVMRead_37166 BeceemNVMRead 0 37166 NULL ++f2fs_direct_IO_37167 f2fs_direct_IO 4 37167 NULL +can_set_xattr_37182 can_set_xattr 4 37182 NULL -+crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL ++btrfs_insert_delayed_items_37191 btrfs_insert_delayed_items 0 37191 NULL ++vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL ++sysfs_add_file_37200 sysfs_add_file 0 37200 NULL ++mpol_misplaced_37205 mpol_misplaced 0 37205 NULL ++forced_ps_write_37209 forced_ps_write 3 37209 NULL ++crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL nohasharray ++ext4_ind_direct_IO_37212 ext4_ind_direct_IO 0-4 37212 &crypto_shash_descsize_37212 ++bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL +__do_replace_37227 __do_replace 5 37227 NULL ++produce_free_peb_37232 produce_free_peb 0 37232 NULL ++iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL ++BeceemFlashBulkWrite_37255 BeceemFlashBulkWrite 0 37255 NULL +prot_queue_del_37258 prot_queue_del 0 37258 NULL -+ath6kl_wmi_set_ie_cmd_37260 ath6kl_wmi_set_ie_cmd 6 37260 NULL +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL ++__add_keyed_refs_37264 __add_keyed_refs 0 37264 NULL +nested_svm_map_37268 nested_svm_map 2 37268 NULL -+c101_run_37279 c101_run 2 37279 NULL -+srp_target_alloc_37288 srp_target_alloc 3 37288 NULL -+isku_sysfs_write_talkfx_37298 isku_sysfs_write_talkfx 6 37298 NULL ++create_cq_user_37278 create_cq_user 5 37278 NULL ++request_threaded_irq_37303 request_threaded_irq 0 37303 NULL +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL ++ext3_direct_IO_37308 ext3_direct_IO 4 37308 NULL +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL +send_msg_37323 send_msg 4 37323 NULL -+brcmf_sdbrcm_membytes_37324 brcmf_sdbrcm_membytes 3-5 37324 NULL -+l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL ++l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray ++bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL ++lz4_compressbound_37337 lz4_compressbound 0-1 37337 NULL ++move_vma_37341 move_vma 0-5 37341 NULL +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL ++cl_io_submit_rw_37374 cl_io_submit_rw 0 37374 NULL ++iterate_leaf_refs_37385 iterate_leaf_refs 0 37385 NULL +iommu_num_pages_37391 iommu_num_pages 0-1-3-2 37391 NULL -+sys_getxattr_37418 sys_getxattr 4 37418 NULL ++btrfs_find_free_objectid_37412 btrfs_find_free_objectid 0 37412 NULL +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL nohasharray -+find_next_bit_37422 find_next_bit 0-2-3 37422 &acpi_os_allocate_zeroed_37422 -+tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4 37428 NULL ++find_next_bit_37422 find_next_bit 0-3-2 37422 &acpi_os_allocate_zeroed_37422 ++ocfs2_insert_path_37425 ocfs2_insert_path 0 37425 NULL ++tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL -+tty_audit_log_37440 tty_audit_log 5 37440 NULL ++fru_alloc_37442 fru_alloc 1 37442 NULL +tcp_established_options_37450 tcp_established_options 0 37450 NULL +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL +__remove_37457 __remove 2 37457 NULL +ufs_data_ptr_to_cpu_37475 ufs_data_ptr_to_cpu 0 37475 NULL +get_est_timing_37484 get_est_timing 0 37484 NULL +kmem_realloc_37489 kmem_realloc 2 37489 NULL -+kvm_vcpu_compat_ioctl_37500 kvm_vcpu_compat_ioctl 3 37500 NULL -+vmalloc_32_user_37519 vmalloc_32_user 1 37519 NULL ++__hfsplus_setxattr_37499 __hfsplus_setxattr 4 37499 NULL ++bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL ++osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL ++bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL nohasharray ++vmalloc_32_user_37519 vmalloc_32_user 1 37519 &bdev_writeseg_37519 ++xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL +fault_inject_read_37534 fault_inject_read 3 37534 NULL +hdr_size_37536 hdr_size 0 37536 NULL -+a2p_37544 a2p 0-1 37544 NULL -+sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL nohasharray -+nf_nat_mangle_tcp_packet_37551 nf_nat_mangle_tcp_packet 6-8 37551 &sep_create_dcb_dmatables_context_37551 ++extent_map_end_37550 extent_map_end 0 37550 NULL ++sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL ++ioat_chansts_37558 ioat_chansts 0 37558 NULL +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL -+mlx4_get_mgm_entry_size_37607 mlx4_get_mgm_entry_size 0 37607 NULL ++ocfs2_add_branch_37588 ocfs2_add_branch 0 37588 NULL ++alloc_descs_37593 alloc_descs 0-1-3 37593 NULL ++qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL ++find_extent_clone_37603 find_extent_clone 0 37603 NULL ++btrfs_write_and_wait_marked_extents_37604 btrfs_write_and_wait_marked_extents 0 37604 NULL +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6-3 37611 NULL -+SYSC_mbind_37622 SYSC_mbind 5 37622 NULL ++SYSC_mbind_37622 SYSC_mbind 5 37622 NULL nohasharray ++ocfs2_split_refcount_rec_37622 ocfs2_split_refcount_rec 0 37622 &SYSC_mbind_37622 +btrfs_calc_trans_metadata_size_37629 btrfs_calc_trans_metadata_size 0-2 37629 NULL nohasharray +policy_residency_37629 policy_residency 0 37629 &btrfs_calc_trans_metadata_size_37629 -+check_pt_base_37635 check_pt_base 3 37635 NULL +alloc_fd_37637 alloc_fd 1 37637 NULL ++SyS_mbind_37638 SyS_mbind 5 37638 NULL +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL +rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 NULL nohasharray +vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 &rfcomm_sock_sendmsg_37661 @@ -105227,423 +106802,485 @@ index 0000000..b04803b +lnw_gpio_to_irq_37665 lnw_gpio_to_irq 2 37665 NULL +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL -+nametbl_header_37698 nametbl_header 2 37698 NULL ++page_chain_free_37697 page_chain_free 0 37697 NULL ++nametbl_header_37698 nametbl_header 2-0 37698 NULL +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL ++dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL +dm_thin_remove_block_37724 dm_thin_remove_block 2 37724 NULL +find_active_uprobe_37733 find_active_uprobe 1 37733 NULL +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL -+ocfs2_duplicate_clusters_by_jbd_37749 ocfs2_duplicate_clusters_by_jbd 6-4-5 37749 NULL ++ocfs2_duplicate_clusters_by_jbd_37749 ocfs2_duplicate_clusters_by_jbd 5-4-6 37749 NULL +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL -+dma_pte_addr_37784 dma_pte_addr 0 37784 NULL +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL +smk_read_logging_37804 smk_read_logging 3 37804 NULL +deny_write_access_37813 deny_write_access 0 37813 NULL ++ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL -+bitmap_find_next_zero_area_37827 bitmap_find_next_zero_area 2-3-5-4 37827 NULL ++bitmap_find_next_zero_area_37827 bitmap_find_next_zero_area 2-3-0-5-4 37827 NULL ++android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL ++jbd2_journal_get_undo_access_37837 jbd2_journal_get_undo_access 0 37837 NULL +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL -+isku_sysfs_write_last_set_37868 isku_sysfs_write_last_set 6 37868 NULL nohasharray -+xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 &isku_sysfs_write_last_set_37868 -+sys_setxattr_37880 sys_setxattr 4 37880 NULL -+dvb_net_sec_37884 dvb_net_sec 3 37884 NULL ++SYSC_pwrite64_37862 SYSC_pwrite64 3 37862 NULL ++xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL ++set_registers_37883 set_registers 4 37883 NULL ++btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL +max77686_irq_domain_map_37897 max77686_irq_domain_map 2 37897 NULL -+compat_sys_rt_sigpending_37899 compat_sys_rt_sigpending 2 37899 NULL +tipc_link_send_sections_fast_37920 tipc_link_send_sections_fast 4 37920 NULL -+pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 NULL ++_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray ++pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL ++write_file_bool_37957 write_file_bool 3 37957 NULL +fifo_alloc_37961 fifo_alloc 1 37961 NULL -+ext3_free_blocks_sb_37967 ext3_free_blocks_sb 3-4 37967 NULL ++ext3_free_blocks_sb_37967 ext3_free_blocks_sb 4-3 37967 NULL +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL +vfs_readv_38011 vfs_readv 3 38011 NULL +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL ++SyS_pwrite64_38041 SyS_pwrite64 3 38041 NULL +klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 NULL nohasharray +il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 &klsi_105_prepare_write_buffer_38044 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL ++sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL nohasharray +is_discarded_38058 is_discarded 2 38058 &_xfs_buf_alloc_38058 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL -+tcf_csum_ipv4_udp_38089 tcf_csum_ipv4_udp 3 38089 NULL +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL +ep0_read_38095 ep0_read 3 38095 NULL -+sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL -+rbd_obj_read_sync_38098 rbd_obj_read_sync 3-4 38098 NULL ++sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL nohasharray ++osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 &sk_wmem_schedule_38096 ++o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL ++_get_val_38115 _get_val 2 38115 NULL +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL -+__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 3-4 38153 NULL ++__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 0-4-3 38153 NULL +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL ++cirrus_ttm_tt_create_38167 cirrus_ttm_tt_create 2 38167 NULL ++send_rename_38170 send_rename 0 38170 NULL +cdev_add_38176 cdev_add 2-3 38176 NULL -+brcmf_sdcard_recv_buf_38179 brcmf_sdcard_recv_buf 6 38179 NULL ++create_srq_user_38191 create_srq_user 5 38191 NULL +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL ++do_chunk_alloc_38200 do_chunk_alloc 0 38200 NULL +get_ucode_user_38202 get_ucode_user 3 38202 NULL -+ext3_new_block_38208 ext3_new_block 3 38208 NULL ++ext3_new_block_38208 ext3_new_block 3-0 38208 NULL +stmpe_gpio_irq_map_38222 stmpe_gpio_irq_map 3 38222 NULL +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL +palmas_gpio_to_irq_38235 palmas_gpio_to_irq 2 38235 NULL -+vhost_net_compat_ioctl_38237 vhost_net_compat_ioctl 3 38237 NULL ++ceph_decode_16_38239 ceph_decode_16 0 38239 NULL +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL ++snd_pcm_playback_rewind_38249 snd_pcm_playback_rewind 0-2 38249 NULL +from_dblock_38256 from_dblock 0-1 38256 NULL -+vmci_qp_broker_set_page_store_38260 vmci_qp_broker_set_page_store 2-3 38260 NULL -+ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 NULL nohasharray -+SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 &ieee80211_if_read_auto_open_plinks_38268 nohasharray -+mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &SYSC_msgrcv_38268 -+xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray -+xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275 -+ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL nohasharray -+swiotlb_sync_single_for_cpu_38281 swiotlb_sync_single_for_cpu 2 38281 &ftdi_process_packet_38281 ++vmci_qp_broker_set_page_store_38260 vmci_qp_broker_set_page_store 3-2 38260 NULL ++SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 NULL nohasharray ++ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &SYSC_msgrcv_38268 nohasharray ++mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &ieee80211_if_read_auto_open_plinks_38268 ++xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 NULL nohasharray ++xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 &xfs_bmdr_to_bmbt_38275 ++ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL +gpa_to_gfn_38291 gpa_to_gfn 0-1 38291 NULL -+zd_mac_rx_38296 zd_mac_rx 3 38296 NULL ++ucma_query_path_38305 ucma_query_path 3 38305 NULL +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL -+ida_simple_get_38326 ida_simple_get 2 38326 NULL ++ida_simple_get_38326 ida_simple_get 2-0 38326 NULL ++ocfs2_rotate_rightmost_leaf_left_38330 ocfs2_rotate_rightmost_leaf_left 0 38330 NULL +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL -+pyra_sysfs_write_38370 pyra_sysfs_write 6 38370 NULL ++ocfs2_replace_extent_rec_38357 ocfs2_replace_extent_rec 0 38357 NULL ++btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL +get_valid_node_allowed_38412 get_valid_node_allowed 1-0 38412 NULL -+ocfs2_which_cluster_group_38413 ocfs2_which_cluster_group 2 38413 NULL ++ocfs2_which_cluster_group_38413 ocfs2_which_cluster_group 0-2 38413 NULL +ht_destroy_irq_38418 ht_destroy_irq 1 38418 NULL +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL -+asix_write_cmd_async_38420 asix_write_cmd_async 5 38420 NULL -+pcnet32_realloc_tx_ring_38428 pcnet32_realloc_tx_ring 3 38428 NULL +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL -+i915_min_freq_read_38470 i915_min_freq_read 3 38470 NULL ++btrfs_next_old_leaf_38465 btrfs_next_old_leaf 0 38465 NULL +kvm_arch_setup_async_pf_38481 kvm_arch_setup_async_pf 3 38481 NULL -+blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL ++blk_end_bidi_request_38482 blk_end_bidi_request 4-3 38482 NULL +cpu_to_mem_38501 cpu_to_mem 0 38501 NULL +dev_names_read_38509 dev_names_read 3 38509 NULL +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL -+set_queue_count_38519 set_queue_count 0 38519 NULL +mlx4_ib_db_map_user_38529 mlx4_ib_db_map_user 2 38529 NULL +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL ++kuc_len_38557 kuc_len 0-1 38557 NULL +cpu_to_node_38561 cpu_to_node 0 38561 NULL +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL +_ipw_read32_38565 _ipw_read32 0 38565 NULL +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL -+cosa_net_setup_rx_38594 cosa_net_setup_rx 2 38594 NULL -+compat_sys_ptrace_38595 compat_sys_ptrace 3-4 38595 NULL ++compat_sys_ptrace_38595 compat_sys_ptrace 3 38595 NULL ++blkg_stat_read_38612 blkg_stat_read 0 38612 NULL +icn_writecmd_38629 icn_writecmd 2 38629 NULL ++write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL +ext2_readpages_38640 ext2_readpages 4 38640 NULL +cma_create_area_38642 cma_create_area 2 38642 NULL +audit_init_entry_38644 audit_init_entry 1 38644 NULL -+qp_broker_alloc_38646 qp_broker_alloc 5-6 38646 NULL ++qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL -+skb_tnl_header_len_38669 skb_tnl_header_len 0 38669 NULL -+cfg80211_send_disassoc_38678 cfg80211_send_disassoc 3 38678 NULL ++snd_es1371_wait_src_ready_38673 snd_es1371_wait_src_ready 0 38673 NULL +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL +ext4_wait_block_bitmap_38695 ext4_wait_block_bitmap 2 38695 NULL ++validate_vid_hdr_38699 validate_vid_hdr 0 38699 NULL +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL -+find_next_usable_block_38716 find_next_usable_block 1-3 38716 NULL ++find_next_usable_block_38716 find_next_usable_block 3-1-0 38716 NULL +alloc_trace_probe_38720 alloc_trace_probe 6 38720 NULL -+phys_to_virt_38757 phys_to_virt 0-1 38757 NULL ++w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL +udf_readpages_38761 udf_readpages 4 38761 NULL +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL ++bcache_device_init_38781 bcache_device_init 3 38781 NULL +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL ++slab_order_38794 slab_order 0 38794 NULL ++do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL +err_decode_38804 err_decode 2 38804 NULL ++btrfs_find_space_cluster_38812 btrfs_find_space_cluster 4-0 38812 NULL +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL -+sys_select_38827 sys_select 1 38827 NULL -+b43_txhdr_size_38832 b43_txhdr_size 0 38832 NULL +direct_entry_38836 direct_entry 3 38836 NULL +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL ++read_nic_io_word_38853 read_nic_io_word 0 38853 NULL +interfaces_38859 interfaces 2 38859 NULL +pci_msix_table_size_38867 pci_msix_table_size 0 38867 NULL -+sizeof_gpio_leds_priv_38882 sizeof_gpio_leds_priv 0-1 38882 NULL +dbgfs_state_38894 dbgfs_state 3 38894 NULL +f2fs_xattr_set_acl_38895 f2fs_xattr_set_acl 4 38895 NULL -+process_bulk_data_command_38906 process_bulk_data_command 4 38906 NULL -+ext3_trim_all_free_38929 ext3_trim_all_free 3-4-2 38929 NULL -+sbp_count_se_tpg_luns_38943 sbp_count_se_tpg_luns 0 38943 NULL ++traverse_38897 traverse 0 38897 NULL ++__fswab16_38898 __fswab16 0 38898 NULL ++ext3_trim_all_free_38929 ext3_trim_all_free 4-3-2 38929 NULL ++il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL +C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 NULL nohasharray +usb_maxpacket_38977 usb_maxpacket 0 38977 &C_SYSC_preadv64_38977 -+OSDSetBlock_38986 OSDSetBlock 4-2 38986 NULL ++OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL ++lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL +udf_new_block_38999 udf_new_block 4 38999 NULL +get_nodes_39012 get_nodes 3 39012 NULL +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL ++__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3-0 39020 NULL ++qgroup_account_ref_step1_39024 qgroup_account_ref_step1 0 39024 NULL +acpi_install_gpe_block_39031 acpi_install_gpe_block 4 39031 NULL +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL -+line6_midibuf_read_39067 line6_midibuf_read 0-3 39067 NULL ++do_write_kmem_39051 do_write_kmem 1-3-0 39051 NULL ++gen_pool_create_39064 gen_pool_create 2 39064 NULL +ext4_init_block_bitmap_39071 ext4_init_block_bitmap 3 39071 NULL ++atomic64_add_negative_39098 atomic64_add_negative 1 39098 NULL ++ReadHFC_39104 ReadHFC 0 39104 NULL +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL -+__kfifo_to_user_r_39123 __kfifo_to_user_r 3 39123 NULL ++leb_write_lock_39111 leb_write_lock 0 39111 NULL ++__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL ++ttm_mem_global_alloc_zone_39125 ttm_mem_global_alloc_zone 0 39125 NULL +ea_foreach_39133 ea_foreach 0 39133 NULL +generic_permission_39150 generic_permission 0 39150 NULL -+alloc_ring_39151 alloc_ring 2-4 39151 NULL +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL -+create_bounce_buffer_39155 create_bounce_buffer 3 39155 NULL ++echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL ++btrfs_start_delalloc_flush_39173 btrfs_start_delalloc_flush 0 39173 NULL +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL -+init_list_set_39188 init_list_set 2-3 39188 NULL -+ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL ++ubi_more_update_data_39189 ubi_more_update_data 4-0 39189 NULL +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL -+qla4_82xx_pci_mem_read_direct_39208 qla4_82xx_pci_mem_read_direct 2 39208 NULL -+vfio_group_fops_compat_ioctl_39219 vfio_group_fops_compat_ioctl 3 39219 NULL +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL -+batadv_tt_response_fill_table_39236 batadv_tt_response_fill_table 1 39236 NULL +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL +drm_order_39244 drm_order 0 39244 NULL ++snd_pcm_capture_forward_39248 snd_pcm_capture_forward 0-2 39248 NULL +r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray +pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250 -+__skb_cow_39254 __skb_cow 2 39254 NULL -+ath6kl_wmi_set_appie_cmd_39266 ath6kl_wmi_set_appie_cmd 5 39266 NULL ++i915_error_state_read_39254 i915_error_state_read 3 39254 NULL ++bitmap_set_bits_39272 bitmap_set_bits 3 39272 NULL +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL -+__vmalloc_node_39308 __vmalloc_node 1 39308 NULL ++__vmalloc_node_39308 __vmalloc_node 1-5 39308 NULL +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL ++insert_reserved_file_extent_39327 insert_reserved_file_extent 3-0 39327 NULL +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL -+__cfg80211_send_deauth_39344 __cfg80211_send_deauth 3 39344 NULL -+__copy_from_user_nocache_39351 __copy_from_user_nocache 3 39351 NULL ++__copy_from_user_nocache_39351 __copy_from_user_nocache 3-0 39351 NULL +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL -+do_write_log_from_user_39362 do_write_log_from_user 3 39362 NULL ++do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL +__send_to_port_39386 __send_to_port 3 39386 NULL ++perf_trace_buf_submit_39413 perf_trace_buf_submit 5 39413 NULL +user_power_read_39414 user_power_read 3 39414 NULL +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL -+sys_semop_39457 sys_semop 3 39457 NULL -+ptrace_peek_siginfo_39458 ptrace_peek_siginfo 3 39458 NULL ++__vb2_get_done_vb_39448 __vb2_get_done_vb 0 39448 NULL ++apei_resources_add_39470 apei_resources_add 0 39470 NULL +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL +do_get_mempolicy_39485 do_get_mempolicy 3 39485 NULL +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL -+atomic64_read_unchecked_39505 atomic64_read_unchecked 0 39505 NULL ++cl_req_alloc_39523 cl_req_alloc 4 39523 NULL +int_proc_write_39542 int_proc_write 3 39542 NULL +pp_write_39554 pp_write 3 39554 NULL -+ol_dqblk_block_39558 ol_dqblk_block 0-3-2 39558 NULL ++ol_dqblk_block_39558 ol_dqblk_block 2-0-3 39558 NULL +datablob_format_39571 datablob_format 2 39571 NULL nohasharray +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571 -+handle_response_icmp_39574 handle_response_icmp 7 39574 NULL -+mtdchar_compat_ioctl_39602 mtdchar_compat_ioctl 3 39602 NULL -+n_tty_compat_ioctl_helper_39605 n_tty_compat_ioctl_helper 4 39605 NULL +ext_depth_39607 ext_depth 0 39607 NULL +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL +sdio_readb_39618 sdio_readb 0 39618 NULL +set_dev_class_39645 set_dev_class 4 39645 NULL nohasharray +dm_exception_table_init_39645 dm_exception_table_init 2 39645 &set_dev_class_39645 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL -+tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL nohasharray -+prism2_info_hostscanresults_39657 prism2_info_hostscanresults 3 39657 &tcp_try_rmem_schedule_39657 ++tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL ++vmx_set_cr3_39688 vmx_set_cr3 2 39688 NULL ++sd_completed_bytes_39705 sd_completed_bytes 0 39705 NULL +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL -+tcf_csum_ipv4_tcp_39713 tcf_csum_ipv4_tcp 4 39713 NULL ++test_add_free_space_entry_39754 test_add_free_space_entry 2-3 39754 NULL ++adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL +remap_to_origin_clear_discard_39767 remap_to_origin_clear_discard 3 39767 NULL -+ocfs2_pages_per_cluster_39790 ocfs2_pages_per_cluster 0 39790 NULL +crypto_ablkcipher_blocksize_39811 crypto_ablkcipher_blocksize 0 39811 NULL +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL -+sys_migrate_pages_39825 sys_migrate_pages 2 39825 NULL +get_priv_size_39828 get_priv_size 0-1 39828 NULL ++can_rmdir_39890 can_rmdir 0 39890 NULL +pkt_add_39897 pkt_add 3 39897 NULL +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL -+gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL ++gen_pool_add_virt_39913 gen_pool_add_virt 4-5 39913 NULL +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL ++dma_to_mm_pfn_39916 dma_to_mm_pfn 0-1 39916 NULL +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL +exofs_read_kern_39921 exofs_read_kern 6 39921 NULL nohasharray +oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921 +__spi_async_39932 __spi_async 0 39932 NULL +__get_order_39935 __get_order 0 39935 NULL -+error_error_frame_read_39947 error_error_frame_read 3 39947 NULL nohasharray -+fwnet_pd_new_39947 fwnet_pd_new 4 39947 &error_error_frame_read_39947 -+tty_prepare_flip_string_39955 tty_prepare_flip_string 3 39955 NULL ++error_error_frame_read_39947 error_error_frame_read 3 39947 NULL ++tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL ++lstcon_group_list_39958 lstcon_group_list 2 39958 NULL +dma_push_rx_39973 dma_push_rx 2 39973 NULL -+vfio_pci_read_39975 vfio_pci_read 3 39975 NULL +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL +mthca_array_init_39987 mthca_array_init 2 39987 NULL ++fw_device_op_read_39990 fw_device_op_read 3 39990 NULL ++server_name2svname_39998 server_name2svname 4 39998 NULL +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL -+nf_nat_icmpv6_reply_translation_40023 nf_nat_icmpv6_reply_translation 5 40023 NULL nohasharray -+ivtvfb_write_40023 ivtvfb_write 3 40023 &nf_nat_icmpv6_reply_translation_40023 ++ivtvfb_write_40023 ivtvfb_write 3 40023 NULL +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL +regmap_add_irq_chip_40042 regmap_add_irq_chip 4 40042 NULL ++ocfs2_claim_clusters_40050 ocfs2_claim_clusters 0 40050 NULL +add_tty_40055 add_tty 1 40055 NULL nohasharray +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 &add_tty_40055 +atomic_xchg_40070 atomic_xchg 0 40070 NULL ++snd_pcm_sw_params_user_40095 snd_pcm_sw_params_user 0 40095 NULL +gen_pool_first_fit_40110 gen_pool_first_fit 2-3-4 40110 NULL +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL ++ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL ++clone_backref_node_40154 clone_backref_node 0 40154 NULL +pt_write_40159 pt_write 3 40159 NULL +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL nohasharray +devnode_find_40199 devnode_find 3-2 40199 &ipr_alloc_ucode_buffer_40199 +allocate_probes_40204 allocate_probes 1 40204 NULL -+compat_put_long_40214 compat_put_long 1 40214 NULL ++acpi_system_write_alarm_40205 acpi_system_write_alarm 3 40205 NULL +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL ++compress_file_range_40225 compress_file_range 3-4 40225 NULL +osst_read_40237 osst_read 3 40237 NULL -+lpage_info_slot_40243 lpage_info_slot 1-3 40243 NULL -+ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4 40248 NULL -+of_get_child_count_40254 of_get_child_count 0 40254 NULL ++lpage_info_slot_40243 lpage_info_slot 3-1 40243 NULL ++ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL ++ext2_fiemap_40271 ext2_fiemap 4 40271 NULL +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL ++vfio_unmap_unpin_40284 vfio_unmap_unpin 3 40284 NULL +_calc_trunk_info_40291 _calc_trunk_info 2 40291 NULL -+crash_free_reserved_phys_range_40292 crash_free_reserved_phys_range 1 40292 NULL -+ubi_io_write_data_40305 ubi_io_write_data 4-5 40305 NULL ++SyS_bind_40303 SyS_bind 3 40303 NULL ++ubi_io_write_data_40305 ubi_io_write_data 0-5-4 40305 NULL +batadv_tt_changes_fill_buff_40323 batadv_tt_changes_fill_buff 4 40323 NULL +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL +mmio_read_40348 mmio_read 4 40348 NULL -+usb_dump_interface_40353 usb_dump_interface 0 40353 NULL -+ocfs2_release_clusters_40355 ocfs2_release_clusters 4 40355 NULL ++ocfs2_release_clusters_40355 ocfs2_release_clusters 4-0 40355 NULL +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL -+ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 2-3 40365 NULL -+fwnet_incoming_packet_40380 fwnet_incoming_packet 3 40380 NULL -+brcmf_sdbrcm_get_image_40397 brcmf_sdbrcm_get_image 0-2 40397 NULL -+atmel_rmem16_40450 atmel_rmem16 0 40450 NULL ++ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL ++get_chars_40373 get_chars 3 40373 NULL ++submit_page_section_40408 submit_page_section 0 40408 NULL ++ecryptfs_read_lower_40419 ecryptfs_read_lower 3 40419 NULL ++slab_node_40421 slab_node 0 40421 NULL ++fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL ++SyS_writev_40467 SyS_writev 3 40467 NULL ++__i915_add_request_40469 __i915_add_request 0 40469 NULL ++SyS_select_40473 SyS_select 1 40473 NULL ++afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL -+tty_write_room_40495 tty_write_room 0 40495 NULL -+persistent_ram_new_40501 persistent_ram_new 1-2 40501 NULL ++drm_vma_node_start_40500 drm_vma_node_start 0 40500 NULL +sg_phys_40507 sg_phys 0 40507 NULL -+TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL ++__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL ++TSS_checkhmac2_40520 TSS_checkhmac2 7-5 40520 NULL +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL ++i915_gem_execbuffer_relocate_object_slow_40546 i915_gem_execbuffer_relocate_object_slow 0 40546 NULL +ima_write_policy_40548 ima_write_policy 3 40548 NULL -+esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL ++btrfs_flush_all_pending_stuffs_40553 btrfs_flush_all_pending_stuffs 0 40553 NULL ++esp_alloc_tmp_40558 esp_alloc_tmp 2-3 40558 NULL +ufs_inode_getfrag_40560 ufs_inode_getfrag 2-4 40560 NULL +bdev_sectors_40564 bdev_sectors 0 40564 NULL +lba_to_map_index_40580 lba_to_map_index 0-1 40580 NULL -+skge_rx_get_40598 skge_rx_get 3 40598 NULL ++b1_get_byte_40597 b1_get_byte 0 40597 NULL +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL -+bl_mark_sectors_init_40613 bl_mark_sectors_init 2-3 40613 NULL -+cpuset_sprintf_cpulist_40627 cpuset_sprintf_cpulist 0 40627 NULL ++qla8044_rd_reg_40652 qla8044_rd_reg 0 40652 NULL ++pid_nr_ns_40654 pid_nr_ns 0 40654 NULL +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL +fops_read_40672 fops_read 3 40672 NULL ++ext4_mark_inode_dirty_40673 ext4_mark_inode_dirty 0 40673 NULL ++idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL +alloc_rbio_40676 alloc_rbio 4 40676 NULL -+videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 3 40678 NULL ++videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 3-4 40678 NULL ++pci_enable_resources_40680 pci_enable_resources 0 40680 NULL +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL -+vfio_pci_config_rw_40698 vfio_pci_config_rw 3 40698 NULL +__seq_open_private_40715 __seq_open_private 3 40715 NULL ++btrfs_find_one_extref_40724 btrfs_find_one_extref 0 40724 NULL +fuse_readpages_40737 fuse_readpages 4 40737 NULL +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL nohasharray -+find_next_zero_bit_le_40744 find_next_zero_bit_le 0-2-3 40744 &xfs_iext_remove_direct_40744 ++find_next_zero_bit_le_40744 find_next_zero_bit_le 2-3-0 40744 &xfs_iext_remove_direct_40744 ++i915_gem_execbuffer_relocate_entry_40750 i915_gem_execbuffer_relocate_entry 0 40750 NULL +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL -+fat_generic_compat_ioctl_40755 fat_generic_compat_ioctl 3 40755 NULL +card_send_command_40757 card_send_command 3 40757 NULL +ad1889_readl_40765 ad1889_readl 0 40765 NULL +pg_write_40766 pg_write 3 40766 NULL -+show_list_40775 show_list 3 40775 NULL ++show_list_40775 show_list 3-0 40775 NULL +calcu_metadata_size_40782 calcu_metadata_size 0 40782 NULL -+kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL ++kfifo_out_copy_r_40784 kfifo_out_copy_r 3-0 40784 NULL +bitmap_weight_40791 bitmap_weight 0-2 40791 NULL +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL -+netdev_alloc_skb_ip_align_40811 netdev_alloc_skb_ip_align 2 40811 NULL ++add_action_40811 add_action 4 40811 NULL +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL +SyS_mbind_40828 SyS_mbind 5 40828 NULL +__mlx4_qp_reserve_range_40847 __mlx4_qp_reserve_range 2-3 40847 NULL -+isku_sysfs_write_keys_thumbster_40851 isku_sysfs_write_keys_thumbster 6 40851 NULL ++nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL +ocfs2_zero_partial_clusters_40856 ocfs2_zero_partial_clusters 2-3 40856 NULL +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL +read_file_queue_40895 read_file_queue 3 40895 NULL ++btrfs_set_inode_index_count_40901 btrfs_set_inode_index_count 0 40901 NULL +waiters_read_40902 waiters_read 3 40902 NULL +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL -+snd_vx_create_40948 snd_vx_create 4 40948 NULL -+skb_end_offset_40949 skb_end_offset 0 40949 NULL ++snd_vx_create_40948 snd_vx_create 4 40948 NULL nohasharray ++sg_alloc_table_40948 sg_alloc_table 0 40948 &snd_vx_create_40948 +wm8994_free_irq_40951 wm8994_free_irq 2 40951 NULL +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL ++btrfs_find_orphan_item_40977 btrfs_find_orphan_item 0 40977 NULL ++insert_old_idx_40987 insert_old_idx 0 40987 NULL +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL +mtd_block_isbad_41015 mtd_block_isbad 0 41015 NULL ++__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL +_req_append_segment_41031 _req_append_segment 2 41031 NULL +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL -+vfs_listxattr_41062 vfs_listxattr 0 41062 NULL ++lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL ++BcmFlash2xBulkWrite_41054 BcmFlash2xBulkWrite 0 41054 NULL ++calculate_order_41061 calculate_order 0 41061 NULL ++vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray ++beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL +roccat_read_41093 roccat_read 3 41093 NULL nohasharray -+nvme_map_user_pages_41093 nvme_map_user_pages 3-4 41093 &roccat_read_41093 -+dma_attach_41094 dma_attach 5-6 41094 NULL ++nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 &roccat_read_41093 ++dma_attach_41094 dma_attach 6-5 41094 NULL +provide_user_output_41105 provide_user_output 3 41105 NULL +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL ++ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL ++ocfs2_extend_trans_41116 ocfs2_extend_trans 0 41116 NULL ++btrfs_subvolume_reserve_metadata_41130 btrfs_subvolume_reserve_metadata 3 41130 NULL +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL +ol_quota_chunk_block_41177 ol_quota_chunk_block 0-2 41177 NULL -+netif_get_num_default_rss_queues_41187 netif_get_num_default_rss_queues 0 41187 NULL ++dgap_driver_kzmalloc_41189 dgap_driver_kzmalloc 1 41189 NULL +compat_sys_process_vm_writev_41194 compat_sys_process_vm_writev 3-5 41194 NULL +dfs_file_write_41196 dfs_file_write 3 41196 NULL -+xfs_readdir_41200 xfs_readdir 3 41200 NULL +ocfs2_read_quota_block_41207 ocfs2_read_quota_block 2 41207 NULL +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL -+hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2-3 41255 NULL ++cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL ++hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL ++create_dir_41256 create_dir 0 41256 NULL +erst_read_41260 erst_read 0 41260 NULL -+__fprog_create_41263 __fprog_create 2 41263 NULL -+setup_cluster_bitmap_41270 setup_cluster_bitmap 4 41270 NULL ++setup_cluster_bitmap_41270 setup_cluster_bitmap 4-0 41270 NULL +alloc_context_41283 alloc_context 1 41283 NULL -+arch_gnttab_map_shared_41306 arch_gnttab_map_shared 3 41306 NULL -+objio_alloc_io_state_41316 objio_alloc_io_state 6 41316 NULL ++objio_alloc_io_state_41316 objio_alloc_io_state 7-6 41316 NULL ++o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL ++rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL ++irq_expand_nr_irqs_41351 irq_expand_nr_irqs 0 41351 NULL +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL +jbd2_alloc_41359 jbd2_alloc 1 41359 NULL +kmp_init_41373 kmp_init 2 41373 NULL ++netlink_alloc_large_skb_41375 netlink_alloc_large_skb 1 41375 NULL +isr_commands_read_41398 isr_commands_read 3 41398 NULL +is_writethrough_io_41406 is_writethrough_io 3 41406 NULL -+sys_flistxattr_41407 sys_flistxattr 3 41407 NULL +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL -+vsock_dev_compat_ioctl_41427 vsock_dev_compat_ioctl 3 41427 NULL +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL -+ntfs_file_buffered_write_41442 ntfs_file_buffered_write 4-6 41442 NULL ++ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL ++snd_pcm_status_41472 snd_pcm_status 0 41472 NULL +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL ++bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL ++split_item_41483 split_item 0 41483 NULL ++kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL ++ipath_user_sdma_page_length_41490 ipath_user_sdma_page_length 0-2-1 41490 NULL +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL +SyS_get_mempolicy_41495 SyS_get_mempolicy 3-4 41495 NULL +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL -+ldisc_receive_41516 ldisc_receive 4 41516 NULL ++perf_sw_event_41517 perf_sw_event 2 41517 NULL ++SyS_preadv_41523 SyS_preadv 3 41523 NULL ++dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL ++add_excluded_extent_41547 add_excluded_extent 0 41547 NULL +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL -+nr_status_frames_41559 nr_status_frames 0-1 41559 NULL -+batadv_receive_client_update_packet_41578 batadv_receive_client_update_packet 3 41578 NULL ++si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 NULL nohasharray ++nr_status_frames_41559 nr_status_frames 0-1 41559 &si476x_radio_fops_read_41559 +rng_dev_read_41581 rng_dev_read 3 41581 NULL -+read_file_rx_chainmask_41605 read_file_rx_chainmask 3 41605 NULL +vga_io_r_41609 vga_io_r 0 41609 NULL +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL -+usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 NULL ++lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray ++usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613 +a2mp_send_41615 a2mp_send 4 41615 NULL +btrfs_calc_trunc_metadata_size_41626 btrfs_calc_trunc_metadata_size 0-2 41626 NULL ++lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL +get_std_timing_41654 get_std_timing 0 41654 NULL -+squashfs_cache_init_41656 squashfs_cache_init 2 41656 NULL ++start_graph_tracing_41656 start_graph_tracing 0 41656 NULL +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL +params_period_bytes_41683 params_period_bytes 0 41683 NULL -+aac_src_ioremap_41688 aac_src_ioremap 2 41688 NULL ++fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL ++lov_unpackmd_41701 lov_unpackmd 4 41701 NULL ++__ext3_journal_get_write_access_41705 __ext3_journal_get_write_access 0 41705 NULL ++apei_exec_for_each_entry_41717 apei_exec_for_each_entry 0 41717 NULL +bdx_tx_db_init_41719 bdx_tx_db_init 2 41719 NULL -+sys_pwritev_41722 sys_pwritev 3 41722 NULL -+get_bios_ebda_41730 get_bios_ebda 0 41730 NULL ++ocfs2_block_group_fill_41744 ocfs2_block_group_fill 0 41744 NULL +fillonedir_41746 fillonedir 3 41746 NULL +ocfs2_dx_dir_rebalance_41793 ocfs2_dx_dir_rebalance 7 41793 NULL +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL ++remap_pte_range_41800 remap_pte_range 5 41800 NULL +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL -+regcache_sync_block_raw_41803 regcache_sync_block_raw 3-4 41803 NULL ++regcache_sync_block_raw_41803 regcache_sync_block_raw 4-3 41803 NULL ++rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL +da9052_enable_irq_41814 da9052_enable_irq 2 41814 NULL +sco_send_frame_41815 sco_send_frame 3 41815 NULL +lp_gpio_to_irq_41822 lp_gpio_to_irq 2 41822 NULL +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL -+ieee80211_rx_radiotap_space_41870 ieee80211_rx_radiotap_space 0 41870 NULL -+get_packet_41914 get_packet 3 41914 NULL ++pci_map_single_41869 pci_map_single 0 41869 NULL ++usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL ++v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL +find_ge_pid_41918 find_ge_pid 1 41918 NULL +build_inv_iotlb_pages_41922 build_inv_iotlb_pages 4-5 41922 NULL @@ -105652,14 +107289,17 @@ index 0000000..b04803b +read_gssp_41947 read_gssp 3 41947 NULL +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL +portnames_read_41958 portnames_read 3 41958 NULL -+ubi_self_check_all_ff_41959 ubi_self_check_all_ff 4 41959 NULL ++ubi_self_check_all_ff_41959 ubi_self_check_all_ff 0-4 41959 NULL +dst_mtu_41969 dst_mtu 0 41969 NULL ++btrfs_check_trunc_cache_free_space_41973 btrfs_check_trunc_cache_free_space 0 41973 NULL +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL +ubi_io_is_bad_41983 ubi_io_is_bad 0 41983 NULL -+lguest_map_42008 lguest_map 1-2 42008 NULL +pool_allocate_42012 pool_allocate 3 42012 NULL +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL ++rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL ++nouveau_ttm_tt_create_42026 nouveau_ttm_tt_create 2 42026 NULL +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL ++__btrfs_drop_extents_42032 __btrfs_drop_extents 5-0 42032 NULL +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL +dma_generic_alloc_coherent_42048 dma_generic_alloc_coherent 2 42048 NULL nohasharray @@ -105669,198 +107309,240 @@ index 0000000..b04803b +alloc_bitset_42085 alloc_bitset 1 42085 NULL +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL ++send_truncate_42107 send_truncate 0 42107 NULL +submit_inquiry_42108 submit_inquiry 3 42108 NULL +sysfs_read_file_42113 sysfs_read_file 3 42113 NULL nohasharray +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 &sysfs_read_file_42113 -+Read_hfc16_stable_42131 Read_hfc16_stable 0 42131 NULL ++__btrfs_unlink_inode_42114 __btrfs_unlink_inode 0 42114 NULL ++ext4_do_update_inode_42127 ext4_do_update_inode 0 42127 NULL ++blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL ++kvm_lapic_get_cr8_42166 kvm_lapic_get_cr8 0 42166 NULL +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL -+iwl_mvm_send_cmd_42173 iwl_mvm_send_cmd 0 42173 NULL +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL ++write_file_beacon_42185 write_file_beacon 3 42185 NULL +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL -+btmrvl_hsmode_write_42252 btmrvl_hsmode_write 3 42252 NULL ++ocfs2_resv_window_bits_42207 ocfs2_resv_window_bits 0 42207 NULL ++pla_ocp_read_42235 pla_ocp_read 3 42235 NULL +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL -+netxen_nic_map_indirect_address_128M_42257 netxen_nic_map_indirect_address_128M 2 42257 NULL -+savu_sysfs_write_42273 savu_sysfs_write 6 42273 NULL ++vfio_remove_dma_overlap_42255 vfio_remove_dma_overlap 2 42255 NULL ++__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL ++__cpus_weight_42299 __cpus_weight 2-0 42299 NULL +sel_read_perm_42302 sel_read_perm 3 42302 NULL +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304 -+gfn_to_hva_42305 gfn_to_hva 0-2 42305 NULL -+xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL ++gfn_to_hva_42305 gfn_to_hva 2-0 42305 NULL ++close_cur_inode_file_42308 close_cur_inode_file 0 42308 NULL nohasharray ++xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 &close_cur_inode_file_42308 +free_cblock_42318 free_cblock 2 42318 NULL +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL -+tcp_sync_mss_42330 tcp_sync_mss 0-2 42330 NULL ++tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL +snd_pcm_plug_alloc_42339 snd_pcm_plug_alloc 2 42339 NULL +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL ++drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL +hash_ipportnet4_expire_42391 hash_ipportnet4_expire 3 42391 NULL +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL +krng_get_random_42420 krng_get_random 3 42420 NULL +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL ++alloc_request_42448 alloc_request 0 42448 NULL +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL ++kuc_free_42455 kuc_free 2 42455 NULL +tc3589x_gpio_irq_get_virq_42457 tc3589x_gpio_irq_get_virq 2 42457 NULL +ext3_valid_block_bitmap_42459 ext3_valid_block_bitmap 3 42459 NULL +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL +follow_hugetlb_page_42486 follow_hugetlb_page 0-7 42486 NULL +omfs_readpages_42490 omfs_readpages 4 42490 NULL -+brcmf_sdbrcm_bus_txctl_42492 brcmf_sdbrcm_bus_txctl 3 42492 NULL +bypass_write_42498 bypass_write 3 42498 NULL ++SyS_mincore_42511 SyS_mincore 1-2 42511 NULL ++jbd2_log_wait_commit_42519 jbd2_log_wait_commit 0 42519 NULL +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL ++dio_bio_complete_42524 dio_bio_complete 0 42524 NULL +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL -+snd_emux_create_port_42533 snd_emux_create_port 3 42533 NULL ++self_check_ec_hdr_42528 self_check_ec_hdr 0 42528 NULL ++__register_ftrace_function_42543 __register_ftrace_function 0 42543 NULL +dbAllocNear_42546 dbAllocNear 0 42546 NULL -+i915_ring_stop_read_42549 i915_ring_stop_read 3 42549 NULL nohasharray -+ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 &i915_ring_stop_read_42549 ++inorder_next_42548 inorder_next 1-0 42548 NULL ++ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL ++udp_recvmsg_42558 udp_recvmsg 4 42558 NULL +iwl_print_event_log_42566 iwl_print_event_log 0-5-7 42566 NULL ++ocfs2_reserve_suballoc_bits_42569 ocfs2_reserve_suballoc_bits 0 42569 NULL +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL -+map_state_42602 map_state 1 42602 NULL nohasharray -+__pskb_pull_42602 __pskb_pull 2 42602 &map_state_42602 -+nd_get_link_42603 nd_get_link 0 42603 NULL -+sys_move_pages_42626 sys_move_pages 2 42626 NULL ++map_state_42602 map_state 1 42602 NULL +resp_write_42628 resp_write 2 42628 NULL +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL -+l2tp_xmit_skb_42672 l2tp_xmit_skb 3 42672 NULL ++parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL ++ocfs2_search_chain_42655 ocfs2_search_chain 0 42655 NULL +request_key_and_link_42693 request_key_and_link 4 42693 NULL +acpi_dev_get_irqresource_42694 acpi_dev_get_irqresource 2 42694 NULL +vb2_read_42703 vb2_read 3 42703 NULL -+sierra_net_send_cmd_42708 sierra_net_send_cmd 3 42708 NULL -+__ocfs2_decrease_refcount_42717 __ocfs2_decrease_refcount 4 42717 NULL ++__ocfs2_decrease_refcount_42717 __ocfs2_decrease_refcount 5-4-0 42717 NULL ++read_status_42722 read_status 0 42722 NULL +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL +xen_bind_pirq_gsi_to_irq_42750 xen_bind_pirq_gsi_to_irq 1 42750 NULL ++dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL ++x25_recvmsg_42777 x25_recvmsg 4 42777 NULL +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL +cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray +isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781 ++elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0-2 42796 NULL -+fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2-3 42804 NULL ++fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL +drm_ioctl_42813 drm_ioctl 2 42813 NULL +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL ++xfs_iomap_eof_prealloc_initial_size_42822 xfs_iomap_eof_prealloc_initial_size 0-3 42822 NULL +set_arg_42824 set_arg 3 42824 NULL +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL +ocfs2_desc_bitmap_to_cluster_off_42831 ocfs2_desc_bitmap_to_cluster_off 2 42831 NULL +prandom_u32_42853 prandom_u32 0 42853 NULL -+of_property_count_strings_42863 of_property_count_strings 0 42863 NULL ++ntfs_mapping_pairs_build_42859 ntfs_mapping_pairs_build 0 42859 NULL ++nouveau_vm_create_42869 nouveau_vm_create 3-2 42869 NULL +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL -+pskb_expand_head_42881 pskb_expand_head 2-3 42881 NULL -+vt_compat_ioctl_42887 vt_compat_ioctl 3 42887 NULL -+tipc_port_recv_sections_42890 tipc_port_recv_sections 4 42890 NULL ++nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL -+SendTxCommandPacket_42901 SendTxCommandPacket 3 42901 NULL +hd_end_request_42904 hd_end_request 2 42904 NULL +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL +get_unmapped_area_42944 get_unmapped_area 0 42944 NULL -+sys_sethostname_42962 sys_sethostname 2 42962 NULL ++vx_reset_chk_42946 vx_reset_chk 0 42946 NULL ++send_link_42948 send_link 0 42948 NULL ++blkdev_direct_IO_42962 blkdev_direct_IO 4 42962 NULL +read_file_node_stat_42964 read_file_node_stat 3 42964 NULL +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL -+snd_timer_user_ioctl_compat_42985 snd_timer_user_ioctl_compat 3 42985 NULL -+nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL ++nfs_idmap_get_desc_42990 nfs_idmap_get_desc 2-4 42990 NULL nohasharray ++rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990 +mlx4_qp_reserve_range_43000 mlx4_qp_reserve_range 2-3 43000 NULL +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL -+add_bytes_to_bitmap_43026 add_bytes_to_bitmap 0 43026 NULL ++add_bytes_to_bitmap_43026 add_bytes_to_bitmap 0-3-4 43026 NULL ++init_phys_status_page_43028 init_phys_status_page 0 43028 NULL +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL ++send_to_group_43051 send_to_group 0 43051 NULL +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL -+cpuset_sprintf_memlist_43088 cpuset_sprintf_memlist 0 43088 NULL +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL -+read_file_dfs_43145 read_file_dfs 3 43145 NULL nohasharray -+i2c_hid_get_report_43145 i2c_hid_get_report 0 43145 &read_file_dfs_43145 -+uuid_string_43154 uuid_string 0 43154 NULL ++calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL ++cow_file_range_inline_43132 cow_file_range_inline 4 43132 NULL ++read_file_dfs_43145 read_file_dfs 3 43145 NULL ++cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL +usb_string_sub_43164 usb_string_sub 0 43164 NULL +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL ++send_cmd_43168 send_cmd 0 43168 NULL +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL -+process_measurement_43190 process_measurement 0 43190 NULL +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL +uio_write_43202 uio_write 3 43202 NULL +iso_callback_43208 iso_callback 3 43208 NULL ++ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL -+atomic_long_add_return_43217 atomic_long_add_return 1 43217 NULL -+comedi_compat_ioctl_43218 comedi_compat_ioctl 3 43218 NULL ++atomic_long_add_return_43217 atomic_long_add_return 1-0 43217 NULL +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL +fixup_leb_43256 fixup_leb 3 43256 NULL +ide_end_rq_43269 ide_end_rq 4 43269 NULL -+evtchn_write_43278 evtchn_write 3 43278 NULL ++nilfs_direct_IO_43271 nilfs_direct_IO 4 43271 NULL ++mlx5_ib_reg_user_mr_43275 mlx5_ib_reg_user_mr 2-3 43275 NULL ++parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 NULL nohasharray ++evtchn_write_43278 evtchn_write 3 43278 &parport_pc_ecp_write_block_pio_43278 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL +mpage_alloc_43299 mpage_alloc 3 43299 NULL +get_nr_irqs_gsi_43315 get_nr_irqs_gsi 0 43315 NULL -+mmu_set_spte_43327 mmu_set_spte 6-7 43327 NULL ++mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL -+kvm_host_page_size_43348 kvm_host_page_size 2 43348 NULL ++kvm_host_page_size_43348 kvm_host_page_size 2-0 43348 NULL +gart_free_coherent_43362 gart_free_coherent 4-2 43362 NULL +hash_net4_expire_43378 hash_net4_expire 3 43378 NULL -+__alloc_bootmem_low_43423 __alloc_bootmem_low 1-2 43423 NULL nohasharray -+gdm_wimax_netif_rx_43423 gdm_wimax_netif_rx 3 43423 &__alloc_bootmem_low_43423 -+isku_sysfs_write_keys_capslock_43432 isku_sysfs_write_keys_capslock 6 43432 NULL ++xenfb_write_43412 xenfb_write 3 43412 NULL ++__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL -+ucs2_strsize_43438 ucs2_strsize 0 43438 NULL +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL ++ocfs2_rotate_tree_left_43442 ocfs2_rotate_tree_left 0 43442 NULL +usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray +usb_string_43443 usb_string 0 43443 &usemap_size_43443 -+alloc_new_reservation_43480 alloc_new_reservation 4 43480 NULL ++get_vm_area_size_43444 get_vm_area_size 0 43444 NULL ++nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL ++calculate_discard_block_size_43480 calculate_discard_block_size 0 43480 NULL nohasharray ++alloc_new_reservation_43480 alloc_new_reservation 4-0-2 43480 &calculate_discard_block_size_43480 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL +do_readlink_43518 do_readlink 2 43518 NULL +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL ++read_events_43534 read_events 3 43534 NULL +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL nohasharray +ufs_alloccg_block_43540 ufs_alloccg_block 3-0 43540 &tx_frag_failed_read_43540 -+ath_rx_init_43564 ath_rx_init 2 43564 NULL -+_fc_frame_alloc_43568 _fc_frame_alloc 1 43568 NULL ++request_resource_43548 request_resource 0 43548 NULL +rpc_malloc_43573 rpc_malloc 2 43573 NULL ++handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL +proc_read_43614 proc_read 3 43614 NULL ++i915_gem_execbuffer_relocate_object_slow_43618 i915_gem_execbuffer_relocate_object_slow 0 43618 NULL nohasharray ++disable_dma_on_even_43618 disable_dma_on_even 0 43618 &i915_gem_execbuffer_relocate_object_slow_43618 ++random_write_43656 random_write 3 43656 NULL +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL -+dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4-2 43679 NULL -+calgary_map_page_43686 calgary_map_page 3-4 43686 NULL ++fs_path_copy_43673 fs_path_copy 0 43673 NULL ++dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL ++calgary_map_page_43686 calgary_map_page 4 43686 NULL +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL ++wait_for_completion_interruptible_43723 wait_for_completion_interruptible 0 43723 NULL +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL ++reset_card_proc_43731 reset_card_proc 0 43731 NULL +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL -+ocfs2_replace_clusters_43733 ocfs2_replace_clusters 5 43733 NULL -+osdv1_attr_list_elem_size_43747 osdv1_attr_list_elem_size 0-1 43747 NULL ++ocfs2_replace_clusters_43733 ocfs2_replace_clusters 5-0 43733 NULL ++fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL +__bm_find_next_43748 __bm_find_next 2 43748 NULL +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray +byte_pos_43787 byte_pos 0-2 43787 &ocfs2_xattr_get_value_outside_43787 -+btrfs_copy_from_user_43806 btrfs_copy_from_user 3-1 43806 NULL ++btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL +ext4_read_block_bitmap_43814 ext4_read_block_bitmap 2 43814 NULL -+div64_u64_safe_43815 div64_u64_safe 1-2 43815 NULL ++div64_u64_safe_43815 div64_u64_safe 2-1 43815 NULL ++ext4_split_extent_43818 ext4_split_extent 0 43818 NULL ++i915_gem_execbuffer_relocate_entry_43822 i915_gem_execbuffer_relocate_entry 0 43822 NULL +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL -+p54_download_eeprom_43842 p54_download_eeprom 4 43842 NULL +read_flush_43851 read_flush 3 43851 NULL +ocfs2_block_group_find_clear_bits_43874 ocfs2_block_group_find_clear_bits 4 43874 NULL +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL -+prism2_sta_send_mgmt_43916 prism2_sta_send_mgmt 5 43916 NULL +SendString_43928 SendString 3 43928 NULL -+xen_register_gsi_43946 xen_register_gsi 1-2 43946 NULL ++xen_register_gsi_43946 xen_register_gsi 2-1 43946 NULL +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL -+__get_required_blob_size_43980 __get_required_blob_size 0-2-3 43980 NULL ++perf_tp_event_43971 perf_tp_event 2 43971 NULL ++__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL +nla_reserve_43984 nla_reserve 3 43984 NULL +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL +scsi_command_size_43992 scsi_command_size 0 43992 NULL nohasharray -+bcm_recvmsg_43992 bcm_recvmsg 4 43992 &scsi_command_size_43992 ++kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 &scsi_command_size_43992 nohasharray ++bcm_recvmsg_43992 bcm_recvmsg 4 43992 &kvm_read_guest_virt_43992 ++ulist_add_43994 ulist_add 0 43994 NULL +emit_flags_44006 emit_flags 4-3 44006 NULL +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL -+swiotlb_unmap_page_44063 swiotlb_unmap_page 2 44063 NULL ++fru_strlen_44046 fru_strlen 0 44046 NULL ++tree_insert_offset_44069 tree_insert_offset 0 44069 NULL +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL -+load_discard_44083 load_discard 3 44083 NULL ++btrfs_prev_leaf_44083 btrfs_prev_leaf 0 44083 NULL nohasharray ++load_discard_44083 load_discard 3 44083 &btrfs_prev_leaf_44083 ++__vxge_hw_vpath_tim_configure_44093 __vxge_hw_vpath_tim_configure 2 44093 NULL +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL ++skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL ++SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL +vmw_gmr_bind_44130 vmw_gmr_bind 3 44130 NULL ++lookup_extent_data_ref_44136 lookup_extent_data_ref 0 44136 NULL ++ttm_get_pages_44142 ttm_get_pages 2 44142 NULL +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL +ubifs_find_dirty_idx_leb_44169 ubifs_find_dirty_idx_leb 0 44169 NULL +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL ++readreg_ipac_44186 readreg_ipac 0 44186 NULL +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL +IO_APIC_get_PCI_irq_vector_44198 IO_APIC_get_PCI_irq_vector 0 44198 NULL +__set_free_44211 __set_free 2 44211 NULL @@ -105868,305 +107550,361 @@ index 0000000..b04803b +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL +ioapic_register_intr_44238 ioapic_register_intr 1 44238 NULL +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL ++sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL +tc3589x_gpio_irq_map_44245 tc3589x_gpio_irq_map 2 44245 NULL -+enlarge_skb_44248 enlarge_skb 2 44248 NULL ++apei_resources_sub_44252 apei_resources_sub 0 44252 NULL ++byt_gpio_irq_map_44275 byt_gpio_irq_map 2 44275 NULL ++device_create_file_44285 device_create_file 0 44285 NULL +ufs_clusteracct_44293 ufs_clusteracct 3 44293 NULL +ocfs2_zero_range_for_truncate_44294 ocfs2_zero_range_for_truncate 3 44294 NULL +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL -+bitmap_scnprintf_44318 bitmap_scnprintf 2 44318 NULL ++bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL -+ubi_eba_write_leb_st_44343 ubi_eba_write_leb_st 5 44343 NULL ++rs_init_44327 rs_init 1 44327 NULL ++create_free_space_inode_44332 create_free_space_inode 0 44332 NULL ++insert_into_bitmap_44340 insert_into_bitmap 0 44340 NULL ++ubi_eba_write_leb_st_44343 ubi_eba_write_leb_st 0-5 44343 NULL ++radix_tree_maybe_preload_44346 radix_tree_maybe_preload 0 44346 NULL +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355 +__is_discarded_44359 __is_discarded 2 44359 NULL ++ipx_recvmsg_44366 ipx_recvmsg 4 44366 NULL ++alloc_requests_44372 alloc_requests 0 44372 NULL +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL ++iterate_dir_item_44386 iterate_dir_item 0 44386 NULL ++mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL +aoedev_flush_44398 aoedev_flush 2 44398 NULL ++strlcpy_44400 strlcpy 3 44400 NULL +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL +check_user_page_hwpoison_44412 check_user_page_hwpoison 1 44412 NULL +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL +prandom_u32_state_44445 prandom_u32_state 0 44445 NULL -+___alloc_bootmem_node_nopanic_44461 ___alloc_bootmem_node_nopanic 2-3 44461 NULL ++iwl_dbgfs_bf_params_write_44450 iwl_dbgfs_bf_params_write 3 44450 NULL ++write_file_debug_44476 write_file_debug 3 44476 NULL +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL +bio_advance_44496 bio_advance 2 44496 NULL +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL ++ac_register_board_44504 ac_register_board 3 44504 NULL +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505 +spidev_write_44510 spidev_write 3 44510 NULL -+sys_msgsnd_44537 sys_msgsnd 3 44537 NULL nohasharray -+comm_write_44537 comm_write 3 44537 &sys_msgsnd_44537 ++SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL ++ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL ++comm_write_44537 comm_write 3 44537 NULL ++xfs_log_calc_unit_res_44540 xfs_log_calc_unit_res 0-2 44540 NULL ++snd_pcm_drop_44542 snd_pcm_drop 0 44542 NULL ++dbg_chk_pnode_44555 dbg_chk_pnode 0 44555 NULL ++shmem_getpage_gfp_44556 shmem_getpage_gfp 0 44556 NULL +hash_ipport4_expire_44564 hash_ipport4_expire 3 44564 NULL +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL +snd_pcm_alloc_vmalloc_buffer_44595 snd_pcm_alloc_vmalloc_buffer 2 44595 NULL -+slip_compat_ioctl_44599 slip_compat_ioctl 4 44599 NULL -+brcmf_sdbrcm_glom_len_44618 brcmf_sdbrcm_glom_len 0 44618 NULL -+cfpkt_add_body_44630 cfpkt_add_body 3 44630 NULL -+ext2_new_block_44645 ext2_new_block 2 44645 NULL ++btrfs_qgroup_account_ref_44604 btrfs_qgroup_account_ref 0 44604 NULL ++huge_page_shift_44618 huge_page_shift 0 44618 NULL ++sysfs_add_one_44629 sysfs_add_one 0 44629 NULL ++msb_get_free_block_44633 msb_get_free_block 2 44633 NULL ++ext2_new_block_44645 ext2_new_block 2-0 44645 NULL +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL +mpi_resize_44674 mpi_resize 2 44674 NULL ++sysfs_create_link_44685 sysfs_create_link 0 44685 NULL nohasharray ++__copy_user_intel_nocache_44685 __copy_user_intel_nocache 0-3 44685 &sysfs_create_link_44685 +ts_read_44687 ts_read 3 44687 NULL +qib_get_user_pages_44689 qib_get_user_pages 1-2 44689 NULL -+xfer_to_user_44713 xfer_to_user 3 44713 NULL ++lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL ++__ocfs2_rotate_tree_left_44705 __ocfs2_rotate_tree_left 0 44705 NULL ++xfer_to_user_44713 xfer_to_user 3 44713 NULL nohasharray ++__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 &xfer_to_user_44713 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL ++SyS_read_44732 SyS_read 3 44732 NULL ++vm_insert_mixed_44738 vm_insert_mixed 3 44738 NULL +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL -+WIL_GET_BITS_44747 WIL_GET_BITS 0-1-2-3 44747 NULL -+set_brk_44749 set_brk 1 44749 NULL ++set_brk_44749 set_brk 1-2 44749 NULL +tnode_new_44757 tnode_new 3 44757 NULL nohasharray +pty_write_44757 pty_write 3 44757 &tnode_new_44757 -+__videobuf_copy_stream_44769 __videobuf_copy_stream 4 44769 NULL ++__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL ++irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL +sisusb_write_44834 sisusb_write 3 44834 NULL -+nl80211_send_unprot_disassoc_44846 nl80211_send_unprot_disassoc 4 44846 NULL +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL +cubic_root_44848 cubic_root 1 44848 NULL ++qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL +copydesc_user_44855 copydesc_user 3 44855 NULL ++i915_gem_execbuffer_relocate_44868 i915_gem_execbuffer_relocate 0 44868 NULL ++init_rs_44873 init_rs 1 44873 NULL +skb_availroom_44883 skb_availroom 0 44883 NULL -+nf_bridge_encap_header_len_44890 nf_bridge_encap_header_len 0 44890 NULL ++ocfs2_wait_for_mask_44893 ocfs2_wait_for_mask 0 44893 NULL +do_tty_write_44896 do_tty_write 5 44896 NULL ++regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL ++_snd_pcm_hw_param_last_44947 _snd_pcm_hw_param_last 0 44947 NULL ++__add_delayed_refs_44977 __add_delayed_refs 0 44977 NULL +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL -+nf_nat_seq_adjust_44989 nf_nat_seq_adjust 4 44989 NULL +map_index_to_lba_44993 map_index_to_lba 0-1 44993 NULL -+bytepos_delta_45017 bytepos_delta 0 45017 NULL ++send_chmod_45011 send_chmod 0 45011 NULL ++i915_gem_do_execbuffer_45012 i915_gem_do_execbuffer 0 45012 NULL ++bytepos_delta_45017 bytepos_delta 0-2 45017 NULL +read_block_bitmap_45021 read_block_bitmap 2 45021 NULL nohasharray +ptrace_writedata_45021 ptrace_writedata 4-3 45021 &read_block_bitmap_45021 ++dm_kvzalloc_45025 dm_kvzalloc 1-2 45025 NULL +vhci_get_user_45039 vhci_get_user 3 45039 NULL -+sel_write_user_45060 sel_write_user 3 45060 NULL ++sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL ++remap_oldmem_pfn_range_45060 remap_oldmem_pfn_range 2-3-4 45060 NULL nohasharray ++sel_write_user_45060 sel_write_user 3 45060 &remap_oldmem_pfn_range_45060 +vmscan_swappiness_45062 vmscan_swappiness 0 45062 NULL -+snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL nohasharray -+do_video_ioctl_45069 do_video_ioctl 3 45069 &snd_mixart_BA0_read_45069 ++snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL +usbdev_read_45114 usbdev_read 3 45114 NULL -+isku_sysfs_write_reset_45133 isku_sysfs_write_reset 6 45133 NULL +send_to_tty_45141 send_to_tty 3 45141 NULL +stmpe_irq_map_45146 stmpe_irq_map 2 45146 NULL -+crypto_aead_blocksize_45148 crypto_aead_blocksize 0 45148 NULL ++cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL +ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 NULL nohasharray +device_write_45156 device_write 3 45156 &ocfs2_remove_inode_range_45156 +ocfs2_dq_frozen_trigger_45159 ocfs2_dq_frozen_trigger 4 45159 NULL ++SYSC_write_45160 SYSC_write 3 45160 NULL +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL -+snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL ++sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 NULL nohasharray ++snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 &sctp_pack_cookie_45190 +num_clusters_in_group_45194 num_clusters_in_group 2 45194 NULL -+add_child_45201 add_child 4 45201 NULL ++__radix_tree_preload_45197 __radix_tree_preload 0 45197 NULL +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL +__dirty_45228 __dirty 2 45228 NULL +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL ++event_enable_write_45238 event_enable_write 3 45238 NULL +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL -+vcc_compat_ioctl_45291 vcc_compat_ioctl 3 45291 NULL ++gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL ++e1000_tx_map_45309 e1000_tx_map 5 45309 NULL +pte_val_45313 pte_val 0 45313 NULL -+__i2c_hid_command_45321 __i2c_hid_command 0 45321 NULL +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL -+lane2_associate_req_45398 lane2_associate_req 4 45398 NULL -+keymap_store_45406 keymap_store 4 45406 NULL ++null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL ++sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL +paging64_gva_to_gpa_45421 paging64_gva_to_gpa 2 45421 NULL nohasharray +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 &paging64_gva_to_gpa_45421 ++alloc_task_struct_node_45426 alloc_task_struct_node 1 45426 NULL ++ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL -+intel_render_ring_init_dri_45446 intel_render_ring_init_dri 2-3 45446 NULL nohasharray -+SYSC_mremap_45446 SYSC_mremap 5-1-2 45446 &intel_render_ring_init_dri_45446 ++SYSC_mremap_45446 SYSC_mremap 5-1-2-3 45446 NULL +__node_remap_45458 __node_remap 4 45458 NULL +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL -+udp_manip_pkt_45467 udp_manip_pkt 4 45467 NULL +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL ++snd_pcm_hwsync_45479 snd_pcm_hwsync 0 45479 NULL +arizona_init_fll_45503 arizona_init_fll 5 45503 NULL +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL -+sys_lgetxattr_45531 sys_lgetxattr 4 45531 NULL ++i40e_alloc_vfs_45511 i40e_alloc_vfs 2 45511 NULL ++__split_vma_45522 __split_vma 0 45522 NULL +cgroup_read_u64_45532 cgroup_read_u64 5 45532 NULL +copy_macs_45534 copy_macs 4 45534 NULL +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL -+atomic_long_sub_return_45551 atomic_long_sub_return 1 45551 NULL +ext3_group_first_block_no_45555 ext3_group_first_block_no 0-2 45555 NULL +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL +venus_rmdir_45564 venus_rmdir 4 45564 NULL ++btrfs_find_free_ino_45585 btrfs_find_free_ino 0 45585 NULL +ipath_create_cq_45586 ipath_create_cq 2 45586 NULL -+rdma_set_ib_paths_45592 rdma_set_ib_paths 3 45592 NULL ++ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL -+audit_log_n_hex_45617 audit_log_n_hex 3 45617 NULL -+ebitmap_next_positive_45651 ebitmap_next_positive 3 45651 NULL ++commit_cowonly_roots_45640 commit_cowonly_roots 0 45640 NULL ++ebitmap_next_positive_45651 ebitmap_next_positive 3-0 45651 NULL ++ext4_reserve_inode_write_45654 ext4_reserve_inode_write 0 45654 NULL +dma_map_cont_45668 dma_map_cont 5 45668 NULL +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL -+dm_compat_ctl_ioctl_45692 dm_compat_ctl_ioctl 3 45692 NULL +unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL nohasharray -+bscnl_emit_45699 bscnl_emit 2-5-0 45699 &unix_dgram_sendmsg_45699 -+dvb_ca_en50221_init_45718 dvb_ca_en50221_init 4 45718 NULL -+snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL -+rw_copy_check_uvector_45748 rw_copy_check_uvector 3 45748 NULL nohasharray ++bscnl_emit_45699 bscnl_emit 0-2-5 45699 &unix_dgram_sendmsg_45699 ++sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL ++snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL nohasharray ++task_cgroup_path_45734 task_cgroup_path 3 45734 &snd_cs46xx_io_read_45734 ++rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL -+nilfs_compat_ioctl_45769 nilfs_compat_ioctl 3 45769 NULL ++btrfs_delete_delayed_dir_index_45757 btrfs_delete_delayed_dir_index 0 45757 NULL +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL ++osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL ++rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL ++ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL +fm_v4l2_init_video_device_45821 fm_v4l2_init_video_device 2 45821 NULL +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL ++task_state_char_45839 task_state_char 1 45839 NULL ++__ip_select_ident_45851 __ip_select_ident 3 45851 NULL +x509_process_extension_45854 x509_process_extension 5 45854 NULL ++efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL +isdn_write_45863 isdn_write 3 45863 NULL +unpack_orig_pfns_45867 unpack_orig_pfns 0 45867 NULL ++tpm_config_in_45880 tpm_config_in 0 45880 NULL +get_rdac_req_45882 get_rdac_req 3 45882 NULL +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL ++online_page_cgroup_45894 online_page_cgroup 3 45894 NULL ++cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL -+nf_nat_ftp_fmt_cmd_45926 nf_nat_ftp_fmt_cmd 0 45926 NULL -+smp_scan_config_45934 smp_scan_config 1 45934 NULL +alloc_mr_45935 alloc_mr 1 45935 NULL -+split_large_page_45941 split_large_page 2 45941 NULL ++kmem_cache_alloc_node_trace_45968 kmem_cache_alloc_node_trace 3 45968 NULL ++copy_to_45969 copy_to 3 45969 NULL +rb_simple_read_45972 rb_simple_read 3 45972 NULL -+ezusb_writememory_45976 ezusb_writememory 4 45976 NULL +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL +ore_calc_stripe_info_46023 ore_calc_stripe_info 2 46023 NULL +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL +get_free_entries_46030 get_free_entries 1 46030 NULL -+__access_remote_vm_46031 __access_remote_vm 0-5-3 46031 NULL ++__access_remote_vm_46031 __access_remote_vm 0-3-5 46031 NULL +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL +acpi_register_gsi_xen_hvm_46052 acpi_register_gsi_xen_hvm 2 46052 NULL -+line6_midibuf_bytes_used_46059 line6_midibuf_bytes_used 0 46059 NULL -+__ocfs2_move_extent_46060 __ocfs2_move_extent 5-6 46060 NULL nohasharray ++__ocfs2_move_extent_46060 __ocfs2_move_extent 5-6-4-0-3 46060 NULL nohasharray +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 &__ocfs2_move_extent_46060 -+slhc_toss_46066 slhc_toss 0 46066 NULL +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL -+vfio_config_do_rw_46091 vfio_config_do_rw 3 46091 NULL -+ata_host_alloc_46094 ata_host_alloc 2 46094 NULL +arizona_set_irq_wake_46101 arizona_set_irq_wake 2 46101 NULL -+pkt_ctl_compat_ioctl_46110 pkt_ctl_compat_ioctl 3 46110 NULL +memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray +il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL +paging32_walk_addr_nested_46121 paging32_walk_addr_nested 3 46121 NULL -+vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 2 46146 NULL ++replay_dir_deletes_46136 replay_dir_deletes 0 46136 NULL ++rtw_buf_update_46138 rtw_buf_update 4 46138 NULL ++vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 2-3 46146 NULL +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL ++alloc_iova_46160 alloc_iova 2 46160 NULL +twl_direction_out_46182 twl_direction_out 2 46182 NULL +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL -+add_conn_list_46197 add_conn_list 3 46197 NULL ++fq_resize_46195 fq_resize 2 46195 NULL ++add_conn_list_46197 add_conn_list 3-0 46197 NULL +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL +dsp_write_46218 dsp_write 2 46218 NULL ++xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL -+nf_nat_ftp_46265 nf_nat_ftp 6 46265 NULL +ReadReg_46277 ReadReg 0 46277 NULL -+batadv_iv_ogm_queue_add_46319 batadv_iv_ogm_queue_add 3 46319 NULL -+qlcnic_83xx_sysfs_flash_bulk_write_46320 qlcnic_83xx_sysfs_flash_bulk_write 4 46320 NULL -+__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL ++sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL ++__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray ++compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL +smk_write_direct_46363 smk_write_direct 3 46363 NULL +__iommu_calculate_agaw_46366 __iommu_calculate_agaw 2 46366 NULL +ubi_dump_flash_46381 ubi_dump_flash 4 46381 NULL ++mmap_ureg_46388 mmap_ureg 3 46388 NULL ++vma_adjust_46390 vma_adjust 0 46390 NULL +fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL ++ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL ++cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL +hash_ipportip6_expire_46443 hash_ipportip6_expire 3 46443 NULL +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL ++parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL ++il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL +filldir64_46469 filldir64 3 46469 NULL ++ocfs2_reserve_clusters_with_limit_46479 ocfs2_reserve_clusters_with_limit 0 46479 NULL +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL ++p9pdu_vreadf_46500 p9pdu_vreadf 0 46500 NULL +pin_code_reply_46510 pin_code_reply 4 46510 NULL +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL -+kmsg_read_46514 kmsg_read 3 46514 NULL ++nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 NULL nohasharray ++kmsg_read_46514 kmsg_read 3 46514 &nouveau_drm_ioctl_46514 +bdx_rxdb_create_46525 bdx_rxdb_create 1 46525 NULL +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL +pm860x_irq_domain_map_46553 pm860x_irq_domain_map 2 46553 NULL -+mv_get_hc_count_46554 mv_get_hc_count 0 46554 NULL +link_send_sections_long_46556 link_send_sections_long 4 46556 NULL -+irq_domain_associate_46564 irq_domain_associate 2 46564 NULL -+dn_current_mss_46574 dn_current_mss 0 46574 NULL ++dn_current_mss_46574 dn_current_mss 0 46574 NULL nohasharray ++blk_flush_complete_seq_46574 blk_flush_complete_seq 2 46574 &dn_current_mss_46574 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL +vscnprintf_46617 vscnprintf 0-2 46617 NULL -+__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL ++__kfifo_out_r_46623 __kfifo_out_r 3-0 46623 NULL +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL ++pci_enable_device_46642 pci_enable_device 0 46642 NULL +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL +av7110_ipack_init_46655 av7110_ipack_init 2 46655 NULL ++e1000_tx_map_46672 e1000_tx_map 4 46672 NULL +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL ++ide_read_status_46719 ide_read_status 0 46719 NULL +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL -+prepare_copy_46725 prepare_copy 2 46725 NULL +irq_domain_add_simple_46734 irq_domain_add_simple 2-3 46734 NULL -+set_memory_wc_46747 set_memory_wc 1 46747 NULL +ext4_count_free_46754 ext4_count_free 2 46754 NULL nohasharray +pte_pfn_46754 pte_pfn 0 46754 &ext4_count_free_46754 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL +regcache_lzo_sync_46777 regcache_lzo_sync 2 46777 NULL -+_sys_packet_req_46793 _sys_packet_req 4 46793 NULL +_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL ++btrfs_insert_empty_items_46822 btrfs_insert_empty_items 0 46822 NULL +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL +shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL ++readreg_46845 readreg 0 46845 NULL +spi_async_46857 spi_async 0 46857 NULL +vsnprintf_46863 vsnprintf 0 46863 NULL nohasharray +SyS_move_pages_46863 SyS_move_pages 2 46863 &vsnprintf_46863 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL -+sip_sprintf_addr_46872 sip_sprintf_addr 0 46872 NULL +rvmalloc_46873 rvmalloc 1 46873 NULL -+qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 4-5 46874 NULL -+hpi_read_word_nolock_46881 hpi_read_word_nolock 0 46881 NULL ++qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL ++lov_iocontrol_46876 lov_iocontrol 3 46876 NULL +stmpe_gpio_irq_unmap_46884 stmpe_gpio_irq_unmap 2 46884 NULL +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL -+ol_dqblk_off_46904 ol_dqblk_off 3-2 46904 NULL ++ol_dqblk_off_46904 ol_dqblk_off 2-3 46904 NULL +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL -+wlcore_alloc_hw_46917 wlcore_alloc_hw 1 46917 NULL ++wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL +fb_write_46924 fb_write 3 46924 NULL -+btmrvl_curpsmode_read_46939 btmrvl_curpsmode_read 3 46939 NULL ++i915_gem_check_olr_46925 i915_gem_check_olr 0 46925 NULL +kvm_register_read_46948 kvm_register_read 0 46948 NULL +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL ++SYSC_poll_46965 SYSC_poll 2 46965 NULL +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL ++strlcat_46985 strlcat 3 46985 NULL ++bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL +gfs2_xattr_system_set_46996 gfs2_xattr_system_set 4 46996 NULL nohasharray +sel_write_bool_46996 sel_write_bool 3 46996 &gfs2_xattr_system_set_46996 +ttm_bo_io_47000 ttm_bo_io 5 47000 NULL +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL -+add_free_space_entry_47005 add_free_space_entry 2 47005 NULL -+__map_single_47020 __map_single 3-4-7 47020 NULL -+cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2 47024 NULL -+swiotlb_sync_single_47031 swiotlb_sync_single 2 47031 NULL -+set_dis_bypass_pfs_47038 set_dis_bypass_pfs 3 47038 NULL ++__map_single_47020 __map_single 3-4-7-0 47020 NULL ++cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL +fs_path_len_47060 fs_path_len 0 47060 NULL -+ufs_new_fragments_47070 ufs_new_fragments 3-5-4 47070 NULL ++ufs_new_fragments_47070 ufs_new_fragments 4-3-5 47070 NULL nohasharray ++ext4_xattr_list_entries_47070 ext4_xattr_list_entries 0-4 47070 &ufs_new_fragments_47070 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL ++ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL ++tboot_log_read_47110 tboot_log_read 3 47110 NULL +mousedev_read_47123 mousedev_read 3 47123 NULL ++ubi_compare_lebs_47141 ubi_compare_lebs 0 47141 NULL +ses_recv_diag_47143 ses_recv_diag 4 47143 NULL nohasharray +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 &ses_recv_diag_47143 -+persistent_ram_iomap_47156 persistent_ram_iomap 1-2 47156 NULL +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL ++bpf_alloc_binary_47170 bpf_alloc_binary 1 47170 NULL +rts51x_ms_rw_47171 rts51x_ms_rw 3-4 47171 NULL -+svc_pool_map_alloc_arrays_47181 svc_pool_map_alloc_arrays 2 47181 NULL ++btrfs_del_inode_ref_47181 btrfs_del_inode_ref 0 47181 NULL +can_set_system_xattr_47182 can_set_system_xattr 4 47182 NULL -+ioremap_cache_47189 ioremap_cache 1-2 47189 NULL -+gnttab_set_map_op_47206 gnttab_set_map_op 2 47206 NULL -+l2headersize_47238 l2headersize 0 47238 NULL +options_write_47243 options_write 3 47243 NULL +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL +da9052_disable_irq_nosync_47260 da9052_disable_irq_nosync 2 47260 NULL -+ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL -+tty_audit_log_47280 tty_audit_log 8 47280 NULL ++p9pdu_readf_47269 p9pdu_readf 0 47269 NULL ++ablkcipher_next_slow_47274 ablkcipher_next_slow 3-4 47274 NULL +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL +vsnprintf_47291 vsnprintf 0 47291 NULL -+SYSC_semop_47292 SYSC_semop 3 47292 NULL +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL -+SyS_madvise_47354 SyS_madvise 1 47354 NULL ++iterate_inode_ref_47322 iterate_inode_ref 0 47322 NULL ++SyS_madvise_47354 SyS_madvise 1-2 47354 NULL +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL +find_first_zero_bit_le_47369 find_first_zero_bit_le 2 47369 NULL @@ -106177,79 +107915,104 @@ index 0000000..b04803b +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL +gfn_to_pfn_prot_47398 gfn_to_pfn_prot 2 47398 NULL ++lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL +ocfs2_resv_end_47408 ocfs2_resv_end 0 47408 NULL +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL ++lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL +vzalloc_47421 vzalloc 1 47421 NULL +hash_ipportip4_expire_47426 hash_ipportip4_expire 3 47426 NULL +posix_acl_from_disk_47445 posix_acl_from_disk 2 47445 NULL ++numaq_apicid_to_cpu_present_47449 numaq_apicid_to_cpu_present 1 47449 NULL ++environ_read_47451 environ_read 3 47451 NULL +__load_mapping_47460 __load_mapping 2 47460 NULL ++try_lock_extent_47465 try_lock_extent 0 47465 NULL +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL +wb_force_mapping_47485 wb_force_mapping 2 47485 NULL nohasharray -+newpart_47485 newpart 6 47485 &wb_force_mapping_47485 ++newpart_47485 newpart 6-4 47485 &wb_force_mapping_47485 ++mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL +core_sys_select_47494 core_sys_select 1 47494 NULL -+alloc_arraycache_47505 alloc_arraycache 2 47505 NULL ++read_block_for_search_47502 read_block_for_search 0 47502 NULL ++alloc_arraycache_47505 alloc_arraycache 2-1 47505 NULL nohasharray ++btrfs_init_inode_security_47505 btrfs_init_inode_security 0 47505 &alloc_arraycache_47505 +unlink_simple_47506 unlink_simple 3 47506 NULL ++pstore_decompress_47510 pstore_decompress 0 47510 NULL +ufs_inode_getblock_47512 ufs_inode_getblock 4 47512 NULL ++__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL ++snd_pcm_resume_47530 snd_pcm_resume 0 47530 NULL +vscnprintf_47533 vscnprintf 0-2 47533 NULL nohasharray +process_vm_rw_47533 process_vm_rw 3-5 47533 &vscnprintf_47533 -+oz_events_read_47535 oz_events_read 3 47535 NULL ++einj_check_trigger_header_47534 einj_check_trigger_header 0 47534 NULL +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL ++ocfs2_resv_find_window_47557 ocfs2_resv_find_window 3 47557 NULL +read_ldt_47570 read_ldt 2 47570 NULL -+_rtl_rx_get_padding_47572 _rtl_rx_get_padding 0 47572 NULL nohasharray -+isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 &_rtl_rx_get_padding_47572 -+pci_iomap_47575 pci_iomap 3 47575 NULL -+rpipe_get_idx_47579 rpipe_get_idx 2 47579 NULL ++isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL ++rpipe_get_idx_47579 rpipe_get_idx 2-0 47579 NULL +SYSC_fcntl64_47581 SYSC_fcntl64 3 47581 NULL ++vendorextnReadSection_47583 vendorextnReadSection 0 47583 NULL ++btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL -+sctp_ssnmap_new_47608 sctp_ssnmap_new 1-2 47608 NULL -+uea_request_47613 uea_request 4 47613 NULL ++sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL +irq_set_chip_47638 irq_set_chip 1 47638 NULL -+__build_packet_message_47643 __build_packet_message 3-9 47643 NULL ++get_size_47644 get_size 1-2 47644 NULL ++snd_pcm_info_47699 snd_pcm_info 0 47699 NULL ++packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray ++ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700 +global_rt_runtime_47712 global_rt_runtime 0 47712 NULL +save_microcode_47717 save_microcode 3 47717 NULL -+bits_to_user_47733 bits_to_user 2-3 47733 NULL ++bits_to_user_47733 bits_to_user 3-2 47733 NULL +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL +ext3_find_near_47752 ext3_find_near 0 47752 NULL +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL -+i915_wedged_write_47771 i915_wedged_write 3 47771 NULL +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL -+stmmac_set_bfsize_47834 stmmac_set_bfsize 0 47834 NULL ++W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL ++lov_packmd_47810 lov_packmd 0 47810 NULL ++pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL +ubifs_unpack_nnode_47866 ubifs_unpack_nnode 0 47866 NULL +vhci_read_47878 vhci_read 3 47878 NULL ++ubi_wl_put_peb_47886 ubi_wl_put_peb 0 47886 NULL +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL +load_mapping_47904 load_mapping 3 47904 NULL -+osd_req_read_sg_47905 osd_req_read_sg 5 47905 NULL ++btrfs_duplicate_item_47910 btrfs_duplicate_item 0 47910 NULL ++cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL +comedi_write_47926 comedi_write 3 47926 NULL +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL +lp8788_irq_map_47964 lp8788_irq_map 2 47964 NULL ++gether_get_ifname_47972 gether_get_ifname 3 47972 NULL +iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 NULL nohasharray +mempool_resize_47983 mempool_resize 2 47983 &iwl_dbgfs_ucode_tracing_read_47983 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL +ib_umad_write_47993 ib_umad_write 3 47993 NULL ++ocfs2_find_refcount_split_pos_48001 ocfs2_find_refcount_split_pos 0 48001 NULL ++lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL ++gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL +ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL +SYSC_writev_48040 SYSC_writev 3 48040 NULL ++btrfs_reserve_extent_48044 btrfs_reserve_extent 6 48044 NULL +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL ++ocfs2_change_refcount_rec_48059 ocfs2_change_refcount_rec 0 48059 NULL +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL +disc_write_48070 disc_write 3 48070 NULL +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL -+skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL ++skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5-0 48102 NULL +radio_isa_common_probe_48107 radio_isa_common_probe 3 48107 NULL +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL +set_discoverable_48141 set_discoverable 4 48141 NULL +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL -+bitmap_onto_48152 bitmap_onto 4 48152 NULL ++get_cur_inode_state_48149 get_cur_inode_state 0 48149 NULL ++_add_to_r4w_48152 _add_to_r4w 4 48152 NULL nohasharray ++bitmap_onto_48152 bitmap_onto 4 48152 &_add_to_r4w_48152 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL +ocfs2_find_next_zero_bit_unaligned_48170 ocfs2_find_next_zero_bit_unaligned 2-3 48170 NULL nohasharray @@ -106257,379 +108020,467 @@ index 0000000..b04803b +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL +init_ipath_48187 init_ipath 1 48187 NULL +brcmf_sdio_chip_cm3_exitdl_48192 brcmf_sdio_chip_cm3_exitdl 4 48192 NULL ++cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL ++ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL ++ll_direct_IO_26_48216 ll_direct_IO_26 4 48216 NULL +is_block_in_journal_48223 is_block_in_journal 3 48223 NULL +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL +read_file_recv_48232 read_file_recv 3 48232 NULL -+unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL ++unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL nohasharray ++blk_rq_pos_48233 blk_rq_pos 0 48233 &unaccount_shadowed_48233 ++nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL ++batadv_socket_read_48257 batadv_socket_read 3 48257 NULL +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL ++trace_options_write_48275 trace_options_write 3 48275 NULL +send_set_info_48288 send_set_info 7 48288 NULL -+set_disc_pwup_pfs_48300 set_disc_pwup_pfs 3 48300 NULL +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL +timblogiw_read_48305 timblogiw_read 3 48305 NULL +hash_setkey_48310 hash_setkey 3 48310 NULL ++audio_set_intf_req_48319 audio_set_intf_req 0 48319 NULL ++kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL +__alloc_fd_48356 __alloc_fd 2 48356 NULL +skb_add_data_48363 skb_add_data 3 48363 NULL +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL -+ixgbe_pci_sriov_enable_48410 ixgbe_pci_sriov_enable 2 48410 NULL +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL ++uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL ++div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL ++snd_power_wait_48422 snd_power_wait 0 48422 NULL +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL -+nfs4_alloc_pages_48426 nfs4_alloc_pages 1 48426 NULL ++hugepage_madvise_48435 hugepage_madvise 0 48435 NULL +print_filtered_48442 print_filtered 2-0 48442 NULL +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL ++compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL ++ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL ++ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL +send_control_msg_48498 send_control_msg 6 48498 NULL +mlx4_en_create_tx_ring_48501 mlx4_en_create_tx_ring 4 48501 NULL +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL +phantom_get_free_48514 phantom_get_free 0 48514 NULL -+wiimote_hid_send_48528 wiimote_hid_send 3 48528 NULL ++drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL +ext3_splice_branch_48531 ext3_splice_branch 6 48531 NULL -+named_distribute_48544 named_distribute 4 48544 NULL +raid10_size_48571 raid10_size 0-2-3 48571 NULL ++llog_data_len_48607 llog_data_len 1 48607 NULL +ufs_dtogd_48616 ufs_dtogd 0-2 48616 NULL +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL ++ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL +mtd_read_48655 mtd_read 0 48655 NULL +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL -+ore_get_rw_state_48667 ore_get_rw_state 4 48667 NULL -+sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL nohasharray -+sys_setgroups_48668 sys_setgroups 1 48668 &sm501_create_subdev_48668 ++ore_get_rw_state_48667 ore_get_rw_state 5-4 48667 NULL ++sm501_create_subdev_48668 sm501_create_subdev 4-3 48668 NULL ++ubi_eba_unmap_leb_48671 ubi_eba_unmap_leb 0 48671 NULL ++hysdn_log_write_48694 hysdn_log_write 3 48694 NULL +altera_drscan_48698 altera_drscan 2 48698 NULL +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL ++recv_msg_48709 recv_msg 4 48709 NULL ++lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL ++SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL -+l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL -+lua_sysfs_write_48797 lua_sysfs_write 6 48797 NULL ++event_buffer_read_48772 event_buffer_read 3 48772 NULL nohasharray ++l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 &event_buffer_read_48772 ++gfs2_direct_IO_48774 gfs2_direct_IO 4 48774 NULL +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL ++register_ftrace_profiler_48816 register_ftrace_profiler 0 48816 NULL +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL -+efi_memory_uc_48828 efi_memory_uc 1 48828 NULL +azx_get_position_48841 azx_get_position 0 48841 NULL -+vc_do_resize_48842 vc_do_resize 3-4 48842 NULL ++vc_do_resize_48842 vc_do_resize 4-3 48842 NULL ++comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL ++suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL +C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 NULL nohasharray +viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 &C_SYSC_pwritev64_48864 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL -+sys_setgroups16_48882 sys_setgroups16 1 48882 NULL +ext2_alloc_branch_48889 ext2_alloc_branch 4 48889 NULL +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL ++joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL -+gdth_isa_probe_one_48925 gdth_isa_probe_one 1 48925 NULL ++snd_pcm_update_hw_ptr_48925 snd_pcm_update_hw_ptr 0 48925 NULL +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL ++si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL +batadv_orig_hash_del_if_48972 batadv_orig_hash_del_if 2 48972 NULL -+_alloc_set_attr_list_48991 _alloc_set_attr_list 4 48991 NULL ++btrfs_delete_delayed_insertion_item_48981 btrfs_delete_delayed_insertion_item 0 48981 NULL +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL ++null_alloc_rs_49019 null_alloc_rs 2 49019 NULL +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL ++aic_inb_49023 aic_inb 0 49023 NULL +transient_status_49027 transient_status 4 49027 NULL -+ipath_reg_user_mr_49038 ipath_reg_user_mr 2-3 49038 NULL ++iwl_mvm_power_legacy_dbgfs_read_49038 iwl_mvm_power_legacy_dbgfs_read 4 49038 NULL nohasharray ++ipath_reg_user_mr_49038 ipath_reg_user_mr 2-3 49038 &iwl_mvm_power_legacy_dbgfs_read_49038 ++aic7xxx_rem_scb_from_disc_list_49041 aic7xxx_rem_scb_from_disc_list 0 49041 NULL +setup_msi_irq_49052 setup_msi_irq 3-4 49052 NULL +ubi_read_49061 ubi_read 0 49061 NULL +scsi_register_49094 scsi_register 2 49094 NULL +paging64_walk_addr_nested_49100 paging64_walk_addr_nested 3 49100 NULL +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL -+check_exists_49119 check_exists 2 49119 NULL nohasharray -+xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 &check_exists_49119 -+pt_read_49136 pt_read 3 49136 NULL -+tipc_multicast_49144 tipc_multicast 5 49144 NULL -+atyfb_setup_generic_49151 atyfb_setup_generic 3 49151 NULL ++xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL ++ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL ++qib_user_sdma_pin_pages_49136 qib_user_sdma_pin_pages 4-5-6 49136 NULL nohasharray ++pt_read_49136 pt_read 3 49136 &qib_user_sdma_pin_pages_49136 ++read_file_49137 read_file 4 49137 NULL +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL +ext4_free_clusters_after_init_49174 ext4_free_clusters_after_init 2 49174 NULL ++__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL ++ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL ++print_queue_49191 print_queue 0 49191 NULL ++root_nfs_cat_49192 root_nfs_cat 3 49192 NULL +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL +resp_write_same_49217 resp_write_same 2 49217 NULL +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL -+nouveau_i2c_port_create__49237 nouveau_i2c_port_create_ 6 49237 NULL +hugetlb_cgroup_read_49259 hugetlb_cgroup_read 5 49259 NULL +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL -+osd_req_add_get_attr_list_49278 osd_req_add_get_attr_list 3 49278 NULL ++ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL ++__ext4_ext_dirty_49284 __ext4_ext_dirty 0 49284 NULL ++ext4_xattr_ibody_list_49287 ext4_xattr_ibody_list 3-0 49287 NULL ++viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL +uio_read_49300 uio_read 3 49300 NULL +ocfs2_resmap_find_free_bits_49301 ocfs2_resmap_find_free_bits 3 49301 NULL +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL -+SYSC_mincore_49319 SYSC_mincore 1 49319 NULL ++update_ref_for_cow_49313 update_ref_for_cow 0 49313 NULL ++SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL -+srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-3-4 49330 NULL -+cfpkt_setlen_49343 cfpkt_setlen 2 49343 NULL ++srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL ++__intel_map_single_49338 __intel_map_single 3-2 49338 NULL ++intel_ring_invalidate_all_caches_49346 intel_ring_invalidate_all_caches 0 49346 NULL +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL -+ocfs2_remove_btree_range_49370 ocfs2_remove_btree_range 4-5-3 49370 NULL -+px_raw_event_49371 px_raw_event 4 49371 NULL ++ocfs2_remove_btree_range_49370 ocfs2_remove_btree_range 4-3-5 49370 NULL +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL -+applesmc_create_nodes_49392 applesmc_create_nodes 2 49392 NULL ++ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL +tnode_alloc_49407 tnode_alloc 1 49407 NULL +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL -+md_domain_init_49432 md_domain_init 2 49432 NULL ++ubi_add_to_av_49432 ubi_add_to_av 0 49432 NULL nohasharray ++md_domain_init_49432 md_domain_init 2 49432 &ubi_add_to_av_49432 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL +get_lru_size_49441 get_lru_size 0 49441 NULL ++i915_gem_object_set_to_gtt_domain_49450 i915_gem_object_set_to_gtt_domain 0 49450 NULL ++ocfs2_merge_rec_left_49455 ocfs2_merge_rec_left 0 49455 NULL ++__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL +xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL +savu_sysfs_read_49473 savu_sysfs_read 6 49473 NULL +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL -+acpi_os_ioremap_49523 acpi_os_ioremap 1-2 49523 NULL ++btrfs_add_free_space_49524 btrfs_add_free_space 0 49524 NULL +smk_write_access_49561 smk_write_access 3 49561 NULL +ntfs_malloc_nofs_49572 ntfs_malloc_nofs 1 49572 NULL +alloc_chunk_49575 alloc_chunk 1 49575 NULL +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL ++readfifo_49583 readfifo 1 49583 NULL +tap_write_49595 tap_write 3 49595 NULL ++create_task_io_context_49601 create_task_io_context 3 49601 NULL +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL +heap_init_49617 heap_init 2 49617 NULL +smk_write_doi_49621 smk_write_doi 3 49621 NULL ++port_fops_read_49626 port_fops_read 3 49626 NULL +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL ++__swab32p_49657 __swab32p 0 49657 NULL ++ubi_wl_flush_49682 ubi_wl_flush 0 49682 NULL +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL -+sys_gethostname_49698 sys_gethostname 2 49698 NULL ++__setup_irq_49696 __setup_irq 0 49696 NULL +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL ++do_splice_to_49714 do_splice_to 4 49714 NULL ++write_pool_49718 write_pool 3 49718 NULL +dm_thin_insert_block_49720 dm_thin_insert_block 2-3 49720 NULL ++kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL -+sys_fsetxattr_49736 sys_fsetxattr 4 49736 NULL -+check_frame_49741 check_frame 0 49741 NULL +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL +fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL -+isku_sysfs_write_49767 isku_sysfs_write 6-5 49767 NULL -+ceph_osdc_readpages_49789 ceph_osdc_readpages 10-4 49789 NULL ++w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL ++ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL -+arch_gnttab_map_status_49812 arch_gnttab_map_status 3 49812 NULL +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL +add_uuid_49831 add_uuid 4 49831 NULL -+tcf_csum_ipv4_tcp_49834 tcf_csum_ipv4_tcp 3 49834 NULL +ath6kl_fwlog_block_read_49836 ath6kl_fwlog_block_read 3 49836 NULL ++iraw_loop_49842 iraw_loop 0-1 49842 NULL +twl4030_write_49846 twl4030_write 2 49846 NULL +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL +timeradd_entry_49850 timeradd_entry 3 49850 NULL ++ubifs_destroy_tnc_subtree_49853 ubifs_destroy_tnc_subtree 0 49853 NULL +btrfs_subvolume_reserve_metadata_49859 btrfs_subvolume_reserve_metadata 3 49859 NULL ++fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL ++snd_mask_eq_49889 snd_mask_eq 0 49889 NULL +ceph_get_caps_49890 ceph_get_caps 0 49890 NULL ++osc_brw_49896 osc_brw 4 49896 NULL +__cow_file_range_49901 __cow_file_range 5 49901 NULL +__copy_from_user_inatomic_nocache_49921 __copy_from_user_inatomic_nocache 3 49921 NULL ++config_ep_by_speed_49939 config_ep_by_speed 0 49939 NULL +batadv_tt_realloc_packet_buff_49960 batadv_tt_realloc_packet_buff 4 49960 NULL -+b43legacy_pio_read_49978 b43legacy_pio_read 0 49978 NULL +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL ++drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL +sta2x11_swiotlb_alloc_coherent_49994 sta2x11_swiotlb_alloc_coherent 2 49994 NULL +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL +__module_alloc_50004 __module_alloc 1 50004 NULL +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL +ptrace_readdata_50020 ptrace_readdata 2-4 50020 NULL +isdn_read_50021 isdn_read 3 50021 NULL ++mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL +qp_alloc_queue_50028 qp_alloc_queue 1 50028 NULL -+alloc_ebda_hpc_50046 alloc_ebda_hpc 1-2 50046 NULL ++ioread8_50049 ioread8 0 50049 NULL ++fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL +vmw_surface_destroy_size_50072 vmw_surface_destroy_size 0 50072 NULL +arch_setup_ht_irq_50073 arch_setup_ht_irq 1 50073 NULL ++__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL +dev_set_alias_50084 dev_set_alias 3 50084 NULL -+pcpu_get_vm_areas_50085 pcpu_get_vm_areas 3 50085 NULL ++libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL ++android_set_cntry_50100 android_set_cntry 0 50100 NULL ++process_recorded_refs_50110 process_recorded_refs 0 50110 NULL +read_file_slot_50111 read_file_slot 3 50111 NULL ++xfs_dir3_sf_entsize_50112 xfs_dir3_sf_entsize 0-3 50112 NULL ++rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL ++ocfs2_search_one_group_50125 ocfs2_search_one_group 0 50125 NULL nohasharray ++jfs_direct_IO_50125 jfs_direct_IO 4 50125 &ocfs2_search_one_group_50125 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL +copy_items_50140 copy_items 6 50140 NULL +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL -+set_cmd_header_50155 set_cmd_header 0 50155 NULL +reiserfs_bmap_count_50160 reiserfs_bmap_count 0 50160 NULL -+aac_nark_ioremap_50163 aac_nark_ioremap 2 50163 NULL nohasharray -+kmalloc_node_50163 kmalloc_node 1 50163 &aac_nark_ioremap_50163 ++kmalloc_node_50163 kmalloc_node 1-3 50163 NULL +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL ++ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL +odev_update_50169 odev_update 2 50169 NULL +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 NULL nohasharray -+ubi_resize_volume_50172 ubi_resize_volume 2 50172 &ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 -+ib_send_cm_drep_50186 ib_send_cm_drep 3 50186 NULL -+cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL ++xfs_get_blocks_direct_50172 xfs_get_blocks_direct 2 50172 &ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 nohasharray ++ubi_resize_volume_50172 ubi_resize_volume 2 50172 &xfs_get_blocks_direct_50172 ++ext3_do_update_inode_50178 ext3_do_update_inode 0 50178 NULL ++cfg80211_roamed_bss_50198 cfg80211_roamed_bss 6-4 50198 NULL ++cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL -+ieee80211_skb_resize_50211 ieee80211_skb_resize 3 50211 NULL ++compat_SyS_sendfile_50206 compat_SyS_sendfile 4 50206 NULL nohasharray ++mthca_buddy_init_50206 mthca_buddy_init 2 50206 &compat_SyS_sendfile_50206 ++l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL -+afs_extract_data_50261 afs_extract_data 5 50261 NULL ++vma_dup_policy_50269 vma_dup_policy 0 50269 NULL +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL -+soc_codec_reg_show_50302 soc_codec_reg_show 0 50302 NULL ++soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL ++iterate_irefs_50313 iterate_irefs 0 50313 NULL +soc_camera_read_50319 soc_camera_read 3 50319 NULL +do_launder_page_50329 do_launder_page 0 50329 NULL +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL +ocfs2_block_to_cluster_group_50337 ocfs2_block_to_cluster_group 2 50337 NULL nohasharray +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 &ocfs2_block_to_cluster_group_50337 -+roccat_common2_send_with_status_50343 roccat_common2_send_with_status 4 50343 NULL +tpm_read_50344 tpm_read 3 50344 NULL +sched_clock_remote_50347 sched_clock_remote 0 50347 NULL ++efx_nic_update_stats_50352 efx_nic_update_stats 2 50352 NULL +kvm_arch_create_memslot_50354 kvm_arch_create_memslot 2 50354 NULL +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL -+unpack_u16_chunk_50357 unpack_u16_chunk 0 50357 NULL ++ocfs2_figure_insert_type_50362 ocfs2_figure_insert_type 0 50362 NULL nohasharray ++iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 &ocfs2_figure_insert_type_50362 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL +hash_ip6_expire_50390 hash_ip6_expire 3 50390 NULL ++snd_mask_refine_last_50406 snd_mask_refine_last 0 50406 NULL +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL -+ceph_writepages_osd_request_50423 ceph_writepages_osd_request 5 50423 NULL +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL -+btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL ++btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL nohasharray ++ecryptfs_write_lower_page_segment_50444 ecryptfs_write_lower_page_segment 4 50444 &btrfs_error_discard_extent_50444 +calc_csum_metadata_size_50448 calc_csum_metadata_size 0 50448 NULL +pgctrl_write_50453 pgctrl_write 3 50453 NULL ++device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL +force_mapping_50464 force_mapping 2 50464 NULL ++cfs_size_round_50472 cfs_size_round 0-1 50472 NULL +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL -+fwnet_receive_packet_50537 fwnet_receive_packet 9 50537 NULL ++__ctzdi2_50536 __ctzdi2 1 50536 NULL +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL -+hme_read_desc32_50574 hme_read_desc32 0 50574 NULL ++usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL ++self_check_peb_vid_hdr_50563 self_check_peb_vid_hdr 0 50563 NULL nohasharray ++ttm_agp_tt_create_50563 ttm_agp_tt_create 3 50563 &self_check_peb_vid_hdr_50563 +fat_readpages_50582 fat_readpages 4 50582 NULL +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL +build_inv_iommu_pages_50589 build_inv_iommu_pages 2-3 50589 NULL -+sge_rx_50594 sge_rx 3 50594 NULL ++xillybus_write_50605 xillybus_write 3 50605 NULL +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL -+__ffs_50625 __ffs 0 50625 NULL ++ocfs2_split_extent_50618 ocfs2_split_extent 0 50618 NULL ++sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL ++__ffs_50625 __ffs 0-1 50625 NULL +regcache_rbtree_write_50629 regcache_rbtree_write 2 50629 NULL +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL -+ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL nohasharray -+sys_readv_50664 sys_readv 3 50664 &ath6kl_tm_rx_event_50664 ++ocfs2_do_insert_extent_50658 ocfs2_do_insert_extent 0 50658 NULL ++ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL -+ext2_try_to_allocate_with_rsv_50669 ext2_try_to_allocate_with_rsv 4-2 50669 NULL -+btmrvl_psstate_read_50683 btmrvl_psstate_read 3 50683 NULL -+swiotlb_free_coherent_50690 swiotlb_free_coherent 4 50690 NULL ++ext2_try_to_allocate_with_rsv_50669 ext2_try_to_allocate_with_rsv 4-2-0 50669 NULL ++prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL nohasharray ++i2c_smbus_read_byte_data_50689 i2c_smbus_read_byte_data 0 50689 &prism2_read_fid_reg_50689 +paging32_gva_to_gpa_50696 paging32_gva_to_gpa 2 50696 NULL +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL ++dev_mem_read_50706 dev_mem_read 3 50706 NULL +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL -+skb_padto_50759 skb_padto 2 50759 NULL ++btrfs_truncate_free_space_cache_50769 btrfs_truncate_free_space_cache 0 50769 NULL +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL -+bio_alloc_map_data_50782 bio_alloc_map_data 1-2 50782 NULL ++bio_alloc_map_data_50782 bio_alloc_map_data 2-1 50782 NULL +tpm_write_50798 tpm_write 3 50798 NULL +write_flush_50803 write_flush 3 50803 NULL +dvb_play_50814 dvb_play 3 50814 NULL +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL +acpi_ev_install_gpe_block_50829 acpi_ev_install_gpe_block 2 50829 NULL +SetArea_50835 SetArea 4 50835 NULL nohasharray -+create_mem_extents_50835 create_mem_extents 0 50835 &SetArea_50835 -+videobuf_dma_init_user_50839 videobuf_dma_init_user 3 50839 NULL -+self_check_write_50856 self_check_write 5 50856 NULL ++create_mem_extents_50835 create_mem_extents 0 50835 &SetArea_50835 nohasharray ++mask_from_50835 mask_from 0-1-2 50835 &create_mem_extents_50835 ++videobuf_dma_init_user_50839 videobuf_dma_init_user 3-4 50839 NULL ++btrfs_search_slot_for_read_50843 btrfs_search_slot_for_read 0 50843 NULL ++self_check_write_50856 self_check_write 0-5 50856 NULL +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL ++__percpu_counter_init_50878 __percpu_counter_init 0 50878 NULL ++btrfs_insert_inode_ref_50884 btrfs_insert_inode_ref 0 50884 NULL +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL -+osd_req_write_sg_50908 osd_req_write_sg 5 50908 NULL ++__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL ++show_device_status_50947 show_device_status 0 50947 NULL ++irq_timeout_write_50950 irq_timeout_write 3 50950 NULL +ocfs2_add_refcount_flag_50952 ocfs2_add_refcount_flag 6 50952 NULL ++sdio_uart_write_50954 sdio_uart_write 3 50954 NULL +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL ++btrfs_del_csums_50969 btrfs_del_csums 0 50969 NULL ++__btrfs_mod_ref_50973 __btrfs_mod_ref 0 50973 NULL +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL +timeout_write_50991 timeout_write 3 50991 NULL +wm831x_irq_map_50995 wm831x_irq_map 2 50995 NULL +proc_write_51003 proc_write 3 51003 NULL -+snd_pcm_default_page_ops_51021 snd_pcm_default_page_ops 2 51021 NULL ++jbd2_journal_extend_51012 jbd2_journal_extend 2-0 51012 NULL +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL +ntfs_attr_find_51028 ntfs_attr_find 0 51028 NULL nohasharray +fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 &ntfs_attr_find_51028 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL +dump_midi_51040 dump_midi 3 51040 NULL ++usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL +solo_enc_v4l2_init_51094 solo_enc_v4l2_init 2 51094 NULL +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL -+ti_recv_51110 ti_recv 3 51110 NULL -+dgrp_net_read_51113 dgrp_net_read 3 51113 NULL ++btrfs_del_item_51110 btrfs_del_item 0 51110 NULL nohasharray ++ti_recv_51110 ti_recv 3 51110 &btrfs_del_item_51110 ++uasp_prepare_r_request_51124 uasp_prepare_r_request 0 51124 NULL +nfs_map_name_to_uid_51132 nfs_map_name_to_uid 3 51132 NULL +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL +set_dirty_51144 set_dirty 3 51144 NULL +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL -+compat_sys_pwritev64_51151 compat_sys_pwritev64 3 51151 NULL -+blk_bio_map_sg_51213 blk_bio_map_sg 0 51213 NULL ++walk_page_buffers_51170 walk_page_buffers 0 51170 NULL ++snd_pcm_unlink_51210 snd_pcm_unlink 0 51210 NULL ++uhci_frame_skel_link_51213 uhci_frame_skel_link 2 51213 NULL +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL +tipc_send_51238 tipc_send 4 51238 NULL +drm_property_create_51239 drm_property_create 4 51239 NULL ++__mxt_read_reg_51249 __mxt_read_reg 0 51249 NULL +st_read_51251 st_read 3 51251 NULL +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL ++target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL -+zone_reclaimable_pages_51283 zone_reclaimable_pages 0 51283 NULL ++zone_reclaimable_pages_51283 zone_reclaimable_pages 0 51283 NULL nohasharray ++__get_cur_name_and_parent_51283 __get_cur_name_and_parent 0 51283 &zone_reclaimable_pages_51283 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL +get_cell_51316 get_cell 2 51316 NULL +init_map_ipmac_51317 init_map_ipmac 4-3-5 51317 NULL ++ocfs2_read_inode_block_51319 ocfs2_read_inode_block 0 51319 NULL +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL nohasharray -+compat_arch_ptrace_51337 compat_arch_ptrace 3-4 51337 &alloc_smp_req_51337 ++compat_arch_ptrace_51337 compat_arch_ptrace 3 51337 &alloc_smp_req_51337 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL -+ieee80211_wx_set_gen_ie_51399 ieee80211_wx_set_gen_ie 3 51399 NULL -+ceph_sync_read_51410 ceph_sync_read 3 51410 NULL -+x86_swiotlb_free_coherent_51421 x86_swiotlb_free_coherent 4 51421 NULL ++pci_sriov_resource_alignment_51406 pci_sriov_resource_alignment 0 51406 NULL ++ceph_sync_read_51410 ceph_sync_read 3-0 51410 NULL ++get_first_ref_51413 get_first_ref 0 51413 NULL ++__btrfs_end_transaction_51420 __btrfs_end_transaction 0 51420 NULL +blk_register_region_51424 blk_register_region 1-2 51424 NULL +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL ++hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL -+vaddr_51480 vaddr 0 51480 NULL -+skb_inner_mac_header_51482 skb_inner_mac_header 0 51482 NULL nohasharray -+btrfs_find_space_cluster_51482 btrfs_find_space_cluster 5 51482 &skb_inner_mac_header_51482 -+__cpa_process_fault_51502 __cpa_process_fault 2 51502 NULL ++btrfs_find_space_cluster_51482 btrfs_find_space_cluster 5 51482 NULL ++kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL ++key_search_51533 key_search 0 51533 NULL +load_pdptrs_51541 load_pdptrs 3 51541 NULL +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL -+icmp_manip_pkt_51560 icmp_manip_pkt 4 51560 NULL +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL ++get_cur_path_51589 get_cur_path 0 51589 NULL nohasharray ++snd_interval_refine_first_51589 snd_interval_refine_first 0 51589 &get_cur_path_51589 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL -+raw_ioctl_51607 raw_ioctl 3 51607 NULL +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL -+gnttab_end_foreign_access_51617 gnttab_end_foreign_access 3 51617 NULL -+dns_resolve_server_name_to_ip_51632 dns_resolve_server_name_to_ip 0 51632 NULL ++extent_fiemap_51621 extent_fiemap 3 51621 NULL +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL +get_new_cssid_51665 get_new_cssid 2 51665 NULL +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL -+sfi_sysfs_install_table_51688 sfi_sysfs_install_table 1 51688 NULL +host_mapping_level_51696 host_mapping_level 2 51696 NULL +sel_write_access_51704 sel_write_access 3 51704 NULL +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL -+hid_parse_report_51737 hid_parse_report 3 51737 NULL -+get_user_pages_fast_51751 get_user_pages_fast 0-1-2 51751 NULL ++dbg_check_lpt_nodes_51727 dbg_check_lpt_nodes 0 51727 NULL ++cm4040_read_51732 cm4040_read 3 51732 NULL ++get_user_pages_fast_51751 get_user_pages_fast 1-2-0 51751 NULL +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL +if_write_51756 if_write 3 51756 NULL -+ioremap_prot_51764 ioremap_prot 1-2 51764 NULL -+iio_buffer_add_channel_sysfs_51766 iio_buffer_add_channel_sysfs 0 51766 NULL -+to_ratio_51809 to_ratio 2-1 51809 NULL ++ext4_ext_create_new_leaf_51763 ext4_ext_create_new_leaf 0 51763 NULL ++__fswab32_51781 __fswab32 0 51781 NULL ++to_ratio_51809 to_ratio 1-2 51809 NULL +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL +buffer_from_user_51826 buffer_from_user 3 51826 NULL ++max732x_irq_pending_51840 max732x_irq_pending 0 51840 NULL +ioread32_51847 ioread32 0 51847 NULL nohasharray +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847 +do_readv_writev_51849 do_readv_writev 4 51849 NULL +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL ++bm_page_io_async_51858 bm_page_io_async 2 51858 NULL +pointer_size_read_51863 pointer_size_read 3 51863 NULL +mlx4_alloc_db_from_pgdir_51865 mlx4_alloc_db_from_pgdir 3 51865 NULL +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL +user_read_51881 user_read 3 51881 NULL -+memblock_alloc_51884 memblock_alloc 1-2 51884 NULL +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL -+virt_to_phys_51896 virt_to_phys 0 51896 NULL ++SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL nohasharray ++virt_to_phys_51896 virt_to_phys 0 51896 &SyS_mq_timedsend_51896 ++commit_fs_roots_51898 commit_fs_roots 0 51898 NULL +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL @@ -106638,11 +108489,14 @@ index 0000000..b04803b +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL +arizona_free_irq_51969 arizona_free_irq 2 51969 NULL nohasharray +snd_mask_min_51969 snd_mask_min 0 51969 &arizona_free_irq_51969 ++__blkdev_get_51972 __blkdev_get 0 51972 NULL nohasharray ++read_page_51972 read_page 2 51972 &__blkdev_get_51972 ++get_zone_51981 get_zone 0-1 51981 NULL +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL ++_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL +rdmalt_52022 rdmalt 0 52022 NULL -+vxge_rx_alloc_52024 vxge_rx_alloc 3 52024 NULL +override_release_52032 override_release 2 52032 NULL +end_port_52042 end_port 0 52042 NULL +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL @@ -106651,180 +108505,224 @@ index 0000000..b04803b +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL +isofs_readpages_52067 isofs_readpages 4 52067 NULL +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL ++ulist_add_merge_52096 ulist_add_merge 0 52096 NULL +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL -+smsdvb_stats_read_52114 smsdvb_stats_read 3 52114 NULL ++split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL +retry_count_read_52129 retry_count_read 3 52129 NULL -+zram_meta_alloc_52140 zram_meta_alloc 1 52140 NULL ++snd_pcm_channel_info_user_52135 snd_pcm_channel_info_user 0 52135 NULL ++gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL ++sub_alloc_52140 sub_alloc 0 52140 NULL nohasharray ++zram_meta_alloc_52140 zram_meta_alloc 1 52140 &sub_alloc_52140 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL nohasharray -+ext2_alloc_blocks_52145 ext2_alloc_blocks 2 52145 &hysdn_conf_write_52145 ++ext2_alloc_blocks_52145 ext2_alloc_blocks 2-0 52145 &hysdn_conf_write_52145 +htable_size_52148 htable_size 0-1 52148 NULL -+__le16_to_cpup_52155 __le16_to_cpup 0 52155 NULL nohasharray -+smk_write_load2_52155 smk_write_load2 3 52155 &__le16_to_cpup_52155 -+alix_present_52165 alix_present 1 52165 NULL ++smk_write_load2_52155 smk_write_load2 3 52155 NULL +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL +print_prefix_52176 print_prefix 0 52176 NULL +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL -+vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 5-6 52216 NULL ++vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL +do_dmabuf_dirty_ldu_52241 do_dmabuf_dirty_ldu 6 52241 NULL -+fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL ++fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL nohasharray ++xfs_iomap_eof_align_last_fsb_52243 xfs_iomap_eof_align_last_fsb 3 52243 &fuse_request_alloc_52243 ++ocfs2_try_to_merge_extent_52244 ocfs2_try_to_merge_extent 0 52244 NULL +pm80x_request_irq_52250 pm80x_request_irq 2 52250 NULL +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL +shrink_slab_52261 shrink_slab 2-3 52261 NULL +hva_to_pfn_slow_52262 hva_to_pfn_slow 1 52262 NULL +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL -+atomic64_read_52300 atomic64_read 0 52300 NULL -+ath6kl_wmi_get_new_buf_52304 ath6kl_wmi_get_new_buf 1 52304 NULL ++handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL ++kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL +read_file_reset_52310 read_file_reset 3 52310 NULL -+request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL ++request_asymmetric_key_52317 request_asymmetric_key 4-2 52317 NULL +hwflags_read_52318 hwflags_read 3 52318 NULL -+ntfs_rl_split_52328 ntfs_rl_split 2-4 52328 NULL ++snd_pcm_hw_free_52327 snd_pcm_hw_free 0 52327 NULL ++ntfs_rl_split_52328 ntfs_rl_split 4-2 52328 NULL +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL -+compat_SyS_preadv64_52351 compat_SyS_preadv64 3 52351 NULL ++hur_len_52339 hur_len 0 52339 NULL +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL ++iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL ++hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL ++ocfs2_journal_access_eb_52377 ocfs2_journal_access_eb 0 52377 NULL +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL -+aer_inject_write_52399 aer_inject_write 3 52399 NULL -+aac_rx_ioremap_52410 aac_rx_ioremap 2 52410 NULL ++aer_inject_write_52399 aer_inject_write 3 52399 NULL nohasharray ++cl_page_own_52399 cl_page_own 0 52399 &aer_inject_write_52399 +cgroup_file_write_52417 cgroup_file_write 3 52417 NULL +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL ++hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL +delay_status_52431 delay_status 5 52431 NULL ++ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL -+nl80211_send_mgmt_tx_status_52445 nl80211_send_mgmt_tx_status 5 52445 NULL -+ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1-2 52477 NULL ++acpi_nvs_for_each_region_52448 acpi_nvs_for_each_region 0 52448 NULL ++alauda_read_data_52452 alauda_read_data 3 52452 NULL ++ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL ++usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL -+fd_do_rw_52495 fd_do_rw 3 52495 NULL nohasharray -+skb_cow_head_52495 skb_cow_head 2 52495 &fd_do_rw_52495 -+qib_user_sdma_pin_pages_52498 qib_user_sdma_pin_pages 3-5 52498 NULL ++fd_do_rw_52495 fd_do_rw 3 52495 NULL ++qib_user_sdma_pin_pages_52498 qib_user_sdma_pin_pages 3-5-4 52498 NULL +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL -+qlcnic_83xx_sysfs_flash_write_52507 qlcnic_83xx_sysfs_flash_write 4 52507 NULL ++lmv_get_easize_52504 lmv_get_easize 0 52504 NULL +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL ++bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL ++raw_recvmsg_52529 raw_recvmsg 4 52529 NULL +from_oblock_52546 from_oblock 0-1 52546 NULL +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL +ocfs2_make_right_split_rec_52562 ocfs2_make_right_split_rec 3 52562 NULL -+emit_code_52583 emit_code 0-3 52583 NULL ++debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL ++snd_pcm_sw_params_52594 snd_pcm_sw_params 0 52594 NULL ++SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL ++ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL ++affs_set_blocksize_52625 affs_set_blocksize 2 52625 NULL +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL ++perf_trace_sched_stat_template_52656 perf_trace_sched_stat_template 3 52656 NULL ++nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL ++htb_add_class_to_row_52663 htb_add_class_to_row 3 52663 NULL ++posix_acl_equiv_mode_52666 posix_acl_equiv_mode 0 52666 NULL +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL ++ntfs_get_nr_significant_bytes_52688 ntfs_get_nr_significant_bytes 0 52688 NULL +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL ++vendorextnWriteSection_52698 vendorextnWriteSection 0 52698 NULL +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL ++__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL -+blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL ++blkcipher_next_slow_52733 blkcipher_next_slow 4-3 52733 NULL +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL ++hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL -+copy_ctr_args_52761 copy_ctr_args 2 52761 NULL ++radeon_get_ib_value_52757 radeon_get_ib_value 0 52757 NULL ++nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL ++map_try_harder_52846 map_try_harder 2-3 52846 NULL +ext2_xattr_set_acl_52857 ext2_xattr_set_acl 4 52857 NULL -+mon_bin_get_event_52863 mon_bin_get_event 4 52863 NULL ++process_deleted_xattr_52861 process_deleted_xattr 0 52861 NULL ++mon_bin_get_event_52863 mon_bin_get_event 6-4 52863 NULL ++twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL ++qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL +twlreg_write_52880 twlreg_write 3 52880 NULL +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL +arizona_request_irq_52908 arizona_request_irq 2 52908 NULL ++create_vtbl_52909 create_vtbl 0 52909 NULL ++dio_bio_reap_52913 dio_bio_reap 0 52913 NULL +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL -+iblock_get_bio_52936 iblock_get_bio 3 52936 NULL nohasharray -+__iio_device_attr_init_52936 __iio_device_attr_init 0 52936 &iblock_get_bio_52936 ++iblock_get_bio_52936 iblock_get_bio 3 52936 NULL +__nodes_remap_52951 __nodes_remap 5 52951 NULL +send_packet_52960 send_packet 4 52960 NULL +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL -+hx8357_spi_write_then_read_52964 hx8357_spi_write_then_read 3 52964 NULL nohasharray -+compat_sock_ioctl_52964 compat_sock_ioctl 3 52964 &hx8357_spi_write_then_read_52964 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL +num_node_state_52989 num_node_state 0 52989 NULL -+batadv_check_management_packet_52993 batadv_check_management_packet 3 52993 NULL +efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL ++uasp_alloc_stream_res_53015 uasp_alloc_stream_res 0 53015 NULL +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL +ext4_meta_bg_first_group_53031 ext4_meta_bg_first_group 0-2 53031 NULL ++ocfs2_new_leaf_refcount_block_53036 ocfs2_new_leaf_refcount_block 0 53036 NULL +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL +cfi_read_query_53066 cfi_read_query 0 53066 NULL ++iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL ++page_to_nid_53085 page_to_nid 0 53085 NULL +qib_resize_cq_53090 qib_resize_cq 2 53090 NULL ++insert_new_root_53097 insert_new_root 0 53097 NULL +verity_status_53120 verity_status 5 53120 NULL ++__copy_from_user_ll_nocache_nozero_53123 __copy_from_user_ll_nocache_nozero 0-3 53123 NULL +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL ++btrfs_search_forward_53137 btrfs_search_forward 0 53137 NULL +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL ++SyS_init_module_53202 SyS_init_module 2 53202 NULL +mtdoops_erase_block_53206 mtdoops_erase_block 2 53206 NULL +fixup_user_fault_53210 fixup_user_fault 3 53210 NULL +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL -+rbd_obj_method_sync_53252 rbd_obj_method_sync 8 53252 NULL ++ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL ++hfsplus_xattr_set_posix_acl_53249 hfsplus_xattr_set_posix_acl 4 53249 NULL +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL -+isku_sysfs_write_key_mask_53305 isku_sysfs_write_key_mask 6 53305 NULL -+batadv_interface_rx_53325 batadv_interface_rx 4 53325 NULL ++tsk_fork_get_node_53271 tsk_fork_get_node 0 53271 NULL ++btrfs_find_highest_objectid_53284 btrfs_find_highest_objectid 0 53284 NULL ++setup_leaf_for_split_53312 setup_leaf_for_split 0 53312 NULL ++ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL ++setup_cluster_no_bitmap_53328 setup_cluster_no_bitmap 0 53328 NULL +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL +vm_mmap_53339 vm_mmap 0 53339 NULL ++vendorextnIoctl_53350 vendorextnIoctl 0 53350 NULL nohasharray ++btrfs_find_all_roots_53350 btrfs_find_all_roots 0 53350 &vendorextnIoctl_53350 ++read_6120_creg32_53363 read_6120_creg32 0 53363 NULL +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL -+iwl_pcie_txq_alloc_53413 iwl_pcie_txq_alloc 3 53413 NULL ++isolate_lru_page_53417 isolate_lru_page 0 53417 NULL ++i915_gem_execbuffer_relocate_object_53435 i915_gem_execbuffer_relocate_object 0 53435 NULL +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL -+acpi_tb_parse_root_table_53455 acpi_tb_parse_root_table 1 53455 NULL -+n2_run_53459 n2_run 3 53459 NULL +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL -+rds_tcp_data_recv_53476 rds_tcp_data_recv 3 53476 NULL +iowarrior_read_53483 iowarrior_read 3 53483 NULL +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL ++ext4_ext_grow_indepth_53503 ext4_ext_grow_indepth 0 53503 NULL +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL +dbAllocNext_53506 dbAllocNext 0 53506 NULL +ocfs2_xattr_set_acl_53508 ocfs2_xattr_set_acl 4 53508 NULL +check_acl_53512 check_acl 0 53512 NULL -+alloc_pages_exact_nid_53515 alloc_pages_exact_nid 2 53515 NULL -+SYSC_bind_53582 SYSC_bind 3 53582 NULL nohasharray -+set_registers_53582 set_registers 3 53582 &SYSC_bind_53582 ++send_utimes_53516 send_utimes 0 53516 NULL ++SYSC_bind_53582 SYSC_bind 3 53582 NULL +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL ++proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL +gfn_to_pfn_async_53597 gfn_to_pfn_async 2 53597 NULL -+___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1-2 53626 NULL ++pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL ++___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL +xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL -+ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL ++stmpe_gpio_request_53634 stmpe_gpio_request 2 53634 NULL nohasharray ++ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 &stmpe_gpio_request_53634 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL -+_preload_range_53676 _preload_range 2-3 53676 NULL -+lowpan_fragment_xmit_53680 lowpan_fragment_xmit 3-4 53680 NULL -+fuse_fill_write_pages_53682 fuse_fill_write_pages 4 53682 NULL ++fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL +bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray -+igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 &bdev_logical_block_size_53690 ++igb_alloc_q_vector_53690 igb_alloc_q_vector 6-4 53690 &bdev_logical_block_size_53690 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL +bio_integrity_split_53714 bio_integrity_split 3 53714 NULL +__ocfs2_resv_find_window_53721 __ocfs2_resv_find_window 3 53721 NULL ++__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL +wdm_write_53735 wdm_write 3 53735 NULL -+ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 5-3 53737 NULL ++ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 5-3-0 53737 NULL +da9052_disable_irq_53745 da9052_disable_irq 2 53745 NULL +lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL nohasharray +amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 &lpfc_idiag_queacc_read_qe_53755 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL -+qp_alloc_host_work_53798 qp_alloc_host_work 3-5 53798 NULL -+__tty_alloc_driver_53799 __tty_alloc_driver 1 53799 NULL ++qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL +nls_nullsize_53815 nls_nullsize 0 53815 NULL ++insert_pfn_53816 insert_pfn 3-0 53816 NULL ++setup_data_read_53822 setup_data_read 3 53822 NULL +pms_read_53873 pms_read 3 53873 NULL +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL -+ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 5-4-3 53900 NULL nohasharray ++ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 4-5-3 53900 NULL nohasharray +SyS_setgroups_53900 SyS_setgroups 1 53900 &ocfs2_rm_xattr_cluster_53900 -+proc_file_read_53905 proc_file_read 3 53905 NULL -+early_reserve_e820_53915 early_reserve_e820 1-2 53915 NULL -+ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 4 53938 NULL -+mthca_setup_cmd_doorbells_53954 mthca_setup_cmd_doorbells 2 53954 NULL -+mlx4_num_eq_uar_53965 mlx4_num_eq_uar 0 53965 NULL ++azx_via_get_position_53916 azx_via_get_position 0 53916 NULL ++usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL ++ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 5-4-0 53938 NULL +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL +mthca_reg_user_mr_53980 mthca_reg_user_mr 2-3 53980 NULL +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL -+snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 4-2-5 54018 NULL -+cmpk_message_handle_tx_54024 cmpk_message_handle_tx 4 54024 NULL ++send_clone_54011 send_clone 0 54011 NULL ++hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL ++snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL ++mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL @@ -106832,90 +108730,106 @@ index 0000000..b04803b +btrfs_start_transaction_54066 btrfs_start_transaction 2 54066 NULL +_malloc_54077 _malloc 1 54077 NULL +bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL -+altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL -+create_xattr_54106 create_xattr 5 54106 NULL -+inc_zcache_pers_zbytes_54107 inc_zcache_pers_zbytes 1 54107 NULL ++altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray ++lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103 ++__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL +strn_len_54122 strn_len 0 54122 NULL +isku_receive_54130 isku_receive 4 54130 NULL +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL -+i2400m_zrealloc_2x_54166 i2400m_zrealloc_2x 3 54166 NULL nohasharray -+memcpy_toiovec_54166 memcpy_toiovec 3 54166 &i2400m_zrealloc_2x_54166 ++irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL ++memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL -+acpi_os_read_memory_54186 acpi_os_read_memory 1-3 54186 NULL -+SyS_ipc_54206 SyS_ipc 3 54206 NULL ++p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL ++devm_request_threaded_irq_54215 devm_request_threaded_irq 0 54215 NULL ++do_sys_poll_54221 do_sys_poll 2 54221 NULL +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL -+_format_mac_addr_54229 _format_mac_addr 2-0 54229 NULL +pi_read_regr_54231 pi_read_regr 0 54231 NULL ++mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL +reada_add_block_54247 reada_add_block 2 54247 NULL -+xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL ++write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL ++jbd2__journal_restart_54249 jbd2__journal_restart 0 54249 NULL ++barrier_all_devices_54254 barrier_all_devices 0 54254 NULL nohasharray ++xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 &barrier_all_devices_54254 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL +wusb_prf_54261 wusb_prf 7 54261 NULL nohasharray +audio_write_54261 audio_write 4 54261 &wusb_prf_54261 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL ++kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL +ubi_calc_data_len_54279 ubi_calc_data_len 0-3 54279 NULL +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL +get_iovec_page_array_54298 get_iovec_page_array 6 54298 NULL ++ttm_mem_global_alloc_54299 ttm_mem_global_alloc 0 54299 NULL ++reclaim_pages_54301 reclaim_pages 3 54301 NULL +sprintf_54306 sprintf 0 54306 NULL -+irq_domain_associate_many_54307 irq_domain_associate_many 2 54307 NULL ++bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL -+__get_free_pages_54352 __get_free_pages 0 54352 NULL nohasharray -+_osd_realloc_seg_54352 _osd_realloc_seg 3 54352 &__get_free_pages_54352 ++__get_free_pages_54352 __get_free_pages 0 54352 NULL +tcf_hash_create_54360 tcf_hash_create 4 54360 NULL +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL +vfs_readlink_54368 vfs_readlink 3 54368 NULL +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL nohasharray +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 &do_dccp_setsockopt_54377 -+ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL -+gart_unmap_page_54379 gart_unmap_page 2-3 54379 NULL -+snd_pcm_oss_read2_54387 snd_pcm_oss_read2 0-3 54387 NULL -+i386_mmap_check_54388 i386_mmap_check 0 54388 NULL -+__do_krealloc_54389 __do_krealloc 2 54389 NULL ++ah_alloc_tmp_54378 ah_alloc_tmp 2-3 54378 NULL ++gart_unmap_page_54379 gart_unmap_page 3-2 54379 NULL ++snd_pcm_oss_read2_54387 snd_pcm_oss_read2 3-0 54387 NULL +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL -+copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL -+swiotlb_tbl_sync_single_54486 swiotlb_tbl_sync_single 2 54486 NULL ++efx_nic_describe_stats_54407 efx_nic_describe_stats 2 54407 NULL ++ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL ++copy_gadget_strings_54417 copy_gadget_strings 3-2 54417 NULL ++btrfs_inc_extent_ref_54442 btrfs_inc_extent_ref 0 54442 NULL ++sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL +simple_strtoull_54493 simple_strtoull 0 54493 NULL -+swiotlb_tbl_map_single_54495 swiotlb_tbl_map_single 3-0 54495 NULL ++swiotlb_tbl_map_single_54495 swiotlb_tbl_map_single 0 54495 NULL +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL -+cgroup_write_X64_54514 cgroup_write_X64 5 54514 NULL nohasharray -+xen_bus_to_phys_54514 xen_bus_to_phys 0 54514 &cgroup_write_X64_54514 ++cgroup_write_X64_54514 cgroup_write_X64 5 54514 NULL +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL +viacam_read_54526 viacam_read 3 54526 NULL +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL +setsockopt_54539 setsockopt 5 54539 NULL -+mwifiex_usb_submit_rx_urb_54558 mwifiex_usb_submit_rx_urb 2 54558 NULL -+SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 NULL ++i915_reset_gen7_sol_offsets_54547 i915_reset_gen7_sol_offsets 0 54547 NULL ++lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL ++i915_gem_get_seqno_54555 i915_gem_get_seqno 0 54555 NULL ++btrfs_update_inode_item_54561 btrfs_update_inode_item 0 54561 NULL nohasharray ++SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 &btrfs_update_inode_item_54561 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL +nvme_npages_54601 nvme_npages 0-1 54601 NULL -+fwSendNullPacket_54618 fwSendNullPacket 2 54618 NULL ++irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL ++devm_gen_pool_create_54607 devm_gen_pool_create 3 54607 NULL ++port_fops_write_54627 port_fops_write 3 54627 NULL +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL +kvm_read_cr3_54662 kvm_read_cr3 0 54662 NULL ++bus_add_device_54665 bus_add_device 0 54665 NULL ++cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL +vring_new_virtqueue_54673 vring_new_virtqueue 2 54673 NULL +evm_read_key_54674 evm_read_key 3 54674 NULL -+resource_string_54699 resource_string 0 54699 NULL ++fs_path_add_path_54680 fs_path_add_path 0 54680 NULL +platform_get_irq_byname_54700 platform_get_irq_byname 0 54700 NULL -+rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL nohasharray -+compat_SyS_readv_54711 compat_SyS_readv 3 54711 &rfkill_fop_read_54711 -+_add_sg_continuation_descriptor_54721 _add_sg_continuation_descriptor 3 54721 NULL ++__btrfs_inc_extent_ref_54706 __btrfs_inc_extent_ref 7-0 54706 NULL ++rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL ++clk_divider_set_rate_54726 clk_divider_set_rate 3-2 54726 NULL +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL +kzalloc_54740 kzalloc 1 54740 NULL +wep_iv_read_54744 wep_iv_read 3 54744 NULL ++lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL -+batadv_iv_ogm_aggregate_new_54761 batadv_iv_ogm_aggregate_new 2 54761 NULL +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL ++ldsem_atomic_update_54774 ldsem_atomic_update 1-0 54774 NULL ++gpiochip_add_54781 gpiochip_add 0 54781 NULL +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL +domain_init_54797 domain_init 2 54797 NULL +ext3_find_goal_54801 ext3_find_goal 0 54801 NULL +get_dev_size_54807 get_dev_size 0 54807 NULL +nfsd_write_54809 nfsd_write 6 54809 NULL +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 NULL nohasharray -+crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &aes_decrypt_fail_read_54815 ++kvzalloc_54815 kvzalloc 1 54815 &aes_decrypt_fail_read_54815 nohasharray ++crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815 +generic_perform_write_54832 generic_perform_write 3 54832 NULL +write_rio_54837 write_rio 3 54837 NULL +nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 NULL nohasharray @@ -106926,33 +108840,39 @@ index 0000000..b04803b +alloc_ep_req_54860 alloc_ep_req 2 54860 NULL +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL -+tcf_csum_ipv6_tcp_54877 tcf_csum_ipv6_tcp 4 54877 NULL -+iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL ++iscsi_pool_init_54913 iscsi_pool_init 4-2 54913 NULL nohasharray ++kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL ++bio_add_page_54933 bio_add_page 0-3 54933 NULL +mxms_structlen_54939 mxms_structlen 0 54939 NULL +add_port_54941 add_port 2 54941 NULL -+virtblk_add_buf_wait_54943 virtblk_add_buf_wait 3-4 54943 NULL -+wl12xx_cmd_build_probe_req_54946 wl12xx_cmd_build_probe_req 6-8 54946 NULL +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0 54949 NULL ++alauda_write_data_54967 alauda_write_data 3 54967 NULL +c4_add_card_54968 c4_add_card 3 54968 NULL +iwl_pcie_dump_fh_54975 iwl_pcie_dump_fh 0 54975 NULL -+__proc_file_read_54978 __proc_file_read 3 54978 NULL ++ubi_change_vtbl_record_54979 ubi_change_vtbl_record 0 54979 NULL +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL -+Bus_to_Virtual_54991 Bus_to_Virtual 1 54991 NULL ++rds_ib_inc_copy_to_user_55007 rds_ib_inc_copy_to_user 3 55007 NULL +mem_cgroup_get_lru_size_55008 mem_cgroup_get_lru_size 0 55008 NULL +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL +paging32_get_level1_sp_gpa_55022 paging32_get_level1_sp_gpa 0 55022 NULL +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL -+__netdev_alloc_skb_ip_align_55067 __netdev_alloc_skb_ip_align 2 55067 NULL ++dgap_do_bios_load_55025 dgap_do_bios_load 3 55025 NULL ++btrfs_init_acl_55028 btrfs_init_acl 0 55028 NULL ++write_ctree_super_55039 write_ctree_super 0 55039 NULL ++ext4_ext_handle_uninitialized_extents_55059 ext4_ext_handle_uninitialized_extents 0-6 55059 NULL +apei_exec_run_55075 apei_exec_run 0 55075 NULL +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL -+hx8357_spi_write_array_55095 hx8357_spi_write_array 3 55095 NULL ++snd_pcm_capture_hw_avail_55086 snd_pcm_capture_hw_avail 0 55086 NULL nohasharray ++read_dma_55086 read_dma 3 55086 &snd_pcm_capture_hw_avail_55086 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL -+corrupt_data_55120 corrupt_data 0 55120 NULL ++corrupt_data_55120 corrupt_data 0-3 55120 NULL +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL -+ocfs2_prepare_refcount_change_for_del_55137 ocfs2_prepare_refcount_change_for_del 3 55137 NULL nohasharray ++ocfs2_prepare_refcount_change_for_del_55137 ocfs2_prepare_refcount_change_for_del 3-0 55137 NULL nohasharray +filldir_55137 filldir 3 55137 &ocfs2_prepare_refcount_change_for_del_55137 ++validate_vid_hdr_55145 validate_vid_hdr 0 55145 NULL +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL ++npages_to_npools_55149 npages_to_npools 0-1 55149 NULL +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL +mtd_get_fact_prot_info_55186 mtd_get_fact_prot_info 0 55186 NULL +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL @@ -106961,188 +108881,222 @@ index 0000000..b04803b +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL -+nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL -+dump_command_55220 dump_command 1 55220 NULL +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL -+tipc_port_reject_sections_55229 tipc_port_reject_sections 5 55229 NULL +hash_netport6_expire_55232 hash_netport6_expire 3 55232 NULL -+register_unifi_sdio_55239 register_unifi_sdio 2 55239 NULL +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL -+persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL -+ptrace_request_55288 ptrace_request 3-4 55288 NULL ++lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL ++persistent_ram_new_55286 persistent_ram_new 2-1 55286 NULL ++ptrace_request_55288 ptrace_request 3 55288 NULL +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL ++lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL -+qp_alloc_guest_work_55305 qp_alloc_guest_work 3-5 55305 NULL nohasharray -+__get_vm_area_node_55305 __get_vm_area_node 1 55305 &qp_alloc_guest_work_55305 ++wimax_msg_len_55304 wimax_msg_len 0 55304 NULL ++__get_vm_area_node_55305 __get_vm_area_node 6 55305 NULL nohasharray ++qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 &__get_vm_area_node_55305 ++__vxge_hw_vpath_initialize_55328 __vxge_hw_vpath_initialize 2 55328 NULL +do_shmat_55336 do_shmat 5 55336 NULL +vme_user_read_55338 vme_user_read 3 55338 NULL +sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 NULL nohasharray +__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 &sctp_datamsg_from_user_55342 -+__memblock_alloc_base_55359 __memblock_alloc_base 1-2 55359 NULL -+acpi_system_read_event_55362 acpi_system_read_event 3 55362 NULL -+nf_nat_ipv4_manip_pkt_55387 nf_nat_ipv4_manip_pkt 2 55387 NULL ++iterate_inode_extrefs_55362 iterate_inode_extrefs 0 55362 NULL nohasharray ++acpi_system_read_event_55362 acpi_system_read_event 3 55362 &iterate_inode_extrefs_55362 ++cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL ++__domain_mapping_55393 __domain_mapping 5 55393 NULL +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL -+alloc_skb_55439 alloc_skb 1 55439 NULL ++SyS_read_55449 SyS_read 3 55449 NULL ++add_relation_rb_55451 add_relation_rb 0 55451 NULL +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL -+isdnhdlc_decode_55466 isdnhdlc_decode 0 55466 NULL +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL -+batadv_unicast_push_and_fill_skb_55474 batadv_unicast_push_and_fill_skb 2 55474 NULL +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL -+ocfs2_rec_clusters_55501 ocfs2_rec_clusters 0 55501 NULL ++ocfs2_rec_clusters_55501 ocfs2_rec_clusters 0 55501 NULL nohasharray ++ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 &ocfs2_rec_clusters_55501 +ext4_flex_bg_size_55502 ext4_flex_bg_size 0 55502 NULL -+cfpkt_pad_trail_55511 cfpkt_pad_trail 2 55511 NULL nohasharray -+tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 &cfpkt_pad_trail_55511 -+ea_get_55522 ea_get 0 55522 NULL ++tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL ++ea_get_55522 ea_get 3-0 55522 NULL +buffer_size_55534 buffer_size 0 55534 NULL +set_msr_interception_55538 set_msr_interception 2 55538 NULL +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL ++dgap_do_config_load_55548 dgap_do_config_load 2 55548 NULL ++dm_stats_list_55551 dm_stats_list 4 55551 NULL ++gfs2_bitfit_55566 gfs2_bitfit 2-3-0 55566 NULL +hash_netport4_expire_55584 hash_netport4_expire 3 55584 NULL +add_partition_55588 add_partition 2 55588 NULL ++kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL -+free_pages_55603 free_pages 1 55603 NULL ++allocate_without_wrapping_disk_55607 allocate_without_wrapping_disk 4 55607 NULL +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL ++snd_pcm_hw_param_last_55624 snd_pcm_hw_param_last 0 55624 NULL +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray +pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628 ++osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL +dvb_dmxdev_set_buffer_size_55643 dvb_dmxdev_set_buffer_size 2 55643 NULL +mlx4_buddy_alloc_55647 mlx4_buddy_alloc 2 55647 NULL +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL -+ib_umad_compat_ioctl_55650 ib_umad_compat_ioctl 3 55650 NULL -+cfg80211_send_rx_assoc_55651 cfg80211_send_rx_assoc 4 55651 NULL -+read_oldmem_55658 read_oldmem 3 55658 NULL +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL ++btrfs_reloc_cow_block_55672 btrfs_reloc_cow_block 0 55672 NULL +get_info_55681 get_info 3 55681 NULL -+wil_vring_alloc_skb_55703 wil_vring_alloc_skb 4 55703 NULL -+__videobuf_alloc_uncached_55711 __videobuf_alloc_uncached 1 55711 NULL ++iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL -+mtdswap_init_55719 mtdswap_init 2 55719 NULL ++ocfs2_lock_refcount_tree_55719 ocfs2_lock_refcount_tree 0 55719 NULL nohasharray ++mtdswap_init_55719 mtdswap_init 2 55719 &ocfs2_lock_refcount_tree_55719 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL +set_local_name_55757 set_local_name 4 55757 NULL -+strlen_55778 strlen 0 55778 NULL -+set_spte_55783 set_spte 5-4 55783 NULL ++strlen_55778 strlen 0 55778 NULL nohasharray ++is_idx_node_in_tnc_55778 is_idx_node_in_tnc 0 55778 &strlen_55778 ++set_spte_55783 set_spte 4-5 55783 NULL +req_bio_endio_55786 req_bio_endio 3 55786 NULL nohasharray +conf_read_55786 conf_read 3 55786 &req_bio_endio_55786 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL -+sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL ++sb16_copy_from_user_55836 sb16_copy_from_user 7-6-10 55836 NULL ++ept_gva_to_gpa_55848 ept_gva_to_gpa 2 55848 NULL +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL ++__check_block_validity_55869 __check_block_validity 0 55869 NULL +hsc_write_55875 hsc_write 3 55875 NULL +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL ++ext2_direct_IO_55932 ext2_direct_IO 4 55932 NULL +paging64_page_fault_55942 paging64_page_fault 2 55942 NULL ++kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL +sel_read_policy_55947 sel_read_policy 3 55947 NULL +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL -+simple_read_from_buffer_55957 simple_read_from_buffer 2-5 55957 NULL ++simple_read_from_buffer_55957 simple_read_from_buffer 5-2 55957 NULL +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL -+ssb_bus_pcmciabus_register_56020 ssb_bus_pcmciabus_register 3 56020 NULL ++wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 2-3 55992 NULL +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL +__set_discard_56081 __set_discard 2 56081 NULL +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL -+kmem_zalloc_large_56128 kmem_zalloc_large 1 56128 NULL +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL -+map_addr_56144 map_addr 7 56144 NULL ++write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL ++add_extent_mapping_56157 add_extent_mapping 0 56157 NULL +__i2c_transfer_56162 __i2c_transfer 0 56162 NULL +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL -+create_irq_nr_56180 create_irq_nr 1 56180 NULL ++create_irq_nr_56180 create_irq_nr 1-0-2 56180 NULL +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0 56194 NULL -+skb_headroom_56200 skb_headroom 0 56200 NULL -+usb_dump_iad_descriptor_56204 usb_dump_iad_descriptor 0 56204 NULL ++ocfs2_journal_access_gd_56209 ocfs2_journal_access_gd 0 56209 NULL ++update_space_info_56213 update_space_info 0 56213 NULL +ncp_read_bounce_size_56221 ncp_read_bounce_size 0-1 56221 NULL +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL -+cp210x_get_config_56229 cp210x_get_config 4 56229 NULL +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL +fd_copyin_56247 fd_copyin 3 56247 NULL +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL ++p9pdu_vreadf_56271 p9pdu_vreadf 0 56271 NULL +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL +dvb_aplay_56296 dvb_aplay 3 56296 NULL +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL -+compat_cdrom_read_audio_56304 compat_cdrom_read_audio 4 56304 NULL ++speakup_file_write_56310 speakup_file_write 3 56310 NULL +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL -+sixpack_compat_ioctl_56346 sixpack_compat_ioctl 4 56346 NULL ++ipv6_recv_error_56347 ipv6_recv_error 3 56347 NULL +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL -+iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 4 56368 NULL ++mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL ++iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL +dev_read_56369 dev_read 3 56369 NULL ++ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL ++ata_qc_complete_multiple_56376 ata_qc_complete_multiple 2 56376 NULL ++snd_pcm_common_ioctl1_56382 snd_pcm_common_ioctl1 0 56382 NULL +write_gssp_56404 write_gssp 3 56404 NULL +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL -+__get_vm_area_caller_56416 __get_vm_area_caller 1 56416 NULL nohasharray -+acpi_os_write_memory_56416 acpi_os_write_memory 1-3 56416 &__get_vm_area_caller_56416 -+store_msg_56417 store_msg 3 56417 NULL ++do_get_write_access_56410 do_get_write_access 0 56410 NULL ++i915_gem_object_sync_56417 i915_gem_object_sync 0 56417 NULL nohasharray ++store_msg_56417 store_msg 3 56417 &i915_gem_object_sync_56417 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL +fl_create_56435 fl_create 5 56435 NULL +gnttab_map_56439 gnttab_map 2 56439 NULL -+cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2 56453 NULL ++cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL +set_connectable_56458 set_connectable 4 56458 NULL +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL +putused_user_56467 putused_user 3 56467 NULL ++lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL +calc_linear_pos_56472 calc_linear_pos 0-3 56472 NULL +global_rt_period_56476 global_rt_period 0 56476 NULL +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL ++cfs_access_process_vm_56503 cfs_access_process_vm 2-4-0 56503 NULL +init_map_ip_56508 init_map_ip 5 56508 NULL -+cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL ++lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL ++ext4_zeroout_es_56514 ext4_zeroout_es 0 56514 NULL ++cfg80211_connect_result_56515 cfg80211_connect_result 6-4 56515 NULL +ip_options_get_56538 ip_options_get 4 56538 NULL ++ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL ++vb2_queue_or_prepare_buf_56547 vb2_queue_or_prepare_buf 0 56547 NULL +ocfs2_change_extent_flag_56549 ocfs2_change_extent_flag 5 56549 NULL +alloc_apertures_56561 alloc_apertures 1 56561 NULL +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL +event_filter_write_56609 event_filter_write 3 56609 NULL ++nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL +gather_array_56641 gather_array 3 56641 NULL ++lookup_extent_backref_56644 lookup_extent_backref 9-0 56644 NULL +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL ++tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL ++btrfs_cow_block_56678 btrfs_cow_block 0 56678 NULL +snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL nohasharray +da9055_gpio_to_irq_56686 da9055_gpio_to_irq 2 56686 &snd_gus_dram_read_56686 +build_map_info_56696 build_map_info 2 56696 NULL -+dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3 56702 NULL ++dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL +sta_flags_read_56710 sta_flags_read 3 56710 NULL +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL -+pcpu_populate_chunk_56741 pcpu_populate_chunk 2-3 56741 NULL ++__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL ++pcpu_populate_chunk_56741 pcpu_populate_chunk 3-2 56741 NULL +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL -+alloc_iommu_56778 alloc_iommu 2-3 56778 NULL -+__carl9170_rx_56784 __carl9170_rx 3 56784 NULL -+hash_lookup_56792 hash_lookup 2 56792 NULL ++alloc_iommu_56778 alloc_iommu 2-3-0 56778 NULL ++hash_lookup_56792 hash_lookup 2 56792 NULL nohasharray ++ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 &hash_lookup_56792 +do_syslog_56807 do_syslog 3 56807 NULL ++ext4_ext_rm_idx_56827 ext4_ext_rm_idx 0 56827 NULL +mtdchar_write_56831 mtdchar_write 3 56831 NULL nohasharray +ntfs_rl_realloc_56831 ntfs_rl_realloc 3 56831 &mtdchar_write_56831 -+snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4 56847 NULL ++sysctl_sync_threshold_56835 sysctl_sync_threshold 0 56835 NULL ++snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL +wb_lookup_56858 wb_lookup 2 56858 NULL +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 NULL ++hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL ++hfsplus_setxattr_56902 hfsplus_setxattr 4 56902 NULL ++__bitmap_clear_bits_56912 __bitmap_clear_bits 3 56912 NULL +strcspn_56913 strcspn 0 56913 NULL +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL -+check_header_56930 check_header 2 56930 NULL -+journal_init_revoke_56933 journal_init_revoke 2 56933 NULL ++CopyBufferToControlPacket_56933 CopyBufferToControlPacket 0 56933 NULL nohasharray ++journal_init_revoke_56933 journal_init_revoke 2 56933 &CopyBufferToControlPacket_56933 ++nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL +nouveau_device_create__56984 nouveau_device_create_ 6 56984 NULL ++sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL ++i915_gem_evict_everything_57038 i915_gem_evict_everything 0 57038 NULL +skb_network_offset_57043 skb_network_offset 0 57043 NULL nohasharray +ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 &skb_network_offset_57043 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL -+autofs_dev_ioctl_compat_57059 autofs_dev_ioctl_compat 3 57059 NULL ++__wl_get_peb_57058 __wl_get_peb 0 57058 NULL +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL -+sis190_try_rx_copy_57069 sis190_try_rx_copy 3 57069 NULL +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL ++altera_get_note_57099 altera_get_note 6 57099 NULL ++hpfs_readpages_57106 hpfs_readpages 4 57106 NULL ++snd_pcm_hw_params_old_user_57108 snd_pcm_hw_params_old_user 0 57108 NULL +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL +sysfs_write_file_57116 sysfs_write_file 3 57116 NULL +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL @@ -107150,338 +109104,371 @@ index 0000000..b04803b +rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &nl80211_send_deauth_57136 nohasharray +ima_show_htable_value_57136 ima_show_htable_value 2 57136 &rds_ib_sub_signaled_57136 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL ++changed_inode_57156 changed_inode 0 57156 NULL +udl_prime_create_57159 udl_prime_create 2 57159 NULL +__ipath_get_user_pages_57166 __ipath_get_user_pages 1-2 57166 NULL +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL ++ocfs2_claim_metadata_57192 ocfs2_claim_metadata 0 57192 NULL +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL +dma_fifo_alloc_57236 dma_fifo_alloc 5-3-2 57236 NULL -+flush_space_57241 flush_space 3 57241 NULL ++flush_space_57241 flush_space 3-0 57241 NULL ++rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL -+security_mmap_file_57268 security_mmap_file 0 57268 NULL ++lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL +pstore_file_read_57288 pstore_file_read 3 57288 NULL +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL -+ath6kl_buf_alloc_57304 ath6kl_buf_alloc 1 57304 NULL +fw_file_size_57307 fw_file_size 0 57307 NULL +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL ++write_file_regval_57313 write_file_regval 3 57313 NULL +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL +ocfs2_xattr_shrink_size_57328 ocfs2_xattr_shrink_size 3 57328 NULL -+check_mirror_57342 check_mirror 1-2 57342 NULL nohasharray -+usblp_read_57342 usblp_read 3 57342 &check_mirror_57342 ++usblp_read_57342 usblp_read 3 57342 NULL +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL ++dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL +max8997_irq_domain_map_57375 max8997_irq_domain_map 2 57375 NULL +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL +read_file_blob_57406 read_file_blob 3 57406 NULL +enclosure_register_57412 enclosure_register 3 57412 NULL -+gre_manip_pkt_57416 gre_manip_pkt 4 57416 NULL -+compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL nohasharray -+alloc_ftrace_hash_57431 alloc_ftrace_hash 1 57431 &compat_keyctl_instantiate_key_iov_57431 ++compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL -+sys_pselect6_57449 sys_pselect6 1 57449 NULL -+ReadReg_57453 ReadReg 0 57453 NULL +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL -+crypto_tfm_alg_blocksize_57463 crypto_tfm_alg_blocksize 0 57463 NULL nohasharray -+send_midi_async_57463 send_midi_async 3 57463 &crypto_tfm_alg_blocksize_57463 -+sisusb_clear_vram_57466 sisusb_clear_vram 3-2 57466 NULL ++crypto_tfm_alg_blocksize_57463 crypto_tfm_alg_blocksize 0 57463 NULL ++sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL ++blk_flush_cur_seq_57467 blk_flush_cur_seq 0 57467 NULL +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL nohasharray +sep_lock_user_pages_57470 sep_lock_user_pages 2-3 57470 &ieee80211_if_read_flags_57470 -+ocfs2_write_cluster_57483 ocfs2_write_cluster 8-2-9 57483 NULL ++ocfs2_write_cluster_57483 ocfs2_write_cluster 9-8-2 57483 NULL +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL +skb_headlen_57501 skb_headlen 0 57501 NULL +copy_in_user_57502 copy_in_user 3 57502 NULL -+ks8842_read32_57505 ks8842_read32 0 57505 NULL nohasharray -+ckhdid_printf_57505 ckhdid_printf 2 57505 &ks8842_read32_57505 ++ckhdid_printf_57505 ckhdid_printf 2 57505 NULL +init_tag_map_57515 init_tag_map 3 57515 NULL +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray -+il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517 ++il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517 nohasharray ++btrfs_insert_inode_extref_57517 btrfs_insert_inode_extref 0 57517 &il_dbgfs_force_reset_read_57517 ++cmm_read_57520 cmm_read 3 57520 NULL +inode_permission_57531 inode_permission 0 57531 NULL -+acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL nohasharray -+DoC_Probe_57534 DoC_Probe 1 57534 &acpi_dev_get_resources_57534 -+ext4_group_first_block_no_57559 ext4_group_first_block_no 0-2 57559 NULL ++acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL ++ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL ++ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL nohasharray ++ext4_group_first_block_no_57559 ext4_group_first_block_no 0-2 57559 &ReadHDLCPnP_57559 ++obd_unpackmd_57563 obd_unpackmd 0 57563 NULL +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL -+uio_find_mem_index_57584 uio_find_mem_index 0 57584 NULL ++get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL ++ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL ++il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL +wm831x_gpio_to_irq_57614 wm831x_gpio_to_irq 2 57614 NULL -+sk_stream_alloc_skb_57622 sk_stream_alloc_skb 2 57622 NULL ++vma_kernel_pagesize_57616 vma_kernel_pagesize 0 57616 NULL +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL -+osdmap_set_max_osd_57630 osdmap_set_max_osd 2 57630 NULL nohasharray -+sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 &osdmap_set_max_osd_57630 ++sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL +mem_read_57631 mem_read 3 57631 NULL +tc3589x_irq_map_57639 tc3589x_irq_map 2 57639 NULL -+sys_mq_timedsend_57661 sys_mq_timedsend 3 57661 NULL +r3964_write_57662 r3964_write 4 57662 NULL +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL +__lgwrite_57669 __lgwrite 4 57669 NULL -+ieee80211_MFIE_rate_len_57692 ieee80211_MFIE_rate_len 0 57692 NULL +f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL -+check_prefree_segments_57702 check_prefree_segments 2 57702 NULL +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL ++snd_interval_value_57713 snd_interval_value 0 57713 NULL +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL ++i915_gem_object_get_pages_57734 i915_gem_object_get_pages 0 57734 NULL +nouveau_gpio_create__57735 nouveau_gpio_create_ 4-5 57735 NULL -+compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 NULL ++compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 NULL nohasharray ++pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 &compat_sys_set_mempolicy_57742 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL -+SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL ++SYSC_process_vm_writev_57776 SYSC_process_vm_writev 5-3 57776 NULL ++apei_exec_collect_resources_57788 apei_exec_collect_resources 0 57788 NULL +ld2_57794 ld2 0 57794 NULL +ivtv_read_57796 ivtv_read 3 57796 NULL +generic_ptrace_peekdata_57806 generic_ptrace_peekdata 2 57806 NULL +ipath_user_sdma_num_pages_57813 ipath_user_sdma_num_pages 0 57813 NULL -+usb_dump_config_57817 usb_dump_config 0 57817 NULL +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL -+copy_to_user_57835 copy_to_user 3 57835 NULL ++copy_to_user_57835 copy_to_user 3-0 57835 NULL +flash_read_57843 flash_read 3 57843 NULL ++kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL ++process_all_new_xattrs_57881 process_all_new_xattrs 0 57881 NULL +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL -+emi26_writememory_57908 emi26_writememory 4 57908 NULL -+iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL ++iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL nohasharray ++atomic_add_return_unchecked_57910 atomic_add_return_unchecked 0-1 57910 &iio_read_first_n_kfifo_57910 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL -+twl_i2c_write_57923 twl_i2c_write 4-3 57923 NULL ++twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL ++nvc0_vm_create_57942 nvc0_vm_create 2-3 57942 NULL ++xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953 -+i915_cache_sharing_write_57961 i915_cache_sharing_write 3 57961 NULL -+hfc_empty_fifo_57972 hfc_empty_fifo 2 57972 NULL +c2_reg_user_mr_57982 c2_reg_user_mr 2-3 57982 NULL ++interleave_nodes_57992 interleave_nodes 0 57992 NULL ++do_rx_dma_57996 do_rx_dma 5 57996 NULL +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL -+regcache_rbtree_insert_to_block_58009 regcache_rbtree_insert_to_block 5 58009 NULL +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL ++ext4_block_bitmap_58033 ext4_block_bitmap 0 58033 NULL +mce_async_out_58056 mce_async_out 3 58056 NULL +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL +cm4040_write_58079 cm4040_write 3 58079 NULL -+udi_log_event_58105 udi_log_event 3 58105 NULL -+savemem_58129 savemem 3 58129 NULL +ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray -+slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135 ++slhc_init_58135 slhc_init 2-1 58135 &ipv6_flowlabel_opt_58135 ++ocfs2_reserve_clusters_58164 ocfs2_reserve_clusters 0 58164 NULL ++ext4_bg_num_gdb_58171 ext4_bg_num_gdb 0 58171 NULL +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL -+asix_write_cmd_58192 asix_write_cmd 5 58192 NULL +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL -+hva_to_pfn_58241 hva_to_pfn 1 58241 NULL ++sysfs_add_file_mode_58222 sysfs_add_file_mode 0 58222 NULL ++hva_to_pfn_58241 hva_to_pfn 1-0 58241 NULL +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL +read_file_debug_58256 read_file_debug 3 58256 NULL ++osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL +profile_load_58267 profile_load 3 58267 NULL ++kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL -+r100_mm_rreg_58276 r100_mm_rreg 0 58276 NULL +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL ++intel_alloc_coherent_58302 intel_alloc_coherent 2 58302 NULL +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL ++i915_wait_seqno_58309 i915_wait_seqno 0 58309 NULL +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL -+pcim_iomap_58334 pcim_iomap 3 58334 NULL ++ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL +diva_init_dma_map_58336 diva_init_dma_map 3 58336 NULL -+next_pidmap_58347 next_pidmap 2 58347 NULL ++__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL ++next_pidmap_58347 next_pidmap 2-0 58347 NULL +SyS_migrate_pages_58348 SyS_migrate_pages 2 58348 NULL -+vmalloc_to_sg_58354 vmalloc_to_sg 2 58354 NULL +save_hint_58359 save_hint 2 58359 NULL -+brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL ++vmw_ttm_tt_create_58369 vmw_ttm_tt_create 2 58369 NULL nohasharray ++brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 &vmw_ttm_tt_create_58369 +hash_ipportnet6_expire_58379 hash_ipportnet6_expire 3 58379 NULL +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL -+kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3 58406 NULL ++_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL ++kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3-4 58406 NULL nohasharray ++idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL +__mlx4_alloc_mtt_range_58418 __mlx4_alloc_mtt_range 2 58418 NULL -+__iio_add_chan_devattr_58451 __iio_add_chan_devattr 0 58451 NULL +capabilities_read_58457 capabilities_read 3 58457 NULL +batadv_iv_ogm_aggr_packet_58462 batadv_iv_ogm_aggr_packet 3 58462 NULL +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 NULL nohasharray +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 &lpfc_idiag_baracc_read_58466 ++nv_rd08_58472 nv_rd08 0 58472 NULL +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL -+batadv_bla_is_backbone_gw_58488 batadv_bla_is_backbone_gw 3 58488 NULL -+memblock_alloc_try_nid_58493 memblock_alloc_try_nid 1-2 58493 NULL ++btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL +rndis_add_response_58544 rndis_add_response 2 58544 NULL +__clear_discard_58546 __clear_discard 2 58546 NULL +wrap_max_58548 wrap_max 0-1-2 58548 NULL +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL -+sip_sprintf_addr_port_58574 sip_sprintf_addr_port 0 58574 NULL +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL ++get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL +ea_read_inline_58589 ea_read_inline 0 58589 NULL +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL +xip_file_read_58592 xip_file_read 3 58592 NULL -+gdth_search_isa_58595 gdth_search_isa 1 58595 NULL ++ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL ++radeon_bo_size_58606 radeon_bo_size 0 58606 NULL +ebt_buf_count_58607 ebt_buf_count 0 58607 NULL ++xfs_iomap_write_delay_58616 xfs_iomap_write_delay 2 58616 NULL +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL -+module_alloc_update_bounds_rx_58634 module_alloc_update_bounds_rx 1 58634 NULL nohasharray -+efi_ioremap_58634 efi_ioremap 1-2 58634 &module_alloc_update_bounds_rx_58634 ++filemap_fdatawrite_range_58630 filemap_fdatawrite_range 0 58630 NULL ++module_alloc_update_bounds_rx_58634 module_alloc_update_bounds_rx 1 58634 NULL +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL +ocfs2_block_to_cluster_start_58653 ocfs2_block_to_cluster_start 2 58653 NULL ++iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL +__gfn_to_pfn_58671 __gfn_to_pfn 2 58671 NULL -+iwl_trans_send_cmd_58681 iwl_trans_send_cmd 0 58681 NULL -+find_zero_58685 find_zero 0-1 58685 NULL nohasharray -+mcs7830_set_reg_async_58685 mcs7830_set_reg_async 3 58685 &find_zero_58685 ++find_zero_58685 find_zero 0-1 58685 NULL +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL -+pci_alloc_consistent_58688 pci_alloc_consistent 0 58688 NULL -+tps6586x_writes_58689 tps6586x_writes 3-2 58689 NULL -+vmalloc_node_58700 vmalloc_node 1 58700 NULL -+acpi_map_58725 acpi_map 1-2 58725 NULL ++tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL ++vmalloc_node_58700 vmalloc_node 1-2 58700 NULL ++vx_send_msg_58711 vx_send_msg 0 58711 NULL ++i915_gem_execbuffer_reserve_58722 i915_gem_execbuffer_reserve 0 58722 NULL +da9052_gpio_to_irq_58729 da9052_gpio_to_irq 2 58729 NULL -+csum_exist_in_range_58730 csum_exist_in_range 2 58730 NULL ++csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL +oblock_to_dblock_58762 oblock_to_dblock 0-2 58762 NULL -+__do_config_autodelink_58763 __do_config_autodelink 3 58763 NULL +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL -+isku_sysfs_read_58806 isku_sysfs_read 6-5 58806 NULL ++isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL ++write_file_58812 write_file 4 58812 NULL +ep_read_58813 ep_read 3 58813 NULL +command_write_58841 command_write 3 58841 NULL -+ocfs2_truncate_log_append_58850 ocfs2_truncate_log_append 3 58850 NULL ++ocfs2_truncate_log_append_58850 ocfs2_truncate_log_append 3-0 58850 NULL +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL -+cs553x_init_one_58886 cs553x_init_one 3 58886 NULL -+raw_ctl_compat_ioctl_58905 raw_ctl_compat_ioctl 3 58905 NULL ++esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL ++lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL -+tun_chr_compat_ioctl_58921 tun_chr_compat_ioctl 3 58921 NULL +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL -+st5481_isoc_flatten_58952 st5481_isoc_flatten 0 58952 NULL ++SyS_pread64_58935 SyS_pread64 3 58935 NULL ++wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL -+idx_to_kaddr_58968 idx_to_kaddr 0 58968 NULL +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL ++__mem_cgroup_try_charge_58976 __mem_cgroup_try_charge 0 58976 NULL ++init_list_58990 init_list 3 58990 NULL +remap_to_cache_dirty_58991 remap_to_cache_dirty 4-3 58991 NULL -+handle_rx_packet_58993 handle_rx_packet 3 58993 NULL -+edac_align_ptr_59003 edac_align_ptr 0 59003 NULL +ep_write_59008 ep_write 3 59008 NULL -+i915_ring_stop_write_59010 i915_ring_stop_write 3 59010 NULL ++lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL +SyS_preadv_59029 SyS_preadv 3 59029 NULL +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL -+regmap_bulk_write_59049 regmap_bulk_write 4-2 59049 NULL -+vfio_device_fops_compat_ioctl_59111 vfio_device_fops_compat_ioctl 3 59111 NULL ++regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL ++sysfs_link_sibling_59078 sysfs_link_sibling 0 59078 NULL ++do_perf_sw_event_59099 do_perf_sw_event 3 59099 NULL +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL +scsi_io_completion_59122 scsi_io_completion 2 59122 NULL ++init_status_page_59124 init_status_page 0 59124 NULL +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL -+__iio_add_event_config_attrs_59136 __iio_add_event_config_attrs 0 59136 NULL +print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 NULL nohasharray +framebuffer_alloc_59145 framebuffer_alloc 1 59145 &print_devstats_dot11RTSSuccessCount_59145 ++ocfs2_claim_local_alloc_bits_59147 ocfs2_claim_local_alloc_bits 0 59147 NULL +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL ++ksize_59176 ksize 0 59176 NULL +setup_window_59178 setup_window 4-2-5-7 59178 NULL -+ocfs2_move_extent_59187 ocfs2_move_extent 3 59187 NULL ++ocfs2_move_extent_59187 ocfs2_move_extent 3-5-2 59187 NULL ++validate_exec_list_59204 validate_exec_list 0 59204 NULL +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL -+fast_rx_path_59214 fast_rx_path 3 59214 NULL -+inftl_partscan_59216 inftl_partscan 0 59216 NULL -+skb_transport_header_59223 skb_transport_header 0 59223 NULL ++check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL +dt3155_read_59226 dt3155_read 3 59226 NULL +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL +tty_prepare_flip_string_flags_59240 tty_prepare_flip_string_flags 4 59240 NULL -+solo_v4l2_read_59247 solo_v4l2_read 3 59247 NULL +nla_len_59258 nla_len 0 59258 NULL -+btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL ++drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL ++__push_leaf_right_59302 __push_leaf_right 0 59302 NULL ++btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4-0 59304 NULL +fd_copyout_59323 fd_copyout 3 59323 NULL +read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL +paging64_get_level1_sp_gpa_59346 paging64_get_level1_sp_gpa 0 59346 NULL nohasharray +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 &paging64_get_level1_sp_gpa_59346 ++__map_request_59350 __map_request 0 59350 NULL +xfs_dir2_sf_entsize_59366 xfs_dir2_sf_entsize 0-2 59366 NULL ++blk_flush_policy_59368 blk_flush_policy 0 59368 NULL ++f2fs_fallocate_59377 f2fs_fallocate 3-4 59377 NULL +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL -+fc_frame_alloc_fill_59394 fc_frame_alloc_fill 2 59394 NULL ++ocfs2_replay_truncate_records_59382 ocfs2_replay_truncate_records 0 59382 NULL ++journal_init_dev_59384 journal_init_dev 5 59384 NULL +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL ++pci_ctrl_read_59424 pci_ctrl_read 0 59424 NULL +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL -+squashfs_read_data_59440 squashfs_read_data 6 59440 NULL ++snd_pcm_tstamp_59431 snd_pcm_tstamp 0 59431 NULL +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL -+fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL ++fs_path_ensure_buf_59445 fs_path_ensure_buf 2-0 59445 NULL +descriptor_loc_59446 descriptor_loc 3 59446 NULL -+do_compat_semctl_59449 do_compat_semctl 4 59449 NULL -+virtqueue_add_buf_59470 virtqueue_add_buf 3-4 59470 NULL ++block_rsv_use_bytes_59464 block_rsv_use_bytes 0 59464 NULL ++shrink_tnc_trees_59481 shrink_tnc_trees 0 59481 NULL ++btrfs_del_dir_entries_in_log_59490 btrfs_del_dir_entries_in_log 0 59490 NULL +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL -+nfsd_nrpools_59503 nfsd_nrpools 0 59503 NULL -+rds_pin_pages_59507 rds_pin_pages 0-1-2 59507 NULL ++rds_pin_pages_59507 rds_pin_pages 1-2 59507 NULL ++ext4_resize_fs_59543 ext4_resize_fs 2 59543 NULL +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL +tunables_write_59563 tunables_write 3 59563 NULL ++__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL ++write_pbl_59583 write_pbl 4 59583 NULL +memdup_user_59590 memdup_user 2 59590 NULL +tps6586x_irq_get_virq_59601 tps6586x_irq_get_virq 2 59601 NULL -+mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL ++mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray ++xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616 ++ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL +mtrr_write_59622 mtrr_write 3 59622 NULL ++ocfs2_adjust_rightmost_branch_59623 ocfs2_adjust_rightmost_branch 0 59623 NULL +find_first_zero_bit_59636 find_first_zero_bit 0-2 59636 NULL -+ubifs_setxattr_59650 ubifs_setxattr 4 59650 NULL nohasharray -+hidraw_read_59650 hidraw_read 3 59650 &ubifs_setxattr_59650 ++SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL ++hidraw_read_59650 hidraw_read 3 59650 NULL +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL +paravirt_sched_clock_59660 paravirt_sched_clock 0 59660 NULL +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL -+can_nocow_odirect_59681 can_nocow_odirect 3 59681 NULL -+sriov_enable_59689 sriov_enable 2 59689 NULL +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL ++ioperm_get_59701 ioperm_get 4-3 59701 NULL ++snd_pcm_info_user_59711 snd_pcm_info_user 0 59711 NULL +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL ++fat_direct_IO_59741 fat_direct_IO 4 59741 NULL +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL +strnlen_59746 strnlen 0 59746 NULL -+sctp_manip_pkt_59749 sctp_manip_pkt 4 59749 NULL -+ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL ++process_all_refs_59754 process_all_refs 0 59754 NULL nohasharray ++ext3_acl_count_59754 ext3_acl_count 0-1 59754 &process_all_refs_59754 ++process_new_xattr_59755 process_new_xattr 0 59755 NULL +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL +venus_remove_59781 venus_remove 4 59781 NULL +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL -+C_SYSC_preadv_59801 C_SYSC_preadv 3 59801 NULL ++xlog_do_recover_59789 xlog_do_recover 3 59789 NULL ++msb_get_zone_from_lba_59800 msb_get_zone_from_lba 0-1 59800 NULL +ipw_write_59807 ipw_write 3 59807 NULL -+rtllib_wx_set_gen_ie_59808 rtllib_wx_set_gen_ie 3 59808 NULL +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL ++fs64_to_cpu_59845 fs64_to_cpu 0 59845 NULL +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL ++intel_ring_wait_request_59865 intel_ring_wait_request 0 59865 NULL +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL +shmem_zero_setup_59885 shmem_zero_setup 0 59885 NULL nohasharray +start_transaction_59885 start_transaction 2 59885 &shmem_zero_setup_59885 ++l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL ++ocfs2_extend_rotate_transaction_59894 ocfs2_extend_rotate_transaction 0 59894 NULL +swiotlb_map_page_59909 swiotlb_map_page 3 59909 NULL ++aic7xxx_abort_waiting_scb_59932 aic7xxx_abort_waiting_scb 0 59932 NULL ++kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL ++ocfs2_expand_inline_ref_root_59945 ocfs2_expand_inline_ref_root 0 59945 NULL +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 NULL nohasharray +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 &il_dbgfs_rxon_flags_read_59950 +lookup_node_59953 lookup_node 2 59953 NULL -+il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL nohasharray -+compat_ipmi_ioctl_59956 compat_ipmi_ioctl 3 59956 &il_dbgfs_missed_beacon_read_59956 ++il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL +kvm_set_cr3_59965 kvm_set_cr3 2 59965 NULL -+fb_getput_cmap_59971 fb_getput_cmap 3 59971 NULL +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL -+register_device_60015 register_device 2-3 60015 NULL +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL -+sys_sched_getaffinity_60033 sys_sched_getaffinity 2 60033 NULL +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL -+pin_2_irq_60050 pin_2_irq 0-3 60050 NULL nohasharray -+vcs_size_60050 vcs_size 0 60050 &pin_2_irq_60050 ++vcs_size_60050 vcs_size 0 60050 NULL nohasharray ++pin_2_irq_60050 pin_2_irq 0-3 60050 &vcs_size_60050 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL ++open_cur_inode_file_60057 open_cur_inode_file 0 60057 NULL +compat_writev_60063 compat_writev 3 60063 NULL -+ieee80211_build_probe_req_60064 ieee80211_build_probe_req 6-8 60064 NULL ++ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL +mp_register_gsi_60079 mp_register_gsi 2 60079 NULL +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL -+ttm_bo_kmap_60118 ttm_bo_kmap 3-2 60118 NULL ++nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL ++__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL ++ld_usb_read_60156 ld_usb_read 3 60156 NULL +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL +init_state_60165 init_state 2 60165 NULL +sg_build_sgat_60179 sg_build_sgat 3 60179 NULL nohasharray +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 &sg_build_sgat_60179 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL -+svc_compat_ioctl_60194 svc_compat_ioctl 3 60194 NULL -+ib_send_cm_mra_60202 ib_send_cm_mra 4 60202 NULL nohasharray -+qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 &ib_send_cm_mra_60202 -+set_tap_pfs_60203 set_tap_pfs 3 60203 NULL -+ieee80211_mgmt_tx_60209 ieee80211_mgmt_tx 7 60209 NULL ++qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL +arizona_map_irq_60230 arizona_map_irq 2 60230 NULL nohasharray -+__phys_addr_nodebug_60230 __phys_addr_nodebug 0-1 60230 &arizona_map_irq_60230 ++__phys_addr_nodebug_60230 __phys_addr_nodebug 0 60230 &arizona_map_irq_60230 +wm831x_irq_60254 wm831x_irq 2 60254 NULL -+compat_sys_fcntl64_60256 compat_sys_fcntl64 3 60256 NULL ++irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 3-2 60264 NULL +printer_write_60276 printer_write 3 60276 NULL -+__pskb_pull_tail_60287 __pskb_pull_tail 2 60287 NULL ++alloc_irq_pin_list_60277 alloc_irq_pin_list 1 60277 NULL +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL +getDataLength_60301 getDataLength 0 60301 NULL -+ceph_parse_server_name_60318 ceph_parse_server_name 2 60318 NULL -+__kfifo_from_user_r_60345 __kfifo_from_user_r 3-5 60345 NULL ++xfs_next_bit_60322 xfs_next_bit 0-3 60322 NULL ++inorder_to_tree_60331 inorder_to_tree 1-0 60331 NULL ++usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL ++__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL ++max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL -+ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 5 60379 NULL ++ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 0-5 60379 NULL +instruction_pointer_60384 instruction_pointer 0 60384 NULL +drop_outstanding_extent_60390 drop_outstanding_extent 0 60390 NULL +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL @@ -107492,236 +109479,308 @@ index 0000000..b04803b +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL +tstats_write_60432 tstats_write 3 60432 NULL nohasharray +kmalloc_60432 kmalloc 1 60432 &tstats_write_60432 -+tipc_buf_acquire_60437 tipc_buf_acquire 1 60437 NULL -+rx_data_60442 rx_data 4 60442 NULL nohasharray -+scaled_div32_60442 scaled_div32 1-2 60442 &rx_data_60442 -+tcf_csum_ipv4_igmp_60446 tcf_csum_ipv4_igmp 3 60446 NULL ++scaled_div32_60442 scaled_div32 2-1-0 60442 NULL +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL -+ath_tx_init_60515 ath_tx_init 2 60515 NULL -+hysdn_sched_rx_60533 hysdn_sched_rx 3 60533 NULL ++lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL +nonpaging_map_60551 nonpaging_map 4 60551 NULL -+nfsd_hashsize_60562 nfsd_hashsize 0 60562 NULL ++osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL ++tracing_entries_write_60563 tracing_entries_write 3 60563 NULL +hash_net6_expire_60598 hash_net6_expire 3 60598 NULL ++btrfs_add_delayed_tree_ref_60602 btrfs_add_delayed_tree_ref 0 60602 NULL +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL ++usb_control_msg_60624 usb_control_msg 0 60624 NULL +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL ++free_dind_blocks_60635 free_dind_blocks 0 60635 NULL +ubifs_recover_leb_60639 ubifs_recover_leb 3 60639 NULL -+fb_get_fscreeninfo_60640 fb_get_fscreeninfo 3 60640 NULL ++__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL ++mv_ffc64_60648 mv_ffc64 1 60648 NULL +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL ++run_clustered_refs_60668 run_clustered_refs 0 60668 NULL +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL -+read_vbt_r10_60679 read_vbt_r10 1 60679 NULL ++btrfs_reserve_extent_60674 btrfs_reserve_extent 5-0 60674 NULL +init_data_container_60709 init_data_container 1 60709 NULL ++vga_rcrt_60731 vga_rcrt 0 60731 NULL +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL +raid_status_60755 raid_status 5 60755 NULL +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL +opticon_write_60775 opticon_write 4 60775 NULL +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL ++block_rsv_migrate_bytes_60843 block_rsv_migrate_bytes 0 60843 NULL +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL -+alloc_buf_60864 alloc_buf 3-2 60864 NULL ++alloc_buf_60864 alloc_buf 2-3 60864 NULL +generic_writepages_60871 generic_writepages 0 60871 NULL ++tipc_createport_60875 tipc_createport 4 60875 NULL ++ubifs_read_one_lp_60882 ubifs_read_one_lp 0 60882 NULL +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL ++libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL +scrub_chunk_60926 scrub_chunk 5 60926 NULL -+sys_mlock_60932 sys_mlock 1 60932 NULL ++submit_extent_page_60928 submit_extent_page 5 60928 NULL +pti_char_write_60960 pti_char_write 3 60960 NULL -+mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL ++mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 3-2 60961 NULL +__a2mp_build_60987 __a2mp_build 3 60987 NULL +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL ++graph_depth_write_61024 graph_depth_write 3 61024 NULL ++sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL ++lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL +symtab_init_61050 symtab_init 2 61050 NULL +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL ++snd_pcm_pause_61054 snd_pcm_pause 0 61054 NULL +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-4-2 61062 NULL +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL ++journal_stop_61080 journal_stop 0 61080 NULL ++snd_pcm_update_hw_ptr0_61084 snd_pcm_update_hw_ptr0 0 61084 NULL +get_derived_key_61100 get_derived_key 4 61100 NULL ++mem_cgroup_cache_charge_61101 mem_cgroup_cache_charge 0 61101 NULL ++i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-1-2-3-4 61104 NULL +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL -+p80211_headerlen_61119 p80211_headerlen 0 61119 NULL nohasharray -+__probe_kernel_read_61119 __probe_kernel_read 3 61119 &p80211_headerlen_61119 ++__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL +brcmf_sdio_chip_cr4_exitdl_61143 brcmf_sdio_chip_cr4_exitdl 4 61143 NULL +__vmalloc_61168 __vmalloc 1 61168 NULL +event_oom_late_read_61175 event_oom_late_read 3 61175 NULL nohasharray +pair_device_61175 pair_device 4 61175 &event_oom_late_read_61175 -+sys_lsetxattr_61177 sys_lsetxattr 4 61177 NULL ++dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL ++btrfs_reloc_post_snapshot_61189 btrfs_reloc_post_snapshot 0 61189 NULL +SyS_prctl_61202 SyS_prctl 4 61202 NULL +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL -+btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 NULL -+vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 NULL -+sys_add_key_61288 sys_add_key 4 61288 NULL nohasharray -+nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 &sys_add_key_61288 ++__verify_planes_array_61249 __verify_planes_array 0 61249 NULL ++find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray ++ifalias_store_61270 ifalias_store 4 61270 &find_get_pages_tag_61270 nohasharray ++btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &ifalias_store_61270 ++kick_a_thread_61273 kick_a_thread 0 61273 NULL ++hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray ++vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283 ++nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL +ext4_issue_discard_61305 ext4_issue_discard 2 61305 NULL +xfer_from_user_61307 xfer_from_user 3 61307 NULL ++ocfs2_get_sector_61309 ocfs2_get_sector 4 61309 NULL +timespec_to_ns_61317 timespec_to_ns 0 61317 NULL +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL -+C_SYSC_msgsnd_61330 C_SYSC_msgsnd 2-3 61330 NULL -+st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL -+rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL ++C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL ++write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL ++__fls_61340 __fls 0 61340 NULL nohasharray ++st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 &__fls_61340 ++do_splice_direct_61341 do_splice_direct 5 61341 NULL nohasharray ++rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 &do_splice_direct_61341 ++__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-2-3 61342 NULL +f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL ++kvm_apic_id_61363 kvm_apic_id 0 61363 NULL +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL -+sys_ptrace_61369 sys_ptrace 3 61369 NULL -+change_xattr_61390 change_xattr 5 61390 NULL ++get_inode_info_61387 get_inode_info 0 61387 NULL ++system_enable_write_61396 system_enable_write 3 61396 NULL +size_entry_mwt_61400 size_entry_mwt 0 61400 NULL -+dma_ops_area_alloc_61440 dma_ops_area_alloc 3-4-5 61440 NULL ++xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL ++i915_emit_box_61436 i915_emit_box 0 61436 NULL ++dma_ops_area_alloc_61440 dma_ops_area_alloc 3-4-5-0 61440 NULL +tc3589x_irq_unmap_61447 tc3589x_irq_unmap 2 61447 NULL +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL -+snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 4-2-5 61483 NULL ++snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL ++ocfs2_get_refcount_rec_61514 ocfs2_get_refcount_rec 0 61514 NULL ++__vmalloc_area_node_61525 __vmalloc_area_node 4 61525 NULL +erst_errno_61526 erst_errno 0 61526 NULL +ntfs_attr_lookup_61539 ntfs_attr_lookup 0 61539 NULL +get_ohm_of_thermistor_61545 get_ohm_of_thermistor 2 61545 NULL ++trace_options_core_write_61551 trace_options_core_write 3 61551 NULL +o2hb_pop_count_61553 o2hb_pop_count 2 61553 NULL +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL ++parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL ++fan_proc_write_61569 fan_proc_write 3 61569 NULL +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL ++ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL +seq_open_private_61589 seq_open_private 3 61589 NULL -+__get_vm_area_61599 __get_vm_area 1 61599 NULL ++ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-2-1 61591 NULL ++netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL -+ncp_compat_ioctl_61608 ncp_compat_ioctl 3 61608 NULL +configfs_write_file_61621 configfs_write_file 3 61621 NULL +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL +resize_stripes_61650 resize_stripes 2 61650 NULL -+ttm_page_pool_free_61661 ttm_page_pool_free 2 61661 NULL ++ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL +insert_one_name_61668 insert_one_name 7 61668 NULL ++snd_pcm_playback_avail_61671 snd_pcm_playback_avail 0 61671 NULL ++qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL +lock_loop_61681 lock_loop 1 61681 NULL +__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL +filter_read_61692 filter_read 3 61692 NULL ++prog_page_61711 prog_page 2 61711 NULL +iov_length_61716 iov_length 0 61716 NULL +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL ++null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742 -+batadv_dat_snoop_incoming_arp_reply_61801 batadv_dat_snoop_incoming_arp_reply 3 61801 NULL ++SyS_sendto_61763 SyS_sendto 6 61763 NULL ++gfs2_meta_wait_61773 gfs2_meta_wait 0 61773 NULL ++num_counter_active_61789 num_counter_active 0 61789 NULL ++mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL +tps80031_irq_init_61830 tps80031_irq_init 3 61830 NULL +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL -+fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2 61854 NULL ++regcache_sync_block_61846 regcache_sync_block 4-5 61846 NULL ++fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2-0 61854 NULL +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL +get_fw_name_61874 get_fw_name 3 61874 NULL -+free_init_pages_61875 free_init_pages 2 61875 NULL -+twl4030_sih_setup_61878 twl4030_sih_setup 3 61878 NULL -+ieee80211_rtl_auth_challenge_61897 ieee80211_rtl_auth_challenge 3 61897 NULL -+ax25_addr_size_61899 ax25_addr_size 0 61899 NULL nohasharray -+cxgb4_pktgl_to_skb_61899 cxgb4_pktgl_to_skb 2 61899 &ax25_addr_size_61899 ++twl4030_sih_setup_61878 twl4030_sih_setup 3-0 61878 NULL ++btrfs_ioctl_clone_61886 btrfs_ioctl_clone 4-3-5 61886 NULL ++lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL ++lov_mds_md_stripecnt_61899 lov_mds_md_stripecnt 0-1 61899 NULL +clear_refs_write_61904 clear_refs_write 3 61904 NULL +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL -+au0828_init_isoc_61917 au0828_init_isoc 3-2 61917 NULL ++au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL -+send_bulk_static_data_61932 send_bulk_static_data 3 61932 NULL ++ocfs2_reserve_new_metadata_blocks_61926 ocfs2_reserve_new_metadata_blocks 0 61926 NULL ++SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL +gfn_to_pfn_memslot_atomic_61947 gfn_to_pfn_memslot_atomic 2 61947 NULL +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL ++fix_read_error_61965 fix_read_error 4 61965 NULL +mlx4_alloc_mtt_range_61966 mlx4_alloc_mtt_range 2 61966 NULL +ocfs2_quota_write_61972 ocfs2_quota_write 5-4 61972 NULL ++fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL +cow_file_range_61979 cow_file_range 3 61979 NULL +module_alloc_exec_61991 module_alloc_exec 1 61991 NULL -+virtnet_send_command_61993 virtnet_send_command 5-6 61993 NULL ++dequeue_event_62000 dequeue_event 3 62000 NULL +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL ++SyS_setxattr_62019 SyS_setxattr 4 62019 NULL +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL +SYSC_select_62024 SYSC_select 1 62024 NULL +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL -+ppp_tx_cp_62044 ppp_tx_cp 5 62044 NULL +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL +do_pselect_62061 do_pselect 1 62061 NULL -+pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2-3 62074 NULL ++pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL +get_domain_for_dev_62099 get_domain_for_dev 2 62099 NULL -+ipath_user_sdma_pin_pages_62100 ipath_user_sdma_pin_pages 3-5 62100 NULL ++ipath_user_sdma_pin_pages_62100 ipath_user_sdma_pin_pages 3-5-4 62100 NULL +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL ++btrfs_direct_IO_62114 btrfs_direct_IO 4 62114 NULL ++generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL -+qib_diag_write_62133 qib_diag_write 3 62133 NULL -+ql_status_62135 ql_status 5 62135 NULL ++qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray ++kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133 ++ql_status_62135 ql_status 5 62135 NULL nohasharray ++device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135 +video_usercopy_62151 video_usercopy 2 62151 NULL ++wrmWithLock_62164 wrmWithLock 0 62164 NULL ++SyS_getxattr_62166 SyS_getxattr 4 62166 NULL +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL ++write_file_dfs_62180 write_file_dfs 3 62180 NULL +alloc_upcall_62186 alloc_upcall 2 62186 NULL +btrfs_xattr_acl_set_62203 btrfs_xattr_acl_set 4 62203 NULL +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL +nfsd_read_file_62241 nfsd_read_file 6 62241 NULL +allocate_partition_62245 allocate_partition 4 62245 NULL ++security_file_permission_62278 security_file_permission 0 62278 NULL ++get_random_int_62279 get_random_int 0 62279 NULL +__qib_get_user_pages_62287 __qib_get_user_pages 1-2 62287 NULL +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL ++ocfs2_find_victim_alloc_group_62306 ocfs2_find_victim_alloc_group 0 62306 NULL +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL -+udf_sb_alloc_partition_maps_62313 udf_sb_alloc_partition_maps 2 62313 NULL ++timespec_to_jiffies_62321 timespec_to_jiffies 0 62321 NULL +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL +subseq_list_62332 subseq_list 3-0 62332 NULL ++ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL +flash_write_62354 flash_write 3 62354 NULL -+set_wd_exp_mode_pfs_62372 set_wd_exp_mode_pfs 3 62372 NULL -+twl_get_num_slaves_62386 twl_get_num_slaves 0 62386 NULL ++xfpregs_set_62363 xfpregs_set 4 62363 NULL +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL +altera_irscan_62396 altera_irscan 2 62396 NULL +set_ssp_62411 set_ssp 4 62411 NULL -+unmap_single_62423 unmap_single 2 62423 NULL -+netdev_alloc_skb_62437 netdev_alloc_skb 2 62437 NULL -+e1000_check_copybreak_62448 e1000_check_copybreak 3 62448 NULL -+ip_vs_icmp_xmit_v6_62477 ip_vs_icmp_xmit_v6 4 62477 NULL -+ceph_dns_resolve_name_62488 ceph_dns_resolve_name 2 62488 NULL -+remove_mapping_62491 remove_mapping 2 62491 NULL +mlx4_en_create_rx_ring_62498 mlx4_en_create_rx_ring 3 62498 NULL +ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL -+pep_sendmsg_62524 pep_sendmsg 4 62524 NULL nohasharray -+i915_next_seqno_read_62524 i915_next_seqno_read 3 62524 &pep_sendmsg_62524 -+test_iso_queue_62534 test_iso_queue 5 62534 NULL ++ocfs2_path_bh_journal_access_62504 ocfs2_path_bh_journal_access 0 62504 NULL ++pep_sendmsg_62524 pep_sendmsg 4 62524 NULL ++test_iso_queue_62534 test_iso_queue 5 62534 NULL nohasharray ++__kmalloc_node_track_caller_62534 __kmalloc_node_track_caller 3 62534 &test_iso_queue_62534 +debugfs_read_62535 debugfs_read 3 62535 NULL +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL +get_subdir_62581 get_subdir 3 62581 NULL -+prism2_send_mgmt_62605 prism2_send_mgmt 4 62605 NULL nohasharray -+nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 &prism2_send_mgmt_62605 -+iommu_area_alloc_62619 iommu_area_alloc 2-3-4-7 62619 NULL -+ems_pcmcia_add_card_62627 ems_pcmcia_add_card 2 62627 NULL -+compat_rangeinfo_62630 compat_rangeinfo 2 62630 NULL ++nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL ++get_desc_base_62617 get_desc_base 0 62617 NULL ++iommu_area_alloc_62619 iommu_area_alloc 2-3-4-7-0 62619 NULL ++vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL -+memblock_alloc_nid_62652 memblock_alloc_nid 1-2 62652 NULL -+ima_file_mmap_62663 ima_file_mmap 0 62663 NULL +write_62671 write 3 62671 NULL ++ocfs2_wait_for_mask_interruptible_62675 ocfs2_wait_for_mask_interruptible 0 62675 NULL +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL ++ext4_ind_map_blocks_62690 ext4_ind_map_blocks 0 62690 NULL ++htb_remove_class_from_row_62692 htb_remove_class_from_row 3 62692 NULL +qla4_83xx_rd_reg_62693 qla4_83xx_rd_reg 0 62693 NULL -+ioremap_wc_62695 ioremap_wc 1-2 62695 NULL +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL ++gfs2_log_write_62717 gfs2_log_write 3 62717 NULL +rdm_62719 rdm 0 62719 NULL ++obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL +key_replays_read_62746 key_replays_read 3 62746 NULL -+init_chip_wc_pat_62768 init_chip_wc_pat 2 62768 NULL ++lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL ++mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL +ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL +page_key_alloc_62771 page_key_alloc 0 62771 NULL -+C_SYSC_ipc_62776 C_SYSC_ipc 5-3-6-4 62776 NULL ++C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL ++SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL ++dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL ++posix_acl_valid_62788 posix_acl_valid 0 62788 NULL ++is_first_ref_62805 is_first_ref 0 62805 NULL +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL ++name_cache_insert_62822 name_cache_insert 0 62822 NULL ++BeceemEEPROMBulkRead_62835 BeceemEEPROMBulkRead 0 62835 NULL +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL +set_swbp_62853 set_swbp 3 62853 NULL -+hpi_read_word_62862 hpi_read_word 0 62862 NULL ++read_nic_io_dword_62859 read_nic_io_dword 0 62859 NULL ++l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL +aoechr_write_62883 aoechr_write 3 62883 NULL -+resize_info_buffer_62889 resize_info_buffer 2 62889 NULL +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL ++ocfs2_validate_gd_parent_62905 ocfs2_validate_gd_parent 0 62905 NULL +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL +getdqbuf_62908 getdqbuf 1 62908 NULL +try_async_pf_62914 try_async_pf 3 62914 NULL nohasharray -+SyS_remap_file_pages_62914 SyS_remap_file_pages 1 62914 &try_async_pf_62914 ++SyS_remap_file_pages_62914 SyS_remap_file_pages 1-2 62914 &try_async_pf_62914 ++ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL ++atomic64_sub_return_62941 atomic64_sub_return 1 62941 NULL +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL -+__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL ++send_write_62969 send_write 0-3 62969 NULL ++__ext3_journal_stop_63017 __ext3_journal_stop 0 63017 NULL ++kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL ++PTR_ERR_63033 PTR_ERR 0 63033 NULL nohasharray ++__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 &PTR_ERR_63033 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL -+gso_pskb_expand_head_63052 gso_pskb_expand_head 2 63052 NULL ++run_delayed_tree_ref_63042 run_delayed_tree_ref 0 63042 NULL +unlink1_63059 unlink1 3 63059 NULL ++__do_munmap_63063 __do_munmap 0 63063 NULL +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL -+ocfs2_decrease_refcount_63078 ocfs2_decrease_refcount 3 63078 NULL -+sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5-2-3 63087 NULL ++iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL ++ocfs2_decrease_refcount_63078 ocfs2_decrease_refcount 4-3-0 63078 NULL ++find_extent_in_eb_63082 find_extent_in_eb 0 63082 NULL ++sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5-3-2 63087 NULL ++__ocfs2_flush_truncate_log_63097 __ocfs2_flush_truncate_log 0 63097 NULL +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL ++ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL +alloc_cblock_63133 alloc_cblock 2 63133 NULL -+ib_send_cm_rtu_63138 ib_send_cm_rtu 3 63138 NULL -+xen_zap_pfn_range_63149 xen_zap_pfn_range 1 63149 NULL ++snd_pcm_status_user_63140 snd_pcm_status_user 0 63140 NULL ++ubifs_change_one_lp_63157 ubifs_change_one_lp 0 63157 NULL +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL ++SyS_syslog_63178 SyS_syslog 3 63178 NULL ++security_policydb_len_63198 security_policydb_len 0 63198 NULL +vme_master_read_63221 vme_master_read 0 63221 NULL +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL +module_alloc_update_bounds_rw_63233 module_alloc_update_bounds_rw 1 63233 NULL +ptp_read_63251 ptp_read 4 63251 NULL ++xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL ++ntfs_attr_can_be_non_resident_63267 ntfs_attr_can_be_non_resident 0 63267 NULL +raid5_resize_63306 raid5_resize 2 63306 NULL +proc_info_read_63344 proc_info_read 3 63344 NULL +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL @@ -107731,100 +109790,125 @@ index 0000000..b04803b +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL +nouveau_event_create_63411 nouveau_event_create 1 63411 NULL +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL -+sep_prepare_input_output_dma_table_63429 sep_prepare_input_output_dma_table 2-4-3 63429 NULL -+kone_send_63435 kone_send 4 63435 NULL -+gfn_to_hva_many_63437 gfn_to_hva_many 0-2 63437 NULL ++sep_prepare_input_output_dma_table_63429 sep_prepare_input_output_dma_table 3-4-2 63429 NULL ++gfn_to_hva_many_63437 gfn_to_hva_many 2-0 63437 NULL +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL -+ipv6_is_mld_63461 ipv6_is_mld 3 63461 NULL ++lookup_dir_item_inode_63447 lookup_dir_item_inode 0 63447 NULL ++i915_gem_object_get_fence_63455 i915_gem_object_get_fence 0 63455 NULL ++__do_kmalloc_node_63461 __do_kmalloc_node 3 63461 NULL ++si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL ++do_work_63483 do_work 0 63483 NULL +reada_find_extent_63486 reada_find_extent 2 63486 NULL -+read_kcore_63488 read_kcore 3 63488 NULL ++__copy_from_user_ll_nocache_63487 __copy_from_user_ll_nocache 0-3 63487 NULL ++read_kcore_63488 read_kcore 3 63488 NULL nohasharray ++alloc_reserved_tree_block_63488 alloc_reserved_tree_block 0 63488 &read_kcore_63488 +save_hint_63497 save_hint 2 63497 NULL ++wl1271_tx_min_rate_get_63498 wl1271_tx_min_rate_get 2 63498 NULL ++sis_voice_irq_63501 sis_voice_irq 1 63501 NULL +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL -+ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL ++efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 5-4 63529 NULL ++ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4-0 63534 NULL ++write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL +append_to_buffer_63550 append_to_buffer 3 63550 NULL +dbg_leb_write_63555 dbg_leb_write 4-5 63555 NULL nohasharray -+kvm_write_guest_page_63555 kvm_write_guest_page 5-2 63555 &dbg_leb_write_63555 ++kvm_write_guest_page_63555 kvm_write_guest_page 2-5 63555 &dbg_leb_write_63555 +ubifs_lpt_scan_nolock_63572 ubifs_lpt_scan_nolock 0 63572 NULL +iwch_reg_user_mr_63575 iwch_reg_user_mr 2-3 63575 NULL +ocfs2_calc_trunc_pos_63576 ocfs2_calc_trunc_pos 4 63576 NULL +rproc_alloc_63577 rproc_alloc 5 63577 NULL +ext3_clear_blocks_63597 ext3_clear_blocks 4-5 63597 NULL ++write_debug_level_63613 write_debug_level 3 63613 NULL +module_alloc_63630 module_alloc 1 63630 NULL +ntfs_malloc_nofs_nofail_63631 ntfs_malloc_nofs_nofail 1 63631 NULL +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL -+_ubh_find_next_zero_bit__63640 _ubh_find_next_zero_bit_ 4-5-3 63640 NULL ++_ubh_find_next_zero_bit__63640 _ubh_find_next_zero_bit_ 3-5-4 63640 NULL ++ext4_ext_get_access_63642 ext4_ext_get_access 0 63642 NULL +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL ++ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL +vbi_read_63673 vbi_read 3 63673 NULL nohasharray +xen_register_pirq_63673 xen_register_pirq 1-2 63673 &vbi_read_63673 -+alloc_tty_driver_63681 alloc_tty_driver 1 63681 NULL -+mkiss_compat_ioctl_63686 mkiss_compat_ioctl 4 63686 NULL ++write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL ++bin_search_63697 bin_search 0 63697 NULL +arizona_irq_map_63709 arizona_irq_map 2 63709 NULL ++ocfs2_et_root_journal_access_63713 ocfs2_et_root_journal_access 0 63713 NULL +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL -+btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL ++btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4-0 63720 NULL +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL ++snd_pcm_link_63772 snd_pcm_link 0 63772 NULL +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL -+spidev_compat_ioctl_63778 spidev_compat_ioctl 2-3 63778 NULL -+snapshot_compat_ioctl_63792 snapshot_compat_ioctl 3 63792 NULL -+kovaplus_sysfs_write_63795 kovaplus_sysfs_write 6 63795 NULL ++spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL -+dec_zcache_eph_zbytes_63817 dec_zcache_eph_zbytes 1 63817 NULL +prepare_copy_63826 prepare_copy 2 63826 NULL +sel_write_load_63830 sel_write_load 3 63830 NULL ++ll_readlink_63836 ll_readlink 3 63836 NULL ++IsSectionWritable_63842 IsSectionWritable 0 63842 NULL +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL -+init_map_ipmac_63896 init_map_ipmac 4-3 63896 NULL +divas_write_63901 divas_write 3 63901 NULL -+xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL -+uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-3-2 63922 NULL ++IsOffsetWritable_63902 IsOffsetWritable 0 63902 NULL nohasharray ++xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 &IsOffsetWritable_63902 ++uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL +snd_compr_write_63923 snd_compr_write 3 63923 NULL +acpi_ev_get_gpe_xrupt_block_63924 acpi_ev_get_gpe_xrupt_block 1 63924 NULL +tipc_send2port_63935 tipc_send2port 5 63935 NULL +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL +__team_options_register_63941 __team_options_register 3 63941 NULL +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL -+ieee80211_if_fmt_rc_rateidx_mcs_mask_2ghz_63968 ieee80211_if_fmt_rc_rateidx_mcs_mask_2ghz 3 63968 NULL -+ieee80211_authentication_req_63973 ieee80211_authentication_req 3 63973 NULL ++generic_acl_init_63955 generic_acl_init 0 63955 NULL ++domain_pfn_mapping_63957 domain_pfn_mapping 4 63957 NULL +diva_xdi_write_63975 diva_xdi_write 4 63975 NULL ++rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL -+kmemdup_64015 kmemdup 2 64015 NULL ++hfsplus_security_setxattr_64009 hfsplus_security_setxattr 4 64009 NULL ++C_SYSC_sendfile64_64017 C_SYSC_sendfile64 4 64017 NULL +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL -+offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 NULL nohasharray -+tcf_csum_skb_nextlayer_64025 tcf_csum_skb_nextlayer 3 64025 &offset_to_vaddr_64025 ++offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 NULL +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL +resize_async_buffer_64031 resize_async_buffer 4 64031 NULL -+sep_lli_table_secure_dma_64042 sep_lli_table_secure_dma 2-3 64042 NULL ++SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL +tfrc_calc_x_reverse_lookup_64057 tfrc_calc_x_reverse_lookup 0 64057 NULL ++__sock_create_64069 __sock_create 0 64069 NULL +get_u8_64076 get_u8 0 64076 NULL ++xilly_malloc_64077 xilly_malloc 2 64077 NULL ++btrfs_copy_root_64079 btrfs_copy_root 0 64079 NULL +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL -+vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL ++clear_update_marker_64088 clear_update_marker 0 64088 NULL nohasharray ++vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 &clear_update_marker_64088 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL ++SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL ++rdma_addr_size_64116 rdma_addr_size 0 64116 NULL +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL ++bypass_wd_write_64120 bypass_wd_write 3 64120 NULL +ol_quota_entries_per_block_64122 ol_quota_entries_per_block 0 64122 NULL +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL -+init_bch_64130 init_bch 1-2 64130 NULL -+SYSC_ptrace_64136 SYSC_ptrace 3-4 64136 NULL -+uea_idma_write_64139 uea_idma_write 3 64139 NULL ++init_bch_64130 init_bch 2-1 64130 NULL ++SYSC_ptrace_64136 SYSC_ptrace 3 64136 NULL +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL +__comedi_buf_alloc_64155 __comedi_buf_alloc 3 64155 NULL -+cpumask_scnprintf_64170 cpumask_scnprintf 2 64170 NULL ++cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL ++ocfs2_reserve_blocks_for_rec_trunc_64206 ocfs2_reserve_blocks_for_rec_trunc 0 64206 NULL ++xfs_vm_direct_IO_64223 xfs_vm_direct_IO 4 64223 NULL +read_pulse_64227 read_pulse 0-3 64227 NULL -+header_len_64232 header_len 0 64232 NULL -+redrat3_transmit_ir_64244 redrat3_transmit_ir 3 64244 NULL ++ea_len_64229 ea_len 0 64229 NULL ++btrfs_make_block_group_64241 btrfs_make_block_group 0 64241 NULL ++__btrfs_update_delayed_inode_64248 __btrfs_update_delayed_inode 0 64248 NULL +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL ++btrfs_next_item_64285 btrfs_next_item 0 64285 NULL +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL +event_id_read_64288 event_id_read 3 64288 NULL nohasharray +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 &event_id_read_64288 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL ++snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL -+ffz_64324 ffz 0 64324 NULL ++ffz_64324 ffz 0-1 64324 NULL +map_region_64328 map_region 1 64328 NULL +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL +ts_write_64336 ts_write 3 64336 NULL @@ -107832,7 +109916,9 @@ index 0000000..b04803b +do_write_orph_node_64343 do_write_orph_node 2 64343 NULL +ft1000_read_reg_64352 ft1000_read_reg 0 64352 NULL +bnx2x_vfop_mcast_cmd_64354 bnx2x_vfop_mcast_cmd 5 64354 NULL ++user_regset_copyin_64360 user_regset_copyin 7 64360 NULL +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL ++reg_create_64372 reg_create 5 64372 NULL +ilo_write_64378 ilo_write 3 64378 NULL +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL +vmcs_readl_64381 vmcs_readl 0 64381 NULL @@ -107846,8 +109932,7 @@ index 0000000..b04803b +oom_adj_write_64428 oom_adj_write 3 64428 NULL +ext4_trim_extent_64431 ext4_trim_extent 4 64431 NULL nohasharray +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 &ext4_trim_extent_64431 -+cap_capable_64462 cap_capable 0 64462 NULL -+ip_vs_create_timeout_table_64478 ip_vs_create_timeout_table 2 64478 NULL ++ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL +single_open_size_64483 single_open_size 4 64483 NULL +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL +msg_data_sz_64503 msg_data_sz 0 64503 NULL @@ -107855,32 +109940,46 @@ index 0000000..b04803b +handle_abnormal_pfn_64505 handle_abnormal_pfn 3 64505 &remove_uuid_64505 +crypto_blkcipher_alignmask_64520 crypto_blkcipher_alignmask 0 64520 NULL +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL ++iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL +ses_send_diag_64527 ses_send_diag 4 64527 NULL +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL +SyS_bind_64544 SyS_bind 3 64544 NULL -+rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4 64554 NULL -+__spi_sync_64561 __spi_sync 0 64561 NULL ++rbd_obj_read_sync_64554 rbd_obj_read_sync 4-3 64554 NULL ++__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3-0 64557 NULL ++__spi_sync_64561 __spi_sync 0 64561 NULL nohasharray ++ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 &__spi_sync_64561 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL ++kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL ++do_erase_64574 do_erase 4 64574 NULL +fanotify_write_64623 fanotify_write 3 64623 NULL ++ocfs2_remove_refcount_extent_64631 ocfs2_remove_refcount_extent 0 64631 NULL +to_dblock_64655 to_dblock 0-1 64655 NULL +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray -+tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661 ++tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661 nohasharray ++pool_create_64661 pool_create 3 64661 &tlbflush_read_file_64661 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL -+sec_bulk_write_64691 sec_bulk_write 2-3 64691 NULL -+__feat_register_sp_64712 __feat_register_sp 6 64712 NULL ++sec_bulk_write_64691 sec_bulk_write 2-3 64691 NULL nohasharray ++mremap_to_64691 mremap_to 0-3 64691 &sec_bulk_write_64691 ++pfn_to_hpa_64703 pfn_to_hpa 0-1 64703 NULL ++ip_select_ident_more_64707 ip_select_ident_more 4 64707 NULL +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL ++AscGetChipVersion_64737 AscGetChipVersion 0 64737 NULL +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL ++perf_swevent_event_64745 perf_swevent_event 2 64745 NULL +bio_map_kern_64751 bio_map_kern 3 64751 NULL +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL ++message_for_md_64777 message_for_md 5 64777 NULL +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL ++rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL ++proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL +vaddr_get_pfn_64818 vaddr_get_pfn 1 64818 NULL @@ -107888,68 +109987,78 @@ index 0000000..b04803b +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL +gfn_to_pfn_64870 gfn_to_pfn 2 64870 NULL ++lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL +ffs_epfile_io_64886 ffs_epfile_io 3 64886 NULL ++mk_pid_64894 mk_pid 0-3 64894 NULL +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL ++usb_reset_and_verify_device_64933 usb_reset_and_verify_device 0 64933 NULL +ubifs_wbuf_write_nolock_64946 ubifs_wbuf_write_nolock 3 64946 NULL -+snd_rawmidi_ioctl_compat_64954 snd_rawmidi_ioctl_compat 3 64954 NULL +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL +acpi_os_install_interrupt_handler_64968 acpi_os_install_interrupt_handler 1 64968 NULL +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL +ext2_group_first_block_no_64972 ext2_group_first_block_no 0-2 64972 NULL -+pskb_pull_65005 pskb_pull 2 65005 NULL -+unifi_write_65012 unifi_write 3 65012 NULL +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL -+nfs_readdata_alloc_65015 nfs_readdata_alloc 2 65015 NULL +insert_dent_65034 insert_dent 7 65034 NULL -+compat_put_ushort_65040 compat_put_ushort 1 65040 NULL -+brcmf_sdcard_rwdata_65041 brcmf_sdcard_rwdata 5 65041 NULL -+tty_audit_log_65043 tty_audit_log 8 65043 NULL -+compat_cmdtest_65064 compat_cmdtest 2 65064 NULL -+count_run_65072 count_run 0-2-4 65072 NULL nohasharray -+bnx2fc_process_l2_frame_compl_65072 bnx2fc_process_l2_frame_compl 3 65072 &count_run_65072 -+__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2-3 65076 NULL ++snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL ++ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL ++pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL ++make_idx_node_65068 make_idx_node 0 65068 NULL ++count_run_65072 count_run 0-2-4-5 65072 NULL ++__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL -+ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0 65090 NULL -+C_SYSC_semctl_65091 C_SYSC_semctl 4 65091 NULL -+ssb_bus_register_65183 ssb_bus_register 3 65183 NULL ++send_create_inode_65090 send_create_inode 0 65090 NULL nohasharray ++ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0 65090 &send_create_inode_65090 ++uasp_alloc_cmd_65097 uasp_alloc_cmd 0 65097 NULL ++__ext3_journal_dirty_metadata_65103 __ext3_journal_dirty_metadata 0 65103 NULL ++generic_ocp_write_65107 generic_ocp_write 4 65107 NULL ++kswapd_shrink_zone_65174 kswapd_shrink_zone 4 65174 NULL ++i2c_smbus_xfer_emulated_65183 i2c_smbus_xfer_emulated 0 65183 NULL ++btrfs_run_delayed_items_nr_65204 btrfs_run_delayed_items_nr 0 65204 NULL +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL +print_endpoint_stat_65232 print_endpoint_stat 3-4-0 65232 NULL ++journal_get_write_access_65243 journal_get_write_access 0 65243 NULL +whci_n_caps_65247 whci_n_caps 0 65247 NULL -+atomic_long_read_65263 atomic_long_read 0 65263 NULL +kmem_zalloc_greedy_65268 kmem_zalloc_greedy 3-2 65268 NULL +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL ++get_unaligned_le16_65293 get_unaligned_le16 0 65293 NULL +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL +get_var_len_65304 get_var_len 0 65304 NULL +unpack_array_65318 unpack_array 0 65318 NULL +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL -+init_list_set_65351 init_list_set 2-3 65351 NULL ++init_list_set_65351 init_list_set 3-2 65351 NULL +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL +batadv_tt_save_orig_buffer_65361 batadv_tt_save_orig_buffer 4 65361 NULL +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL +__ext4_new_inode_65370 __ext4_new_inode 5 65370 NULL -+strchr_65372 strchr 0 65372 NULL nohasharray -+SyS_writev_65372 SyS_writev 3 65372 &strchr_65372 -+__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1-2 65397 NULL ++SyS_writev_65372 SyS_writev 3 65372 NULL ++mi_set_context_65395 mi_set_context 0 65395 NULL ++__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL +mtd_get_device_size_65400 mtd_get_device_size 0 65400 NULL -+iio_device_add_channel_sysfs_65406 iio_device_add_channel_sysfs 0 65406 NULL -+ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL -+drm_calloc_large_65421 drm_calloc_large 1-2 65421 NULL ++__read_vmcore_65402 __read_vmcore 2 65402 NULL ++usb_ep_enable_65405 usb_ep_enable 0 65405 NULL ++ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 4-3 65410 NULL ++drm_calloc_large_65421 drm_calloc_large 2-1 65421 NULL ++device_add_groups_65423 device_add_groups 0 65423 NULL +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL ++vmalloc_to_pfn_65437 vmalloc_to_pfn 0 65437 NULL +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL -+ath_rx_edma_init_65483 ath_rx_edma_init 2 65483 NULL ++il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL ++ext4_es_zeroout_65465 ext4_es_zeroout 0 65465 NULL ++clear_user_65470 clear_user 2 65470 NULL +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL -+alloc_dr_65495 alloc_dr 2 65495 NULL ++lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9-0 65493 NULL ++nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c new file mode 100644 -index 0000000..03d0c84 +index 0000000..a3f9702 --- /dev/null +++ b/tools/gcc/size_overflow_plugin.c -@@ -0,0 +1,2113 @@ +@@ -0,0 +1,3870 @@ +/* + * Copyright 2011, 2012, 2013 by Emese Revfy + * Licensed under the GPL v2, or (at your option) v3 @@ -107986,1790 +110095,3373 @@ index 0000000..03d0c84 +#include "diagnostic.h" +#include "cfgloop.h" + -+#if BUILDING_GCC_VERSION >= 4008 -+#define TODO_dump_func 0 ++#if BUILDING_GCC_VERSION >= 4008 ++#define TODO_dump_func 0 ++#define TODO_dump_cgraph 0 ++#endif ++ ++#define __unused __attribute__((__unused__)) ++#define ASM_NAME(node) IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(node)) ++#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node)) ++#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node)) ++#define BEFORE_STMT true ++#define AFTER_STMT false ++#define CREATE_NEW_VAR NULL_TREE ++#define CODES_LIMIT 32 ++#define MAX_PARAM 31 ++#define VEC_LEN 128 ++#define MY_STMT GF_PLF_1 ++#define NO_CAST_CHECK GF_PLF_2 ++#define RET_CHECK NULL_TREE ++#define CANNOT_FIND_ARG 32 ++#define WRONG_NODE 32 ++#define NOT_INTENTIONAL_ASM NULL ++#define MIN_CHECK true ++#define MAX_CHECK false ++ ++#if BUILDING_GCC_VERSION == 4005 ++#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE))) ++#endif ++ ++struct size_overflow_hash { ++ const struct size_overflow_hash * const next; ++ const char * const name; ++ const unsigned int param; ++}; ++ ++#include "size_overflow_hash.h" ++ ++enum mark { ++ MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF ++}; ++ ++static unsigned int call_count; ++ ++struct visited { ++ struct visited *next; ++ const_tree fndecl; ++ unsigned int num; ++ const_gimple first_stmt; ++}; ++ ++struct next_cgraph_node { ++ struct next_cgraph_node *next; ++ struct cgraph_node *current_function; ++ tree callee_fndecl; ++ unsigned int num; ++}; ++ ++struct interesting_node { ++ struct interesting_node *next; ++ gimple first_stmt; ++ const_tree fndecl; ++ tree node; ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC(tree, gc) *last_nodes; ++#else ++ vec *last_nodes; ++#endif ++ unsigned int num; ++ enum mark intentional_attr_decl; ++ enum mark intentional_attr_cur_fndecl; ++ gimple intentional_mark_from_gimple; ++}; ++ ++int plugin_is_GPL_compatible; ++void debug_gimple_stmt(gimple gs); ++ ++static tree report_size_overflow_decl; ++static const_tree const_char_ptr_type_node; ++ ++static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs); ++static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs); ++static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs); ++static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs); ++static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs); ++ ++static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before); ++static tree get_size_overflow_type(gimple stmt, const_tree node); ++static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3); ++ ++static struct plugin_info size_overflow_plugin_info = { ++ .version = "20131203beta", ++ .help = "no-size-overflow\tturn off size overflow checking\n", ++}; ++ ++static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs) ++{ ++ unsigned int arg_count; ++ enum tree_code code = TREE_CODE(*node); ++ ++ switch (code) { ++ case FUNCTION_DECL: ++ arg_count = type_num_arguments(TREE_TYPE(*node)); ++ break; ++ case FUNCTION_TYPE: ++ case METHOD_TYPE: ++ arg_count = type_num_arguments(*node); ++ break; ++ default: ++ *no_add_attrs = true; ++ error("%s: %qE attribute only applies to functions", __func__, name); ++ return NULL_TREE; ++ } ++ ++ for (; args; args = TREE_CHAIN(args)) { ++ tree position = TREE_VALUE(args); ++ if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) { ++ error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position)); ++ *no_add_attrs = true; ++ } ++ } ++ return NULL_TREE; ++} ++ ++static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs) ++{ ++ unsigned int arg_count; ++ enum tree_code code = TREE_CODE(*node); ++ ++ switch (code) { ++ case FUNCTION_DECL: ++ arg_count = type_num_arguments(TREE_TYPE(*node)); ++ break; ++ case FUNCTION_TYPE: ++ case METHOD_TYPE: ++ arg_count = type_num_arguments(*node); ++ break; ++ case FIELD_DECL: ++ return NULL_TREE; ++ default: ++ *no_add_attrs = true; ++ error("%qE attribute only applies to functions", name); ++ return NULL_TREE; ++ } ++ ++ if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0) ++ return NULL_TREE; ++ ++ for (; args; args = TREE_CHAIN(args)) { ++ tree position = TREE_VALUE(args); ++ if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) { ++ error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position)); ++ *no_add_attrs = true; ++ } ++ } ++ return NULL_TREE; ++} ++ ++static struct attribute_spec size_overflow_attr = { ++ .name = "size_overflow", ++ .min_length = 1, ++ .max_length = -1, ++ .decl_required = true, ++ .type_required = false, ++ .function_type_required = false, ++ .handler = handle_size_overflow_attribute, ++#if BUILDING_GCC_VERSION >= 4007 ++ .affects_type_identity = false ++#endif ++}; ++ ++static struct attribute_spec intentional_overflow_attr = { ++ .name = "intentional_overflow", ++ .min_length = 1, ++ .max_length = -1, ++ .decl_required = true, ++ .type_required = false, ++ .function_type_required = false, ++ .handler = handle_intentional_overflow_attribute, ++#if BUILDING_GCC_VERSION >= 4007 ++ .affects_type_identity = false ++#endif ++}; ++ ++static void register_attributes(void __unused *event_data, void __unused *data) ++{ ++ register_attribute(&size_overflow_attr); ++ register_attribute(&intentional_overflow_attr); ++} ++ ++static bool is_bool(const_tree node) ++{ ++ const_tree type; ++ ++ if (node == NULL_TREE) ++ return false; ++ ++ type = TREE_TYPE(node); ++ if (!INTEGRAL_TYPE_P(type)) ++ return false; ++ if (TREE_CODE(type) == BOOLEAN_TYPE) ++ return true; ++ if (TYPE_PRECISION(type) == 1) ++ return true; ++ return false; ++} ++ ++static bool skip_types(const_tree var) ++{ ++ tree type; ++ enum tree_code code; ++ ++ if (is_gimple_constant(var)) ++ return true; ++ ++ switch (TREE_CODE(var)) { ++ case ADDR_EXPR: ++#if BUILDING_GCC_VERSION >= 4006 ++ case MEM_REF: ++#endif ++ case ARRAY_REF: ++ case BIT_FIELD_REF: ++ case INDIRECT_REF: ++ case TARGET_MEM_REF: ++ case COMPONENT_REF: ++ case VAR_DECL: ++ case VIEW_CONVERT_EXPR: ++ return true; ++ default: ++ break; ++ } ++ ++ code = TREE_CODE(var); ++ gcc_assert(code == SSA_NAME || code == PARM_DECL); ++ ++ type = TREE_TYPE(var); ++ switch (TREE_CODE(type)) { ++ case INTEGER_TYPE: ++ case ENUMERAL_TYPE: ++ return false; ++ case BOOLEAN_TYPE: ++ return is_bool(var); ++ default: ++ return true; ++ } ++} ++ ++static inline gimple get_def_stmt(const_tree node) ++{ ++ gcc_assert(node != NULL_TREE); ++ ++ if (skip_types(node)) ++ return NULL; ++ ++ if (TREE_CODE(node) != SSA_NAME) ++ return NULL; ++ return SSA_NAME_DEF_STMT(node); ++} ++ ++static unsigned char get_tree_code(const_tree type) ++{ ++ switch (TREE_CODE(type)) { ++ case ARRAY_TYPE: ++ return 0; ++ case BOOLEAN_TYPE: ++ return 1; ++ case ENUMERAL_TYPE: ++ return 2; ++ case FUNCTION_TYPE: ++ return 3; ++ case INTEGER_TYPE: ++ return 4; ++ case POINTER_TYPE: ++ return 5; ++ case RECORD_TYPE: ++ return 6; ++ case UNION_TYPE: ++ return 7; ++ case VOID_TYPE: ++ return 8; ++ case REAL_TYPE: ++ return 9; ++ case VECTOR_TYPE: ++ return 10; ++ case REFERENCE_TYPE: ++ return 11; ++ case OFFSET_TYPE: ++ return 12; ++ case COMPLEX_TYPE: ++ return 13; ++ default: ++ debug_tree((tree)type); ++ gcc_unreachable(); ++ } ++} ++ ++struct function_hash { ++ size_t tree_codes_len; ++ unsigned char tree_codes[CODES_LIMIT]; ++ tree fndecl; ++ unsigned int hash; ++}; ++ ++// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html ++static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed) ++{ ++#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); } ++#define cwmixa( in ) { cwfold( in, m, k, h ); } ++#define cwmixb( in ) { cwfold( in, n, h, k ); } ++ ++ unsigned int m = 0x57559429; ++ unsigned int n = 0x5052acdb; ++ const unsigned int *key4 = (const unsigned int *)key; ++ unsigned int h = len; ++ unsigned int k = len + seed + n; ++ unsigned long long p; ++ ++ while (len >= 8) { ++ cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2; ++ len -= 8; ++ } ++ if (len >= 4) { ++ cwmixb(key4[0]) key4 += 1; ++ len -= 4; ++ } ++ if (len) ++ cwmixa(key4[0] & ((1 << (len * 8)) - 1 )); ++ cwmixb(h ^ (k + n)); ++ return k ^ h; ++ ++#undef cwfold ++#undef cwmixa ++#undef cwmixb ++} ++ ++static void set_hash(const char *fn_name, struct function_hash *fn_hash_data) ++{ ++ unsigned int fn, codes, seed = 0; ++ ++ fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff; ++ codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff; ++ ++ fn_hash_data->hash = fn ^ codes; ++} ++ ++static void set_node_codes(const_tree type, struct function_hash *fn_hash_data) ++{ ++ gcc_assert(type != NULL_TREE); ++ gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type); ++ ++ while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) { ++ fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type); ++ fn_hash_data->tree_codes_len++; ++ type = TREE_TYPE(type); ++ } ++} ++ ++static void set_result_codes(const_tree node, struct function_hash *fn_hash_data) ++{ ++ const_tree result; ++ ++ gcc_assert(node != NULL_TREE); ++ ++ if (DECL_P(node)) { ++ result = DECL_RESULT(node); ++ if (result != NULL_TREE) ++ return set_node_codes(TREE_TYPE(result), fn_hash_data); ++ return set_result_codes(TREE_TYPE(node), fn_hash_data); ++ } ++ ++ gcc_assert(TYPE_P(node)); ++ ++ if (TREE_CODE(node) == FUNCTION_TYPE) ++ return set_result_codes(TREE_TYPE(node), fn_hash_data); ++ ++ return set_node_codes(node, fn_hash_data); ++} ++ ++static void set_function_codes(struct function_hash *fn_hash_data) ++{ ++ const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl); ++ enum tree_code code = TREE_CODE(type); ++ ++ gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE); ++ ++ set_result_codes(fn_hash_data->fndecl, fn_hash_data); ++ ++ for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg)) ++ set_node_codes(TREE_VALUE(arg), fn_hash_data); ++} ++ ++static const struct size_overflow_hash *get_function_hash(tree fndecl) ++{ ++ const struct size_overflow_hash *entry; ++ struct function_hash fn_hash_data; ++ const char *func_name; ++ ++ // skip builtins __builtin_constant_p ++ if (DECL_BUILT_IN(fndecl)) ++ return NULL; ++ ++ fn_hash_data.fndecl = fndecl; ++ fn_hash_data.tree_codes_len = 0; ++ ++ set_function_codes(&fn_hash_data); ++ gcc_assert(fn_hash_data.tree_codes_len != 0); ++ ++ func_name = ASM_NAME(fn_hash_data.fndecl); ++ set_hash(func_name, &fn_hash_data); ++ ++ entry = size_overflow_hash[fn_hash_data.hash]; ++ ++ while (entry) { ++ if (!strcmp(entry->name, func_name)) ++ return entry; ++ entry = entry->next; ++ } ++ return NULL; ++} ++ ++static void print_missing_msg(tree func, unsigned int argnum) ++{ ++ location_t loc; ++ const char *curfunc; ++ struct function_hash fn_hash_data; ++ ++ fn_hash_data.fndecl = DECL_ORIGIN(func); ++ fn_hash_data.tree_codes_len = 0; ++ ++ loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl); ++ curfunc = ASM_NAME(fn_hash_data.fndecl); ++ ++ set_function_codes(&fn_hash_data); ++ set_hash(curfunc, &fn_hash_data); ++ ++ inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash); ++} ++ ++static unsigned int find_arg_number_tree(const_tree arg, const_tree func) ++{ ++ tree var; ++ unsigned int argnum = 1; ++ ++ if (TREE_CODE(arg) == SSA_NAME) ++ arg = SSA_NAME_VAR(arg); ++ ++ for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) { ++ if (!operand_equal_p(arg, var, 0) && strcmp(NAME(var), NAME(arg))) ++ continue; ++ if (!skip_types(var)) ++ return argnum; ++ } ++ ++ return CANNOT_FIND_ARG; ++} ++ ++static tree create_new_var(tree type) ++{ ++ tree new_var = create_tmp_var(type, "cicus"); ++ ++#if BUILDING_GCC_VERSION <= 4007 ++ add_referenced_var(new_var); ++#endif ++ return new_var; ++} ++ ++static gimple create_binary_assign(enum tree_code code, gimple stmt, tree rhs1, tree rhs2) ++{ ++ gimple assign; ++ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); ++ tree type = TREE_TYPE(rhs1); ++ tree lhs = create_new_var(type); ++ ++ gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2))); ++ assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2); ++ gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign)); ++ ++ gsi_insert_before(&gsi, assign, GSI_NEW_STMT); ++ update_stmt(assign); ++ gimple_set_plf(assign, MY_STMT, true); ++ return assign; ++} ++ ++static tree cast_a_tree(tree type, tree var) ++{ ++ gcc_assert(type != NULL_TREE); ++ gcc_assert(var != NULL_TREE); ++ gcc_assert(fold_convertible_p(type, var)); ++ ++ return fold_convert(type, var); ++} ++ ++static tree get_lhs(const_gimple stmt) ++{ ++ switch (gimple_code(stmt)) { ++ case GIMPLE_ASSIGN: ++ case GIMPLE_CALL: ++ return gimple_get_lhs(stmt); ++ case GIMPLE_PHI: ++ return gimple_phi_result(stmt); ++ default: ++ return NULL_TREE; ++ } ++} ++ ++static bool skip_cast(tree dst_type, const_tree rhs, bool force) ++{ ++ const_gimple def_stmt = get_def_stmt(rhs); ++ ++ if (force) ++ return false; ++ ++ if (is_gimple_constant(rhs)) ++ return false; ++ ++ if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP) ++ return false; ++ ++ if (!types_compatible_p(dst_type, TREE_TYPE(rhs))) ++ return false; ++ ++ // DI type can be on 32 bit (from create_assign) but overflow type stays DI ++ if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode)) ++ return false; ++ ++ return true; ++} ++ ++static gimple build_cast_stmt(tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force) ++{ ++ gimple assign, def_stmt; ++ ++ gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE); ++ if (gsi_end_p(*gsi) && before == AFTER_STMT) ++ gcc_unreachable(); ++ ++ def_stmt = get_def_stmt(rhs); ++ if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && gimple_plf(def_stmt, MY_STMT)) ++ return def_stmt; ++ ++ if (lhs == CREATE_NEW_VAR) ++ lhs = create_new_var(dst_type); ++ ++ assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs)); ++ ++ if (!gsi_end_p(*gsi)) { ++ location_t loc = gimple_location(gsi_stmt(*gsi)); ++ gimple_set_location(assign, loc); ++ } ++ ++ gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign)); ++ ++ if (before) ++ gsi_insert_before(gsi, assign, GSI_NEW_STMT); ++ else ++ gsi_insert_after(gsi, assign, GSI_NEW_STMT); ++ update_stmt(assign); ++ return assign; ++} ++ ++static tree cast_to_new_size_overflow_type(gimple stmt, tree rhs, tree size_overflow_type, bool before) ++{ ++ gimple_stmt_iterator gsi; ++ tree lhs; ++ gimple new_stmt; ++ ++ if (rhs == NULL_TREE) ++ return NULL_TREE; ++ ++ gsi = gsi_for_stmt(stmt); ++ new_stmt = build_cast_stmt(size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false); ++ gimple_set_plf(new_stmt, MY_STMT, true); ++ ++ lhs = get_lhs(new_stmt); ++ gcc_assert(lhs != NULL_TREE); ++ return lhs; ++} ++ ++static tree cast_to_TI_type(gimple stmt, tree node) ++{ ++ gimple_stmt_iterator gsi; ++ gimple cast_stmt; ++ tree type = TREE_TYPE(node); ++ ++ if (types_compatible_p(type, intTI_type_node)) ++ return node; ++ ++ gsi = gsi_for_stmt(stmt); ++ cast_stmt = build_cast_stmt(intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false); ++ gimple_set_plf(cast_stmt, MY_STMT, true); ++ return gimple_assign_lhs(cast_stmt); ++} ++ ++static tree create_assign(struct pointer_set_t *visited, gimple oldstmt, tree rhs1, bool before) ++{ ++ tree lhs, new_lhs; ++ gimple_stmt_iterator gsi; ++ ++ if (rhs1 == NULL_TREE) { ++ debug_gimple_stmt(oldstmt); ++ error("%s: rhs1 is NULL_TREE", __func__); ++ gcc_unreachable(); ++ } ++ ++ switch (gimple_code(oldstmt)) { ++ case GIMPLE_ASM: ++ lhs = rhs1; ++ break; ++ case GIMPLE_CALL: ++ case GIMPLE_ASSIGN: ++ lhs = gimple_get_lhs(oldstmt); ++ break; ++ default: ++ debug_gimple_stmt(oldstmt); ++ gcc_unreachable(); ++ } ++ ++ gsi = gsi_for_stmt(oldstmt); ++ pointer_set_insert(visited, oldstmt); ++ if (lookup_stmt_eh_lp(oldstmt) != 0) { ++ basic_block next_bb, cur_bb; ++ const_edge e; ++ ++ gcc_assert(before == false); ++ gcc_assert(stmt_can_throw_internal(oldstmt)); ++ gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL); ++ gcc_assert(!gsi_end_p(gsi)); ++ ++ cur_bb = gimple_bb(oldstmt); ++ next_bb = cur_bb->next_bb; ++ e = find_edge(cur_bb, next_bb); ++ gcc_assert(e != NULL); ++ gcc_assert(e->flags & EDGE_FALLTHRU); ++ ++ gsi = gsi_after_labels(next_bb); ++ gcc_assert(!gsi_end_p(gsi)); ++ ++ before = true; ++ oldstmt = gsi_stmt(gsi); ++ } ++ ++ new_lhs = cast_to_new_size_overflow_type(oldstmt, rhs1, get_size_overflow_type(oldstmt, lhs), before); ++ return new_lhs; ++} ++ ++static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3) ++{ ++ gimple stmt; ++ gimple_stmt_iterator gsi; ++ tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt); ++ ++ if (gimple_plf(oldstmt, MY_STMT)) ++ return lhs; ++ ++ if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) { ++ rhs1 = gimple_assign_rhs1(oldstmt); ++ rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT); ++ } ++ if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) { ++ rhs2 = gimple_assign_rhs2(oldstmt); ++ rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT); ++ } ++ ++ stmt = gimple_copy(oldstmt); ++ gimple_set_location(stmt, gimple_location(oldstmt)); ++ gimple_set_plf(stmt, MY_STMT, true); ++ ++ if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR) ++ gimple_assign_set_rhs_code(stmt, MULT_EXPR); ++ ++ size_overflow_type = get_size_overflow_type(oldstmt, node); ++ ++ new_var = create_new_var(size_overflow_type); ++ new_var = make_ssa_name(new_var, stmt); ++ gimple_assign_set_lhs(stmt, new_var); ++ ++ if (rhs1 != NULL_TREE) ++ gimple_assign_set_rhs1(stmt, rhs1); ++ ++ if (rhs2 != NULL_TREE) ++ gimple_assign_set_rhs2(stmt, rhs2); ++#if BUILDING_GCC_VERSION >= 4007 ++ if (rhs3 != NULL_TREE) ++ gimple_assign_set_rhs3(stmt, rhs3); ++#endif ++ gimple_set_vuse(stmt, gimple_vuse(oldstmt)); ++ gimple_set_vdef(stmt, gimple_vdef(oldstmt)); ++ ++ gsi = gsi_for_stmt(oldstmt); ++ gsi_insert_after(&gsi, stmt, GSI_SAME_STMT); ++ update_stmt(stmt); ++ pointer_set_insert(visited, oldstmt); ++ return gimple_assign_lhs(stmt); ++} ++ ++static tree cast_parm_decl(tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb) ++{ ++ gimple assign; ++ gimple_stmt_iterator gsi; ++ basic_block first_bb; ++ ++ gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg)); ++ ++ if (bb->index == 0) { ++ first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest; ++ gcc_assert(dom_info_available_p(CDI_DOMINATORS)); ++ set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR); ++ bb = first_bb; ++ } ++ ++ gsi = gsi_after_labels(bb); ++ assign = build_cast_stmt(size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false); ++ gimple_set_plf(assign, MY_STMT, true); ++ ++ return gimple_assign_lhs(assign); ++} ++ ++static tree use_phi_ssa_name(tree ssa_name_var, tree new_arg) ++{ ++ gimple_stmt_iterator gsi; ++ gimple assign, def_stmt = get_def_stmt(new_arg); ++ ++ if (gimple_code(def_stmt) == GIMPLE_PHI) { ++ gsi = gsi_after_labels(gimple_bb(def_stmt)); ++ assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true); ++ } else { ++ gsi = gsi_for_stmt(def_stmt); ++ assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true); ++ } ++ ++ gimple_set_plf(assign, MY_STMT, true); ++ return gimple_assign_lhs(assign); ++} ++ ++static tree cast_visited_phi_arg(tree ssa_name_var, tree arg, tree size_overflow_type) ++{ ++ basic_block bb; ++ gimple_stmt_iterator gsi; ++ const_gimple def_stmt; ++ gimple assign; ++ ++ def_stmt = get_def_stmt(arg); ++ bb = gimple_bb(def_stmt); ++ gcc_assert(bb->index != 0); ++ gsi = gsi_after_labels(bb); ++ ++ assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false); ++ gimple_set_plf(assign, MY_STMT, true); ++ return gimple_assign_lhs(assign); ++} ++ ++static tree create_new_phi_arg(tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i) ++{ ++ tree size_overflow_type; ++ tree arg; ++ const_gimple def_stmt; ++ ++ if (new_arg != NULL_TREE && is_gimple_constant(new_arg)) ++ return new_arg; ++ ++ arg = gimple_phi_arg_def(oldstmt, i); ++ def_stmt = get_def_stmt(arg); ++ gcc_assert(def_stmt != NULL); ++ size_overflow_type = get_size_overflow_type(oldstmt, arg); ++ ++ switch (gimple_code(def_stmt)) { ++ case GIMPLE_PHI: ++ return cast_visited_phi_arg(ssa_name_var, arg, size_overflow_type); ++ case GIMPLE_NOP: { ++ basic_block bb; ++ ++ bb = gimple_phi_arg_edge(oldstmt, i)->src; ++ return cast_parm_decl(ssa_name_var, arg, size_overflow_type, bb); ++ } ++ case GIMPLE_ASM: { ++ gimple_stmt_iterator gsi; ++ gimple assign, stmt = get_def_stmt(arg); ++ ++ gsi = gsi_for_stmt(stmt); ++ assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false); ++ gimple_set_plf(assign, MY_STMT, true); ++ return gimple_assign_lhs(assign); ++ } ++ default: ++ gcc_assert(new_arg != NULL_TREE); ++ gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type)); ++ return use_phi_ssa_name(ssa_name_var, new_arg); ++ } ++} ++ ++static gimple overflow_create_phi_node(gimple oldstmt, tree result) ++{ ++ basic_block bb; ++ gimple phi; ++ gimple_seq seq; ++ gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt); ++ ++ bb = gsi_bb(gsi); ++ ++ if (result == NULL_TREE) { ++ tree old_result = gimple_phi_result(oldstmt); ++ tree size_overflow_type = get_size_overflow_type(oldstmt, old_result); ++ ++ result = create_new_var(size_overflow_type); ++ } ++ ++ phi = create_phi_node(result, bb); ++ gimple_phi_set_result(phi, make_ssa_name(result, phi)); ++ seq = phi_nodes(bb); ++ gsi = gsi_last(seq); ++ gsi_remove(&gsi, false); ++ ++ gsi = gsi_for_stmt(oldstmt); ++ gsi_insert_after(&gsi, phi, GSI_NEW_STMT); ++ gimple_set_bb(phi, bb); ++ gimple_set_plf(phi, MY_STMT, true); ++ return phi; ++} ++ ++#if BUILDING_GCC_VERSION <= 4007 ++static tree create_new_phi_node(VEC(tree, gc) *args, tree ssa_name_var, gimple oldstmt) ++#else ++static tree create_new_phi_node(vec *args, tree ssa_name_var, gimple oldstmt) ++#endif ++{ ++ gimple new_phi; ++ unsigned int i; ++ tree arg, result; ++ location_t loc = gimple_location(oldstmt); ++ ++#if BUILDING_GCC_VERSION <= 4007 ++ gcc_assert(!VEC_empty(tree, args)); ++#else ++ gcc_assert(!args->is_empty()); ++#endif ++ ++ new_phi = overflow_create_phi_node(oldstmt, ssa_name_var); ++ result = gimple_phi_result(new_phi); ++ ssa_name_var = SSA_NAME_VAR(result); ++ ++ ++#if BUILDING_GCC_VERSION == 4005 ++ for (i = 0; i < VEC_length(tree, args); i++) { ++ arg = VEC_index(tree, args, i); ++#elif BUILDING_GCC_VERSION <= 4007 ++ FOR_EACH_VEC_ELT(tree, args, i, arg) { ++#else ++ FOR_EACH_VEC_ELT(*args, i, arg) { ++#endif ++ arg = create_new_phi_arg(ssa_name_var, arg, oldstmt, i); ++ add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc); ++ } ++ ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC_free(tree, gc, args); ++#else ++ vec_free(args); ++#endif ++ update_stmt(new_phi); ++ return result; ++} ++ ++static tree handle_phi(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree orig_result) ++{ ++ tree ssa_name_var = NULL_TREE; ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC(tree, gc) *args; ++#else ++ vec *args; ++#endif ++ gimple oldstmt = get_def_stmt(orig_result); ++ unsigned int i, len = gimple_phi_num_args(oldstmt); ++ ++ pointer_set_insert(visited, oldstmt); ++#if BUILDING_GCC_VERSION <= 4007 ++ args = VEC_alloc(tree, gc, len); ++#else ++ vec_alloc(args, len); ++#endif ++ for (i = 0; i < len; i++) { ++ tree arg, new_arg; ++ ++ arg = gimple_phi_arg_def(oldstmt, i); ++ new_arg = expand(visited, caller_node, arg); ++ ++ if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE) ++ ssa_name_var = SSA_NAME_VAR(new_arg); ++ ++ if (is_gimple_constant(arg)) { ++ tree size_overflow_type = get_size_overflow_type(oldstmt, arg); ++ ++ new_arg = cast_a_tree(size_overflow_type, arg); ++ } ++ ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC_safe_push(tree, gc, args, new_arg); ++#else ++ vec_safe_push(args, new_arg); ++#endif ++ } ++ ++ return create_new_phi_node(args, ssa_name_var, oldstmt); ++} ++ ++static tree change_assign_rhs(gimple stmt, const_tree orig_rhs, tree new_rhs) ++{ ++ gimple assign; ++ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); ++ tree origtype = TREE_TYPE(orig_rhs); ++ ++ gcc_assert(is_gimple_assign(stmt)); ++ ++ assign = build_cast_stmt(origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false); ++ gimple_set_plf(assign, MY_STMT, true); ++ return gimple_assign_lhs(assign); ++} ++ ++static bool is_a_cast_and_const_overflow(const_tree no_const_rhs) ++{ ++ const_tree rhs1, lhs, rhs1_type, lhs_type; ++ enum machine_mode lhs_mode, rhs_mode; ++ gimple def_stmt = get_def_stmt(no_const_rhs); ++ ++ if (!def_stmt || !gimple_assign_cast_p(def_stmt)) ++ return false; ++ ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ lhs = gimple_assign_lhs(def_stmt); ++ rhs1_type = TREE_TYPE(rhs1); ++ lhs_type = TREE_TYPE(lhs); ++ rhs_mode = TYPE_MODE(rhs1_type); ++ lhs_mode = TYPE_MODE(lhs_type); ++ if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode) ++ return false; ++ ++ return true; ++} ++ ++static tree create_cast_assign(struct pointer_set_t *visited, gimple stmt) ++{ ++ tree rhs1 = gimple_assign_rhs1(stmt); ++ tree lhs = gimple_assign_lhs(stmt); ++ const_tree rhs1_type = TREE_TYPE(rhs1); ++ const_tree lhs_type = TREE_TYPE(lhs); ++ ++ if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type)) ++ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ ++ return create_assign(visited, stmt, rhs1, AFTER_STMT); ++} ++ ++static bool no_uses(tree node) ++{ ++ imm_use_iterator imm_iter; ++ use_operand_p use_p; ++ ++ FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) { ++ const_gimple use_stmt = USE_STMT(use_p); ++ ++ if (use_stmt == NULL) ++ return true; ++ if (is_gimple_debug(use_stmt)) ++ continue; ++ return false; ++ } ++ return true; ++} ++ ++// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max ++static bool is_const_plus_unsigned_signed_truncation(const_tree lhs) ++{ ++ tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs; ++ gimple def_stmt = get_def_stmt(lhs); ++ ++ if (!def_stmt || !gimple_assign_cast_p(def_stmt)) ++ return false; ++ ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs_type = TREE_TYPE(rhs1); ++ lhs_type = TREE_TYPE(lhs); ++ if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type)) ++ return false; ++ if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type)) ++ return false; ++ ++ def_stmt = get_def_stmt(rhs1); ++ if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3) ++ return false; ++ ++ if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR) ++ return false; ++ ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs2 = gimple_assign_rhs2(def_stmt); ++ if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2)) ++ return false; ++ ++ if (is_gimple_constant(rhs2)) ++ not_const_rhs = rhs1; ++ else ++ not_const_rhs = rhs2; ++ ++ return no_uses(not_const_rhs); ++} ++ ++static bool skip_lhs_cast_check(const_gimple stmt) ++{ ++ const_tree rhs = gimple_assign_rhs1(stmt); ++ const_gimple def_stmt = get_def_stmt(rhs); ++ ++ // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max ++ if (gimple_code(def_stmt) == GIMPLE_ASM) ++ return true; ++ ++ if (is_const_plus_unsigned_signed_truncation(rhs)) ++ return true; ++ ++ return false; ++} ++ ++static tree create_cast_overflow_check(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt) ++{ ++ bool cast_lhs, cast_rhs; ++ tree lhs = gimple_assign_lhs(stmt); ++ tree rhs = gimple_assign_rhs1(stmt); ++ const_tree lhs_type = TREE_TYPE(lhs); ++ const_tree rhs_type = TREE_TYPE(rhs); ++ enum machine_mode lhs_mode = TYPE_MODE(lhs_type); ++ enum machine_mode rhs_mode = TYPE_MODE(rhs_type); ++ unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode); ++ unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode); ++ ++ static bool check_lhs[3][4] = { ++ // ss su us uu ++ { false, true, true, false }, // lhs > rhs ++ { false, false, false, false }, // lhs = rhs ++ { true, true, true, true }, // lhs < rhs ++ }; ++ ++ static bool check_rhs[3][4] = { ++ // ss su us uu ++ { true, false, true, true }, // lhs > rhs ++ { true, false, true, true }, // lhs = rhs ++ { true, false, true, true }, // lhs < rhs ++ }; ++ ++ // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!! ++ if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode)) ++ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ ++ if (lhs_size > rhs_size) { ++ cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; ++ cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; ++ } else if (lhs_size == rhs_size) { ++ cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; ++ cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; ++ } else { ++ cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; ++ cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; ++ } ++ ++ if (!cast_lhs && !cast_rhs) ++ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); ++ ++ if (cast_lhs && !skip_lhs_cast_check(stmt)) ++ check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT); ++ ++ if (cast_rhs) ++ check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT); ++ ++ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); ++} ++ ++static tree handle_unary_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt) ++{ ++ tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt); ++ ++ if (gimple_plf(stmt, MY_STMT)) ++ return lhs; ++ ++ rhs1 = gimple_assign_rhs1(stmt); ++ if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE) ++ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ ++ new_rhs1 = expand(visited, caller_node, rhs1); ++ ++ if (new_rhs1 == NULL_TREE) ++ return create_cast_assign(visited, stmt); ++ ++ if (gimple_plf(stmt, NO_CAST_CHECK)) ++ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); ++ ++ if (gimple_assign_rhs_code(stmt) == BIT_NOT_EXPR) { ++ tree size_overflow_type = get_size_overflow_type(stmt, rhs1); ++ ++ new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT); ++ check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT); ++ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ } ++ ++ if (!gimple_assign_cast_p(stmt)) ++ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); ++ ++ return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt); ++} ++ ++static tree handle_unary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt) ++{ ++ tree rhs1, lhs = gimple_assign_lhs(stmt); ++ gimple def_stmt = get_def_stmt(lhs); ++ ++ gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP); ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ ++ if (is_gimple_constant(rhs1)) ++ return create_assign(visited, def_stmt, lhs, AFTER_STMT); ++ ++ switch (TREE_CODE(rhs1)) { ++ case SSA_NAME: ++ return handle_unary_rhs(visited, caller_node, def_stmt); ++ case ARRAY_REF: ++ case BIT_FIELD_REF: ++ case ADDR_EXPR: ++ case COMPONENT_REF: ++ case INDIRECT_REF: ++#if BUILDING_GCC_VERSION >= 4006 ++ case MEM_REF: ++#endif ++ case TARGET_MEM_REF: ++ case VIEW_CONVERT_EXPR: ++ return create_assign(visited, def_stmt, lhs, AFTER_STMT); ++ case PARM_DECL: ++ case VAR_DECL: ++ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ ++ default: ++ debug_gimple_stmt(def_stmt); ++ debug_tree(rhs1); ++ gcc_unreachable(); ++ } ++} ++ ++static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value) ++{ ++ gimple cond_stmt; ++ gimple_stmt_iterator gsi = gsi_last_bb(cond_bb); ++ ++ cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE); ++ gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING); ++ update_stmt(cond_stmt); ++} ++ ++static tree create_string_param(tree string) ++{ ++ tree i_type, a_type; ++ const int length = TREE_STRING_LENGTH(string); ++ ++ gcc_assert(length > 0); ++ ++ i_type = build_index_type(build_int_cst(NULL_TREE, length - 1)); ++ a_type = build_array_type(char_type_node, i_type); ++ ++ TREE_TYPE(string) = a_type; ++ TREE_CONSTANT(string) = 1; ++ TREE_READONLY(string) = 1; ++ ++ return build1(ADDR_EXPR, ptr_type_node, string); ++} ++ ++#if BUILDING_GCC_VERSION <= 4006 ++struct cgraph_node *cgraph_get_create_node(tree decl); ++ ++struct cgraph_node *cgraph_get_create_node(tree decl) ++{ ++ struct cgraph_node *node; ++ ++ node = cgraph_get_node(decl); ++ if (node) ++ return node; ++ return cgraph_node(decl); ++} ++#endif ++ ++static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min) ++{ ++ gimple func_stmt; ++ const_gimple def_stmt; ++ const_tree loc_line; ++ tree loc_file, ssa_name, current_func; ++ expanded_location xloc; ++ char *ssa_name_buf; ++ int len; ++ struct cgraph_edge *edge; ++ struct cgraph_node *callee_node; ++ int frequency; ++ gimple_stmt_iterator gsi = gsi_start_bb(bb_true); ++ ++ def_stmt = get_def_stmt(arg); ++ xloc = expand_location(gimple_location(def_stmt)); ++ ++ if (!gimple_has_location(def_stmt)) { ++ xloc = expand_location(gimple_location(stmt)); ++ if (!gimple_has_location(stmt)) ++ xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl)); ++ } ++ ++ loc_line = build_int_cstu(unsigned_type_node, xloc.line); ++ ++ loc_file = build_string(strlen(xloc.file) + 1, xloc.file); ++ loc_file = create_string_param(loc_file); ++ ++ current_func = build_string(NAME_LEN(current_function_decl) + 1, NAME(current_function_decl)); ++ current_func = create_string_param(current_func); ++ ++ gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL); ++ call_count++; ++ len = asprintf(&ssa_name_buf, "%s_%u %s, count: %u\n", NAME(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max", call_count); ++ gcc_assert(len > 0); ++ ssa_name = build_string(len + 1, ssa_name_buf); ++ free(ssa_name_buf); ++ ssa_name = create_string_param(ssa_name); ++ ++ // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name) ++ func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name); ++ gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING); ++ ++ callee_node = cgraph_get_create_node(report_size_overflow_decl); ++ frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true); ++ ++#if BUILDING_GCC_VERSION <= 4006 ++ edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth); ++#else ++ edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency); +#endif ++ gcc_assert(edge != NULL); ++} + -+struct size_overflow_hash { -+ const struct size_overflow_hash * const next; -+ const char * const name; -+ const unsigned int param; -+}; ++static void __unused print_the_code_insertions(const_gimple stmt) ++{ ++ location_t loc = gimple_location(stmt); + -+#include "size_overflow_hash.h" ++ inform(loc, "Integer size_overflow check applied here."); ++} + -+enum mark { -+ MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF -+}; ++static void insert_check_size_overflow(struct cgraph_node *caller_node, gimple stmt, enum tree_code cond_code, tree arg, tree type_value, bool before, bool min) ++{ ++ basic_block cond_bb, join_bb, bb_true; ++ edge e; ++ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); + -+enum err_code_conditions { -+ CAST_ONLY, FROM_CONST -+}; ++ cond_bb = gimple_bb(stmt); ++ if (before) ++ gsi_prev(&gsi); ++ if (gsi_end_p(gsi)) ++ e = split_block_after_labels(cond_bb); ++ else ++ e = split_block(cond_bb, gsi_stmt(gsi)); ++ cond_bb = e->src; ++ join_bb = e->dest; ++ e->flags = EDGE_FALSE_VALUE; ++ e->probability = REG_BR_PROB_BASE; + -+static unsigned int call_count = 0; ++ bb_true = create_empty_bb(cond_bb); ++ make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE); ++ make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE); ++ make_edge(bb_true, join_bb, EDGE_FALLTHRU); + -+#define __unused __attribute__((__unused__)) -+#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node)) -+#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node)) -+#define BEFORE_STMT true -+#define AFTER_STMT false -+#define CREATE_NEW_VAR NULL_TREE -+#define CODES_LIMIT 32 -+#define MAX_PARAM 31 -+#define MY_STMT GF_PLF_1 -+#define NO_CAST_CHECK GF_PLF_2 -+#define FROM_ARG true -+#define FROM_RET false ++ gcc_assert(dom_info_available_p(CDI_DOMINATORS)); ++ set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb); ++ set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb); + -+#if BUILDING_GCC_VERSION == 4005 -+#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE))) -+#endif ++ if (current_loops != NULL) { ++ gcc_assert(cond_bb->loop_father == join_bb->loop_father); ++ add_bb_to_loop(bb_true, cond_bb->loop_father); ++ } + -+int plugin_is_GPL_compatible; -+void debug_gimple_stmt(gimple gs); ++ insert_cond(cond_bb, arg, cond_code, type_value); ++ insert_cond_result(caller_node, bb_true, stmt, arg, min); + -+static tree expand(struct pointer_set_t *visited, tree lhs); -+static enum mark pre_expand(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs); -+static tree report_size_overflow_decl; -+static const_tree const_char_ptr_type_node; -+static unsigned int handle_function(void); -+static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before); -+static tree get_size_overflow_type(gimple stmt, const_tree node); -+static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3); -+static void print_missing_msg(tree func, unsigned int argnum); ++// print_the_code_insertions(stmt); ++} + -+static struct plugin_info size_overflow_plugin_info = { -+ .version = "20130822beta", -+ .help = "no-size-overflow\tturn off size overflow checking\n", -+}; ++static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before) ++{ ++ const_tree rhs_type = TREE_TYPE(rhs); ++ tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min; + -+static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs) ++ gcc_assert(rhs_type != NULL_TREE); ++ if (TREE_CODE(rhs_type) == POINTER_TYPE) ++ return; ++ ++ gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE); ++ ++ if (is_const_plus_unsigned_signed_truncation(rhs)) ++ return; ++ ++ type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type)); ++ // typemax (-1) < typemin (0) ++ if (TREE_OVERFLOW(type_max)) ++ return; ++ ++ type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type)); ++ ++ cast_rhs_type = TREE_TYPE(cast_rhs); ++ type_max_type = TREE_TYPE(type_max); ++ type_min_type = TREE_TYPE(type_min); ++ gcc_assert(types_compatible_p(cast_rhs_type, type_max_type)); ++ gcc_assert(types_compatible_p(type_max_type, type_min_type)); ++ ++ insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK); ++ insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK); ++} ++ ++static bool is_a_constant_overflow(const_gimple stmt, const_tree rhs) +{ -+ unsigned int arg_count; -+ enum tree_code code = TREE_CODE(*node); ++ if (gimple_assign_rhs_code(stmt) == MIN_EXPR) ++ return false; ++ if (!is_gimple_constant(rhs)) ++ return false; ++ return true; ++} + -+ switch (code) { -+ case FUNCTION_DECL: -+ arg_count = type_num_arguments(TREE_TYPE(*node)); -+ break; -+ case FUNCTION_TYPE: -+ case METHOD_TYPE: -+ arg_count = type_num_arguments(*node); -+ break; -+ default: -+ *no_add_attrs = true; -+ error("%s: %qE attribute only applies to functions", __func__, name); ++static tree get_def_stmt_rhs(const_tree var) ++{ ++ tree rhs1, def_stmt_rhs1; ++ gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt; ++ ++ def_stmt = get_def_stmt(var); ++ if (!gimple_assign_cast_p(def_stmt)) + return NULL_TREE; ++ gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && gimple_plf(def_stmt, MY_STMT) && gimple_assign_cast_p(def_stmt)); ++ ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs1_def_stmt = get_def_stmt(rhs1); ++ if (!gimple_assign_cast_p(rhs1_def_stmt)) ++ return rhs1; ++ ++ def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt); ++ def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1); ++ ++ switch (gimple_code(def_stmt_rhs1_def_stmt)) { ++ case GIMPLE_CALL: ++ case GIMPLE_NOP: ++ case GIMPLE_ASM: ++ case GIMPLE_PHI: ++ return def_stmt_rhs1; ++ case GIMPLE_ASSIGN: ++ return rhs1; ++ default: ++ debug_gimple_stmt(def_stmt_rhs1_def_stmt); ++ gcc_unreachable(); + } ++} + -+ for (; args; args = TREE_CHAIN(args)) { -+ tree position = TREE_VALUE(args); -+ if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) { -+ error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position)); -+ *no_add_attrs = true; -+ } ++static tree handle_intentional_overflow(struct pointer_set_t *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2) ++{ ++ tree new_rhs, orig_rhs; ++ void (*gimple_assign_set_rhs)(gimple, tree); ++ tree rhs1 = gimple_assign_rhs1(stmt); ++ tree rhs2 = gimple_assign_rhs2(stmt); ++ tree lhs = gimple_assign_lhs(stmt); ++ ++ if (!check_overflow) ++ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ ++ if (change_rhs == NULL_TREE) ++ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ ++ if (new_rhs2 == NULL_TREE) { ++ orig_rhs = rhs1; ++ gimple_assign_set_rhs = &gimple_assign_set_rhs1; ++ } else { ++ orig_rhs = rhs2; ++ gimple_assign_set_rhs = &gimple_assign_set_rhs2; + } -+ return NULL_TREE; ++ ++ check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT); ++ ++ new_rhs = change_assign_rhs(stmt, orig_rhs, change_rhs); ++ gimple_assign_set_rhs(stmt, new_rhs); ++ update_stmt(stmt); ++ ++ return create_assign(visited, stmt, lhs, AFTER_STMT); +} + -+static const char* get_asm_name(tree node) ++static bool is_subtraction_special(const_gimple stmt) +{ -+ return IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(node)); ++ gimple rhs1_def_stmt, rhs2_def_stmt; ++ const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs; ++ enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode; ++ const_tree rhs1 = gimple_assign_rhs1(stmt); ++ const_tree rhs2 = gimple_assign_rhs2(stmt); ++ ++ if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2)) ++ return false; ++ ++ gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME); ++ ++ if (gimple_assign_rhs_code(stmt) != MINUS_EXPR) ++ return false; ++ ++ rhs1_def_stmt = get_def_stmt(rhs1); ++ rhs2_def_stmt = get_def_stmt(rhs2); ++ if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt)) ++ return false; ++ ++ rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt); ++ rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt); ++ rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt); ++ rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt); ++ rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1)); ++ rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1)); ++ rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs)); ++ rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs)); ++ if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode)) ++ return false; ++ if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode)) ++ return false; ++ ++ gimple_set_plf(rhs1_def_stmt, NO_CAST_CHECK, true); ++ gimple_set_plf(rhs2_def_stmt, NO_CAST_CHECK, true); ++ return true; +} + -+static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs) ++static tree handle_integer_truncation(struct pointer_set_t *visited, struct cgraph_node *caller_node, const_tree lhs) +{ -+ unsigned int arg_count, arg_num; -+ enum tree_code code = TREE_CODE(*node); ++ tree new_rhs1, new_rhs2; ++ tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs; ++ gimple assign, stmt = get_def_stmt(lhs); ++ tree rhs1 = gimple_assign_rhs1(stmt); ++ tree rhs2 = gimple_assign_rhs2(stmt); + -+ switch (code) { -+ case FUNCTION_DECL: -+ arg_count = type_num_arguments(TREE_TYPE(*node)); -+ break; -+ case FUNCTION_TYPE: -+ case METHOD_TYPE: -+ arg_count = type_num_arguments(*node); -+ break; -+ case FIELD_DECL: -+ arg_num = TREE_INT_CST_LOW(TREE_VALUE(args)); -+ if (arg_num != 0) { -+ *no_add_attrs = true; -+ error("%s: %qE attribute parameter can only be 0 in structure fields", __func__, name); -+ } -+ return NULL_TREE; -+ default: -+ *no_add_attrs = true; -+ error("%qE attribute only applies to functions", name); ++ if (!is_subtraction_special(stmt)) + return NULL_TREE; -+ } + -+ if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0) ++ new_rhs1 = expand(visited, caller_node, rhs1); ++ new_rhs2 = expand(visited, caller_node, rhs2); ++ ++ new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs1); ++ new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs2); ++ ++ if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE) + return NULL_TREE; + -+ for (; args; args = TREE_CHAIN(args)) { -+ tree position = TREE_VALUE(args); -+ if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) { -+ error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position)); -+ *no_add_attrs = true; -+ } ++ if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) { ++ new_rhs1_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs1_def_stmt_rhs1); ++ new_rhs2_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs2_def_stmt_rhs1); + } -+ return NULL_TREE; -+} + -+static struct attribute_spec size_overflow_attr = { -+ .name = "size_overflow", -+ .min_length = 1, -+ .max_length = -1, -+ .decl_required = true, -+ .type_required = false, -+ .function_type_required = false, -+ .handler = handle_size_overflow_attribute, -+#if BUILDING_GCC_VERSION >= 4007 -+ .affects_type_identity = false -+#endif -+}; ++ assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1); ++ new_lhs = gimple_assign_lhs(assign); ++ check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT); + -+static struct attribute_spec intentional_overflow_attr = { -+ .name = "intentional_overflow", -+ .min_length = 1, -+ .max_length = -1, -+ .decl_required = true, -+ .type_required = false, -+ .function_type_required = false, -+ .handler = handle_intentional_overflow_attribute, -+#if BUILDING_GCC_VERSION >= 4007 -+ .affects_type_identity = false -+#endif -+}; ++ return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE); ++} + -+static void register_attributes(void __unused *event_data, void __unused *data) ++static bool is_a_neg_overflow(const_gimple stmt, const_tree rhs) +{ -+ register_attribute(&size_overflow_attr); -+ register_attribute(&intentional_overflow_attr); ++ const_gimple def_stmt; ++ ++ if (TREE_CODE(rhs) != SSA_NAME) ++ return false; ++ ++ if (gimple_assign_rhs_code(stmt) != PLUS_EXPR) ++ return false; ++ ++ def_stmt = get_def_stmt(rhs); ++ if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR) ++ return false; ++ ++ return true; +} + -+// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html -+static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed) ++static tree handle_binary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs) +{ -+#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); } -+#define cwmixa( in ) { cwfold( in, m, k, h ); } -+#define cwmixb( in ) { cwfold( in, n, h, k ); } ++ tree rhs1, rhs2, new_lhs; ++ gimple def_stmt = get_def_stmt(lhs); ++ tree new_rhs1 = NULL_TREE; ++ tree new_rhs2 = NULL_TREE; + -+ unsigned int m = 0x57559429; -+ unsigned int n = 0x5052acdb; -+ const unsigned int *key4 = (const unsigned int *)key; -+ unsigned int h = len; -+ unsigned int k = len + seed + n; -+ unsigned long long p; ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs2 = gimple_assign_rhs2(def_stmt); + -+ while (len >= 8) { -+ cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2; -+ len -= 8; -+ } -+ if (len >= 4) { -+ cwmixb(key4[0]) key4 += 1; -+ len -= 4; ++ /* no DImode/TImode division in the 32/64 bit kernel */ ++ switch (gimple_assign_rhs_code(def_stmt)) { ++ case RDIV_EXPR: ++ case TRUNC_DIV_EXPR: ++ case CEIL_DIV_EXPR: ++ case FLOOR_DIV_EXPR: ++ case ROUND_DIV_EXPR: ++ case TRUNC_MOD_EXPR: ++ case CEIL_MOD_EXPR: ++ case FLOOR_MOD_EXPR: ++ case ROUND_MOD_EXPR: ++ case EXACT_DIV_EXPR: ++ case POINTER_PLUS_EXPR: ++ case BIT_AND_EXPR: ++ return create_assign(visited, def_stmt, lhs, AFTER_STMT); ++ default: ++ break; + } -+ if (len) -+ cwmixa(key4[0] & ((1 << (len * 8)) - 1 )); -+ cwmixb(h ^ (k + n)); -+ return k ^ h; + -+#undef cwfold -+#undef cwmixa -+#undef cwmixb ++ new_lhs = handle_integer_truncation(visited, caller_node, lhs); ++ if (new_lhs != NULL_TREE) ++ return new_lhs; ++ ++ if (TREE_CODE(rhs1) == SSA_NAME) ++ new_rhs1 = expand(visited, caller_node, rhs1); ++ if (TREE_CODE(rhs2) == SSA_NAME) ++ new_rhs2 = expand(visited, caller_node, rhs2); ++ ++ if (is_a_neg_overflow(def_stmt, rhs2)) ++ return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE); ++ if (is_a_neg_overflow(def_stmt, rhs1)) ++ return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2); ++ ++ ++ if (is_a_constant_overflow(def_stmt, rhs2)) ++ return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE); ++ if (is_a_constant_overflow(def_stmt, rhs1)) ++ return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2); ++ ++ return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE); +} + -+static inline unsigned int get_hash_num(const char *fndecl, const char *tree_codes, unsigned int len, unsigned int seed) ++#if BUILDING_GCC_VERSION >= 4007 ++static tree get_new_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs) +{ -+ unsigned int fn = CrapWow(fndecl, strlen(fndecl), seed) & 0xffff; -+ unsigned int codes = CrapWow(tree_codes, len, seed) & 0xffff; -+ return fn ^ codes; ++ if (is_gimple_constant(rhs)) ++ return cast_a_tree(size_overflow_type, rhs); ++ if (TREE_CODE(rhs) != SSA_NAME) ++ return NULL_TREE; ++ return expand(visited, caller_node, rhs); +} + -+static inline tree get_original_function_decl(tree fndecl) ++static tree handle_ternary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs) +{ -+ if (DECL_ABSTRACT_ORIGIN(fndecl)) -+ return DECL_ABSTRACT_ORIGIN(fndecl); -+ return fndecl; ++ tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type; ++ gimple def_stmt = get_def_stmt(lhs); ++ ++ size_overflow_type = get_size_overflow_type(def_stmt, lhs); ++ ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs2 = gimple_assign_rhs2(def_stmt); ++ rhs3 = gimple_assign_rhs3(def_stmt); ++ new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1); ++ new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2); ++ new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3); ++ ++ return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3); +} ++#endif + -+static inline gimple get_def_stmt(const_tree node) ++static tree get_size_overflow_type(gimple stmt, const_tree node) +{ ++ const_tree type; ++ tree new_type; ++ + gcc_assert(node != NULL_TREE); -+ if (TREE_CODE(node) != SSA_NAME) -+ return NULL; -+ return SSA_NAME_DEF_STMT(node); -+} + -+static unsigned char get_tree_code(const_tree type) -+{ -+ switch (TREE_CODE(type)) { -+ case ARRAY_TYPE: -+ return 0; -+ case BOOLEAN_TYPE: -+ return 1; -+ case ENUMERAL_TYPE: -+ return 2; -+ case FUNCTION_TYPE: -+ return 3; -+ case INTEGER_TYPE: -+ return 4; -+ case POINTER_TYPE: -+ return 5; -+ case RECORD_TYPE: -+ return 6; -+ case UNION_TYPE: -+ return 7; -+ case VOID_TYPE: -+ return 8; -+ case REAL_TYPE: -+ return 9; -+ case VECTOR_TYPE: -+ return 10; -+ case REFERENCE_TYPE: -+ return 11; -+ case OFFSET_TYPE: -+ return 12; -+ case COMPLEX_TYPE: -+ return 13; ++ type = TREE_TYPE(node); ++ ++ if (gimple_plf(stmt, MY_STMT)) ++ return TREE_TYPE(node); ++ ++ switch (TYPE_MODE(type)) { ++ case QImode: ++ new_type = intHI_type_node; ++ break; ++ case HImode: ++ new_type = intSI_type_node; ++ break; ++ case SImode: ++ new_type = intDI_type_node; ++ break; ++ case DImode: ++ if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode)) ++ new_type = intDI_type_node; ++ else ++ new_type = intTI_type_node; ++ break; ++ case TImode: ++ gcc_assert(!TYPE_UNSIGNED(type)); ++ new_type = intTI_type_node; ++ break; + default: -+ debug_tree((tree)type); ++ debug_tree((tree)node); ++ error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl); + gcc_unreachable(); + } -+} -+ -+static size_t add_type_codes(const_tree type, unsigned char *tree_codes, size_t len) -+{ -+ gcc_assert(type != NULL_TREE); + -+ while (type && len < CODES_LIMIT) { -+ tree_codes[len] = get_tree_code(type); -+ len++; -+ type = TREE_TYPE(type); -+ } -+ return len; ++ if (TYPE_QUALS(type) != 0) ++ return build_qualified_type(new_type, TYPE_QUALS(type)); ++ return new_type; +} + -+static unsigned int get_function_decl(const_tree fndecl, unsigned char *tree_codes) ++static tree expand_visited(gimple def_stmt) +{ -+ const_tree arg, result, arg_field, type = TREE_TYPE(fndecl); -+ enum tree_code code = TREE_CODE(type); -+ size_t len = 0; -+ -+ gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE); -+ -+ arg = TYPE_ARG_TYPES(type); -+ // skip builtins __builtin_constant_p -+ if (!arg && DECL_BUILT_IN(fndecl)) -+ return 0; ++ const_gimple next_stmt; ++ gimple_stmt_iterator gsi; ++ enum gimple_code code = gimple_code(def_stmt); + -+ if (TREE_CODE_CLASS(code) == tcc_type) -+ result = type; -+ else -+ result = DECL_RESULT(fndecl); ++ if (code == GIMPLE_ASM) ++ return NULL_TREE; + -+ gcc_assert(result != NULL_TREE); -+ len = add_type_codes(TREE_TYPE(result), tree_codes, len); ++ gsi = gsi_for_stmt(def_stmt); ++ gsi_next(&gsi); + -+ if (arg == NULL_TREE) { -+ gcc_assert(CODE_CONTAINS_STRUCT(TREE_CODE(fndecl), TS_DECL_NON_COMMON)); -+ arg_field = DECL_ARGUMENT_FLD(fndecl); -+ if (arg_field == NULL_TREE) -+ return 0; -+ arg = TREE_TYPE(arg_field); -+ len = add_type_codes(arg, tree_codes, len); -+ gcc_assert(len != 0); -+ return len; -+ } ++ if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi)) ++ return NULL_TREE; ++ gcc_assert(!gsi_end_p(gsi)); ++ next_stmt = gsi_stmt(gsi); + -+ gcc_assert(arg != NULL_TREE && TREE_CODE(arg) == TREE_LIST); -+ while (arg && len < CODES_LIMIT) { -+ len = add_type_codes(TREE_VALUE(arg), tree_codes, len); -+ arg = TREE_CHAIN(arg); -+ } ++ if (gimple_code(def_stmt) == GIMPLE_PHI && !gimple_plf((gimple)next_stmt, MY_STMT)) ++ return NULL_TREE; ++ gcc_assert(gimple_plf((gimple)next_stmt, MY_STMT)); + -+ gcc_assert(len != 0); -+ return len; ++ return get_lhs(next_stmt); +} + -+static const struct size_overflow_hash *get_function_hash(tree fndecl) ++static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs) +{ -+ unsigned int hash; -+ const struct size_overflow_hash *entry; -+ unsigned char tree_codes[CODES_LIMIT]; -+ size_t len; -+ const char *func_name; ++ gimple def_stmt; + -+ fndecl = get_original_function_decl(fndecl); -+ len = get_function_decl(fndecl, tree_codes); -+ if (len == 0) -+ return NULL; ++ def_stmt = get_def_stmt(lhs); + -+ func_name = get_asm_name(fndecl); -+ hash = get_hash_num(func_name, (const char*) tree_codes, len, 0); ++ if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP) ++ return NULL_TREE; + -+ entry = size_overflow_hash[hash]; -+ while (entry) { -+ if (!strcmp(entry->name, func_name)) -+ return entry; -+ entry = entry->next; ++ if (gimple_plf(def_stmt, MY_STMT)) ++ return lhs; ++ ++ if (pointer_set_contains(visited, def_stmt)) ++ return expand_visited(def_stmt); ++ ++ switch (gimple_code(def_stmt)) { ++ case GIMPLE_PHI: ++ return handle_phi(visited, caller_node, lhs); ++ case GIMPLE_CALL: ++ case GIMPLE_ASM: ++ return create_assign(visited, def_stmt, lhs, AFTER_STMT); ++ case GIMPLE_ASSIGN: ++ switch (gimple_num_ops(def_stmt)) { ++ case 2: ++ return handle_unary_ops(visited, caller_node, def_stmt); ++ case 3: ++ return handle_binary_ops(visited, caller_node, lhs); ++#if BUILDING_GCC_VERSION >= 4007 ++ case 4: ++ return handle_ternary_ops(visited, caller_node, lhs); ++#endif ++ } ++ default: ++ debug_gimple_stmt(def_stmt); ++ error("%s: unknown gimple code", __func__); ++ gcc_unreachable(); + } -+ -+ return NULL; +} + -+static bool is_bool(const_tree node) ++static tree cast_to_orig_type(gimple stmt, const_tree orig_node, tree new_node) +{ -+ const_tree type; -+ -+ if (node == NULL_TREE) -+ return false; ++ const_gimple assign; ++ tree orig_type = TREE_TYPE(orig_node); ++ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); + -+ type = TREE_TYPE(node); -+ if (!INTEGRAL_TYPE_P(type)) -+ return false; -+ if (TREE_CODE(type) == BOOLEAN_TYPE) -+ return true; -+ if (TYPE_PRECISION(type) == 1) -+ return true; -+ return false; ++ assign = build_cast_stmt(orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false); ++ return gimple_assign_lhs(assign); +} + -+static bool skip_types(const_tree var) ++static void change_orig_node(struct interesting_node *cur_node, tree new_node) +{ -+ tree type; -+ -+ if (is_gimple_constant(var)) -+ return true; ++ void (*set_rhs)(gimple, tree); ++ gimple stmt = cur_node->first_stmt; ++ const_tree orig_node = cur_node->node; + -+ switch (TREE_CODE(var)) { -+ case ADDR_EXPR: -+#if BUILDING_GCC_VERSION >= 4006 -+ case MEM_REF: ++ switch (gimple_code(stmt)) { ++ case GIMPLE_RETURN: ++ gimple_return_set_retval(stmt, cast_to_orig_type(stmt, orig_node, new_node)); ++ break; ++ case GIMPLE_CALL: ++ gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(stmt, orig_node, new_node)); ++ break; ++ case GIMPLE_ASSIGN: ++ switch (cur_node->num) { ++ case 1: ++ set_rhs = &gimple_assign_set_rhs1; ++ break; ++ case 2: ++ set_rhs = &gimple_assign_set_rhs2; ++ break; ++#if BUILDING_GCC_VERSION > 4005 ++ case 3: ++ set_rhs = &gimple_assign_set_rhs3; ++ break; +#endif -+ case ARRAY_REF: -+ case BIT_FIELD_REF: -+ case INDIRECT_REF: -+ case TARGET_MEM_REF: -+ return true; -+ case PARM_DECL: -+ case VAR_DECL: -+ case COMPONENT_REF: -+ return false; + default: -+ break; ++ gcc_unreachable(); ++ } ++ ++ set_rhs(stmt, cast_to_orig_type(stmt, orig_node, new_node)); ++ break; ++ default: ++ debug_gimple_stmt(stmt); ++ gcc_unreachable(); + } + -+ gcc_assert(TREE_CODE(var) == SSA_NAME); ++ update_stmt(stmt); ++} + -+ type = TREE_TYPE(var); -+ switch (TREE_CODE(type)) { -+ case INTEGER_TYPE: -+ case ENUMERAL_TYPE: -+ return false; -+ case BOOLEAN_TYPE: -+ return is_bool(var); -+ default: -+ break; -+ } ++static unsigned int get_correct_arg_count(unsigned int argnum, tree fndecl) ++{ ++ const struct size_overflow_hash *hash; ++ unsigned int new_argnum; ++ tree arg; ++ const_tree origarg; + -+ gcc_assert(TREE_CODE(type) == POINTER_TYPE); ++ if (argnum == 0) ++ return argnum; + -+ type = TREE_TYPE(type); -+ gcc_assert(type != NULL_TREE); -+ switch (TREE_CODE(type)) { -+ case RECORD_TYPE: -+ case POINTER_TYPE: -+ case ARRAY_TYPE: -+ return true; -+ case VOID_TYPE: -+ case INTEGER_TYPE: -+ case UNION_TYPE: -+ return false; -+ default: -+ break; ++ hash = get_function_hash(fndecl); ++ if (hash && hash->param & (1U << argnum)) ++ return argnum; ++ ++ if (DECL_EXTERNAL(fndecl)) ++ return argnum; ++ ++ origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl)); ++ argnum--; ++ while (origarg && argnum) { ++ origarg = TREE_CHAIN(origarg); ++ argnum--; + } ++ gcc_assert(argnum == 0); ++ gcc_assert(origarg != NULL_TREE); ++ ++ for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++) ++ if (operand_equal_p(origarg, arg, 0) || !strcmp(NAME(origarg), NAME(arg))) ++ return new_argnum; + -+ debug_tree((tree)var); -+ gcc_unreachable(); ++ return CANNOT_FIND_ARG; +} + -+static unsigned int find_arg_number(const_tree arg, tree func) ++// Don't want to duplicate entries in next_cgraph_node ++static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num) +{ -+ tree var; -+ unsigned int argnum = 1; ++ const_tree new_callee_fndecl; ++ struct next_cgraph_node *cur_node; + -+ if (TREE_CODE(arg) == SSA_NAME) -+ arg = SSA_NAME_VAR(arg); ++ if (fndecl == RET_CHECK) ++#if BUILDING_GCC_VERSION <= 4007 ++ new_callee_fndecl = node->decl; ++#else ++ new_callee_fndecl = node->symbol.decl; ++#endif ++ else ++ new_callee_fndecl = fndecl; + -+ for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) { -+ if (!operand_equal_p(arg, var, 0) && strcmp(NAME(var), NAME(arg))) ++ for (cur_node = head; cur_node; cur_node = cur_node->next) { ++#if BUILDING_GCC_VERSION <= 4007 ++ if (!operand_equal_p(cur_node->current_function->decl, node->decl, 0)) ++#else ++ if (!operand_equal_p(cur_node->current_function->symbol.decl, node->symbol.decl, 0)) ++#endif + continue; -+ if (!skip_types(var)) -+ return argnum; ++ if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0)) ++ continue; ++ if (num == cur_node->num) ++ return true; + } -+ -+ return 0; ++ return false; +} + -+static tree create_new_var(tree type) ++/* Add a next_cgraph_node into the list for handle_function(). ++ * handle_function() iterates over all the next cgraph nodes and ++ * starts the overflow check insertion process. ++ */ ++static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num) +{ -+ tree new_var = create_tmp_var(type, "cicus"); ++ struct next_cgraph_node *new_node; + ++ if (is_in_next_cgraph_node(head, node, fndecl, num)) ++ return head; ++ ++ new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node)); ++ new_node->current_function = node; ++ new_node->next = NULL; ++ new_node->num = num; ++ if (fndecl == RET_CHECK) +#if BUILDING_GCC_VERSION <= 4007 -+ add_referenced_var(new_var); ++ new_node->callee_fndecl = node->decl; ++#else ++ new_node->callee_fndecl = node->symbol.decl; +#endif -+ return new_var; ++ else ++ new_node->callee_fndecl = fndecl; ++ ++ if (!head) ++ return new_node; ++ ++ new_node->next = head; ++ return new_node; +} + -+static gimple create_binary_assign(enum tree_code code, gimple stmt, tree rhs1, tree rhs2) ++static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num) +{ -+ gimple assign; -+ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); -+ tree type = TREE_TYPE(rhs1); -+ tree lhs = create_new_var(type); ++ struct cgraph_edge *e; + -+ gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2))); -+ assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2); -+ gimple_set_lhs(assign, make_ssa_name(lhs, assign)); ++ if (num == 0) ++ return create_new_next_cgraph_node(head, node, RET_CHECK, num); + -+ gsi_insert_before(&gsi, assign, GSI_NEW_STMT); -+ update_stmt(assign); -+ gimple_set_plf(assign, MY_STMT, true); -+ return assign; ++ for (e = node->callers; e; e = e->next_caller) { ++ tree fndecl = gimple_call_fndecl(e->call_stmt); ++ ++ gcc_assert(fndecl != NULL_TREE); ++ head = create_new_next_cgraph_node(head, e->caller, fndecl, num); ++ } ++ ++ return head; +} + -+static tree cast_a_tree(tree type, tree var) ++static bool is_a_return_check(const_tree node) +{ -+ gcc_assert(type != NULL_TREE); -+ gcc_assert(var != NULL_TREE); -+ gcc_assert(fold_convertible_p(type, var)); ++ if (TREE_CODE(node) == FUNCTION_DECL) ++ return true; + -+ return fold_convert(type, var); ++ gcc_assert(TREE_CODE(node) == PARM_DECL); ++ return false; +} + -+static tree get_lhs(const_gimple stmt) ++static bool is_in_hash_table(tree fndecl, unsigned int num) +{ -+ switch (gimple_code(stmt)) { -+ case GIMPLE_ASSIGN: -+ return gimple_get_lhs(stmt); -+ case GIMPLE_PHI: -+ return gimple_phi_result(stmt); -+ case GIMPLE_CALL: -+ return gimple_call_lhs(stmt); -+ default: -+ return NULL_TREE; -+ } ++ const struct size_overflow_hash *hash; ++ ++ hash = get_function_hash(fndecl); ++ if (hash && (hash->param & (1U << num))) ++ return true; ++ return false; +} + -+static bool skip_cast(tree dst_type, const_tree rhs, bool force) ++struct missing_functions { ++ struct missing_functions *next; ++ const_tree node; ++ tree fndecl; ++}; ++ ++static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node) +{ -+ const_gimple def_stmt = get_def_stmt(rhs); ++ struct missing_functions *new_function; + -+ if (force) -+ return false; ++ new_function = (struct missing_functions *)xmalloc(sizeof(*new_function)); ++ new_function->node = node; ++ new_function->next = NULL; + -+ if (is_gimple_constant(rhs)) -+ return false; ++ if (TREE_CODE(node) == FUNCTION_DECL) ++ new_function->fndecl = node; ++ else ++ new_function->fndecl = current_function_decl; ++ gcc_assert(new_function->fndecl); + -+ if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP) -+ return false; ++ if (!missing_fn_head) ++ return new_function; + -+ if (!types_compatible_p(dst_type, TREE_TYPE(rhs))) ++ new_function->next = missing_fn_head; ++ return new_function; ++} ++ ++/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table. ++ * If the function is missing everywhere then print the missing message into stderr. ++ */ ++static bool is_missing_function(tree orig_fndecl, unsigned int num) ++{ ++ switch (DECL_FUNCTION_CODE(orig_fndecl)) { ++#if BUILDING_GCC_VERSION >= 4008 ++ case BUILT_IN_BSWAP16: ++#endif ++ case BUILT_IN_BSWAP32: ++ case BUILT_IN_BSWAP64: ++ case BUILT_IN_EXPECT: ++ case BUILT_IN_MEMCMP: + return false; ++ default: ++ break; ++ } + -+ // DI type can be on 32 bit (from create_assign) but overflow type stays DI -+ if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode)) ++ // skip test.c ++ if (strcmp(NAME(current_function_decl), "coolmalloc")) { ++ if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl))) ++ warning(0, "unnecessary size_overflow attribute on: %s\n", NAME(orig_fndecl)); ++ } ++ ++ if (is_in_hash_table(orig_fndecl, num)) + return false; + ++ print_missing_msg(orig_fndecl, num); + return true; +} + -+static gimple build_cast_stmt(tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force) ++// Get the argnum of a function decl, if node is a return then the argnum is 0 ++static unsigned int get_function_num(const_tree node, const_tree orig_fndecl) +{ -+ gimple assign, def_stmt; -+ -+ gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE); -+ if (gsi_end_p(*gsi) && before == AFTER_STMT) -+ gcc_unreachable(); -+ -+ def_stmt = get_def_stmt(rhs); -+ if (skip_cast(dst_type, rhs, force) && gimple_plf(def_stmt, MY_STMT)) -+ return def_stmt; -+ -+ if (lhs == CREATE_NEW_VAR) -+ lhs = create_new_var(dst_type); ++ if (is_a_return_check(node)) ++ return 0; ++ else ++ return find_arg_number_tree(node, orig_fndecl); ++} + -+ assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs)); ++/* If the function is missing from the hash table and it is a static function ++ * then create a next_cgraph_node from it for handle_function() ++ */ ++static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head) ++{ ++ unsigned int num; ++ tree orig_fndecl; ++ struct cgraph_node *next_node = NULL; + -+ if (!gsi_end_p(*gsi)) { -+ location_t loc = gimple_location(gsi_stmt(*gsi)); -+ gimple_set_location(assign, loc); -+ } ++ orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl); + -+ gimple_set_lhs(assign, make_ssa_name(lhs, assign)); ++ num = get_function_num(missing_fn_head->node, orig_fndecl); ++ if (num == CANNOT_FIND_ARG) ++ return cnodes; + -+ if (before) -+ gsi_insert_before(gsi, assign, GSI_NEW_STMT); -+ else -+ gsi_insert_after(gsi, assign, GSI_NEW_STMT); -+ update_stmt(assign); -+ gimple_set_plf(assign, MY_STMT, true); ++ if (!is_missing_function(orig_fndecl, num)) ++ return cnodes; + -+ return assign; ++ next_node = cgraph_get_node(missing_fn_head->fndecl); ++ if (next_node && next_node->local.local) ++ cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num); ++ return cnodes; +} + -+static tree cast_to_new_size_overflow_type(gimple stmt, tree rhs, tree size_overflow_type, bool before) ++/* Search for missing size_overflow attributes on the last nodes in ipa and collect them ++ * into the next_cgraph_node list. They will be the next interesting returns or callees. ++ */ ++static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node) +{ -+ gimple_stmt_iterator gsi; -+ tree lhs; -+ const_gimple new_stmt; ++ unsigned int i; ++ tree node; ++ struct missing_functions *cur, *missing_fn_head = NULL; + -+ if (rhs == NULL_TREE) -+ return NULL_TREE; ++#if BUILDING_GCC_VERSION == 4005 ++ for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) { ++ node = VEC_index(tree, cur_node->last_nodes, i); ++#elif BUILDING_GCC_VERSION <= 4007 ++ FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) { ++#else ++ FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) { ++#endif ++ switch (TREE_CODE(node)) { ++ case PARM_DECL: ++ if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE) ++ break; ++ case FUNCTION_DECL: ++ missing_fn_head = create_new_missing_function(missing_fn_head, node); ++ break; ++ default: ++ break; ++ } ++ } + -+ gsi = gsi_for_stmt(stmt); -+ new_stmt = build_cast_stmt(size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false); ++ while (missing_fn_head) { ++ cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head); + -+ lhs = get_lhs(new_stmt); -+ gcc_assert(lhs != NULL_TREE); -+ return lhs; ++ cur = missing_fn_head->next; ++ free(missing_fn_head); ++ missing_fn_head = cur; ++ } ++ ++ return cnodes; +} + -+static tree cast_to_TI_type(gimple stmt, tree node) ++static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result) +{ -+ gimple_stmt_iterator gsi; -+ gimple cast_stmt; -+ tree type = TREE_TYPE(node); ++ gimple phi = get_def_stmt(result); ++ unsigned int i, n = gimple_phi_num_args(phi); + -+ if (types_compatible_p(type, intTI_type_node)) -+ return node; ++ pointer_set_insert(visited, phi); ++ for (i = 0; i < n; i++) { ++ const_tree arg = gimple_phi_arg_def(phi, i); + -+ gsi = gsi_for_stmt(stmt); -+ cast_stmt = build_cast_stmt(intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false); -+ return gimple_get_lhs(cast_stmt); ++ set_conditions(visited, interesting_conditions, arg); ++ } +} + -+static void check_function_hash(const_gimple stmt) ++enum conditions { ++ FROM_CONST, NOT_UNARY, CAST ++}; ++ ++// Search for constants, cast assignments and binary/ternary assignments ++static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs) +{ -+ tree func; -+ const struct size_overflow_hash *hash; ++ gimple def_stmt = get_def_stmt(lhs); + -+ if (gimple_code(stmt) != GIMPLE_CALL) ++ if (is_gimple_constant(lhs)) { ++ interesting_conditions[FROM_CONST] = true; + return; ++ } + -+ func = gimple_call_fndecl(stmt); -+ //fs/xattr.c D.34222_15 = D.34219_14 (dentry_3(D), name_7(D), 0B, 0); -+ if (func == NULL_TREE) ++ if (!def_stmt) + return; + -+ hash = get_function_hash(func); -+ if (!hash) -+ print_missing_msg(func, 0); -+} -+ -+static tree create_assign(struct pointer_set_t *visited, gimple oldstmt, tree rhs1, bool before) -+{ -+ tree lhs, new_lhs; -+ gimple_stmt_iterator gsi; -+ -+ if (rhs1 == NULL_TREE) { -+ debug_gimple_stmt(oldstmt); -+ error("%s: rhs1 is NULL_TREE", __func__); -+ gcc_unreachable(); -+ } ++ if (pointer_set_contains(visited, def_stmt)) ++ return; + -+ switch (gimple_code(oldstmt)) { -+ case GIMPLE_ASM: -+ lhs = rhs1; -+ break; ++ switch (gimple_code(def_stmt)) { ++ case GIMPLE_NOP: + case GIMPLE_CALL: -+ lhs = gimple_call_lhs(oldstmt); -+ break; ++ case GIMPLE_ASM: ++ return; ++ case GIMPLE_PHI: ++ return walk_phi_set_conditions(visited, interesting_conditions, lhs); + case GIMPLE_ASSIGN: -+ lhs = gimple_get_lhs(oldstmt); -+ break; ++ if (gimple_num_ops(def_stmt) == 2) { ++ const_tree rhs = gimple_assign_rhs1(def_stmt); ++ ++ if (gimple_assign_cast_p(def_stmt)) ++ interesting_conditions[CAST] = true; ++ ++ return set_conditions(visited, interesting_conditions, rhs); ++ } else { ++ interesting_conditions[NOT_UNARY] = true; ++ return; ++ } + default: -+ debug_gimple_stmt(oldstmt); ++ debug_gimple_stmt(def_stmt); + gcc_unreachable(); + } ++} + -+ gsi = gsi_for_stmt(oldstmt); -+ pointer_set_insert(visited, oldstmt); -+ if (lookup_stmt_eh_lp(oldstmt) != 0) { -+ basic_block next_bb, cur_bb; -+ const_edge e; -+ -+ gcc_assert(before == false); -+ gcc_assert(stmt_can_throw_internal(oldstmt)); -+ gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL); -+ gcc_assert(!gsi_end_p(gsi)); -+ -+ cur_bb = gimple_bb(oldstmt); -+ next_bb = cur_bb->next_bb; -+ e = find_edge(cur_bb, next_bb); -+ gcc_assert(e != NULL); -+ gcc_assert(e->flags & EDGE_FALLTHRU); -+ -+ gsi = gsi_after_labels(next_bb); -+ gcc_assert(!gsi_end_p(gsi)); ++// determine whether duplication will be necessary or not. ++static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions) ++{ ++ struct pointer_set_t *visited; + -+ before = true; -+ oldstmt = gsi_stmt(gsi); -+ } ++ if (gimple_assign_cast_p(cur_node->first_stmt)) ++ interesting_conditions[CAST] = true; ++ else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2) ++ interesting_conditions[NOT_UNARY] = true; + -+ new_lhs = cast_to_new_size_overflow_type(oldstmt, rhs1, get_size_overflow_type(oldstmt, lhs), before); -+ return new_lhs; ++ visited = pointer_set_create(); ++ set_conditions(visited, interesting_conditions, cur_node->node); ++ pointer_set_destroy(visited); +} + -+static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3) ++// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm ++static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs) +{ -+ gimple stmt; ++ gimple assign; + gimple_stmt_iterator gsi; -+ tree size_overflow_type, new_var, lhs = gimple_get_lhs(oldstmt); + -+ if (gimple_plf(oldstmt, MY_STMT)) -+ return lhs; ++ // already removed ++ if (gimple_bb(asm_stmt) == NULL) ++ return; ++ gsi = gsi_for_stmt(asm_stmt); + -+ if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) { -+ rhs1 = gimple_assign_rhs1(oldstmt); -+ rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT); -+ } -+ if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) { -+ rhs2 = gimple_assign_rhs2(oldstmt); -+ rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT); -+ } ++ assign = gimple_build_assign(lhs, rhs); ++ gsi_insert_before(&gsi, assign, GSI_SAME_STMT); ++ SSA_NAME_DEF_STMT(lhs) = assign; + -+ stmt = gimple_copy(oldstmt); -+ gimple_set_location(stmt, gimple_location(oldstmt)); -+ gimple_set_plf(stmt, MY_STMT, true); ++ gsi_remove(&gsi, true); ++} + -+ if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR) -+ gimple_assign_set_rhs_code(stmt, MULT_EXPR); ++// Get the field decl of a component ref for intentional_overflow checking ++static const_tree search_field_decl(const_tree comp_ref) ++{ ++ const_tree field = NULL_TREE; ++ unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref); + -+ size_overflow_type = get_size_overflow_type(oldstmt, node); ++ for (i = 0; i < len; i++) { ++ field = TREE_OPERAND(comp_ref, i); ++ if (TREE_CODE(field) == FIELD_DECL) ++ break; ++ } ++ gcc_assert(TREE_CODE(field) == FIELD_DECL); ++ return field; ++} + -+ new_var = create_new_var(size_overflow_type); -+ new_var = make_ssa_name(new_var, stmt); -+ gimple_set_lhs(stmt, new_var); ++/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting ++ * stmt is a return otherwise it is the callee function. ++ */ ++static const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum) ++{ ++ const_tree fndecl; + -+ if (rhs1 != NULL_TREE) -+ gimple_assign_set_rhs1(stmt, rhs1); ++ if (argnum == 0) ++ fndecl = current_function_decl; ++ else ++ fndecl = gimple_call_fndecl(stmt); + -+ if (rhs2 != NULL_TREE) -+ gimple_assign_set_rhs2(stmt, rhs2); -+#if BUILDING_GCC_VERSION >= 4007 -+ if (rhs3 != NULL_TREE) -+ gimple_assign_set_rhs3(stmt, rhs3); -+#endif -+ gimple_set_vuse(stmt, gimple_vuse(oldstmt)); -+ gimple_set_vdef(stmt, gimple_vdef(oldstmt)); ++ if (fndecl == NULL_TREE) ++ return NULL_TREE; + -+ gsi = gsi_for_stmt(oldstmt); -+ gsi_insert_after(&gsi, stmt, GSI_SAME_STMT); -+ update_stmt(stmt); -+ pointer_set_insert(visited, oldstmt); -+ return gimple_get_lhs(stmt); ++ return DECL_ORIGIN(fndecl); +} + -+static tree cast_parm_decl(tree phi_ssa_name, tree arg, tree size_overflow_type) ++/* Get the param of the intentional_overflow attribute. ++ * * 0: MARK_NOT_INTENTIONAL ++ * * 1..MAX_PARAM: MARK_YES ++ * * -1: MARK_TURN_OFF ++ */ ++static tree get_attribute_param(const_tree decl) +{ -+ basic_block first_bb; -+ gimple assign; -+ gimple_stmt_iterator gsi; ++ const_tree attr; + -+ first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest; -+ gcc_assert(dom_info_available_p(CDI_DOMINATORS)); -+ set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR); ++ if (decl == NULL_TREE) ++ return NULL_TREE; + -+ gsi = gsi_start_bb(first_bb); -+ assign = build_cast_stmt(size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false); -+ return gimple_get_lhs(assign); ++ attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl)); ++ if (!attr || !TREE_VALUE(attr)) ++ return NULL_TREE; ++ ++ return TREE_VALUE(attr); +} + -+static tree use_phi_ssa_name(tree phi_ssa_name, tree new_arg) ++// MARK_TURN_OFF ++static bool is_turn_off_intentional_attr(const_tree decl) +{ -+ gimple_stmt_iterator gsi; -+ const_gimple assign; -+ gimple def_stmt = get_def_stmt(new_arg); ++ const_tree param_head; + -+ if (gimple_code(def_stmt) == GIMPLE_PHI) { -+ gsi = gsi_after_labels(gimple_bb(def_stmt)); -+ assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, phi_ssa_name, &gsi, BEFORE_STMT, true); -+ } else { -+ gsi = gsi_for_stmt(def_stmt); -+ assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, phi_ssa_name, &gsi, AFTER_STMT, true); -+ } ++ param_head = get_attribute_param(decl); ++ if (param_head == NULL_TREE) ++ return false; + -+ return gimple_get_lhs(assign); ++ if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1) ++ return true; ++ return false; +} + -+static tree cast_visited_phi_arg(tree phi_ssa_name, tree arg, tree size_overflow_type) ++// MARK_NOT_INTENTIONAL ++static bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum) +{ -+ basic_block bb; -+ gimple_stmt_iterator gsi; -+ const_gimple assign, def_stmt; ++ const_tree param_head; + -+ def_stmt = get_def_stmt(arg); -+ bb = gimple_bb(def_stmt); -+ gcc_assert(bb->index != 0); -+ gsi = gsi_after_labels(bb); ++ if (argnum == 0) ++ return false; + -+ assign = build_cast_stmt(size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false); -+ return gimple_get_lhs(assign); ++ param_head = get_attribute_param(decl); ++ if (param_head == NULL_TREE) ++ return false; ++ ++ if (!TREE_INT_CST_LOW(TREE_VALUE(param_head))) ++ return true; ++ return false; +} + -+static tree create_new_phi_arg(tree phi_ssa_name, tree new_arg, tree arg, gimple oldstmt) ++// MARK_YES ++static bool is_yes_intentional_attr(const_tree decl, unsigned int argnum) +{ -+ tree size_overflow_type; -+ const_gimple def_stmt = get_def_stmt(arg); ++ tree param, param_head; + -+ if (phi_ssa_name != NULL_TREE) -+ phi_ssa_name = SSA_NAME_VAR(phi_ssa_name); -+ -+ size_overflow_type = get_size_overflow_type(oldstmt, arg); -+ -+ if (new_arg != NULL_TREE) { -+ gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type)); -+ return use_phi_ssa_name(phi_ssa_name, new_arg); -+ } ++ if (argnum == 0) ++ return false; + -+ switch(gimple_code(def_stmt)) { -+ case GIMPLE_PHI: -+ return cast_visited_phi_arg(phi_ssa_name, arg, size_overflow_type); -+ case GIMPLE_NOP: -+ return cast_parm_decl(phi_ssa_name, arg, size_overflow_type); -+ default: -+ debug_gimple_stmt((gimple)def_stmt); -+ gcc_unreachable(); -+ } ++ param_head = get_attribute_param(decl); ++ for (param = param_head; param; param = TREE_CHAIN(param)) ++ if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param))) ++ return true; ++ return false; +} + -+static gimple overflow_create_phi_node(gimple oldstmt, tree result) ++static bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt) +{ -+ basic_block bb; -+ gimple phi; -+ gimple_seq seq; -+ gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt); ++ const char *str; + -+ bb = gsi_bb(gsi); -+ -+ phi = create_phi_node(result, bb); -+ gimple_phi_set_result(phi, make_ssa_name(result, phi)); -+ seq = phi_nodes(bb); -+ gsi = gsi_last(seq); -+ gsi_remove(&gsi, false); ++ if (!stmt) ++ return false; + -+ gsi = gsi_for_stmt(oldstmt); -+ gsi_insert_after(&gsi, phi, GSI_NEW_STMT); -+ gimple_set_bb(phi, bb); -+ gimple_set_plf(phi, MY_STMT, true); -+ return phi; ++ str = gimple_asm_string(stmt); ++ return !strcmp(str, "# size_overflow MARK_TURN_OFF\n\t"); +} + -+static tree handle_phi(struct pointer_set_t *visited, tree orig_result) ++static bool is_size_overflow_intentional_asm_yes(const_gimple stmt) +{ -+ gimple new_phi = NULL; -+ gimple oldstmt = get_def_stmt(orig_result); -+ tree phi_ssa_name = NULL_TREE; -+ unsigned int i; ++ const char *str; + -+ pointer_set_insert(visited, oldstmt); -+ for (i = 0; i < gimple_phi_num_args(oldstmt); i++) { -+ tree arg, new_arg; ++ if (!stmt) ++ return false; + -+ arg = gimple_phi_arg_def(oldstmt, i); ++ str = gimple_asm_string(stmt); ++ return !strcmp(str, "# size_overflow MARK_YES\n\t"); ++} + -+ new_arg = expand(visited, arg); -+ new_arg = create_new_phi_arg(phi_ssa_name, new_arg, arg, oldstmt); -+ if (i == 0) { -+ phi_ssa_name = new_arg; -+ new_phi = overflow_create_phi_node(oldstmt, SSA_NAME_VAR(phi_ssa_name)); -+ } ++static bool is_size_overflow_asm(const_gimple stmt) ++{ ++ const char *str; + -+ gcc_assert(new_phi != NULL); -+ add_phi_arg(new_phi, new_arg, gimple_phi_arg_edge(oldstmt, i), gimple_location(oldstmt)); -+ } ++ if (!stmt) ++ return false; + -+ gcc_assert(new_phi != NULL); -+ update_stmt(new_phi); -+ return gimple_phi_result(new_phi); ++ str = gimple_asm_string(stmt); ++ return !strncmp(str, "# size_overflow", 15); +} + -+static tree change_assign_rhs(gimple stmt, const_tree orig_rhs, tree new_rhs) ++static void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum) +{ -+ const_gimple assign; -+ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); -+ tree origtype = TREE_TYPE(orig_rhs); ++ location_t loc; + -+ gcc_assert(gimple_code(stmt) == GIMPLE_ASSIGN); ++ if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF) ++ return; + -+ assign = build_cast_stmt(origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false); -+ return gimple_get_lhs(assign); ++ if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES) ++ return; ++ ++ loc = DECL_SOURCE_LOCATION(decl); ++ inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", NAME(decl), argnum); +} + -+static bool is_a_cast_and_const_overflow(const_tree no_const_rhs) ++/* Get the type of the intentional_overflow attribute of a node ++ * * MARK_TURN_OFF ++ * * MARK_YES ++ * * MARK_NO ++ * * MARK_NOT_INTENTIONAL ++ */ ++static enum mark get_intentional_attr_type(const_tree node) +{ -+ const_tree rhs1, lhs, rhs1_type, lhs_type; -+ enum machine_mode lhs_mode, rhs_mode; -+ gimple def_stmt = get_def_stmt(no_const_rhs); ++ const_tree cur_decl; + -+ if (!gimple_assign_cast_p(def_stmt)) -+ return false; ++ if (node == NULL_TREE) ++ return MARK_NO; + -+ rhs1 = gimple_assign_rhs1(def_stmt); -+ lhs = gimple_get_lhs(def_stmt); -+ rhs1_type = TREE_TYPE(rhs1); -+ lhs_type = TREE_TYPE(lhs); -+ rhs_mode = TYPE_MODE(rhs1_type); -+ lhs_mode = TYPE_MODE(lhs_type); -+ if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode) -+ return false; ++ switch (TREE_CODE(node)) { ++ case COMPONENT_REF: ++ cur_decl = search_field_decl(node); ++ if (is_turn_off_intentional_attr(cur_decl)) ++ return MARK_TURN_OFF; ++ if (is_end_intentional_intentional_attr(cur_decl, 1)) ++ return MARK_YES; ++ break; ++ case PARM_DECL: { ++ unsigned int argnum; + -+ return true; ++ cur_decl = DECL_ORIGIN(current_function_decl); ++ argnum = find_arg_number_tree(node, cur_decl); ++ if (argnum == CANNOT_FIND_ARG) ++ return MARK_NO; ++ if (is_yes_intentional_attr(cur_decl, argnum)) ++ return MARK_YES; ++ if (is_end_intentional_intentional_attr(cur_decl, argnum)) ++ return MARK_NOT_INTENTIONAL; ++ break; ++ } ++ case FUNCTION_DECL: ++ if (is_turn_off_intentional_attr(DECL_ORIGIN(node))) ++ return MARK_TURN_OFF; ++ break; ++ default: ++ break; ++ } ++ return MARK_NO; +} + -+static tree create_cast_assign(struct pointer_set_t *visited, gimple stmt) ++// Search for the intentional_overflow attribute on the last nodes ++static enum mark search_last_nodes_intentional(struct interesting_node *cur_node) +{ -+ tree rhs1 = gimple_assign_rhs1(stmt); -+ tree lhs = gimple_get_lhs(stmt); -+ const_tree rhs1_type = TREE_TYPE(rhs1); -+ const_tree lhs_type = TREE_TYPE(lhs); -+ -+ if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type)) -+ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ unsigned int i; ++ tree last_node; ++ enum mark mark = MARK_NO; + -+ return create_assign(visited, stmt, rhs1, AFTER_STMT); ++#if BUILDING_GCC_VERSION == 4005 ++ for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) { ++ last_node = VEC_index(tree, cur_node->last_nodes, i); ++#elif BUILDING_GCC_VERSION <= 4007 ++ FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) { ++#else ++ FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) { ++#endif ++ mark = get_intentional_attr_type(last_node); ++ if (mark != MARK_NO) ++ break; ++ } ++ return mark; +} + -+static bool no_uses(tree node) ++/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and ++ * set the appropriate intentional_overflow type. Delete the asm stmt in the end. ++ */ ++static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node) +{ -+ imm_use_iterator imm_iter; -+ use_operand_p use_p; ++ const_tree input, output; + -+ FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) { -+ const_gimple use_stmt = USE_STMT(use_p); -+ if (use_stmt == NULL) -+ return true; -+ if (is_gimple_debug(use_stmt)) -+ continue; -+ if (!(gimple_bb(use_stmt)->flags & BB_REACHABLE)) -+ continue; ++ if (!cur_node->intentional_mark_from_gimple) + return false; -+ } ++ ++ if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple)) ++ cur_node->intentional_attr_cur_fndecl = MARK_YES; ++ else ++ cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF; ++ ++ // skip param decls ++ if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0) ++ return true; ++ input = gimple_asm_input_op(cur_node->intentional_mark_from_gimple, 0); ++ output = gimple_asm_output_op(cur_node->intentional_mark_from_gimple, 0); ++ ++ replace_size_overflow_asm_with_assign(cur_node->intentional_mark_from_gimple, TREE_VALUE(output), TREE_VALUE(input)); + return true; +} + -+// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max -+static bool is_const_plus_unsigned_signed_truncation(const_tree lhs) ++/* Search intentional_overflow attribute on caller and on callee too. ++ * 0 no dup ++*/ ++static void check_intentional_attribute_ipa(struct interesting_node *cur_node) +{ -+ tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs; -+ gimple def_stmt = get_def_stmt(lhs); ++ const_tree fndecl; + -+ if (!def_stmt || !gimple_assign_cast_p(def_stmt)) -+ return false; ++ if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) { ++ cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF; ++ return; ++ } + -+ rhs1 = gimple_assign_rhs1(def_stmt); -+ rhs_type = TREE_TYPE(rhs1); -+ lhs_type = TREE_TYPE(lhs); -+ if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type)) -+ return false; -+ if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type)) -+ return false; ++ if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) { ++ cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL; ++ return; ++ } + -+ def_stmt = get_def_stmt(rhs1); -+ if (!def_stmt || gimple_code(def_stmt) != GIMPLE_ASSIGN || gimple_num_ops(def_stmt) != 3) -+ return false; ++ if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN) ++ return; + -+ if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR) -+ return false; ++ fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num); ++ if (is_turn_off_intentional_attr(fndecl)) { ++ cur_node->intentional_attr_decl = MARK_TURN_OFF; ++ return; ++ } + -+ rhs1 = gimple_assign_rhs1(def_stmt); -+ rhs2 = gimple_assign_rhs2(def_stmt); -+ if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2)) -+ return false; ++ if (is_end_intentional_intentional_attr(fndecl, cur_node->num)) ++ cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL; ++ else if (is_yes_intentional_attr(fndecl, cur_node->num)) ++ cur_node->intentional_attr_decl = MARK_YES; + -+ if (is_gimple_constant(rhs2)) -+ not_const_rhs = rhs1; -+ else -+ not_const_rhs = rhs2; ++ if (is_intentional_attribute_from_gimple(cur_node)) ++ return; + -+ return no_uses(not_const_rhs); ++ cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node); ++ print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num); +} + -+static bool skip_lhs_cast_check(const_gimple stmt) ++// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max ++static bool skip_asm(const_tree arg) +{ -+ const_tree rhs = gimple_assign_rhs1(stmt); -+ const_gimple def_stmt = get_def_stmt(rhs); -+ -+ // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max -+ if (gimple_code(def_stmt) == GIMPLE_ASM) -+ return true; ++ gimple def_stmt = get_def_stmt(arg); + -+ if (is_const_plus_unsigned_signed_truncation(rhs)) -+ return true; ++ if (!def_stmt || !gimple_assign_cast_p(def_stmt)) ++ return false; + -+ return false; ++ def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt)); ++ return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM; +} + -+static tree create_cast_overflow_check(struct pointer_set_t *visited, tree new_rhs1, gimple stmt) ++static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result) +{ -+ bool cast_lhs, cast_rhs; -+ tree lhs = gimple_get_lhs(stmt); -+ tree rhs = gimple_assign_rhs1(stmt); -+ const_tree lhs_type = TREE_TYPE(lhs); -+ const_tree rhs_type = TREE_TYPE(rhs); -+ enum machine_mode lhs_mode = TYPE_MODE(lhs_type); -+ enum machine_mode rhs_mode = TYPE_MODE(rhs_type); -+ unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode); -+ unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode); -+ -+ static bool check_lhs[3][4] = { -+ // ss su us uu -+ { false, true, true, false }, // lhs > rhs -+ { false, false, false, false }, // lhs = rhs -+ { true, true, true, true }, // lhs < rhs -+ }; -+ -+ static bool check_rhs[3][4] = { -+ // ss su us uu -+ { true, false, true, true }, // lhs > rhs -+ { true, false, true, true }, // lhs = rhs -+ { true, false, true, true }, // lhs < rhs -+ }; ++ gimple phi = get_def_stmt(result); ++ unsigned int i, n = gimple_phi_num_args(phi); + -+ // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!! -+ if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode)) -+ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ pointer_set_insert(visited, phi); ++ for (i = 0; i < n; i++) { ++ tree arg = gimple_phi_arg_def(phi, i); + -+ if (lhs_size > rhs_size) { -+ cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; -+ cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; -+ } else if (lhs_size == rhs_size) { -+ cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; -+ cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; -+ } else { -+ cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; -+ cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)]; ++ walk_use_def(visited, cur_node, arg); + } ++} + -+ if (!cast_lhs && !cast_rhs) -+ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); -+ -+ if (cast_lhs && !skip_lhs_cast_check(stmt)) -+ check_size_overflow(stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT); ++static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs) ++{ ++ gimple def_stmt = get_def_stmt(lhs); ++ tree rhs1, rhs2; + -+ if (cast_rhs) -+ check_size_overflow(stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT); ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs2 = gimple_assign_rhs2(def_stmt); + -+ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); ++ walk_use_def(visited, cur_node, rhs1); ++ walk_use_def(visited, cur_node, rhs2); +} + -+static tree handle_unary_rhs(struct pointer_set_t *visited, gimple stmt) ++static void insert_last_node(struct interesting_node *cur_node, tree node) +{ -+ tree rhs1, new_rhs1, lhs = gimple_get_lhs(stmt); ++ unsigned int i; ++ tree element; ++ enum tree_code code; + -+ if (gimple_plf(stmt, MY_STMT)) -+ return lhs; ++ gcc_assert(node != NULL_TREE); + -+ rhs1 = gimple_assign_rhs1(stmt); -+ if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE) -+ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ if (is_gimple_constant(node)) ++ return; + -+ new_rhs1 = expand(visited, rhs1); ++ code = TREE_CODE(node); ++ if (code == VAR_DECL) { ++ node = DECL_ORIGIN(node); ++ code = TREE_CODE(node); ++ } + -+ if (new_rhs1 == NULL_TREE) -+ return create_cast_assign(visited, stmt); ++ if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF) ++ return; + -+ if (gimple_plf(stmt, NO_CAST_CHECK)) -+ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); ++#if BUILDING_GCC_VERSION == 4005 ++ for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) { ++ element = VEC_index(tree, cur_node->last_nodes, i); ++#elif BUILDING_GCC_VERSION <= 4007 ++ FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) { ++#else ++ FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) { ++#endif ++ if (operand_equal_p(node, element, 0)) ++ return; ++ } + -+ if (gimple_assign_rhs_code(stmt) == BIT_NOT_EXPR) { -+ tree size_overflow_type = get_size_overflow_type(stmt, rhs1); ++#if BUILDING_GCC_VERSION <= 4007 ++ gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN); ++ VEC_safe_push(tree, gc, cur_node->last_nodes, node); ++#else ++ gcc_assert(cur_node->last_nodes->length() < VEC_LEN); ++ vec_safe_push(cur_node->last_nodes, node); ++#endif ++} + -+ new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT); -+ check_size_overflow(stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT); -+ return create_assign(visited, stmt, lhs, AFTER_STMT); -+ } ++// a size_overflow asm stmt in the control flow doesn't stop the recursion ++static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt) ++{ ++ const_tree asm_lhs; + -+ if (!gimple_assign_cast_p(stmt)) -+ return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE); ++ if (!is_size_overflow_asm(stmt)) ++ return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs)); + -+ return create_cast_overflow_check(visited, new_rhs1, stmt); ++ asm_lhs = gimple_asm_input_op(stmt, 0); ++ walk_use_def(visited, cur_node, TREE_VALUE(asm_lhs)); +} + -+static tree handle_unary_ops(struct pointer_set_t *visited, gimple stmt) ++/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow) ++ * and component refs (for checking the intentional_overflow attribute). ++ */ ++static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs) +{ -+ tree rhs1, lhs = gimple_get_lhs(stmt); -+ gimple def_stmt = get_def_stmt(lhs); ++ const_gimple def_stmt; + -+ gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP); -+ rhs1 = gimple_assign_rhs1(def_stmt); ++ if (TREE_CODE(lhs) != SSA_NAME) { ++ insert_last_node(cur_node, lhs); ++ return; ++ } + -+ if (is_gimple_constant(rhs1)) -+ return create_assign(visited, def_stmt, lhs, AFTER_STMT); ++ def_stmt = get_def_stmt(lhs); ++ if (!def_stmt) ++ return; + -+ switch (TREE_CODE(rhs1)) { -+ case SSA_NAME: -+ return handle_unary_rhs(visited, def_stmt); -+ case ARRAY_REF: -+ case BIT_FIELD_REF: -+ case ADDR_EXPR: -+ case COMPONENT_REF: -+ case INDIRECT_REF: -+#if BUILDING_GCC_VERSION >= 4006 -+ case MEM_REF: -+#endif -+ case TARGET_MEM_REF: -+ return create_assign(visited, def_stmt, lhs, AFTER_STMT); -+ case PARM_DECL: -+ case VAR_DECL: -+ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ if (pointer_set_insert(visited, def_stmt)) ++ return; ++ ++ switch (gimple_code(def_stmt)) { ++ case GIMPLE_NOP: ++ return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs)); ++ case GIMPLE_ASM: ++ return handle_asm_stmt(visited, cur_node, lhs, def_stmt); ++ case GIMPLE_CALL: { ++ tree fndecl = gimple_call_fndecl(def_stmt); + ++ if (fndecl == NULL_TREE) ++ return; ++ insert_last_node(cur_node, fndecl); ++ return; ++ } ++ case GIMPLE_PHI: ++ return walk_use_def_phi(visited, cur_node, lhs); ++ case GIMPLE_ASSIGN: ++ switch (gimple_num_ops(def_stmt)) { ++ case 2: ++ return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt)); ++ case 3: ++ return walk_use_def_binary(visited, cur_node, lhs); ++ } + default: -+ debug_gimple_stmt(def_stmt); -+ debug_tree(rhs1); ++ debug_gimple_stmt((gimple)def_stmt); ++ error("%s: unknown gimple code", __func__); + gcc_unreachable(); + } +} + -+static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value) ++// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes ++static void set_last_nodes(struct interesting_node *cur_node) +{ -+ gimple cond_stmt; -+ gimple_stmt_iterator gsi = gsi_last_bb(cond_bb); ++ struct pointer_set_t *visited; + -+ cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE); -+ gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING); -+ update_stmt(cond_stmt); ++ visited = pointer_set_create(); ++ walk_use_def(visited, cur_node, cur_node->node); ++ pointer_set_destroy(visited); +} + -+static tree create_string_param(tree string) ++/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts, ++ * it decides whether the duplication is necessary or not and it searches for missing size_overflow attributes. After expand() it changes the orig node to the duplicated node ++ * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value. ++ * If there is a mark_turn_off intentional attribute on the caller or the callee then there is no duplication and missing size_overflow attribute check anywhere. ++ * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type. ++ * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast. ++ * It skips the possible error codes too. If the def_stmts trace back to a constant and there are no binary/ternary assigments then we assume that it is some kind of error code. ++ */ ++static struct next_cgraph_node *handle_interesting_stmt(struct next_cgraph_node *cnodes, struct interesting_node *cur_node, struct cgraph_node *caller_node) +{ -+ tree i_type, a_type; -+ const int length = TREE_STRING_LENGTH(string); -+ -+ gcc_assert(length > 0); -+ -+ i_type = build_index_type(build_int_cst(NULL_TREE, length - 1)); -+ a_type = build_array_type(char_type_node, i_type); ++ struct pointer_set_t *visited; ++ bool interesting_conditions[3] = {false, false, false}; ++ tree new_node, orig_node = cur_node->node; + -+ TREE_TYPE(string) = a_type; -+ TREE_CONSTANT(string) = 1; -+ TREE_READONLY(string) = 1; ++ set_last_nodes(cur_node); + -+ return build1(ADDR_EXPR, ptr_type_node, string); -+} ++ check_intentional_attribute_ipa(cur_node); ++ if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF) ++ return cnodes; + -+static void insert_cond_result(basic_block bb_true, const_gimple stmt, const_tree arg, bool min) -+{ -+ gimple func_stmt; -+ const_gimple def_stmt; -+ const_tree loc_line; -+ tree loc_file, ssa_name, current_func; -+ expanded_location xloc; -+ char *ssa_name_buf; -+ int len; -+ gimple_stmt_iterator gsi = gsi_start_bb(bb_true); ++ search_interesting_conditions(cur_node, interesting_conditions); + -+ def_stmt = get_def_stmt(arg); -+ xloc = expand_location(gimple_location(def_stmt)); ++ // error code ++ if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY]) ++ return cnodes; + -+ if (!gimple_has_location(def_stmt)) { -+ xloc = expand_location(gimple_location(stmt)); -+ if (!gimple_has_location(stmt)) -+ xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl)); -+ } ++ cnodes = search_overflow_attribute(cnodes, cur_node); + -+ loc_line = build_int_cstu(unsigned_type_node, xloc.line); ++ if (cur_node->intentional_attr_cur_fndecl != MARK_NO) ++ return cnodes; + -+ loc_file = build_string(strlen(xloc.file) + 1, xloc.file); -+ loc_file = create_string_param(loc_file); ++ // unnecessary overflow check ++ if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY]) ++ return cnodes; + -+ current_func = build_string(NAME_LEN(current_function_decl) + 1, NAME(current_function_decl)); -+ current_func = create_string_param(current_func); ++ visited = pointer_set_create(); ++ new_node = expand(visited, caller_node, orig_node); ++ pointer_set_destroy(visited); + -+ gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL); -+ call_count++; -+ len = asprintf(&ssa_name_buf, "%s_%u %s, count: %u\n", NAME(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max", call_count); -+ gcc_assert(len > 0); -+ ssa_name = build_string(len + 1, ssa_name_buf); -+ free(ssa_name_buf); -+ ssa_name = create_string_param(ssa_name); ++ if (new_node == NULL_TREE) ++ return cnodes; + -+ // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name) -+ func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name); ++ change_orig_node(cur_node, new_node); ++ check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT); + -+ gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING); ++ return cnodes; +} + -+static void __unused print_the_code_insertions(const_gimple stmt) ++// Check visited interesting nodes. ++static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num) +{ -+ location_t loc = gimple_location(stmt); ++ struct interesting_node *cur; + -+ inform(loc, "Integer size_overflow check applied here."); ++ for (cur = head; cur; cur = cur->next) { ++ if (!operand_equal_p(node, cur->node, 0)) ++ continue; ++ if (num != cur->num) ++ continue; ++ if (first_stmt == cur->first_stmt) ++ return true; ++ } ++ return false; +} + -+static void insert_check_size_overflow(gimple stmt, enum tree_code cond_code, tree arg, tree type_value, bool before, bool min) ++/* Create an interesting node. The ipa pass starts to duplicate from these stmts. ++ first_stmt: it is the call or assignment or ret stmt, change_orig_node() will change the original node (retval, or function arg) in this ++ last_nodes: they are the last stmts in the recursion (they haven't a def_stmt). They are useful in the missing size_overflow attribute check and ++ the intentional_overflow attribute check. They are collected by set_last_nodes(). ++ num: arg count of a call stmt or 0 when it is a ret ++ node: the recursion starts from here, it is a call arg or a return value ++ fndecl: the fndecl of the interesting node when the node is an arg. it is the fndecl of the callee function otherwise it is the fndecl of the caller (current_function_fndecl) function. ++ intentional_attr_decl: intentional_overflow attribute of the callee function ++ intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function ++ intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists ++ */ ++static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt) +{ -+ basic_block cond_bb, join_bb, bb_true; -+ edge e; -+ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); ++ struct interesting_node *new_node; ++ tree fndecl; ++ enum gimple_code code; + -+ cond_bb = gimple_bb(stmt); -+ if (before) -+ gsi_prev(&gsi); -+ if (gsi_end_p(gsi)) -+ e = split_block_after_labels(cond_bb); ++ gcc_assert(node != NULL_TREE); ++ code = gimple_code(first_stmt); ++ gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN); ++ ++ if (num == CANNOT_FIND_ARG) ++ return head; ++ ++ if (skip_types(node)) ++ return head; ++ ++ if (skip_asm(node)) ++ return head; ++ ++ if (is_gimple_call(first_stmt)) ++ fndecl = gimple_call_fndecl(first_stmt); + else -+ e = split_block(cond_bb, gsi_stmt(gsi)); -+ cond_bb = e->src; -+ join_bb = e->dest; -+ e->flags = EDGE_FALSE_VALUE; -+ e->probability = REG_BR_PROB_BASE; ++ fndecl = current_function_decl; + -+ bb_true = create_empty_bb(cond_bb); -+ make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE); -+ make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE); -+ make_edge(bb_true, join_bb, EDGE_FALLTHRU); ++ if (fndecl == NULL_TREE) ++ return head; + -+ gcc_assert(dom_info_available_p(CDI_DOMINATORS)); -+ set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb); -+ set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb); ++ if (is_in_interesting_node(head, first_stmt, node, num)) ++ return head; + -+ if (current_loops != NULL) { -+ gcc_assert(cond_bb->loop_father == join_bb->loop_father); -+ add_bb_to_loop(bb_true, cond_bb->loop_father); -+ } ++ new_node = (struct interesting_node *)xmalloc(sizeof(*new_node)); + -+ insert_cond(cond_bb, arg, cond_code, type_value); -+ insert_cond_result(bb_true, stmt, arg, min); ++ new_node->next = NULL; ++ new_node->first_stmt = first_stmt; ++#if BUILDING_GCC_VERSION <= 4007 ++ new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN); ++#else ++ vec_alloc(new_node->last_nodes, VEC_LEN); ++#endif ++ new_node->num = num; ++ new_node->node = node; ++ new_node->fndecl = fndecl; ++ new_node->intentional_attr_decl = MARK_NO; ++ new_node->intentional_attr_cur_fndecl = MARK_NO; ++ new_node->intentional_mark_from_gimple = asm_stmt; + -+// print_the_code_insertions(stmt); ++ if (!head) ++ return new_node; ++ ++ new_node->next = head; ++ return new_node; +} + -+static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before) ++/* Check the ret stmts in the functions on the next cgraph node list (these functions will be in the hash table and they are reachable from ipa). ++ * If the ret stmt is in the next cgraph node list then it's an interesting ret. ++ */ ++static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node) +{ -+ const_tree rhs_type = TREE_TYPE(rhs); -+ tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min; ++ struct next_cgraph_node *cur_node; ++ tree ret = gimple_return_retval(stmt); + -+ gcc_assert(rhs_type != NULL_TREE); -+ if (TREE_CODE(rhs_type) == POINTER_TYPE) -+ return; ++ if (ret == NULL_TREE) ++ return head; + -+ gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE); ++ for (cur_node = next_node; cur_node; cur_node = cur_node->next) { ++ if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0)) ++ continue; ++ if (cur_node->num == 0) ++ head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM); ++ } + -+ if (is_const_plus_unsigned_signed_truncation(rhs)) -+ return; ++ return head; ++} + -+ type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type)); -+ // typemax (-1) < typemin (0) -+ if (TREE_OVERFLOW(type_max)) -+ return; ++/* Check the call stmts in the functions on the next cgraph node list (these functions will be in the hash table and they are reachable from ipa). ++ * If the call stmt is in the next cgraph node list then it's an interesting call. ++ */ ++static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node) ++{ ++ unsigned int argnum; ++ tree fndecl, arg; ++ struct next_cgraph_node *cur_node; + -+ type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type)); ++ fndecl = gimple_call_fndecl(stmt); ++ if (fndecl == NULL_TREE) ++ return head; + -+ cast_rhs_type = TREE_TYPE(cast_rhs); -+ type_max_type = TREE_TYPE(type_max); -+ type_min_type = TREE_TYPE(type_min); -+ gcc_assert(types_compatible_p(cast_rhs_type, type_max_type)); -+ gcc_assert(types_compatible_p(type_max_type, type_min_type)); ++ for (cur_node = next_node; cur_node; cur_node = cur_node->next) { ++ if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0)) ++ continue; ++ argnum = get_correct_arg_count(cur_node->num, fndecl); ++ gcc_assert(argnum != CANNOT_FIND_ARG); ++ if (argnum == 0) ++ continue; ++ ++ arg = gimple_call_arg(stmt, argnum - 1); ++ head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM); ++ } + -+ insert_check_size_overflow(stmt, GT_EXPR, cast_rhs, type_max, before, false); -+ insert_check_size_overflow(stmt, LT_EXPR, cast_rhs, type_min, before, true); ++ return head; +} + -+static bool is_a_constant_overflow(const_gimple stmt, const_tree rhs) ++static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count) +{ -+ if (gimple_assign_rhs_code(stmt) == MIN_EXPR) -+ return false; -+ if (!is_gimple_constant(rhs)) -+ return false; -+ return true; ++ if (!operand_equal_p(orig_node, node, 0)) ++ return WRONG_NODE; ++ if (skip_types(node)) ++ return WRONG_NODE; ++ return ret_count; +} + -+static tree get_def_stmt_rhs(const_tree var) ++// Get the index of the rhs node in an assignment ++static unsigned int get_assign_ops_count(const_gimple stmt, tree node) +{ -+ tree rhs1, def_stmt_rhs1; -+ gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt; -+ -+ def_stmt = get_def_stmt(var); -+ gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && gimple_plf(def_stmt, MY_STMT) && gimple_assign_cast_p(def_stmt)); ++ const_tree rhs1, rhs2; ++ unsigned int ret; + -+ rhs1 = gimple_assign_rhs1(def_stmt); -+ rhs1_def_stmt = get_def_stmt(rhs1); -+ if (!gimple_assign_cast_p(rhs1_def_stmt)) -+ return rhs1; ++ gcc_assert(stmt); ++ gcc_assert(is_gimple_assign(stmt)); + -+ def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt); -+ def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1); ++ rhs1 = gimple_assign_rhs1(stmt); ++ gcc_assert(rhs1 != NULL_TREE); ++ ++ switch (gimple_num_ops(stmt)) { ++ case 2: ++ return check_ops(node, rhs1, 1); ++ case 3: ++ ret = check_ops(node, rhs1, 1); ++ if (ret != WRONG_NODE) ++ return ret; + -+ switch (gimple_code(def_stmt_rhs1_def_stmt)) { -+ case GIMPLE_CALL: -+ case GIMPLE_NOP: -+ case GIMPLE_ASM: -+ case GIMPLE_PHI: -+ return def_stmt_rhs1; -+ case GIMPLE_ASSIGN: -+ return rhs1; ++ rhs2 = gimple_assign_rhs2(stmt); ++ gcc_assert(rhs2 != NULL_TREE); ++ return check_ops(node, rhs2, 2); + default: -+ debug_gimple_stmt(def_stmt_rhs1_def_stmt); + gcc_unreachable(); + } +} + -+static tree handle_intentional_overflow(struct pointer_set_t *visited, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2) ++// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function. ++static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt) +{ -+ tree new_rhs, orig_rhs; -+ void (*gimple_assign_set_rhs)(gimple, tree); -+ tree rhs1 = gimple_assign_rhs1(stmt); -+ tree rhs2 = gimple_assign_rhs2(stmt); -+ tree lhs = gimple_get_lhs(stmt); ++ unsigned int i; + -+ if (!check_overflow) -+ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ if (gimple_call_fndecl(stmt) == NULL_TREE) ++ return CANNOT_FIND_ARG; + -+ if (change_rhs == NULL_TREE) -+ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ for (i = 0; i < gimple_call_num_args(stmt); i++) { ++ tree node; + -+ if (new_rhs2 == NULL_TREE) { -+ orig_rhs = rhs1; -+ gimple_assign_set_rhs = &gimple_assign_set_rhs1; -+ } else { -+ orig_rhs = rhs2; -+ gimple_assign_set_rhs = &gimple_assign_set_rhs2; ++ node = gimple_call_arg(stmt, i); ++ if (!operand_equal_p(arg, node, 0)) ++ continue; ++ if (!skip_types(node)) ++ return i + 1; + } + -+ check_size_overflow(stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT); -+ -+ new_rhs = change_assign_rhs(stmt, orig_rhs, change_rhs); -+ gimple_assign_set_rhs(stmt, new_rhs); -+ update_stmt(stmt); -+ -+ return create_assign(visited, stmt, lhs, AFTER_STMT); ++ return CANNOT_FIND_ARG; +} + -+static bool is_subtraction_special(const_gimple stmt) ++/* starting from the size_overflow asm stmt collect interesting stmts. They can be ++ * any of return, call or assignment stmts (because of inlining). ++ */ ++static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm) +{ -+ gimple rhs1_def_stmt, rhs2_def_stmt; -+ const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs; -+ enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode; -+ const_tree rhs1 = gimple_assign_rhs1(stmt); -+ const_tree rhs2 = gimple_assign_rhs2(stmt); ++ use_operand_p use_p; ++ imm_use_iterator imm_iter; ++ unsigned int argnum; + -+ if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2)) -+ return false; ++ if (is_size_overflow_intentional_asm_turn_off(intentional_asm)) ++ return head; + -+ gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME); ++ gcc_assert(TREE_CODE(node) == SSA_NAME); + -+ if (gimple_assign_rhs_code(stmt) != MINUS_EXPR) -+ return false; ++ if (pointer_set_insert(visited, node)) ++ return head; + -+ rhs1_def_stmt = get_def_stmt(rhs1); -+ rhs2_def_stmt = get_def_stmt(rhs2); -+ if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt)) -+ return false; ++ FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) { ++ gimple stmt = USE_STMT(use_p); + -+ rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt); -+ rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt); -+ rhs1_def_stmt_lhs = gimple_get_lhs(rhs1_def_stmt); -+ rhs2_def_stmt_lhs = gimple_get_lhs(rhs2_def_stmt); -+ rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1)); -+ rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1)); -+ rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs)); -+ rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs)); -+ if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode)) -+ return false; -+ if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode)) -+ return false; ++ if (stmt == NULL) ++ return head; ++ if (is_gimple_debug(stmt)) ++ continue; + -+ gimple_set_plf(rhs1_def_stmt, NO_CAST_CHECK, true); -+ gimple_set_plf(rhs2_def_stmt, NO_CAST_CHECK, true); -+ return true; ++ switch (gimple_code(stmt)) { ++ case GIMPLE_CALL: ++ argnum = find_arg_number_gimple(node, stmt); ++ head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm); ++ break; ++ case GIMPLE_RETURN: ++ head = create_new_interesting_node(head, stmt, node, 0, intentional_asm); ++ break; ++ case GIMPLE_ASSIGN: ++ argnum = get_assign_ops_count(stmt, node); ++ head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm); ++ break; ++ case GIMPLE_PHI: { ++ tree result = gimple_phi_result(stmt); ++ head = get_interesting_ret_or_call(visited, head, result, intentional_asm); ++ break; ++ } ++ case GIMPLE_ASM: ++ if (gimple_asm_noutputs(stmt) != 0) ++ break; ++ if (!is_size_overflow_asm(stmt)) ++ break; ++ head = create_new_interesting_node(head, stmt, node, 1, intentional_asm); ++ break; ++ case GIMPLE_COND: ++ case GIMPLE_SWITCH: ++ break; ++ default: ++ debug_gimple_stmt(stmt); ++ gcc_unreachable(); ++ break; ++ } ++ } ++ return head; +} + -+static tree handle_integer_truncation(struct pointer_set_t *visited, const_tree lhs) ++static void remove_size_overflow_asm(gimple stmt) +{ -+ tree new_rhs1, new_rhs2; -+ tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs; -+ gimple assign, stmt = get_def_stmt(lhs); -+ tree rhs1 = gimple_assign_rhs1(stmt); -+ tree rhs2 = gimple_assign_rhs2(stmt); ++ gimple_stmt_iterator gsi; ++ tree input, output; + -+ if (!is_subtraction_special(stmt)) -+ return NULL_TREE; ++ if (gimple_code(stmt) != GIMPLE_ASM) ++ return; ++ if (!is_size_overflow_asm(stmt)) ++ return; + -+ new_rhs1 = expand(visited, rhs1); -+ new_rhs2 = expand(visited, rhs2); ++ if (gimple_asm_noutputs(stmt) == 0) { ++ gsi = gsi_for_stmt(stmt); ++ gsi_remove(&gsi, true); ++ return; ++ } + -+ new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs1); -+ new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs2); ++ input = gimple_asm_input_op(stmt, 0); ++ output = gimple_asm_output_op(stmt, 0); ++ replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input)); ++} + -+ if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) { -+ new_rhs1_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs1_def_stmt_rhs1); -+ new_rhs2_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs2_def_stmt_rhs1); ++/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts. ++ * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it. ++ * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output. ++ */ ++static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head) ++{ ++ const_tree output; ++ struct pointer_set_t *visited; ++ gimple intentional_asm = NOT_INTENTIONAL_ASM; ++ ++ if (!is_size_overflow_asm(stmt)) ++ return head; ++ ++ if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt)) ++ intentional_asm = stmt; ++ ++ gcc_assert(gimple_asm_ninputs(stmt) == 1); ++ ++ if (gimple_asm_noutputs(stmt) == 0) { ++ const_tree input = gimple_asm_input_op(stmt, 0); ++ ++ remove_size_overflow_asm(stmt); ++ if (is_gimple_constant(TREE_VALUE(input))) ++ return head; ++ ++ visited = pointer_set_create(); ++ head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm); ++ pointer_set_destroy(visited); ++ return head; + } + -+ assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1); -+ new_lhs = gimple_get_lhs(assign); -+ check_size_overflow(assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT); ++ if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt)) ++ remove_size_overflow_asm(stmt); + -+ return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE); ++ visited = pointer_set_create(); ++ output = gimple_asm_output_op(stmt, 0); ++ head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm); ++ pointer_set_destroy(visited); ++ return head; +} + -+static bool is_a_neg_overflow(const_gimple stmt, const_tree rhs) ++/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass) ++ * or a call stmt or a return stmt and store them in the interesting_node list ++ */ ++static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node) +{ -+ const_gimple def_stmt; ++ basic_block bb; ++ struct interesting_node *head = NULL; + -+ if (TREE_CODE(rhs) != SSA_NAME) -+ return false; ++ FOR_ALL_BB(bb) { ++ gimple_stmt_iterator gsi; + -+ if (gimple_assign_rhs_code(stmt) != PLUS_EXPR) -+ return false; ++ for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) { ++ enum gimple_code code; ++ gimple stmt = gsi_stmt(gsi); + -+ def_stmt = get_def_stmt(rhs); -+ if (gimple_code(def_stmt) != GIMPLE_ASSIGN || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR) -+ return false; ++ code = gimple_code(stmt); + -+ return true; ++ if (code == GIMPLE_ASM) ++ head = handle_stmt_by_size_overflow_asm(stmt, head); ++ ++ if (!next_node) ++ continue; ++ if (code == GIMPLE_CALL) ++ head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node); ++ if (code == GIMPLE_RETURN) ++ head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node); ++ } ++ } ++ return head; +} + -+static tree handle_binary_ops(struct pointer_set_t *visited, tree lhs) ++static void set_current_function_decl(tree fndecl) +{ -+ tree rhs1, rhs2, new_lhs; -+ gimple def_stmt = get_def_stmt(lhs); -+ tree new_rhs1 = NULL_TREE; -+ tree new_rhs2 = NULL_TREE; ++ gcc_assert(fndecl != NULL_TREE); + -+ rhs1 = gimple_assign_rhs1(def_stmt); -+ rhs2 = gimple_assign_rhs2(def_stmt); ++ push_cfun(DECL_STRUCT_FUNCTION(fndecl)); ++ calculate_dominance_info(CDI_DOMINATORS); ++ current_function_decl = fndecl; ++} + -+ /* no DImode/TImode division in the 32/64 bit kernel */ -+ switch (gimple_assign_rhs_code(def_stmt)) { -+ case RDIV_EXPR: -+ case TRUNC_DIV_EXPR: -+ case CEIL_DIV_EXPR: -+ case FLOOR_DIV_EXPR: -+ case ROUND_DIV_EXPR: -+ case TRUNC_MOD_EXPR: -+ case CEIL_MOD_EXPR: -+ case FLOOR_MOD_EXPR: -+ case ROUND_MOD_EXPR: -+ case EXACT_DIV_EXPR: -+ case POINTER_PLUS_EXPR: -+ case BIT_AND_EXPR: -+ return create_assign(visited, def_stmt, lhs, AFTER_STMT); -+ default: -+ break; ++static void unset_current_function_decl(void) ++{ ++ free_dominance_info(CDI_DOMINATORS); ++ pop_cfun(); ++ current_function_decl = NULL_TREE; ++} ++ ++static void free_interesting_node(struct interesting_node *head) ++{ ++ struct interesting_node *cur; ++ ++ while (head) { ++ cur = head->next; ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC_free(tree, gc, head->last_nodes); ++#else ++ vec_free(head->last_nodes); ++#endif ++ free(head); ++ head = cur; + } ++} ++ ++static struct visited *insert_visited_function(struct visited *head, struct interesting_node *cur_node) ++{ ++ struct visited *new_visited; + -+ new_lhs = handle_integer_truncation(visited, lhs); -+ if (new_lhs != NULL_TREE) -+ return new_lhs; ++ new_visited = (struct visited *)xmalloc(sizeof(*new_visited)); ++ new_visited->fndecl = cur_node->fndecl; ++ new_visited->num = cur_node->num; ++ new_visited->first_stmt = cur_node->first_stmt; ++ new_visited->next = NULL; + -+ if (TREE_CODE(rhs1) == SSA_NAME) -+ new_rhs1 = expand(visited, rhs1); -+ if (TREE_CODE(rhs2) == SSA_NAME) -+ new_rhs2 = expand(visited, rhs2); ++ if (!head) ++ return new_visited; + -+ if (is_a_neg_overflow(def_stmt, rhs2)) -+ return handle_intentional_overflow(visited, true, def_stmt, new_rhs1, NULL_TREE); -+ if (is_a_neg_overflow(def_stmt, rhs1)) -+ return handle_intentional_overflow(visited, true, def_stmt, new_rhs2, new_rhs2); ++ new_visited->next = head; ++ return new_visited; ++} + ++/* Check whether the function was already visited. If the fndecl, the arg count of the fndecl and the first_stmt (call or return) are same then ++ * it is a visited function. ++ */ ++static bool is_visited_function(struct visited *head, struct interesting_node *cur_node) ++{ ++ struct visited *cur; + -+ if (is_a_constant_overflow(def_stmt, rhs2)) -+ return handle_intentional_overflow(visited, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE); -+ if (is_a_constant_overflow(def_stmt, rhs1)) -+ return handle_intentional_overflow(visited, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2); ++ if (!head) ++ return false; + -+ return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE); ++ for (cur = head; cur; cur = cur->next) { ++ if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0)) ++ continue; ++ if (cur_node->num != cur->num) ++ continue; ++ if (cur_node->first_stmt == cur->first_stmt) ++ return true; ++ } ++ return false; +} + -+#if BUILDING_GCC_VERSION >= 4007 -+static tree get_new_rhs(struct pointer_set_t *visited, tree size_overflow_type, tree rhs) ++static void free_next_cgraph_node(struct next_cgraph_node *head) +{ -+ if (is_gimple_constant(rhs)) -+ return cast_a_tree(size_overflow_type, rhs); -+ if (TREE_CODE(rhs) != SSA_NAME) -+ return NULL_TREE; -+ return expand(visited, rhs); ++ struct next_cgraph_node *cur; ++ ++ while (head) { ++ cur = head->next; ++ free(head); ++ head = cur; ++ } +} + -+static tree handle_ternary_ops(struct pointer_set_t *visited, tree lhs) ++static void remove_all_size_overflow_asm(void) +{ -+ tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type; -+ gimple def_stmt = get_def_stmt(lhs); -+ -+ size_overflow_type = get_size_overflow_type(def_stmt, lhs); ++ basic_block bb; + -+ rhs1 = gimple_assign_rhs1(def_stmt); -+ rhs2 = gimple_assign_rhs2(def_stmt); -+ rhs3 = gimple_assign_rhs3(def_stmt); -+ new_rhs1 = get_new_rhs(visited, size_overflow_type, rhs1); -+ new_rhs2 = get_new_rhs(visited, size_overflow_type, rhs2); -+ new_rhs3 = get_new_rhs(visited, size_overflow_type, rhs3); ++ FOR_ALL_BB(bb) { ++ gimple_stmt_iterator si; + -+ return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3); ++ for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si)) ++ remove_size_overflow_asm(gsi_stmt(si)); ++ } +} -+#endif + -+static tree get_size_overflow_type(gimple stmt, const_tree node) ++/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function ++ * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk ++ * the newly collected interesting functions (they are interesting if there is control flow between ++ * the interesting stmts and them). ++ */ ++static struct visited *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited *visited) +{ -+ const_tree type; -+ tree new_type; ++ struct interesting_node *head, *cur_node; ++ struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL; + -+ gcc_assert(node != NULL_TREE); ++#if BUILDING_GCC_VERSION <= 4007 ++ set_current_function_decl(node->decl); ++#else ++ set_current_function_decl(node->symbol.decl); ++#endif ++ call_count = 0; + -+ type = TREE_TYPE(node); ++ head = collect_interesting_stmts(next_node); ++ for (cur_node = head; cur_node; cur_node = cur_node->next) { ++ if (is_visited_function(visited, cur_node)) ++ continue; ++ cnodes_head = handle_interesting_stmt(cnodes_head, cur_node, node); ++ visited = insert_visited_function(visited, cur_node); ++ } + -+ if (gimple_plf(stmt, MY_STMT)) -+ return TREE_TYPE(node); ++ free_interesting_node(head); ++ remove_all_size_overflow_asm(); ++ unset_current_function_decl(); + -+ switch (TYPE_MODE(type)) { -+ case QImode: -+ new_type = intHI_type_node; -+ break; -+ case HImode: -+ new_type = intSI_type_node; -+ break; -+ case SImode: -+ new_type = intDI_type_node; -+ break; -+ case DImode: -+ if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode)) -+ new_type = intDI_type_node; -+ else -+ new_type = intTI_type_node; -+ break; -+ default: -+ debug_tree((tree)node); -+ error("%s: unsupported gcc configuration.", __func__); -+ gcc_unreachable(); -+ } ++ for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next) ++ visited = handle_function(cur_cnodes->current_function, cur_cnodes, visited); + -+ if (TYPE_QUALS(type) != 0) -+ return build_qualified_type(new_type, TYPE_QUALS(type)); -+ return new_type; ++ free_next_cgraph_node(cnodes_head); ++ return visited; +} + -+static tree expand_visited(gimple def_stmt) ++static void free_visited(struct visited *head) +{ -+ const_gimple next_stmt; -+ gimple_stmt_iterator gsi; -+ enum gimple_code code = gimple_code(def_stmt); ++ struct visited *cur; + -+ if (code == GIMPLE_ASM) -+ return NULL_TREE; ++ while (head) { ++ cur = head->next; ++ free(head); ++ head = cur; ++ } ++} + -+ gsi = gsi_for_stmt(def_stmt); -+ gsi_next(&gsi); ++// erase the local flag ++static void set_plf_false(void) ++{ ++ basic_block bb; + -+ if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi)) -+ return NULL_TREE; -+ gcc_assert(!gsi_end_p(gsi)); -+ next_stmt = gsi_stmt(gsi); ++ FOR_ALL_BB(bb) { ++ gimple_stmt_iterator si; + -+ if (gimple_code(def_stmt) == GIMPLE_PHI && !gimple_plf((gimple)next_stmt, MY_STMT)) -+ return NULL_TREE; -+ gcc_assert(gimple_plf((gimple)next_stmt, MY_STMT)); ++ for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si)) ++ gimple_set_plf(gsi_stmt(si), MY_STMT, false); ++ for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si)) ++ gimple_set_plf(gsi_stmt(si), MY_STMT, false); ++ } ++} + -+ return get_lhs(next_stmt); ++#if BUILDING_GCC_VERSION <= 4006 ++static bool cgraph_function_with_gimple_body_p(struct cgraph_node *node) ++{ ++ return node->analyzed && !node->thunk.thunk_p && !node->alias; +} + -+static tree expand(struct pointer_set_t *visited, tree lhs) ++static struct cgraph_node *cgraph_first_function_with_gimple_body(void) +{ -+ gimple def_stmt; ++ struct cgraph_node *node; + -+ if (skip_types(lhs)) -+ return NULL_TREE; ++ for (node = cgraph_nodes; node; node = node->next) { ++ if (cgraph_function_with_gimple_body_p(node)) ++ return node; ++ } ++ return NULL; ++} + -+ def_stmt = get_def_stmt(lhs); ++static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node) ++{ ++ for (node = node->next; node; node = node->next) { ++ if (cgraph_function_with_gimple_body_p(node)) ++ return node; ++ } ++ return NULL; ++} + -+ if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP) -+ return NULL_TREE; ++#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \ ++ for ((node) = cgraph_first_function_with_gimple_body (); (node); \ ++ (node) = cgraph_next_function_with_gimple_body (node)) + -+ if (gimple_plf(def_stmt, MY_STMT)) -+ return lhs; ++#endif + -+ if (pointer_set_contains(visited, def_stmt)) -+ return expand_visited(def_stmt); ++// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions ++static unsigned int search_function(void) ++{ ++ struct cgraph_node *node; ++ struct visited *visited = NULL; + -+ switch (gimple_code(def_stmt)) { -+ case GIMPLE_PHI: -+ return handle_phi(visited, lhs); -+ case GIMPLE_CALL: -+ case GIMPLE_ASM: -+ return create_assign(visited, def_stmt, lhs, AFTER_STMT); -+ case GIMPLE_ASSIGN: -+ switch (gimple_num_ops(def_stmt)) { -+ case 2: -+ return handle_unary_ops(visited, def_stmt); -+ case 3: -+ return handle_binary_ops(visited, lhs); -+#if BUILDING_GCC_VERSION >= 4007 -+ case 4: -+ return handle_ternary_ops(visited, lhs); ++ FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) { ++#if BUILDING_GCC_VERSION <= 4007 ++ set_current_function_decl(node->decl); ++#else ++ set_current_function_decl(node->symbol.decl); +#endif -+ } -+ default: -+ debug_gimple_stmt(def_stmt); -+ error("%s: unknown gimple code", __func__); -+ gcc_unreachable(); ++ set_plf_false(); ++ unset_current_function_decl(); + } -+} + -+static tree get_new_tree(gimple stmt, const_tree orig_node, tree new_node) -+{ -+ const_gimple assign; -+ tree orig_type = TREE_TYPE(orig_node); -+ gimple_stmt_iterator gsi = gsi_for_stmt(stmt); ++ FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) { ++ gcc_assert(cgraph_function_flags_ready); ++#if BUILDING_GCC_VERSION <= 4007 ++ gcc_assert(node->reachable); ++#endif + -+ assign = build_cast_stmt(orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false); -+ return gimple_get_lhs(assign); -+} ++ visited = handle_function(node, NULL, visited); ++ } + -+static void change_function_arg(gimple stmt, const_tree orig_arg, unsigned int argnum, tree new_arg) -+{ -+ gimple_call_set_arg(stmt, argnum, get_new_tree(stmt, orig_arg, new_arg)); -+ update_stmt(stmt); ++ free_visited(visited); ++ return 0; +} + -+static void change_function_return(gimple stmt, const_tree orig_ret, tree new_ret) ++static struct ipa_opt_pass_d pass_ipa = { ++ .pass = { ++ .type = SIMPLE_IPA_PASS, ++ .name = "size_overflow", ++#if BUILDING_GCC_VERSION >= 4008 ++ .optinfo_flags = OPTGROUP_NONE, ++#endif ++ .gate = NULL, ++ .execute = search_function, ++ .sub = NULL, ++ .next = NULL, ++ .static_pass_number = 0, ++ .tv_id = TV_NONE, ++ .properties_required = 0, ++ .properties_provided = 0, ++ .properties_destroyed = 0, ++ .todo_flags_start = 0, ++ .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_remove_unused_locals | TODO_ggc_collect | TODO_verify_flow | TODO_dump_cgraph | TODO_dump_func | TODO_update_ssa_no_phi, ++ }, ++ .generate_summary = NULL, ++ .write_summary = NULL, ++ .read_summary = NULL, ++#if BUILDING_GCC_VERSION >= 4006 ++ .write_optimization_summary = NULL, ++ .read_optimization_summary = NULL, ++#endif ++ .stmt_fixup = NULL, ++ .function_transform_todo_flags_start = 0, ++ .function_transform = NULL, ++ .variable_transform = NULL, ++}; ++ ++// data for the size_overflow asm stmt ++struct asm_data { ++ gimple def_stmt; ++ tree input; ++ tree output; ++}; ++ ++#if BUILDING_GCC_VERSION <= 4007 ++static VEC(tree, gc) *create_asm_io_list(tree string, tree io) ++#else ++static vec *create_asm_io_list(tree string, tree io) ++#endif +{ -+ gimple_return_set_retval(stmt, get_new_tree(stmt, orig_ret, new_ret)); -+ update_stmt(stmt); ++ tree list; ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC(tree, gc) *vec_list = NULL; ++#else ++ vec *vec_list = NULL; ++#endif ++ ++ list = build_tree_list(NULL_TREE, string); ++ list = chainon(NULL_TREE, build_tree_list(list, io)); ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC_safe_push(tree, gc, vec_list, list); ++#else ++ vec_safe_push(vec_list, list); ++#endif ++ return vec_list; +} + -+static bool get_function_arg(unsigned int* argnum, const_tree fndecl) ++static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data) +{ -+ tree arg; -+ const_tree origarg; ++ gimple asm_stmt; ++ gimple_stmt_iterator gsi; ++#if BUILDING_GCC_VERSION <= 4007 ++ VEC(tree, gc) *input, *output = NULL; ++#else ++ vec *input, *output = NULL; ++#endif + -+ if (!DECL_ABSTRACT_ORIGIN(fndecl)) -+ return true; ++ input = create_asm_io_list(str_input, asm_data->input); + -+ origarg = DECL_ARGUMENTS(DECL_ABSTRACT_ORIGIN(fndecl)); -+ while (origarg && *argnum) { -+ (*argnum)--; -+ origarg = TREE_CHAIN(origarg); -+ } ++ if (asm_data->output) ++ output = create_asm_io_list(str_output, asm_data->output); + -+ gcc_assert(*argnum == 0); ++ asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL); ++ gsi = gsi_for_stmt(asm_data->def_stmt); ++ gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT); + -+ gcc_assert(origarg != NULL_TREE); -+ *argnum = 0; -+ for (arg = DECL_ARGUMENTS(fndecl); arg; arg = TREE_CHAIN(arg), (*argnum)++) -+ if (operand_equal_p(origarg, arg, 0) || !strcmp(NAME(origarg), NAME(arg))) -+ return true; -+ return false; ++ if (asm_data->output) ++ SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt; ++} ++ ++static void replace_call_lhs(const struct asm_data *asm_data) ++{ ++ gimple_set_lhs(asm_data->def_stmt, asm_data->input); ++ update_stmt(asm_data->def_stmt); ++ SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt; +} + -+static enum mark walk_phi(struct pointer_set_t *visited, bool *search_err_code, const_tree result) ++static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result) +{ ++ enum mark cur_fndecl_attr; + gimple phi = get_def_stmt(result); + unsigned int i, n = gimple_phi_num_args(phi); + -+ if (!phi) -+ return MARK_NO; -+ + pointer_set_insert(visited, phi); + for (i = 0; i < n; i++) { -+ enum mark marked; -+ const_tree arg = gimple_phi_arg_def(phi, i); -+ marked = pre_expand(visited, search_err_code, arg); -+ if (marked != MARK_NO) -+ return marked; ++ tree arg = gimple_phi_arg_def(phi, i); ++ ++ cur_fndecl_attr = search_intentional(visited, arg); ++ if (cur_fndecl_attr != MARK_NO) ++ return cur_fndecl_attr; + } + return MARK_NO; +} + -+static enum mark walk_unary_ops(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs) ++static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs) +{ ++ enum mark cur_fndecl_attr; ++ const_tree rhs1, rhs2; + gimple def_stmt = get_def_stmt(lhs); -+ const_tree rhs; -+ -+ if (!def_stmt) -+ return MARK_NO; + -+ rhs = gimple_assign_rhs1(def_stmt); -+ -+ def_stmt = get_def_stmt(rhs); -+ if (is_gimple_constant(rhs)) -+ search_err_code[FROM_CONST] = true; ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs2 = gimple_assign_rhs2(def_stmt); + -+ return pre_expand(visited, search_err_code, rhs); ++ cur_fndecl_attr = search_intentional(visited, rhs1); ++ if (cur_fndecl_attr != MARK_NO) ++ return cur_fndecl_attr; ++ return search_intentional(visited, rhs2); +} + -+static enum mark walk_binary_ops(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs) ++// Look up the intentional_overflow attribute on the caller and the callee functions. ++static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs) +{ -+ gimple def_stmt = get_def_stmt(lhs); -+ const_tree rhs1, rhs2; -+ enum mark marked; ++ const_gimple def_stmt; + ++ if (TREE_CODE(lhs) != SSA_NAME) ++ return get_intentional_attr_type(lhs); ++ ++ def_stmt = get_def_stmt(lhs); + if (!def_stmt) + return MARK_NO; + -+ search_err_code[CAST_ONLY] = false; -+ -+ rhs1 = gimple_assign_rhs1(def_stmt); -+ rhs2 = gimple_assign_rhs2(def_stmt); -+ marked = pre_expand(visited, search_err_code, rhs1); -+ if (marked != MARK_NO) -+ return marked; -+ return pre_expand(visited, search_err_code, rhs2); -+} -+ -+static const_tree search_field_decl(const_tree comp_ref) -+{ -+ const_tree field = NULL_TREE; -+ unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref); ++ if (pointer_set_contains(visited, def_stmt)) ++ return MARK_NO; + -+ for (i = 0; i < len; i++) { -+ field = TREE_OPERAND(comp_ref, i); -+ if (TREE_CODE(field) == FIELD_DECL) -+ break; ++ switch (gimple_code(def_stmt)) { ++ case GIMPLE_NOP: ++ return search_intentional(visited, SSA_NAME_VAR(lhs)); ++ case GIMPLE_ASM: ++ case GIMPLE_CALL: ++ return MARK_NO; ++ case GIMPLE_PHI: ++ return search_intentional_phi(visited, lhs); ++ case GIMPLE_ASSIGN: ++ switch (gimple_num_ops(def_stmt)) { ++ case 2: ++ return search_intentional(visited, gimple_assign_rhs1(def_stmt)); ++ case 3: ++ return search_intentional_binary(visited, lhs); ++ } ++ case GIMPLE_RETURN: ++ return MARK_NO; ++ default: ++ debug_gimple_stmt((gimple)def_stmt); ++ error("%s: unknown gimple code", __func__); ++ gcc_unreachable(); + } -+ gcc_assert(TREE_CODE(field) == FIELD_DECL); -+ return field; +} + -+static enum mark mark_status(const_tree fndecl, unsigned int argnum) ++// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt. ++static const char *check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum) +{ -+ const_tree attr, p; ++ const_tree fndecl; ++ const char *asm_str; ++ struct pointer_set_t *visited; ++ enum mark cur_fndecl_attr, decl_attr = MARK_NO; + -+ // mm/filemap.c D.35286_51 = D.35283_46 (file_10(D), mapping_11, pos_1, D.35273_50, D.35285_49, page.14_48, fsdata.15_47); -+ if (fndecl == NULL_TREE) -+ return MARK_NO; ++ fndecl = get_interesting_orig_fndecl(stmt, argnum); ++ if (is_end_intentional_intentional_attr(fndecl, argnum)) ++ decl_attr = MARK_NOT_INTENTIONAL; ++ else if (is_yes_intentional_attr(fndecl, argnum)) ++ decl_attr = MARK_YES; ++ else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) { ++ return "# size_overflow MARK_TURN_OFF\n\t"; ++ } + -+ attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(fndecl)); -+ if (!attr || !TREE_VALUE(attr)) -+ return MARK_NO; ++ visited = pointer_set_create(); ++ cur_fndecl_attr = search_intentional(visited, arg); ++ pointer_set_destroy(visited); + -+ p = TREE_VALUE(attr); -+ if (TREE_INT_CST_HIGH(TREE_VALUE(p)) == -1) -+ return MARK_TURN_OFF; -+ if (!TREE_INT_CST_LOW(TREE_VALUE(p))) -+ return MARK_NOT_INTENTIONAL; -+ if (argnum == 0) { -+ gcc_assert(current_function_decl == fndecl); -+ return MARK_NO; ++ switch (cur_fndecl_attr) { ++ case MARK_NO: ++ asm_str = "# size_overflow\n\t"; ++ break; ++ case MARK_TURN_OFF: ++ asm_str = "# size_overflow MARK_TURN_OFF\n\t"; ++ break; ++ default: ++ asm_str = "# size_overflow MARK_YES\n\t"; ++ print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum); ++ break; + } + -+ do { -+ if (argnum == TREE_INT_CST_LOW(TREE_VALUE(p))) -+ return MARK_YES; -+ p = TREE_CHAIN(p); -+ } while (p); -+ -+ return MARK_NO; ++ return asm_str; +} + -+static void print_missing_msg(tree func, unsigned int argnum) ++static void check_missing_size_overflow_attribute(tree var) +{ -+ unsigned int new_hash; -+ size_t len; -+ unsigned char tree_codes[CODES_LIMIT]; -+ location_t loc; -+ const char *curfunc; ++ tree orig_fndecl; ++ unsigned int num; ++ ++ if (is_a_return_check(var)) ++ orig_fndecl = DECL_ORIGIN(var); ++ else ++ orig_fndecl = DECL_ORIGIN(current_function_decl); + -+ func = get_original_function_decl(func); -+ loc = DECL_SOURCE_LOCATION(func); -+ curfunc = get_asm_name(func); ++ num = get_function_num(var, orig_fndecl); ++ if (num == CANNOT_FIND_ARG) ++ return; + -+ len = get_function_decl(func, tree_codes); -+ new_hash = get_hash_num(curfunc, (const char *) tree_codes, len, 0); -+ inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, new_hash); ++ is_missing_function(orig_fndecl, num); +} + -+static unsigned int search_missing_attribute(const_tree arg) ++static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result) +{ -+ unsigned int argnum; -+ const struct size_overflow_hash *hash; -+ const_tree type = TREE_TYPE(arg); -+ tree func = get_original_function_decl(current_function_decl); -+ -+ gcc_assert(TREE_CODE(arg) != COMPONENT_REF); -+ -+ if (TREE_CODE(type) == POINTER_TYPE) -+ return 0; -+ -+ argnum = find_arg_number(arg, func); -+ if (argnum == 0) -+ return 0; ++ gimple phi = get_def_stmt(result); ++ unsigned int i, n = gimple_phi_num_args(phi); + -+ if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(func))) -+ return argnum; ++ pointer_set_insert(visited, phi); ++ for (i = 0; i < n; i++) { ++ tree arg = gimple_phi_arg_def(phi, i); + -+ hash = get_function_hash(func); -+ if (!hash || !(hash->param & (1U << argnum))) { -+ print_missing_msg(func, argnum); -+ return 0; ++ search_size_overflow_attribute(visited, arg); + } -+ return argnum; +} + -+static enum mark is_already_marked(const_tree lhs) ++static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs) +{ -+ unsigned int argnum; -+ const_tree fndecl; ++ const_gimple def_stmt = get_def_stmt(lhs); ++ tree rhs1, rhs2; + -+ argnum = search_missing_attribute(lhs); -+ fndecl = get_original_function_decl(current_function_decl); -+ if (argnum && mark_status(fndecl, argnum) == MARK_YES) -+ return MARK_YES; -+ return MARK_NO; ++ rhs1 = gimple_assign_rhs1(def_stmt); ++ rhs2 = gimple_assign_rhs2(def_stmt); ++ ++ search_size_overflow_attribute(visited, rhs1); ++ search_size_overflow_attribute(visited, rhs2); +} + -+static enum mark pre_expand(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs) ++static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs) +{ + const_gimple def_stmt; + -+ if (skip_types(lhs)) -+ return MARK_NO; -+ -+ if (TREE_CODE(lhs) == PARM_DECL) -+ return is_already_marked(lhs); -+ -+ if (TREE_CODE(lhs) == COMPONENT_REF) { -+ const_tree field, attr; -+ -+ field = search_field_decl(lhs); -+ attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(field)); -+ if (!attr || !TREE_VALUE(attr)) -+ return MARK_NO; -+ return MARK_YES; ++ if (TREE_CODE(lhs) == PARM_DECL) { ++ check_missing_size_overflow_attribute(lhs); ++ return; + } + + def_stmt = get_def_stmt(lhs); -+ + if (!def_stmt) -+ return MARK_NO; ++ return; + -+ if (pointer_set_contains(visited, def_stmt)) -+ return MARK_NO; ++ if (pointer_set_insert(visited, def_stmt)) ++ return; + + switch (gimple_code(def_stmt)) { + case GIMPLE_NOP: -+ if (TREE_CODE(SSA_NAME_VAR(lhs)) == PARM_DECL) -+ return is_already_marked(lhs); -+ return MARK_NO; -+ case GIMPLE_PHI: -+ return walk_phi(visited, search_err_code, lhs); -+ case GIMPLE_CALL: -+ if (mark_status((gimple_call_fndecl(def_stmt)), 0) == MARK_TURN_OFF) -+ return MARK_TURN_OFF; -+ check_function_hash(def_stmt); -+ return MARK_NO; ++ return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs)); + case GIMPLE_ASM: -+ search_err_code[CAST_ONLY] = false; -+ return MARK_NO; ++ return; ++ case GIMPLE_CALL: { ++ tree fndecl = gimple_call_fndecl(def_stmt); ++ ++ if (fndecl == NULL_TREE) ++ return; ++ check_missing_size_overflow_attribute(fndecl); ++ return; ++ } ++ case GIMPLE_PHI: ++ return search_size_overflow_attribute_phi(visited, lhs); + case GIMPLE_ASSIGN: + switch (gimple_num_ops(def_stmt)) { + case 2: -+ return walk_unary_ops(visited, search_err_code, lhs); ++ return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt)); + case 3: -+ return walk_binary_ops(visited, search_err_code, lhs); ++ return search_size_overflow_attribute_binary(visited, lhs); + } + default: + debug_gimple_stmt((gimple)def_stmt); @@ -109778,220 +113470,298 @@ index 0000000..03d0c84 + } +} + -+// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max -+static bool skip_asm(const_tree arg) ++// Search missing entries in the hash table (invoked from the gimple pass) ++static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num) +{ -+ gimple def_stmt = get_def_stmt(arg); ++ tree fndecl = NULL_TREE; ++ tree lhs; ++ struct pointer_set_t *visited; + -+ if (!def_stmt || !gimple_assign_cast_p(def_stmt)) -+ return false; ++ if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) ++ return; + -+ def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt)); -+ return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM; -+} ++ if (num == 0) { ++ gcc_assert(gimple_code(stmt) == GIMPLE_RETURN); ++ lhs = gimple_return_retval(stmt); ++ } else { ++ gcc_assert(is_gimple_call(stmt)); ++ lhs = gimple_call_arg(stmt, num - 1); ++ fndecl = gimple_call_fndecl(stmt); ++ } + -+/* -+0 no dup -+*/ ++ if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl))) ++ return; + -+static bool search_attributes(tree fndecl, const_tree arg, unsigned int argnum, bool where) -+{ -+ struct pointer_set_t *visited; -+ enum mark is_marked, is_found; -+ location_t loc; -+ bool search_err_code[2] = {true, false}; ++ visited = pointer_set_create(); ++ search_size_overflow_attribute(visited, lhs); ++ pointer_set_destroy(visited); ++} + -+ is_marked = mark_status(current_function_decl, 0); -+ if (is_marked == MARK_TURN_OFF) -+ return true; ++static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data) ++{ ++ gimple_stmt_iterator gsi; ++ gimple assign; + -+ is_marked = mark_status(fndecl, argnum + 1); -+ if (is_marked == MARK_TURN_OFF || is_marked == MARK_NOT_INTENTIONAL) -+ return true; ++ assign = gimple_build_assign(asm_data->input, asm_data->output); ++ gsi = gsi_for_stmt(stmt); ++ gsi_insert_before(&gsi, assign, GSI_NEW_STMT); ++ asm_data->def_stmt = assign; + -+ visited = pointer_set_create(); -+ is_found = pre_expand(visited, search_err_code, arg); -+ pointer_set_destroy(visited); ++ asm_data->output = create_new_var(TREE_TYPE(asm_data->output)); ++ asm_data->output = make_ssa_name(asm_data->output, stmt); ++ if (gimple_code(stmt) == GIMPLE_RETURN) ++ gimple_return_set_retval(stmt, asm_data->output); ++ else ++ gimple_call_set_arg(stmt, argnum - 1, asm_data->output); ++ update_stmt(stmt); ++} + -+ if (where == FROM_RET && search_err_code[CAST_ONLY] && search_err_code[FROM_CONST]) -+ return true; ++/* Create the input of the size_overflow asm stmt. ++ * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt: ++ * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D)); ++ * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion. ++ * otherwise create the input (for a phi stmt the output too) of the asm stmt. ++ */ ++static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data) ++{ ++ if (!asm_data->def_stmt) { ++ asm_data->input = NULL_TREE; ++ return; ++ } + -+ if (where == FROM_ARG && skip_asm(arg)) -+ return true; ++ asm_data->input = create_new_var(TREE_TYPE(asm_data->output)); ++ asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt); + -+ if (is_found == MARK_TURN_OFF) -+ return true; ++ switch (gimple_code(asm_data->def_stmt)) { ++ case GIMPLE_ASSIGN: ++ case GIMPLE_CALL: ++ replace_call_lhs(asm_data); ++ break; ++ case GIMPLE_PHI: ++ create_output_from_phi(stmt, argnum, asm_data); ++ break; ++ case GIMPLE_NOP: { ++ const char *str = check_intentional_attribute_gimple(asm_data->output, stmt, argnum); + -+ if ((is_found == MARK_YES && is_marked == MARK_YES)) -+ return true; ++ asm_data->input = asm_data->output; ++ asm_data->output = NULL; ++ asm_data->def_stmt = stmt; + -+ if (is_found == MARK_YES) { -+ loc = DECL_SOURCE_LOCATION(fndecl); -+ inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", get_asm_name(fndecl), argnum + 1); -+ return true; ++ create_asm_stmt(str, build_string(2, "rm"), NULL, asm_data); ++ asm_data->input = NULL_TREE; ++ break; ++ } ++ case GIMPLE_ASM: ++ if (is_size_overflow_asm(asm_data->def_stmt)) { ++ asm_data->input = NULL_TREE; ++ break; ++ } ++ default: ++ debug_gimple_stmt(asm_data->def_stmt); ++ gcc_unreachable(); + } -+ return false; +} + -+static void handle_function_arg(gimple stmt, tree fndecl, unsigned int argnum) ++/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type ++ * is of the right kind create the appropriate size_overflow asm stmts: ++ * __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16); ++ * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D)); ++ */ ++static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum) +{ -+ struct pointer_set_t *visited; -+ tree arg, new_arg; -+ bool match; ++ struct asm_data asm_data; ++ const char *str; + -+ if (argnum == 0) ++ if (is_gimple_constant(output_node)) + return; + -+ argnum--; ++ search_missing_size_overflow_attribute_gimple(stmt, argnum); + -+ match = get_function_arg(&argnum, fndecl); -+ if (!match) -+ return; -+ gcc_assert(gimple_call_num_args(stmt) > argnum); -+ arg = gimple_call_arg(stmt, argnum); -+ if (arg == NULL_TREE) ++ asm_data.output = output_node; ++ asm_data.def_stmt = get_def_stmt(asm_data.output); ++ create_asm_input(stmt, argnum, &asm_data); ++ if (asm_data.input == NULL_TREE) + return; + -+ if (skip_types(arg)) -+ return; ++ str = check_intentional_attribute_gimple(asm_data.output, stmt, argnum); ++ create_asm_stmt(str, build_string(1, "0"), build_string(3, "=rm"), &asm_data); ++} + -+ if (search_attributes(fndecl, arg, argnum, FROM_ARG)) -+ return; ++// Determine the return value and insert the asm stmt to mark the return stmt. ++static void insert_asm_ret(gimple stmt) ++{ ++ tree ret; + -+ visited = pointer_set_create(); -+ new_arg = expand(visited, arg); -+ pointer_set_destroy(visited); ++ ret = gimple_return_retval(stmt); ++ create_size_overflow_asm(stmt, ret, 0); ++} ++ ++// Determine the correct arg index and arg and insert the asm stmt to mark the stmt. ++static void insert_asm_arg(gimple stmt, unsigned int orig_argnum) ++{ ++ tree arg; ++ unsigned int argnum; + -+ if (new_arg == NULL_TREE) ++ argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt)); ++ gcc_assert(argnum != 0); ++ if (argnum == CANNOT_FIND_ARG) + return; + -+ change_function_arg(stmt, arg, argnum, new_arg); -+ check_size_overflow(stmt, TREE_TYPE(new_arg), new_arg, arg, BEFORE_STMT); ++ arg = gimple_call_arg(stmt, argnum - 1); ++ gcc_assert(arg != NULL_TREE); ++ create_size_overflow_asm(stmt, arg, argnum); +} + -+static void handle_function_by_attribute(gimple stmt, const_tree attr, tree fndecl) ++// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array. ++static void set_argnum_attribute(const_tree attr, bool *argnums) +{ -+ tree p = TREE_VALUE(attr); -+ do { -+ handle_function_arg(stmt, fndecl, TREE_INT_CST_LOW(TREE_VALUE(p))); -+ p = TREE_CHAIN(p); -+ } while (p); ++ unsigned int argnum; ++ tree attr_value; ++ ++ for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) { ++ argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value)); ++ argnums[argnum] = true; ++ } +} + -+static void handle_function_by_hash(gimple stmt, tree fndecl) ++// If a function arg or the return value is in the hash table then set its index in the array. ++static void set_argnum_hash(tree fndecl, bool *argnums) +{ + unsigned int num; + const struct size_overflow_hash *hash; + -+ hash = get_function_hash(fndecl); ++ hash = get_function_hash(DECL_ORIGIN(fndecl)); + if (!hash) + return; + -+ for (num = 0; num <= MAX_PARAM; num++) -+ if (hash->param & (1U << num)) -+ handle_function_arg(stmt, fndecl, num); ++ for (num = 0; num <= MAX_PARAM; num++) { ++ if (!(hash->param & (1U << num))) ++ continue; ++ ++ argnums[num] = true; ++ } +} + -+static bool check_return_value(void) ++static bool is_all_the_argnums_empty(bool *argnums) +{ -+ const struct size_overflow_hash *hash; -+ -+ hash = get_function_hash(current_function_decl); -+ if (!hash || !(hash->param & 1U << 0)) -+ return false; ++ unsigned int i; + ++ for (i = 0; i <= MAX_PARAM; i++) ++ if (argnums[i]) ++ return false; + return true; +} + -+static void handle_return_value(gimple ret_stmt) ++// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute. ++static void search_interesting_args(tree fndecl, bool *argnums) +{ -+ struct pointer_set_t *visited; -+ tree ret, new_ret; ++ const_tree attr; + -+ if (gimple_code(ret_stmt) != GIMPLE_RETURN) ++ set_argnum_hash(fndecl, argnums); ++ if (!is_all_the_argnums_empty(argnums)) + return; + -+ ret = gimple_return_retval(ret_stmt); ++ attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl)); ++ if (attr && TREE_VALUE(attr)) ++ set_argnum_attribute(attr, argnums); ++} + -+ if (skip_types(ret)) -+ return; ++/* ++ * Look up the intentional_overflow attribute that turns off ipa based duplication ++ * on the callee function, if found insert an asm stmt with "MARK_TURN_OFF". ++ */ ++static bool create_mark_turn_off_asm(gimple stmt) ++{ ++ enum mark mark; ++ struct asm_data asm_data; ++ const_tree fndecl = gimple_call_fndecl(stmt); + -+ if (search_attributes(current_function_decl, ret, 0, FROM_RET)) -+ return; ++ mark = get_intentional_attr_type(DECL_ORIGIN(fndecl)); ++ if (mark != MARK_TURN_OFF) ++ return false; + -+ visited = pointer_set_create(); -+ new_ret = expand(visited, ret); -+ pointer_set_destroy(visited); ++ asm_data.input = gimple_call_lhs(stmt); ++ if (asm_data.input == NULL_TREE) { ++ asm_data.input = gimple_call_arg(stmt, 0); ++ if (is_gimple_constant(asm_data.input)) ++ return false; ++ } + -+ change_function_return(ret_stmt, ret, new_ret); -+ check_size_overflow(ret_stmt, TREE_TYPE(new_ret), new_ret, ret, BEFORE_STMT); ++ asm_data.output = NULL; ++ asm_data.def_stmt = stmt; ++ create_asm_stmt("# size_overflow MARK_TURN_OFF\n\t", build_string(2, "rm"), NULL, &asm_data); ++ return true; +} + -+static void set_plf_false(void) ++// If the argument(s) of the callee function is/are in the hash table or are marked by an attribute then mark the call stmt with an asm stmt ++static void handle_interesting_function(gimple stmt) +{ -+ basic_block bb; ++ unsigned int argnum; ++ tree fndecl; ++ bool orig_argnums[MAX_PARAM + 1] = {false}; + -+ FOR_ALL_BB(bb) { -+ gimple_stmt_iterator si; ++ if (gimple_call_num_args(stmt) == 0) ++ return; ++ fndecl = gimple_call_fndecl(stmt); ++ if (fndecl == NULL_TREE) ++ return; ++ fndecl = DECL_ORIGIN(fndecl); + -+ for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si)) -+ gimple_set_plf(gsi_stmt(si), MY_STMT, false); -+ for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si)) -+ gimple_set_plf(gsi_stmt(si), MY_STMT, false); -+ } ++ if (create_mark_turn_off_asm(stmt)) ++ return; ++ ++ search_interesting_args(fndecl, orig_argnums); ++ ++ for (argnum = 1; argnum < MAX_PARAM; argnum++) ++ if (orig_argnums[argnum]) ++ insert_asm_arg(stmt, argnum); +} + -+static unsigned int handle_function(void) ++// If the return value of the caller function is in hash table (its index is 0) then mark the return stmt with an asm stmt ++static void handle_interesting_ret(gimple stmt) +{ -+ basic_block next, bb = ENTRY_BLOCK_PTR->next_bb; -+ bool check_ret; ++ bool orig_argnums[MAX_PARAM + 1] = {false}; + -+ set_plf_false(); ++ search_interesting_args(current_function_decl, orig_argnums); + -+ check_ret = check_return_value(); ++ if (orig_argnums[0]) ++ insert_asm_ret(stmt); ++} + -+ do { ++// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table ++static unsigned int search_interesting_functions(void) ++{ ++ basic_block bb; ++ ++ FOR_ALL_BB(bb) { + gimple_stmt_iterator gsi; -+ next = bb->next_bb; + + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) { -+ tree fndecl, attr; + gimple stmt = gsi_stmt(gsi); + -+ if (check_ret) -+ handle_return_value(stmt); -+ -+ if (!(is_gimple_call(stmt))) -+ continue; -+ fndecl = gimple_call_fndecl(stmt); -+ if (fndecl == NULL_TREE) -+ continue; -+ if (gimple_call_num_args(stmt) == 0) -+ continue; -+ attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl)); -+ if (!attr || !TREE_VALUE(attr)) -+ handle_function_by_hash(stmt, fndecl); -+ else -+ handle_function_by_attribute(stmt, attr, fndecl); -+ gsi = gsi_for_stmt(stmt); -+ next = gimple_bb(stmt)->next_bb; ++ if (is_gimple_call(stmt)) ++ handle_interesting_function(stmt); ++ else if (gimple_code(stmt) == GIMPLE_RETURN) ++ handle_interesting_ret(stmt); + } -+ bb = next; -+ } while (bb); ++ } + return 0; +} + -+static struct gimple_opt_pass size_overflow_pass = { ++/* ++ * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass ++ * this pass inserts asm stmts to mark the interesting args ++ * that the ipa pass will detect and insert the size overflow checks for. ++ */ ++static struct gimple_opt_pass insert_size_overflow_asm_pass = { + .pass = { + .type = GIMPLE_PASS, -+ .name = "size_overflow", ++ .name = "insert_size_overflow_asm", +#if BUILDING_GCC_VERSION >= 4008 + .optinfo_flags = OPTGROUP_NONE, +#endif + .gate = NULL, -+ .execute = handle_function, ++ .execute = search_interesting_functions, + .sub = NULL, + .next = NULL, + .static_pass_number = 0, @@ -110004,6 +113774,7 @@ index 0000000..03d0c84 + } +}; + ++// Create the noreturn report_size_overflow() function decl. +static void start_unit_callback(void __unused *gcc_data, void __unused *user_data) +{ + tree fntype; @@ -110026,6 +113797,77 @@ index 0000000..03d0c84 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1; +} + ++static unsigned int dump_functions(void) ++{ ++ struct cgraph_node *node; ++ ++ FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) { ++ basic_block bb; ++ ++#if BUILDING_GCC_VERSION <= 4007 ++ push_cfun(DECL_STRUCT_FUNCTION(node->decl)); ++ current_function_decl = node->decl; ++#else ++ push_cfun(DECL_STRUCT_FUNCTION(node->symbol.decl)); ++ current_function_decl = node->symbol.decl; ++#endif ++ ++ fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", NAME(current_function_decl)); ++ ++ FOR_ALL_BB(bb) { ++ gimple_stmt_iterator si; ++ ++ fprintf(stderr, ":\n", bb->index); ++ for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si)) ++ debug_gimple_stmt(gsi_stmt(si)); ++ for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si)) ++ debug_gimple_stmt(gsi_stmt(si)); ++ fprintf(stderr, "\n"); ++ } ++ ++ fprintf(stderr, "-------------------------------------------------------------------------\n"); ++ ++ pop_cfun(); ++ current_function_decl = NULL_TREE; ++ } ++ ++ fprintf(stderr, "###############################################################################\n"); ++ ++ return 0; ++} ++ ++static struct ipa_opt_pass_d pass_dump = { ++ .pass = { ++ .type = SIMPLE_IPA_PASS, ++ .name = "dump", ++#if BUILDING_GCC_VERSION >= 4008 ++ .optinfo_flags = OPTGROUP_NONE, ++#endif ++ .gate = NULL, ++ .execute = dump_functions, ++ .sub = NULL, ++ .next = NULL, ++ .static_pass_number = 0, ++ .tv_id = TV_NONE, ++ .properties_required = 0, ++ .properties_provided = 0, ++ .properties_destroyed = 0, ++ .todo_flags_start = 0, ++ .todo_flags_finish = 0, ++ }, ++ .generate_summary = NULL, ++ .write_summary = NULL, ++ .read_summary = NULL, ++#if BUILDING_GCC_VERSION >= 4006 ++ .write_optimization_summary = NULL, ++ .read_optimization_summary = NULL, ++#endif ++ .stmt_fixup = NULL, ++ .function_transform_todo_flags_start = 0, ++ .function_transform = NULL, ++ .variable_transform = NULL, ++}; ++ +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version) +{ + int i; @@ -110034,13 +113876,34 @@ index 0000000..03d0c84 + const struct plugin_argument * const argv = plugin_info->argv; + bool enable = true; + -+ struct register_pass_info size_overflow_pass_info = { -+ .pass = &size_overflow_pass.pass, ++ struct register_pass_info insert_size_overflow_asm_pass_info = { ++ .pass = &insert_size_overflow_asm_pass.pass, + .reference_pass_name = "ssa", + .ref_pass_instance_number = 1, + .pos_op = PASS_POS_INSERT_AFTER + }; + ++ struct register_pass_info __unused dump_before_pass_info = { ++ .pass = &pass_dump.pass, ++ .reference_pass_name = "increase_alignment", ++ .ref_pass_instance_number = 1, ++ .pos_op = PASS_POS_INSERT_BEFORE ++ }; ++ ++ struct register_pass_info ipa_pass_info = { ++ .pass = &pass_ipa.pass, ++ .reference_pass_name = "increase_alignment", ++ .ref_pass_instance_number = 1, ++ .pos_op = PASS_POS_INSERT_BEFORE ++ }; ++ ++ struct register_pass_info __unused dump_after_pass_info = { ++ .pass = &pass_dump.pass, ++ .reference_pass_name = "increase_alignment", ++ .ref_pass_instance_number = 1, ++ .pos_op = PASS_POS_INSERT_BEFORE ++ }; ++ + if (!plugin_default_version_check(version, &gcc_version)) { + error(G_("incompatible gcc/plugin versions")); + return 1; @@ -110057,7 +113920,10 @@ index 0000000..03d0c84 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info); + if (enable) { + register_callback("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL); -+ register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &size_overflow_pass_info); ++ register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info); ++// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info); ++ register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &ipa_pass_info); ++// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info); + } + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL); + @@ -110680,10 +114546,10 @@ index 0000000..4fae911 + return 0; +} diff --git a/tools/lib/lk/Makefile b/tools/lib/lk/Makefile -index 280dd82..077b427 100644 +index 3dba0a4..97175dc 100644 --- a/tools/lib/lk/Makefile +++ b/tools/lib/lk/Makefile -@@ -28,7 +28,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o +@@ -13,7 +13,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o LIBFILE = liblk.a @@ -110722,7 +114588,7 @@ index 96b919d..c49bb74 100644 + #endif diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 1580dd4..5627b5b 100644 +index 1cf9ccb..b9236e2 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -75,12 +75,17 @@ LIST_HEAD(vm_list); @@ -110745,7 +114611,7 @@ index 1580dd4..5627b5b 100644 struct dentry *kvm_debugfs_dir; -@@ -766,7 +771,7 @@ int __kvm_set_memory_region(struct kvm *kvm, +@@ -749,7 +754,7 @@ int __kvm_set_memory_region(struct kvm *kvm, /* We can read the guest memory with __xxx_user() later on. */ if ((mem->slot < KVM_USER_MEM_SLOTS) && ((mem->userspace_addr & (PAGE_SIZE - 1)) || @@ -110754,7 +114620,7 @@ index 1580dd4..5627b5b 100644 (void __user *)(unsigned long)mem->userspace_addr, mem->memory_size))) goto out; -@@ -1878,7 +1883,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp) +@@ -1867,7 +1872,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp) return 0; } @@ -110763,7 +114629,7 @@ index 1580dd4..5627b5b 100644 .release = kvm_vcpu_release, .unlocked_ioctl = kvm_vcpu_ioctl, #ifdef CONFIG_COMPAT -@@ -2561,7 +2566,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma) +@@ -2550,7 +2555,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma) return 0; } @@ -110772,7 +114638,7 @@ index 1580dd4..5627b5b 100644 .release = kvm_vm_release, .unlocked_ioctl = kvm_vm_ioctl, #ifdef CONFIG_COMPAT -@@ -2662,7 +2667,7 @@ out: +@@ -2651,7 +2656,7 @@ out: return r; } @@ -110781,7 +114647,7 @@ index 1580dd4..5627b5b 100644 .unlocked_ioctl = kvm_dev_ioctl, .compat_ioctl = kvm_dev_ioctl, .llseek = noop_llseek, -@@ -2688,7 +2693,7 @@ static void hardware_enable_nolock(void *junk) +@@ -2677,7 +2682,7 @@ static void hardware_enable_nolock(void *junk) if (r) { cpumask_clear_cpu(cpu, cpus_hardware_enabled); @@ -110790,7 +114656,7 @@ index 1580dd4..5627b5b 100644 printk(KERN_INFO "kvm: enabling virtualization on " "CPU%d failed\n", cpu); } -@@ -2742,10 +2747,10 @@ static int hardware_enable_all(void) +@@ -2731,10 +2736,10 @@ static int hardware_enable_all(void) kvm_usage_count++; if (kvm_usage_count == 1) { @@ -110803,7 +114669,7 @@ index 1580dd4..5627b5b 100644 hardware_disable_all_nolock(); r = -EBUSY; } -@@ -3100,7 +3105,7 @@ static void kvm_sched_out(struct preempt_notifier *pn, +@@ -3168,7 +3173,7 @@ static void kvm_sched_out(struct preempt_notifier *pn, kvm_arch_vcpu_put(vcpu); } @@ -110812,7 +114678,7 @@ index 1580dd4..5627b5b 100644 struct module *module) { int r; -@@ -3147,7 +3152,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +@@ -3215,7 +3220,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, if (!vcpu_align) vcpu_align = __alignof__(struct kvm_vcpu); kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align, @@ -110821,7 +114687,7 @@ index 1580dd4..5627b5b 100644 if (!kvm_vcpu_cache) { r = -ENOMEM; goto out_free_3; -@@ -3157,9 +3162,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +@@ -3225,9 +3230,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, if (r) goto out_free; @@ -110833,7 +114699,7 @@ index 1580dd4..5627b5b 100644 r = misc_register(&kvm_dev); if (r) { -@@ -3169,9 +3176,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, +@@ -3237,9 +3244,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, register_syscore_ops(&kvm_syscore_ops); diff --git a/kernel/patches/linux-3.11-omap-mpuss-lowpower.patch b/kernel/patches/linux-3.11-omap-mpuss-lowpower.patch deleted file mode 100644 index 55b63c61d..000000000 --- a/kernel/patches/linux-3.11-omap-mpuss-lowpower.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c -index f991016..088767b 100644 ---- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c -+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c -@@ -389,11 +389,13 @@ int __init omap4_mpuss_init(void) - - save_l2x0_context(); - -+#if 0 - if (cpu_is_omap44xx()) { - omap_pm_ops.finish_suspend = omap4_finish_suspend; - omap_pm_ops.resume = omap4_cpu_resume; - omap_pm_ops.scu_prepare = scu_pwrst_prepare; - } -+#endif - - return 0; - } -diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c -index 5bb848c..ba468a6 100644 ---- a/drivers/clk/socfpga/clk.c -+++ b/drivers/clk/socfpga/clk.c -@@ -276,8 +276,10 @@ static void __init socfpga_gate_clk_init(struct device_node *node, - socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0]; - socfpga_clk->hw.bit_idx = clk_gate[1]; - -+#if 0 - gateclk_ops.enable = clk_gate_ops.enable; - gateclk_ops.disable = clk_gate_ops.disable; -+#endif - } - - rc = of_property_read_u32(node, "fixed-divider", &fixed_div); diff --git a/kernel/patches/linux-3.12-imx6-utilite.patch b/kernel/patches/linux-3.12-imx6-utilite.patch new file mode 100644 index 000000000..58a839a6e --- /dev/null +++ b/kernel/patches/linux-3.12-imx6-utilite.patch @@ -0,0 +1,95 @@ +Add initial support for cm-fx6 module. + +cm-fx6 is a module based on mx6q SoC with the following features: +- Up to 4GB of DDR3 +- 1 LCD/DVI output port +- 1 HDMI output port +- 2 LVDS LCD ports +- Gigabit Ethernet +- Analog Audio +- CAN +- SATA +- NAND +- PCIE + +This patch allows to boot up the module, configures the serial console, +the Ethernet adapter and the hearbeat led. + +Signed-off-by: Valentin Raevsky +Acked-by: Igor Grinberg +--- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 51 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts + +diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts +new file mode 100644 +index 0000000..1080215 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts +@@ -0,0 +1,51 @@ ++/* ++ * Copyright 2013 CompuLab Ltd. ++ * ++ * The code contained herein is licensed under the GNU General Public ++ * License. You may obtain a copy of the GNU General Public License ++ * Version 2 or later at the following locations: ++ * ++ * http://www.opensource.org/licenses/gpl-license.html ++ * http://www.gnu.org/copyleft/gpl.html ++ */ ++ ++/dts-v1/; ++#include "imx6q.dtsi" ++ ++/ { ++ model = "CompuLab CM-FX6"; ++ compatible = "compulab,cm-fx6", "fsl,imx6q"; ++ ++ memory { ++ reg = <0x10000000 0x80000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ debug-led { ++ label = "Heartbeat"; ++ gpios = <&gpio2 31 0>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++}; ++ ++&gpmi { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_gpmi_nand_1>; ++ status = "okay"; ++}; ++ ++&fec { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_enet_1>; ++ phy-mode = "rgmii"; ++ status = "okay"; ++}; ++ ++&uart4 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart4_1>; ++ status = "okay"; ++}; +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -137,6 +137,7 @@ + imx6dl-sabresd.dtb \ + imx6dl-wandboard.dtb \ + imx6q-arm2.dtb \ ++ imx6q-cm-fx6.dtb \ + imx6q-phytec-pbab01.dtb \ + imx6q-sabreauto.dtb \ + imx6q-sabrelite.dtb \ +-- +1.7.9.5 +