mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
core/linux-kirkwood to 4.4.1-1
This commit is contained in:
moonman
parent
f600ee8949
commit
3d02154797
4 changed files with 103 additions and 126 deletions
|
|
@ -6,11 +6,11 @@ buildarch=2
|
|||
pkgbase=linux-kirkwood
|
||||
_kernelname=${pkgbase#linux}
|
||||
_desc="Marvell Kirkwood"
|
||||
pkgver=4.3.3
|
||||
pkgver=4.4.1
|
||||
srcver=${pkgver%.0}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
cryptodev_commit=bc67142c57eadc0aafd0323ec527849012786643
|
||||
bfqver=v7r8
|
||||
bfqver=v7r11
|
||||
|
||||
### BFQ patch kernel version
|
||||
bfqkern=${pkgver:0:3}
|
||||
|
|
@ -28,28 +28,26 @@ options=('!strip')
|
|||
|
||||
source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
|
||||
'archlinuxarm.patch'
|
||||
'kernel-CVE-2016-0728.patch'
|
||||
'config'
|
||||
'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
|
||||
'0001-disable-mv643xx_eth-TSO.patch'
|
||||
"git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}"
|
||||
"cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.0.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.0.patch"
|
||||
"ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for.patch"
|
||||
'linux.preset')
|
||||
|
||||
md5sums=('f3068333fa524ff98914cf751d0b5710'
|
||||
md5sums=('d27b1458acde6369cf9eaf956f402901'
|
||||
'b91129f87c799e7184c00257eeddd2f2'
|
||||
'6470e9783bd1c7a8feddc2d67f07afd5'
|
||||
'cfae749ec27515f0f5b4bb3fc3b7e885'
|
||||
'ff71ed0dead6bd4601c38025a1cdc575'
|
||||
'5faf5d5f9aadf621942bd03c3b993947'
|
||||
'09d44b9f07abfaeaf4f688ee52034786'
|
||||
'SKIP'
|
||||
'2c8ecae91223868decdf37b8a76489b7'
|
||||
'c075ad682894b99fcc0f8b5bdc5b8b1b'
|
||||
'5d346d74dce5ea4aafc2af55bdf1e961'
|
||||
'69e80fbf2e272c94fc10435ebb2dd022'
|
||||
'c1d7fcfe88edb658375089c0a9cc1811'
|
||||
'953133d5e387de2ad79ac0ae5c27cb6b'
|
||||
'f0387e673975e9f2a5e05136948edece'
|
||||
'6d8c200779cbdef582e9e435ed86ca31')
|
||||
|
||||
prepare() {
|
||||
|
|
@ -71,13 +69,12 @@ prepare() {
|
|||
|
||||
msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
|
||||
patch -Np1 -i "${srcdir}/archlinuxarm.patch"
|
||||
patch -Np1 -i "${srcdir}/kernel-CVE-2016-0728.patch"
|
||||
cp "${srcdir}/mach-types" arch/arm/tools
|
||||
|
||||
msg2 "Add BFQ patches"
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
|
||||
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch"
|
||||
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.0.patch"
|
||||
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.0.patch"
|
||||
patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for.patch"
|
||||
|
||||
cat "${srcdir}/config" > ./.config
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.3.0-1 Kernel Configuration
|
||||
# Linux/arm 4.4.1-1 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
|
|
@ -291,7 +291,7 @@ CONFIG_IOSCHED_DEADLINE=y
|
|||
CONFIG_IOSCHED_CFQ=y
|
||||
CONFIG_CFQ_GROUP_IOSCHED=y
|
||||
CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_CGROUP_BFQIO=y
|
||||
CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
# CONFIG_DEFAULT_CFQ is not set
|
||||
CONFIG_DEFAULT_BFQ=y
|
||||
|
|
@ -328,7 +328,6 @@ CONFIG_ARCH_KIRKWOOD=y
|
|||
# CONFIG_ARCH_W90X900 is not set
|
||||
# CONFIG_ARCH_LPC32XX is not set
|
||||
# CONFIG_ARCH_PXA is not set
|
||||
# CONFIG_ARCH_SHMOBILE_LEGACY is not set
|
||||
# CONFIG_ARCH_RPC is not set
|
||||
# CONFIG_ARCH_SA1100 is not set
|
||||
# CONFIG_ARCH_S3C24XX is not set
|
||||
|
|
@ -436,6 +435,7 @@ CONFIG_PCI_SYSCALL=y
|
|||
# Kernel Features
|
||||
#
|
||||
CONFIG_VMSPLIT_3G=y
|
||||
# CONFIG_VMSPLIT_3G_OPT is not set
|
||||
# CONFIG_VMSPLIT_2G is not set
|
||||
# CONFIG_VMSPLIT_1G is not set
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
|
|
@ -468,7 +468,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y
|
|||
CONFIG_HAVE_MEMBLOCK=y
|
||||
CONFIG_NO_BOOTMEM=y
|
||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=999999
|
||||
CONFIG_COMPACTION=y
|
||||
CONFIG_MIGRATION=y
|
||||
|
|
@ -719,7 +718,8 @@ CONFIG_NF_CONNTRACK_SIP=m
|
|||
CONFIG_NF_CONNTRACK_TFTP=m
|
||||
CONFIG_NF_CT_NETLINK=m
|
||||
# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
|
||||
# CONFIG_NETFILTER_NETLINK_QUEUE_CT is not set
|
||||
CONFIG_NF_CT_NETLINK_HELPER=m
|
||||
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
|
||||
CONFIG_NF_NAT=m
|
||||
CONFIG_NF_NAT_NEEDED=y
|
||||
CONFIG_NF_NAT_PROTO_DCCP=m
|
||||
|
|
@ -1084,6 +1084,7 @@ CONFIG_VSOCKETS=m
|
|||
# CONFIG_MPLS is not set
|
||||
# CONFIG_HSR is not set
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
# CONFIG_NET_L3_MASTER_DEV is not set
|
||||
CONFIG_CGROUP_NET_PRIO=y
|
||||
CONFIG_CGROUP_NET_CLASSID=y
|
||||
CONFIG_NET_RX_BUSY_POLL=y
|
||||
|
|
@ -1223,6 +1224,7 @@ CONFIG_NL80211_TESTMODE=y
|
|||
CONFIG_CFG80211_DEFAULT_PS=y
|
||||
# CONFIG_CFG80211_DEBUGFS is not set
|
||||
# CONFIG_CFG80211_INTERNAL_REGDB is not set
|
||||
CONFIG_CFG80211_CRDA_SUPPORT=y
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
CONFIG_CFG80211_WEXT_EXPORT=y
|
||||
CONFIG_LIB80211=m
|
||||
|
|
@ -1428,7 +1430,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
|
|||
CONFIG_BLK_DEV_DRBD=m
|
||||
# CONFIG_DRBD_FAULT_INJECTION is not set
|
||||
CONFIG_BLK_DEV_NBD=m
|
||||
# CONFIG_BLK_DEV_NVME is not set
|
||||
CONFIG_BLK_DEV_SX8=m
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
|
|
@ -1438,6 +1439,7 @@ CONFIG_ATA_OVER_ETH=m
|
|||
# CONFIG_MG_DISK is not set
|
||||
# CONFIG_BLK_DEV_RBD is not set
|
||||
# CONFIG_BLK_DEV_RSXX is not set
|
||||
# CONFIG_BLK_DEV_NVME is not set
|
||||
|
||||
#
|
||||
# Misc devices
|
||||
|
|
@ -1515,6 +1517,10 @@ CONFIG_TI_ST=m
|
|||
#
|
||||
# SCIF Driver
|
||||
#
|
||||
|
||||
#
|
||||
# Intel MIC Coprocessor State Management (COSM) Drivers
|
||||
#
|
||||
# CONFIG_ECHO is not set
|
||||
# CONFIG_CXL_BASE is not set
|
||||
# CONFIG_CXL_KERNEL_API is not set
|
||||
|
|
@ -1581,8 +1587,8 @@ CONFIG_ISCSI_BOOT_SYSFS=m
|
|||
# CONFIG_MEGARAID_NEWGEN is not set
|
||||
# CONFIG_MEGARAID_LEGACY is not set
|
||||
# CONFIG_MEGARAID_SAS is not set
|
||||
# CONFIG_SCSI_MPT2SAS is not set
|
||||
# CONFIG_SCSI_MPT3SAS is not set
|
||||
# CONFIG_SCSI_MPT2SAS is not set
|
||||
# CONFIG_SCSI_UFSHCD is not set
|
||||
# CONFIG_SCSI_HPTIOP is not set
|
||||
# CONFIG_SCSI_SNIC is not set
|
||||
|
|
@ -1768,7 +1774,6 @@ CONFIG_TUN=m
|
|||
# CONFIG_TUN_VNET_CROSS_LE is not set
|
||||
CONFIG_VETH=m
|
||||
# CONFIG_NLMON is not set
|
||||
# CONFIG_NET_VRF is not set
|
||||
# CONFIG_ARCNET is not set
|
||||
|
||||
#
|
||||
|
|
@ -1806,6 +1811,7 @@ CONFIG_NET_VENDOR_ATHEROS=y
|
|||
# CONFIG_ATL1E is not set
|
||||
# CONFIG_ATL1C is not set
|
||||
# CONFIG_ALX is not set
|
||||
# CONFIG_NET_VENDOR_AURORA is not set
|
||||
# CONFIG_NET_CADENCE is not set
|
||||
CONFIG_NET_VENDOR_BROADCOM=y
|
||||
# CONFIG_B44 is not set
|
||||
|
|
@ -1814,6 +1820,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
|
|||
# CONFIG_CNIC is not set
|
||||
# CONFIG_TIGON3 is not set
|
||||
# CONFIG_BNX2X is not set
|
||||
# CONFIG_BNXT is not set
|
||||
CONFIG_NET_VENDOR_BROCADE=y
|
||||
# CONFIG_BNA is not set
|
||||
CONFIG_NET_VENDOR_CAVIUM=y
|
||||
|
|
@ -1842,9 +1849,6 @@ CONFIG_NET_VENDOR_EXAR=y
|
|||
CONFIG_NET_VENDOR_FARADAY=y
|
||||
# CONFIG_FTMAC100 is not set
|
||||
# CONFIG_FTGMAC100 is not set
|
||||
CONFIG_NET_VENDOR_HISILICON=y
|
||||
# CONFIG_HIX5HD2_GMAC is not set
|
||||
# CONFIG_HIP04_ETH is not set
|
||||
CONFIG_NET_VENDOR_HP=y
|
||||
# CONFIG_HP100 is not set
|
||||
CONFIG_NET_VENDOR_INTEL=y
|
||||
|
|
@ -1857,7 +1861,6 @@ CONFIG_NET_VENDOR_INTEL=y
|
|||
# CONFIG_IXGBE is not set
|
||||
# CONFIG_I40E is not set
|
||||
CONFIG_NET_VENDOR_I825XX=y
|
||||
# CONFIG_IP1000 is not set
|
||||
# CONFIG_JME is not set
|
||||
CONFIG_NET_VENDOR_MARVELL=y
|
||||
CONFIG_MV643XX_ETH=y
|
||||
|
|
@ -1877,6 +1880,7 @@ CONFIG_NET_VENDOR_MICREL=y
|
|||
# CONFIG_KSZ884X_PCI is not set
|
||||
CONFIG_NET_VENDOR_MICROCHIP=y
|
||||
# CONFIG_ENC28J60 is not set
|
||||
# CONFIG_ENCX24J600 is not set
|
||||
CONFIG_NET_VENDOR_MYRI=y
|
||||
# CONFIG_MYRI10GE is not set
|
||||
# CONFIG_FEALNX is not set
|
||||
|
|
@ -1898,6 +1902,7 @@ CONFIG_NET_VENDOR_QLOGIC=y
|
|||
# CONFIG_QLCNIC is not set
|
||||
# CONFIG_QLGE is not set
|
||||
# CONFIG_NETXEN_NIC is not set
|
||||
# CONFIG_QED is not set
|
||||
CONFIG_NET_VENDOR_QUALCOMM=y
|
||||
CONFIG_NET_VENDOR_REALTEK=y
|
||||
# CONFIG_8139CP is not set
|
||||
|
|
@ -1973,7 +1978,7 @@ CONFIG_MARVELL_PHY=y
|
|||
# CONFIG_MICREL_PHY is not set
|
||||
# CONFIG_DP83848_PHY is not set
|
||||
# CONFIG_DP83867_PHY is not set
|
||||
# CONFIG_MICROCHIP_PHY is not set
|
||||
CONFIG_MICROCHIP_PHY=m
|
||||
# CONFIG_FIXED_PHY is not set
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
|
|
@ -2042,10 +2047,10 @@ CONFIG_AT76C50X_USB=m
|
|||
# CONFIG_PRISM54 is not set
|
||||
CONFIG_USB_ZD1201=m
|
||||
CONFIG_USB_NET_RNDIS_WLAN=m
|
||||
# CONFIG_ADM8211 is not set
|
||||
CONFIG_RTL8180=m
|
||||
CONFIG_RTL8187=m
|
||||
CONFIG_RTL8187_LEDS=y
|
||||
# CONFIG_ADM8211 is not set
|
||||
# CONFIG_MAC80211_HWSIM is not set
|
||||
CONFIG_MWL8K=m
|
||||
CONFIG_ATH_COMMON=m
|
||||
|
|
@ -2205,6 +2210,8 @@ CONFIG_RTLWIFI_DEBUG=y
|
|||
CONFIG_RTL8192C_COMMON=m
|
||||
CONFIG_RTL8723_COMMON=m
|
||||
CONFIG_RTLBTCOEXIST=m
|
||||
CONFIG_RTL8XXXU=m
|
||||
CONFIG_RTL8XXXU_UNTESTED=y
|
||||
# CONFIG_WL_TI is not set
|
||||
CONFIG_ZD1211RW=m
|
||||
# CONFIG_ZD1211RW_DEBUG is not set
|
||||
|
|
@ -2227,6 +2234,7 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
|
|||
# CONFIG_WAN is not set
|
||||
# CONFIG_VMXNET3 is not set
|
||||
# CONFIG_ISDN is not set
|
||||
# CONFIG_NVM is not set
|
||||
|
||||
#
|
||||
# Input device support
|
||||
|
|
@ -2319,6 +2327,7 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
|
|||
CONFIG_TOUCHSCREEN_DYNAPRO=m
|
||||
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
|
||||
# CONFIG_TOUCHSCREEN_EETI is not set
|
||||
# CONFIG_TOUCHSCREEN_FT6236 is not set
|
||||
CONFIG_TOUCHSCREEN_FUJITSU=m
|
||||
# CONFIG_TOUCHSCREEN_GOODIX is not set
|
||||
# CONFIG_TOUCHSCREEN_ILI210X is not set
|
||||
|
|
@ -2361,6 +2370,7 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
|
|||
CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
|
||||
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2004 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2005 is not set
|
||||
CONFIG_TOUCHSCREEN_TSC2007=m
|
||||
# CONFIG_TOUCHSCREEN_ST1232 is not set
|
||||
|
|
@ -2368,6 +2378,7 @@ CONFIG_TOUCHSCREEN_TSC2007=m
|
|||
# CONFIG_TOUCHSCREEN_SX8654 is not set
|
||||
CONFIG_TOUCHSCREEN_TPS6507X=m
|
||||
# CONFIG_TOUCHSCREEN_ZFORCE is not set
|
||||
# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
|
||||
# CONFIG_INPUT_MISC is not set
|
||||
|
||||
#
|
||||
|
|
@ -2381,6 +2392,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# CONFIG_SERIO_ALTERA_PS2 is not set
|
||||
# CONFIG_SERIO_PS2MULT is not set
|
||||
# CONFIG_SERIO_ARC_PS2 is not set
|
||||
# CONFIG_USERIO is not set
|
||||
# CONFIG_GAMEPORT is not set
|
||||
|
||||
#
|
||||
|
|
@ -2416,8 +2428,11 @@ CONFIG_SERIAL_8250_PCI=y
|
|||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
CONFIG_SERIAL_8250_FSL=y
|
||||
# CONFIG_SERIAL_8250_DW is not set
|
||||
# CONFIG_SERIAL_8250_EM is not set
|
||||
# CONFIG_SERIAL_8250_RT288X is not set
|
||||
# CONFIG_SERIAL_8250_MID is not set
|
||||
|
||||
#
|
||||
# Non-8250 serial port support
|
||||
|
|
@ -2602,8 +2617,8 @@ CONFIG_GPIO_SYSFS=y
|
|||
#
|
||||
# CONFIG_GPIO_DWAPB is not set
|
||||
# CONFIG_GPIO_GENERIC_PLATFORM is not set
|
||||
# CONFIG_GPIO_SCH311X is not set
|
||||
# CONFIG_GPIO_VX855 is not set
|
||||
# CONFIG_GPIO_ZX is not set
|
||||
|
||||
#
|
||||
# I2C GPIO expanders
|
||||
|
|
@ -2631,9 +2646,12 @@ CONFIG_GPIO_SYSFS=y
|
|||
# SPI GPIO expanders
|
||||
#
|
||||
# CONFIG_GPIO_MAX7301 is not set
|
||||
# CONFIG_GPIO_MCP23S08 is not set
|
||||
# CONFIG_GPIO_MC33880 is not set
|
||||
# CONFIG_GPIO_ZX is not set
|
||||
|
||||
#
|
||||
# SPI or I2C GPIO expanders
|
||||
#
|
||||
# CONFIG_GPIO_MCP23S08 is not set
|
||||
|
||||
#
|
||||
# USB GPIO expanders
|
||||
|
|
@ -2676,7 +2694,7 @@ CONFIG_POWER_SUPPLY=y
|
|||
# CONFIG_BATTERY_DS2781 is not set
|
||||
# CONFIG_BATTERY_DS2782 is not set
|
||||
# CONFIG_BATTERY_SBS is not set
|
||||
# CONFIG_BATTERY_BQ27x00 is not set
|
||||
# CONFIG_BATTERY_BQ27XXX is not set
|
||||
# CONFIG_BATTERY_MAX17040 is not set
|
||||
# CONFIG_BATTERY_MAX17042 is not set
|
||||
# CONFIG_CHARGER_MAX8903 is not set
|
||||
|
|
@ -2749,6 +2767,7 @@ CONFIG_HWMON_VID=m
|
|||
# CONFIG_SENSORS_MAX6642 is not set
|
||||
# CONFIG_SENSORS_MAX6650 is not set
|
||||
# CONFIG_SENSORS_MAX6697 is not set
|
||||
# CONFIG_SENSORS_MAX31790 is not set
|
||||
# CONFIG_SENSORS_HTU21 is not set
|
||||
# CONFIG_SENSORS_MCP3021 is not set
|
||||
# CONFIG_SENSORS_ADCXX is not set
|
||||
|
|
@ -2845,6 +2864,7 @@ CONFIG_ORION_WATCHDOG=y
|
|||
# CONFIG_MAX63XX_WATCHDOG is not set
|
||||
# CONFIG_ALIM7101_WDT is not set
|
||||
# CONFIG_I6300ESB_WDT is not set
|
||||
# CONFIG_BCM7038_WDT is not set
|
||||
# CONFIG_MEN_A21_WDT is not set
|
||||
|
||||
#
|
||||
|
|
@ -2870,6 +2890,7 @@ CONFIG_SSB_PCIHOST=y
|
|||
CONFIG_SSB_B43_PCI_BRIDGE=y
|
||||
CONFIG_SSB_SDIOHOST_POSSIBLE=y
|
||||
# CONFIG_SSB_SDIOHOST is not set
|
||||
# CONFIG_SSB_HOST_SOC is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
||||
CONFIG_SSB_DRIVER_PCICORE=y
|
||||
|
|
@ -3588,6 +3609,7 @@ CONFIG_FB_MODE_HELPERS=y
|
|||
# CONFIG_FB_CARMINE is not set
|
||||
# CONFIG_FB_SMSCUFX is not set
|
||||
CONFIG_FB_UDL=m
|
||||
# CONFIG_FB_IBM_GXT4500 is not set
|
||||
# CONFIG_FB_VIRTUAL is not set
|
||||
# CONFIG_FB_METRONOME is not set
|
||||
# CONFIG_FB_MB862XX is not set
|
||||
|
|
@ -3635,12 +3657,12 @@ CONFIG_SND_TIMER=m
|
|||
CONFIG_SND_PCM=m
|
||||
CONFIG_SND_HWDEP=m
|
||||
CONFIG_SND_RAWMIDI=m
|
||||
CONFIG_SND_COMPRESS_OFFLOAD=m
|
||||
CONFIG_SND_JACK=y
|
||||
CONFIG_SND_SEQUENCER=m
|
||||
# CONFIG_SND_SEQ_DUMMY is not set
|
||||
# CONFIG_SND_MIXER_OSS is not set
|
||||
# CONFIG_SND_PCM_OSS is not set
|
||||
CONFIG_SND_PCM_TIMER=y
|
||||
# CONFIG_SND_SEQUENCER_OSS is not set
|
||||
CONFIG_SND_HRTIMER=m
|
||||
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
|
||||
|
|
@ -3703,6 +3725,11 @@ CONFIG_SND_SOC=m
|
|||
# CONFIG_SND_SOC_FSL_SPDIF is not set
|
||||
# CONFIG_SND_SOC_FSL_ESAI is not set
|
||||
# CONFIG_SND_SOC_IMX_AUDMUX is not set
|
||||
|
||||
#
|
||||
# Allwinner SoC Audio support
|
||||
#
|
||||
# CONFIG_SND_SUN4I_CODEC is not set
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
|
||||
|
|
@ -3713,6 +3740,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
|
|||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
# CONFIG_SND_SOC_AK4104 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
CONFIG_SND_SOC_ALC5623=m
|
||||
|
|
@ -3727,7 +3755,6 @@ CONFIG_SND_SOC_ALC5623=m
|
|||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_HDMI_CODEC is not set
|
||||
# CONFIG_SND_SOC_ES8328 is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
|
|
@ -3798,6 +3825,7 @@ CONFIG_HID_BELKIN=m
|
|||
# CONFIG_HID_BETOP_FF is not set
|
||||
CONFIG_HID_CHERRY=m
|
||||
CONFIG_HID_CHICONY=m
|
||||
# CONFIG_HID_CORSAIR is not set
|
||||
CONFIG_HID_PRODIKEYS=m
|
||||
CONFIG_HID_CP2112=m
|
||||
CONFIG_HID_CYPRESS=m
|
||||
|
|
@ -3808,6 +3836,7 @@ CONFIG_HID_ELECOM=m
|
|||
CONFIG_HID_ELO=m
|
||||
CONFIG_HID_EZKEY=m
|
||||
# CONFIG_HID_GEMBIRD is not set
|
||||
# CONFIG_HID_GFRM is not set
|
||||
CONFIG_HID_HOLTEK=m
|
||||
CONFIG_HOLTEK_FF=y
|
||||
# CONFIG_HID_GT683R is not set
|
||||
|
|
@ -3898,7 +3927,6 @@ CONFIG_USB_DEFAULT_PERSIST=y
|
|||
# CONFIG_USB_DYNAMIC_MINORS is not set
|
||||
# CONFIG_USB_OTG is not set
|
||||
# CONFIG_USB_OTG_WHITELIST is not set
|
||||
# CONFIG_USB_OTG_FSM is not set
|
||||
# CONFIG_USB_ULPI_BUS is not set
|
||||
# CONFIG_USB_MON is not set
|
||||
CONFIG_USB_WUSB=m
|
||||
|
|
@ -3920,7 +3948,6 @@ CONFIG_USB_EHCI_HCD_ORION=y
|
|||
# CONFIG_USB_OXU210HP_HCD is not set
|
||||
# CONFIG_USB_ISP116X_HCD is not set
|
||||
# CONFIG_USB_ISP1362_HCD is not set
|
||||
# CONFIG_USB_FUSBH200_HCD is not set
|
||||
# CONFIG_USB_FOTG210_HCD is not set
|
||||
# CONFIG_USB_MAX3421_HCD is not set
|
||||
# CONFIG_USB_OHCI_HCD is not set
|
||||
|
|
@ -4095,7 +4122,6 @@ CONFIG_UWB=m
|
|||
# CONFIG_UWB_WHCI is not set
|
||||
CONFIG_MMC=y
|
||||
# CONFIG_MMC_DEBUG is not set
|
||||
# CONFIG_MMC_CLKGATE is not set
|
||||
|
||||
#
|
||||
# MMC/SD/SDIO Card Drivers
|
||||
|
|
@ -4225,6 +4251,7 @@ CONFIG_RTC_DRV_S35390A=y
|
|||
# CONFIG_RTC_DRV_RX8025 is not set
|
||||
# CONFIG_RTC_DRV_EM3027 is not set
|
||||
# CONFIG_RTC_DRV_RV3029C2 is not set
|
||||
# CONFIG_RTC_DRV_RV8803 is not set
|
||||
|
||||
#
|
||||
# SPI RTC drivers
|
||||
|
|
@ -4279,12 +4306,11 @@ CONFIG_DMADEVICES=y
|
|||
#
|
||||
CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
|
||||
CONFIG_DMA_ENGINE=y
|
||||
# CONFIG_IDMA64 is not set
|
||||
# CONFIG_INTEL_IDMA64 is not set
|
||||
CONFIG_MV_XOR=y
|
||||
# CONFIG_NBPFAXI_DMA is not set
|
||||
# CONFIG_DW_DMAC is not set
|
||||
# CONFIG_DW_DMAC_PCI is not set
|
||||
# CONFIG_HSU_DMA_PCI is not set
|
||||
|
||||
#
|
||||
# DMA Clients
|
||||
|
|
@ -4406,7 +4432,6 @@ CONFIG_R8188EU=m
|
|||
# CONFIG_IIO_SIMPLE_DUMMY is not set
|
||||
# CONFIG_FB_SM750 is not set
|
||||
CONFIG_FB_XGI=m
|
||||
# CONFIG_FT1000 is not set
|
||||
|
||||
#
|
||||
# Speakup console speech
|
||||
|
|
@ -4426,6 +4451,7 @@ CONFIG_FB_XGI=m
|
|||
# CONFIG_DGAP is not set
|
||||
# CONFIG_GS_FPGABOOT is not set
|
||||
# CONFIG_FB_TFT is not set
|
||||
# CONFIG_WILC1000_DRIVER is not set
|
||||
# CONFIG_MOST is not set
|
||||
# CONFIG_CHROME_PLATFORMS is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
|
|
@ -4474,6 +4500,7 @@ CONFIG_IOMMU_SUPPORT=y
|
|||
#
|
||||
# SOC (System On Chip) specific Drivers
|
||||
#
|
||||
# CONFIG_SOC_BRCMSTB is not set
|
||||
# CONFIG_SUNXI_SRAM is not set
|
||||
# CONFIG_SOC_TI is not set
|
||||
# CONFIG_PM_DEVFREQ is not set
|
||||
|
|
@ -4495,6 +4522,7 @@ CONFIG_IIO=m
|
|||
# CONFIG_MMA8452 is not set
|
||||
# CONFIG_MMA9551 is not set
|
||||
# CONFIG_MMA9553 is not set
|
||||
# CONFIG_MXC4005 is not set
|
||||
# CONFIG_STK8312 is not set
|
||||
# CONFIG_STK8BA50 is not set
|
||||
|
||||
|
|
@ -4510,6 +4538,7 @@ CONFIG_IIO=m
|
|||
# CONFIG_AD7887 is not set
|
||||
# CONFIG_AD7923 is not set
|
||||
# CONFIG_AD799X is not set
|
||||
# CONFIG_HI8435 is not set
|
||||
# CONFIG_MAX1027 is not set
|
||||
# CONFIG_MAX1363 is not set
|
||||
# CONFIG_MCP320X is not set
|
||||
|
|
@ -4523,6 +4552,11 @@ CONFIG_IIO=m
|
|||
#
|
||||
# CONFIG_AD8366 is not set
|
||||
|
||||
#
|
||||
# Chemical Sensors
|
||||
#
|
||||
# CONFIG_VZ89X is not set
|
||||
|
||||
#
|
||||
# Hid Sensor IIO Common
|
||||
#
|
||||
|
|
@ -4586,6 +4620,8 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
|
|||
# Humidity sensors
|
||||
#
|
||||
CONFIG_DHT11=m
|
||||
# CONFIG_HDC100X is not set
|
||||
# CONFIG_HTU21 is not set
|
||||
CONFIG_SI7005=m
|
||||
# CONFIG_SI7020 is not set
|
||||
|
||||
|
|
@ -4603,6 +4639,7 @@ CONFIG_SI7005=m
|
|||
# CONFIG_ADJD_S311 is not set
|
||||
# CONFIG_AL3320A is not set
|
||||
# CONFIG_APDS9300 is not set
|
||||
# CONFIG_APDS9960 is not set
|
||||
# CONFIG_BH1750 is not set
|
||||
CONFIG_CM32181=m
|
||||
# CONFIG_CM3232 is not set
|
||||
|
|
@ -4622,6 +4659,7 @@ CONFIG_CM32181=m
|
|||
# CONFIG_TCS3472 is not set
|
||||
# CONFIG_SENSORS_TSL2563 is not set
|
||||
# CONFIG_TSL4531 is not set
|
||||
# CONFIG_US5182D is not set
|
||||
# CONFIG_VCNL4000 is not set
|
||||
|
||||
#
|
||||
|
|
@ -4629,11 +4667,11 @@ CONFIG_CM32181=m
|
|||
#
|
||||
# CONFIG_AK8975 is not set
|
||||
# CONFIG_AK09911 is not set
|
||||
# CONFIG_BMC150_MAGN is not set
|
||||
# CONFIG_MAG3110 is not set
|
||||
# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
|
||||
# CONFIG_MMC35240 is not set
|
||||
# CONFIG_IIO_ST_MAGN_3AXIS is not set
|
||||
# CONFIG_BMC150_MAGN is not set
|
||||
|
||||
#
|
||||
# Inclinometer sensors
|
||||
|
|
@ -4641,6 +4679,11 @@ CONFIG_CM32181=m
|
|||
# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
|
||||
# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
|
||||
|
||||
#
|
||||
# Digital potentiometers
|
||||
#
|
||||
# CONFIG_MCP4531 is not set
|
||||
|
||||
#
|
||||
# Pressure sensors
|
||||
#
|
||||
|
|
@ -4649,6 +4692,7 @@ CONFIG_CM32181=m
|
|||
# CONFIG_MPL115 is not set
|
||||
# CONFIG_MPL3115 is not set
|
||||
# CONFIG_MS5611 is not set
|
||||
# CONFIG_MS5637 is not set
|
||||
# CONFIG_IIO_ST_PRESS is not set
|
||||
# CONFIG_T5403 is not set
|
||||
|
||||
|
|
@ -4660,6 +4704,7 @@ CONFIG_CM32181=m
|
|||
#
|
||||
# Proximity sensors
|
||||
#
|
||||
# CONFIG_LIDAR_LITE_V2 is not set
|
||||
# CONFIG_SX9500 is not set
|
||||
|
||||
#
|
||||
|
|
@ -4667,6 +4712,8 @@ CONFIG_CM32181=m
|
|||
#
|
||||
# CONFIG_MLX90614 is not set
|
||||
# CONFIG_TMP006 is not set
|
||||
# CONFIG_TSYS01 is not set
|
||||
# CONFIG_TSYS02D is not set
|
||||
# CONFIG_NTB is not set
|
||||
# CONFIG_VME_BUS is not set
|
||||
# CONFIG_PWM is not set
|
||||
|
|
@ -4696,6 +4743,15 @@ CONFIG_ARM_PMU=y
|
|||
#
|
||||
# CONFIG_ANDROID is not set
|
||||
# CONFIG_NVMEM is not set
|
||||
# CONFIG_STM is not set
|
||||
# CONFIG_STM_DUMMY is not set
|
||||
# CONFIG_STM_SOURCE_CONSOLE is not set
|
||||
# CONFIG_INTEL_TH is not set
|
||||
|
||||
#
|
||||
# FPGA Configuration Support
|
||||
#
|
||||
# CONFIG_FPGA is not set
|
||||
|
||||
#
|
||||
# Firmware Drivers
|
||||
|
|
@ -4843,6 +4899,7 @@ CONFIG_UBIFS_FS=y
|
|||
CONFIG_UBIFS_FS_ADVANCED_COMPR=y
|
||||
CONFIG_UBIFS_FS_LZO=y
|
||||
CONFIG_UBIFS_FS_ZLIB=y
|
||||
# CONFIG_UBIFS_ATIME_SUPPORT is not set
|
||||
# CONFIG_LOGFS is not set
|
||||
CONFIG_CRAMFS=y
|
||||
CONFIG_SQUASHFS=m
|
||||
|
|
@ -5016,6 +5073,7 @@ CONFIG_FRAME_WARN=1024
|
|||
CONFIG_DEBUG_FS=y
|
||||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_SECTION_MISMATCH is not set
|
||||
CONFIG_SECTION_MISMATCH_WARN_ONLY=y
|
||||
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
|
||||
|
|
@ -5125,6 +5183,7 @@ CONFIG_PROBE_EVENTS=y
|
|||
# CONFIG_RING_BUFFER_BENCHMARK is not set
|
||||
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
|
||||
# CONFIG_TRACE_ENUM_MAP_FILE is not set
|
||||
CONFIG_TRACING_EVENTS_GPIO=y
|
||||
|
||||
#
|
||||
# Runtime Testing
|
||||
|
|
@ -5141,6 +5200,7 @@ CONFIG_PROBE_EVENTS=y
|
|||
# CONFIG_TEST_HEXDUMP is not set
|
||||
# CONFIG_TEST_STRING_HELPERS is not set
|
||||
# CONFIG_TEST_KSTRTOX is not set
|
||||
# CONFIG_TEST_PRINTF is not set
|
||||
# CONFIG_TEST_RHASHTABLE is not set
|
||||
# CONFIG_DMA_API_DEBUG is not set
|
||||
# CONFIG_TEST_LKM is not set
|
||||
|
|
@ -5258,6 +5318,7 @@ CONFIG_CRYPTO_ECB=y
|
|||
CONFIG_CRYPTO_LRW=m
|
||||
CONFIG_CRYPTO_PCBC=m
|
||||
CONFIG_CRYPTO_XTS=y
|
||||
# CONFIG_CRYPTO_KEYWRAP is not set
|
||||
|
||||
#
|
||||
# Hash modes
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001
|
||||
From: Yevgeny Pats <yevgeny@perception-point.io>
|
||||
Date: Tue, 19 Jan 2016 22:09:04 +0000
|
||||
Subject: KEYS: Fix keyring ref leak in join_session_keyring()
|
||||
|
||||
This fixes CVE-2016-0728.
|
||||
|
||||
If a thread is asked to join as a session keyring the keyring that's already
|
||||
set as its session, we leak a keyring reference.
|
||||
|
||||
This can be tested with the following program:
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <keyutils.h>
|
||||
|
||||
int main(int argc, const char *argv[])
|
||||
{
|
||||
int i = 0;
|
||||
key_serial_t serial;
|
||||
|
||||
serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
|
||||
"leaked-keyring");
|
||||
if (serial < 0) {
|
||||
perror("keyctl");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (keyctl(KEYCTL_SETPERM, serial,
|
||||
KEY_POS_ALL | KEY_USR_ALL) < 0) {
|
||||
perror("keyctl");
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (i = 0; i < 100; i++) {
|
||||
serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
|
||||
"leaked-keyring");
|
||||
if (serial < 0) {
|
||||
perror("keyctl");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
If, after the program has run, there something like the following line in
|
||||
/proc/keys:
|
||||
|
||||
3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty
|
||||
|
||||
with a usage count of 100 * the number of times the program has been run,
|
||||
then the kernel is malfunctioning. If leaked-keyring has zero usages or
|
||||
has been garbage collected, then the problem is fixed.
|
||||
|
||||
Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
|
||||
Signed-off-by: David Howells <dhowells@redhat.com>
|
||||
Acked-by: Don Zickus <dzickus@redhat.com>
|
||||
Acked-by: Prarit Bhargava <prarit@redhat.com>
|
||||
Acked-by: Jarod Wilson <jarod@redhat.com>
|
||||
Signed-off-by: James Morris <james.l.morris@oracle.com>
|
||||
---
|
||||
security/keys/process_keys.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
|
||||
index a3f85d2..e6d50172 100644
|
||||
--- a/security/keys/process_keys.c
|
||||
+++ b/security/keys/process_keys.c
|
||||
@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
|
||||
ret = PTR_ERR(keyring);
|
||||
goto error2;
|
||||
} else if (keyring == new->session_keyring) {
|
||||
+ key_put(keyring);
|
||||
ret = 0;
|
||||
goto error2;
|
||||
}
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=-kirkwood
|
||||
KERNEL_VERSION=4.3.0-1-ARCH
|
||||
KERNEL_VERSION=4.4.1-1-ARCH
|
||||
|
||||
post_install () {
|
||||
# updating module dependencies
|
||||
|
|
|
|||
Loading…
Reference in a new issue