1 |
Author: mpagano |
2 |
Date: 2010-04-25 00:23:19 +0000 (Sun, 25 Apr 2010) |
3 |
New Revision: 1695 |
4 |
|
5 |
Removed: |
6 |
genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch |
7 |
Modified: |
8 |
genpatches-2.6/trunk/2.6.33/0000_README |
9 |
Log: |
10 |
Removal of alpha sysctl uac patch |
11 |
|
12 |
Modified: genpatches-2.6/trunk/2.6.33/0000_README |
13 |
=================================================================== |
14 |
--- genpatches-2.6/trunk/2.6.33/0000_README 2010-04-09 14:50:45 UTC (rev 1694) |
15 |
+++ genpatches-2.6/trunk/2.6.33/0000_README 2010-04-25 00:23:19 UTC (rev 1695) |
16 |
@@ -54,8 +54,3 @@ |
17 |
Patch: 4200_fbcondecor-0.9.6.patch |
18 |
From: http://dev.gentoo.org/~spock |
19 |
Desc: Bootsplash successor by Michal Januszewski |
20 |
- |
21 |
-Patch: 4400_alpha-sysctl-uac.patch |
22 |
-From: Tavis Ormandy <taviso@g.o> and http://bugs.gentoo.org/show_bug.cgi?id=217323 |
23 |
-Desc: Enable control of the unaligned access control policy from sysctl |
24 |
- |
25 |
|
26 |
Deleted: genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch |
27 |
=================================================================== |
28 |
--- genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch 2010-04-09 14:50:45 UTC (rev 1694) |
29 |
+++ genpatches-2.6/trunk/2.6.33/4400_alpha-sysctl-uac.patch 2010-04-25 00:23:19 UTC (rev 1695) |
30 |
@@ -1,152 +0,0 @@ |
31 |
-Index: linux-2.6.26-gentoo/arch/alpha/Kconfig |
32 |
-=================================================================== |
33 |
---- linux-2.6.26-gentoo.orig/arch/alpha/Kconfig |
34 |
-+++ linux-2.6.26-gentoo/arch/alpha/Kconfig |
35 |
-@@ -624,6 +624,32 @@ config HZ |
36 |
- default 1200 if ALPHA_RAWHIDE |
37 |
- default 1024 |
38 |
- |
39 |
-+config ALPHA_UAC_SYSCTL |
40 |
-+ bool "Configure UAC policy via sysctl" |
41 |
-+ depends on SYSCTL |
42 |
-+ default y |
43 |
-+ ---help--- |
44 |
-+ Configuring the UAC (unaligned access control) policy on a Linux |
45 |
-+ system usually involves setting a compile time define. If you say |
46 |
-+ Y here, you will be able to modify the UAC policy at runtime using |
47 |
-+ the /proc interface. |
48 |
-+ |
49 |
-+ The UAC policy defines the action Linux should take when an |
50 |
-+ unaligned memory access occurs. The action can include printing a |
51 |
-+ warning message (NOPRINT), sending a signal to the offending |
52 |
-+ program to help developers debug their applications (SIGBUS), or |
53 |
-+ disabling the transparent fixing (NOFIX). |
54 |
-+ |
55 |
-+ The sysctls will be initialized to the compile-time defined UAC |
56 |
-+ policy. You can change these manually, or with the sysctl(8) |
57 |
-+ userspace utility. |
58 |
-+ |
59 |
-+ To disable the warning messages at runtime, you would use |
60 |
-+ |
61 |
-+ echo 1 > /proc/sys/kernel/uac/noprint |
62 |
-+ |
63 |
-+ This is pretty harmless. Say Y if you're not sure. |
64 |
-+ |
65 |
- source "drivers/pci/Kconfig" |
66 |
- source "drivers/eisa/Kconfig" |
67 |
- |
68 |
-Index: linux-2.6.26-gentoo/arch/alpha/kernel/traps.c |
69 |
-=================================================================== |
70 |
---- linux-2.6.26-gentoo.orig/arch/alpha/kernel/traps.c |
71 |
-+++ linux-2.6.26-gentoo/arch/alpha/kernel/traps.c |
72 |
-@@ -103,6 +103,52 @@ static char * ireg_name[] = {"v0", "t0", |
73 |
- "t10", "t11", "ra", "pv", "at", "gp", "sp", "zero"}; |
74 |
- #endif |
75 |
- |
76 |
-+#ifdef CONFIG_ALPHA_UAC_SYSCTL |
77 |
-+ |
78 |
-+#include <linux/sysctl.h> |
79 |
-+ |
80 |
-+static int enabled_noprint = 0; |
81 |
-+static int enabled_sigbus = 0; |
82 |
-+static int enabled_nofix = 0; |
83 |
-+ |
84 |
-+ctl_table uac_table[] = { |
85 |
-+ { |
86 |
-+ .ctl_name = CTL_UNNUMBERED, |
87 |
-+ .procname = "noprint", |
88 |
-+ .data = &enabled_noprint, |
89 |
-+ .maxlen = sizeof (int), |
90 |
-+ .mode = 0644, |
91 |
-+ .proc_handler = &proc_dointvec, |
92 |
-+ }, |
93 |
-+ { |
94 |
-+ .ctl_name = CTL_UNNUMBERED, |
95 |
-+ .procname = "sigbus", |
96 |
-+ .data = &enabled_sigbus, |
97 |
-+ .maxlen = sizeof (int), |
98 |
-+ .mode = 0644, |
99 |
-+ .proc_handler = &proc_dointvec, |
100 |
-+ }, |
101 |
-+ { |
102 |
-+ .ctl_name = CTL_UNNUMBERED, |
103 |
-+ .procname = "nofix", |
104 |
-+ .data = &enabled_nofix, |
105 |
-+ .maxlen = sizeof (int), |
106 |
-+ .mode = 0644, |
107 |
-+ .proc_handler = &proc_dointvec, |
108 |
-+ }, |
109 |
-+ { .ctl_name = 0 } |
110 |
-+}; |
111 |
-+ |
112 |
-+static int __init init_uac_sysctl(void) |
113 |
-+{ |
114 |
-+ /* Initialize sysctls with the #defined UAC policy */ |
115 |
-+ enabled_noprint = (test_thread_flag (TIF_UAC_NOPRINT)) ? 1 : 0; |
116 |
-+ enabled_sigbus = (test_thread_flag (TIF_UAC_SIGBUS)) ? 1 : 0; |
117 |
-+ enabled_nofix = (test_thread_flag (TIF_UAC_NOFIX)) ? 1 : 0; |
118 |
-+ return 0; |
119 |
-+} |
120 |
-+#endif |
121 |
-+ |
122 |
- static void |
123 |
- dik_show_code(unsigned int *pc) |
124 |
- { |
125 |
-@@ -782,7 +828,11 @@ do_entUnaUser(void __user * va, unsigned |
126 |
- /* Check the UAC bits to decide what the user wants us to do |
127 |
- with the unaliged access. */ |
128 |
- |
129 |
-+#ifndef CONFIG_ALPHA_UAC_SYSCTL |
130 |
- if (!test_thread_flag (TIF_UAC_NOPRINT)) { |
131 |
-+#else /* CONFIG_ALPHA_UAC_SYSCTL */ |
132 |
-+ if (!(enabled_noprint)) { |
133 |
-+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ |
134 |
- if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) { |
135 |
- cnt = 0; |
136 |
- } |
137 |
-@@ -793,10 +843,18 @@ do_entUnaUser(void __user * va, unsigned |
138 |
- } |
139 |
- last_time = jiffies; |
140 |
- } |
141 |
-+#ifndef CONFIG_ALPHA_UAC_SYSCTL |
142 |
- if (test_thread_flag (TIF_UAC_SIGBUS)) |
143 |
-+#else /* CONFIG_ALPHA_UAC_SYSCTL */ |
144 |
-+ if (enabled_sigbus) |
145 |
-+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ |
146 |
- goto give_sigbus; |
147 |
- /* Not sure why you'd want to use this, but... */ |
148 |
-+#ifndef CONFIG_ALPHA_UAC_SYSCTL |
149 |
- if (test_thread_flag (TIF_UAC_NOFIX)) |
150 |
-+#else /* CONFIG_ALPHA_UAC_SYSCTL */ |
151 |
-+ if (enabled_nofix) |
152 |
-+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ |
153 |
- return; |
154 |
- |
155 |
- /* Don't bother reading ds in the access check since we already |
156 |
-@@ -1091,3 +1149,7 @@ trap_init(void) |
157 |
- wrent(entSys, 5); |
158 |
- wrent(entDbg, 6); |
159 |
- } |
160 |
-+ |
161 |
-+#ifdef CONFIG_ALPHA_UAC_SYSCTL |
162 |
-+ __initcall(init_uac_sysctl); |
163 |
-+#endif |
164 |
-Index: linux-2.6.26-gentoo/kernel/sysctl.c |
165 |
-=================================================================== |
166 |
---- a/kernel/sysctl.c 2010-03-15 14:22:31.000000000 -0400 |
167 |
-+++ b/kernel/sysctl.c 2010-03-15 14:34:52.000000000 -0400 |
168 |
-@@ -239,6 +239,14 @@ static struct ctl_table root_table[] = { |
169 |
- { } |
170 |
- }; |
171 |
- |
172 |
-+#ifdef CONFIG_ALPHA_UAC_SYSCTL |
173 |
-+ { |
174 |
-+ .procname = "uac", |
175 |
-+ .mode = 0555, |
176 |
-+ .child = uac_table, |
177 |
-+ }, |
178 |
-+#endif /* CONFIG_ALPHA_UAC_SYSCTL */ |
179 |
-+ |
180 |
- #ifdef CONFIG_SCHED_DEBUG |
181 |
- static int min_sched_granularity_ns = 100000; /* 100 usecs */ |
182 |
- static int max_sched_granularity_ns = NSEC_PER_SEC; /* 1 second */ |