]> git.proxmox.com Git - pve-kernel-2.6.32.git/blame - config-2.6.32.diff
fix CVE-2013-2094
[pve-kernel-2.6.32.git] / config-2.6.32.diff
CommitLineData
e5c53408
DM
1--- config-2.6.32-042stab074.10.x86_64 2013-03-04 18:44:35.000000000 +0100
2+++ config-2.6.32 2013-03-08 11:01:45.000000000 +0100
2c811847 3@@ -210,7 +210,7 @@
1cfff965
DM
4 CONFIG_MODVERSIONS=y
5 CONFIG_MODULE_SRCVERSION_ALL=y
6 CONFIG_MODULE_VERIFY_ELF=y
7-CONFIG_MODULE_SIG=y
8+# CONFIG_MODULE_SIG is not set
9 # CONFIG_MODULE_SIG_FORCE is not set
10 CONFIG_MODULE_VERIFY=y
11 CONFIG_STOP_MACHINE=y
e5c53408 12@@ -946,8 +946,8 @@
2c0fe19a
DM
13 # CONFIG_ATM_BR2684_IPFILTER is not set
14 CONFIG_STP=m
15 CONFIG_GARP=m
16-CONFIG_BRIDGE=m
17+CONFIG_BRIDGE=y
814f5a02 18 CONFIG_BRIDGE_IGMP_SNOOPING=y
2c0fe19a
DM
19 CONFIG_NET_DSA=y
20 CONFIG_NET_DSA_TAG_DSA=y
e5c53408
DM
21 CONFIG_NET_DSA_TAG_EDSA=y
22@@ -1364,10 +1364,10 @@
1cfff965
DM
23 #
24 # SCSI support type (disk, tape, CD-ROM)
25 #
26-CONFIG_BLK_DEV_SD=m
27+CONFIG_BLK_DEV_SD=y
28 CONFIG_CHR_DEV_ST=m
29 CONFIG_CHR_DEV_OSST=m
30-CONFIG_BLK_DEV_SR=m
31+CONFIG_BLK_DEV_SR=y
32 CONFIG_BLK_DEV_SR_VENDOR=y
33 CONFIG_CHR_DEV_SG=m
34 CONFIG_CHR_DEV_SCH=m
e5c53408 35@@ -1444,7 +1444,7 @@
229e59d2
DM
36 # CONFIG_SCSI_DMX3191D is not set
37 # CONFIG_SCSI_EATA is not set
38 # CONFIG_SCSI_FUTURE_DOMAIN is not set
39-# CONFIG_SCSI_GDTH is not set
40+CONFIG_SCSI_GDTH=m
41 CONFIG_SCSI_ISCI=m
e21b3827
DM
42 CONFIG_SCSI_IPS=m
43 CONFIG_SCSI_INITIO=m
e5c53408 44@@ -1562,7 +1562,7 @@
1cfff965
DM
45 # CONFIG_MULTICORE_RAID456 is not set
46 # CONFIG_MD_MULTIPATH is not set
47 CONFIG_MD_FAULTY=m
48-CONFIG_BLK_DEV_DM=m
49+CONFIG_BLK_DEV_DM=y
50 CONFIG_DM_DEBUG=y
2c811847
DM
51 CONFIG_DM_BUFIO=m
52 CONFIG_DM_PERSISTENT_DATA=m
e5c53408 53@@ -3169,7 +3169,11 @@
1cfff965
DM
54 # CONFIG_LOGO_LINUX_MONO is not set
55 # CONFIG_LOGO_LINUX_VGA16 is not set
56 CONFIG_LOGO_LINUX_CLUT224=y
2c811847
DM
57-CONFIG_LOGO_PSBM_CLUT224=y
58+# CONFIG_LOGO_PSBM_CLUT224 is not set
1cfff965
DM
59+#
60+# Bootsplash configuration
61+#
62+CONFIG_BOOTSPLASH=y
63 CONFIG_SOUND=m
64 CONFIG_SOUND_OSS_CORE=y
65 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
e5c53408 66@@ -3772,7 +3776,9 @@
e21b3827
DM
67 # CONFIG_SLICOSS is not set
68 # CONFIG_VIDEO_GO7007 is not set
69 # CONFIG_VIDEO_CX25821 is not set
70-# CONFIG_USB_IP_COMMON is not set
71+CONFIG_USB_IP_COMMON=m
72+CONFIG_USB_IP_VHCI_HCD=m
73+CONFIG_USB_IP_HOST=m
74 # CONFIG_W35UND is not set
75 # CONFIG_PRISM2_USB is not set
76 # CONFIG_ECHO is not set
e5c53408 77@@ -3904,7 +3910,11 @@
7e70f1cc
DM
78 CONFIG_REISERFS_FS_XATTR=y
79 CONFIG_REISERFS_FS_POSIX_ACL=y
80 CONFIG_REISERFS_FS_SECURITY=y
81-# CONFIG_JFS_FS is not set
82+CONFIG_JFS_FS=m
83+CONFIG_JFS_POSIX_ACL=y
84+CONFIG_JFS_SECURITY=y
85+# CONFIG_JFS_DEBUG is not set
86+# CONFIG_JFS_STATISTICS is not set
87 CONFIG_FS_POSIX_ACL=y
88 CONFIG_XFS_FS=m
89 CONFIG_XFS_QUOTA=y
e5c53408 90@@ -3992,8 +4002,8 @@
d9e10626
DM
91 # CONFIG_ADFS_FS is not set
92 # CONFIG_AFFS_FS is not set
93 CONFIG_ECRYPT_FS=m
94-# CONFIG_HFS_FS is not set
95-# CONFIG_HFSPLUS_FS is not set
96+CONFIG_HFS_FS=m
97+CONFIG_HFSPLUS_FS=m
98 # CONFIG_BEFS_FS is not set
99 # CONFIG_BFS_FS is not set
100 # CONFIG_EFS_FS is not set
e5c53408 101@@ -4140,7 +4150,7 @@
1cfff965
DM
102 # Kernel hacking
103 #
104 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
105-CONFIG_PRINTK_TIME=y
106+# CONFIG_PRINTK_TIME is not set
107 # CONFIG_ENABLE_WARN_DEPRECATED is not set
108 CONFIG_ENABLE_MUST_CHECK=y
109 CONFIG_FRAME_WARN=2048
e5c53408 110@@ -4184,7 +4194,7 @@
1cfff965
DM
111 CONFIG_STACKTRACE=y
112 # CONFIG_DEBUG_KOBJECT is not set
113 CONFIG_DEBUG_BUGVERBOSE=y
114-CONFIG_DEBUG_INFO=y
115+# CONFIG_DEBUG_INFO is not set
116 # CONFIG_DEBUG_VM is not set
117 # CONFIG_DEBUG_VIRTUAL is not set
118 # CONFIG_DEBUG_WRITECOUNT is not set
e5c53408 119@@ -4415,8 +4425,8 @@
4718bd9c
DM
120 #
121 CONFIG_CRYPTO_ANSI_CPRNG=m
122 CONFIG_CRYPTO_MPILIB=y
123-CONFIG_CRYPTO_SIGNATURE=y
124-CONFIG_CRYPTO_SIGNATURE_DSA=y
125+# CONFIG_CRYPTO_SIGNATURE is not set
126+# CONFIG_CRYPTO_SIGNATURE_DSA is not set
127 CONFIG_CRYPTO_HW=y
128 CONFIG_CRYPTO_DEV_PADLOCK=m
129 CONFIG_CRYPTO_DEV_PADLOCK_AES=m