Commit f9b3de01 authored by Anthony G. Basile's avatar Anthony G. Basile
Browse files

Bump kernel for x86 

 linux-3.13.3 + hardened-patches-3.13.3-2.extras
parent 43ecb087

build.sh

+4 −4
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ TOR=tor-0.2.4.20 
NTPD=openntpd-3.9p1

OPENSSH=openssh-6.1p1



KVERSION=3.12.6

KVERSION=3.13.3

LINUX=linux-${KVERSION}

PATCHES=hardened-patches-${KVERSION}-3.extras

PATCHES=hardened-patches-${KVERSION}-2.extras



################################################################################
@@ -69,7 +69,7 @@ get_sources() 
	[[ ! -f $BUSYBOX.tar.bz2 ]] && wget http://www.busybox.net/downloads/$BUSYBOX.tar.bz2

	[[ ! -f $TOR.tar.gz ]] && wget http://www.torproject.org/dist/$TOR.tar.gz

	[[ ! -f $NTPD.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$NTPD.tar.gz

	[[ ! -f $LINUX.tar.bz2 ]] && wget http://www.kernel.org/pub/linux/kernel/v3.x/$LINUX.tar.bz2

	[[ ! -f $LINUX.tar.xz ]] && wget http://www.kernel.org/pub/linux/kernel/v3.x/$LINUX.tar.xz

	[[ ! -f $PATCHES.tar.bz2 ]] && wget http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/$PATCHES.tar.bz2 

	[[ ! -f $OPENSSH.tar.gz ]] && wget ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$OPENSSH.tar.gz

}
@@ -339,7 +339,7 @@ compile_kernel() 
{

	cd $WORKING

	[[ -f $LINUX/arch/$TARGET/boot/bzImage ]] && return 0

	tar jxvf $WORKING/../sources/$LINUX.tar.bz2

	tar Jxvf $WORKING/../sources/$LINUX.tar.xz

	tar jxvf $WORKING/../sources/$PATCHES.tar.bz2 

	cd $LINUX

	for i in ../$KVERSION/4* ; do patch -p 1 < $i ; done

configs/kernel-3.12.6.x86.config→configs/kernel-3.13.3.x86.config

+77 −5
Original line number Diff line number Diff line 
#

# Automatically generated file; DO NOT EDIT.

# Linux/x86 3.12.4 Kernel Configuration

# Linux/x86 3.13.3 Kernel Configuration

#

# CONFIG_64BIT is not set

CONFIG_X86_32=y
@@ -146,6 +146,7 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y 
CONFIG_UID16=y

# CONFIG_SYSCTL_SYSCALL is not set

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y
@@ -166,6 +167,7 @@ CONFIG_HAVE_PERF_EVENTS=y 
# Kernel Performance Events And Counters

#

CONFIG_PERF_EVENTS=y

# CONFIG_DEBUG_PERF_USE_VMALLOC is not set

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y
@@ -185,7 +187,6 @@ CONFIG_HAVE_KPROBES_ON_FTRACE=y 
CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_HAVE_DMA_ATTRS=y

CONFIG_HAVE_DMA_CONTIGUOUS=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

CONFIG_GENERIC_SMP_IDLE_THREAD=y

CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y

CONFIG_HAVE_DMA_API_DEBUG=y
@@ -319,6 +320,7 @@ CONFIG_VM86=y 
# CONFIG_MICROCODE is not set

# CONFIG_MICROCODE_INTEL_EARLY is not set

# CONFIG_MICROCODE_AMD_EARLY is not set

# CONFIG_X86_MSR is not set

# CONFIG_X86_CPUID is not set

# CONFIG_NOHIGHMEM is not set

CONFIG_HIGHMEM4G=y
@@ -413,6 +415,7 @@ CONFIG_PCI_DIRECT=y 
CONFIG_PCI_DOMAINS=y

# CONFIG_PCIEPORTBUS is not set

# CONFIG_PCI_MSI is not set

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set

# CONFIG_PCI_STUB is not set

CONFIG_HT_IRQ=y
@@ -510,6 +513,7 @@ CONFIG_HAVE_NET_DSA=y 
# CONFIG_NETLINK_MMAP is not set

# CONFIG_NETLINK_DIAG is not set

# CONFIG_NET_MPLS_GSO is not set

# CONFIG_HSR is not set

CONFIG_RPS=y

CONFIG_RFS_ACCEL=y

CONFIG_XPS=y
@@ -549,6 +553,8 @@ CONFIG_FW_LOADER=y 
# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_EXTRA_FIRMWARE=""

# CONFIG_FW_LOADER_USER_HELPER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_DEBUG_DEVRES is not set

# CONFIG_SYS_HYPERVISOR is not set

# CONFIG_GENERIC_CPU_DEVICES is not set

# CONFIG_DMA_SHARED_BUFFER is not set
@@ -559,6 +565,7 @@ CONFIG_EXTRA_FIRMWARE="" 
# CONFIG_CONNECTOR is not set

# CONFIG_MTD is not set

# CONFIG_PARPORT is not set

CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y

# CONFIG_BLK_DEV is not set



#
@@ -609,6 +616,14 @@ CONFIG_EXTRA_FIRMWARE="" 
#

# CONFIG_ALTERA_STAPL is not set

# CONFIG_VMWARE_VMCI is not set



#

# Intel MIC Host Driver

#



#

# Intel MIC Card Driver

#

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -960,7 +975,6 @@ CONFIG_FIX_EARLYCON_MEM=y 
# CONFIG_SERIAL_ARC is not set

# CONFIG_SERIAL_RP2 is not set

# CONFIG_SERIAL_FSL_LPUART is not set

# CONFIG_SERIAL_ST_ASC is not set

# CONFIG_VIRTIO_CONSOLE is not set

# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set
@@ -1068,7 +1082,6 @@ CONFIG_PTP_1588_CLOCK=y 
#

CONFIG_PTP_1588_CLOCK_PCH=y

CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y

CONFIG_GPIO_DEVRES=y

# CONFIG_GPIOLIB is not set

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set
@@ -1407,6 +1420,7 @@ CONFIG_VIRTIO_BALLOON=y 
#

# CONFIG_STAGING is not set

# CONFIG_X86_PLATFORM_DEVICES is not set

# CONFIG_CHROME_PLATFORMS is not set



#

# Hardware Spinlock drivers
@@ -1437,6 +1451,13 @@ CONFIG_CLKBLD_I8253=y 
# CONFIG_RESET_CONTROLLER is not set

# CONFIG_FMC is not set



#

# PHY Subsystem

#

# CONFIG_GENERIC_PHY is not set

# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set

# CONFIG_POWERCAP is not set



#

# Firmware Drivers

#
@@ -1564,49 +1585,88 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
#

# CONFIG_PRINTK_TIME is not set

CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4

# CONFIG_BOOT_PRINTK_DELAY is not set



#

# Compile-time checks and compiler options

#

# CONFIG_DEBUG_INFO is not set

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_FRAME_WARN=1024

CONFIG_STRIP_ASM_SYMS=y

# CONFIG_READABLE_ASM is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

# CONFIG_DEBUG_SECTION_MISMATCH is not set

CONFIG_ARCH_WANT_FRAME_POINTERS=y

# CONFIG_FRAME_POINTER is not set

# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_DEBUG_KERNEL is not set

CONFIG_DEBUG_KERNEL=y



#

# Memory Debugging

#

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_HAVE_DEBUG_KMEMLEAK=y

# CONFIG_DEBUG_KMEMLEAK is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_VIRTUAL is not set

CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_DEBUG_PER_CPU_MAPS is not set

# CONFIG_DEBUG_HIGHMEM is not set

CONFIG_HAVE_DEBUG_STACKOVERFLOW=y

# CONFIG_DEBUG_STACKOVERFLOW is not set

CONFIG_HAVE_ARCH_KMEMCHECK=y

# CONFIG_KMEMCHECK is not set

# CONFIG_DEBUG_SHIRQ is not set



#

# Debug Lockups and Hangs

#

# CONFIG_LOCKUP_DETECTOR is not set

# CONFIG_DETECT_HUNG_TASK is not set

# CONFIG_PANIC_ON_OOPS is not set

CONFIG_PANIC_ON_OOPS_VALUE=0

# CONFIG_SCHED_DEBUG is not set

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set



#

# Lock Debugging (spinlocks, mutexes, etc...)

#

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_ATOMIC_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_WRITECOUNT is not set

CONFIG_DEBUG_LIST=y

# CONFIG_DEBUG_SG is not set

# CONFIG_DEBUG_NOTIFIERS is not set

# CONFIG_DEBUG_CREDENTIALS is not set



#

# RCU Debugging

#

# CONFIG_SPARSE_RCU_POINTER is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_RCU_CPU_STALL_TIMEOUT=60

# CONFIG_RCU_CPU_STALL_INFO is not set

# CONFIG_RCU_TRACE is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_NOTIFIER_ERROR_INJECTION is not set

# CONFIG_FAULT_INJECTION is not set

CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y

# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set

CONFIG_USER_STACKTRACE_SUPPORT=y

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -1623,17 +1683,23 @@ CONFIG_TRACING_SUPPORT=y 
#

# Runtime Testing

#

# CONFIG_TEST_LIST_SORT is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_RBTREE_TEST is not set

# CONFIG_ATOMIC64_SELFTEST is not set

# CONFIG_TEST_STRING_HELPERS is not set

# CONFIG_TEST_KSTRTOX is not set

# CONFIG_DMA_API_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

CONFIG_STRICT_DEVMEM=y

# CONFIG_X86_VERBOSE_BOOTUP is not set

CONFIG_EARLY_PRINTK=y

# CONFIG_EARLY_PRINTK_DBGP is not set

# CONFIG_X86_PTDUMP is not set

CONFIG_DOUBLEFAULT=y

# CONFIG_DEBUG_TLBFLUSH is not set

# CONFIG_IOMMU_STRESS is not set

CONFIG_HAVE_MMIOTRACE_SUPPORT=y

CONFIG_IO_DELAY_TYPE_0X80=0
@@ -1645,7 +1711,10 @@ CONFIG_IO_DELAY_0X80=y 
# CONFIG_IO_DELAY_UDELAY is not set

# CONFIG_IO_DELAY_NONE is not set

CONFIG_DEFAULT_IO_DELAY_TYPE=0

# CONFIG_CPA_DEBUG is not set

# CONFIG_OPTIMIZE_INLINING is not set

# CONFIG_DEBUG_NMI_SELFTEST is not set

# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set



#

# Security options
@@ -1727,6 +1796,8 @@ CONFIG_GRKERNSEC_RAND_THREADSTACK=y 
CONFIG_GRKERNSEC_PROC_MEMMAP=y

CONFIG_GRKERNSEC_BRUTE=y

CONFIG_GRKERNSEC_HIDESYM=y

CONFIG_GRKERNSEC_RANDSTRUCT=y

CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y

CONFIG_GRKERNSEC_KERN_LOCKOUT=y



#
@@ -1955,6 +2026,7 @@ CONFIG_CRC32_SLICEBY8=y 
# CONFIG_CRC7 is not set

CONFIG_LIBCRC32C=y

# CONFIG_CRC8 is not set

# CONFIG_RANDOM32_SELFTEST is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_LZO_DECOMPRESS=y

CONFIG_LZ4_DECOMPRESS=y