Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a7b12929be6cc55eab2dac3330fa9f5984e12dda

Authored by Rabin Vincent
Committed by Greg Kroah-Hartman
1 parent ed85c60457
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

vt: fix race in vt_waitactive() 

pm_restore_console() is called from the suspend/resume path, and this
calls vt_move_to_console(), which calls vt_waitactive().

There's a race in this path which causes the process which requests the
suspend to sleep indefinitely waiting for an event which already
happened:

P1                                      P2
 vt_move_to_console()
  set_console()
    schedule_console_callback()
  vt_waitactive()
    check n == fg_console +1
                                       console_callback()
                                         switch_screen()
                                         vt_event_post() // no waiters

    vt_event_wait() // forever

Fix the race by ensuring we're registered for the event before we check
if it's already completed.

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 34 additions and 13 deletions Inline Diff

drivers/tty/vt/vt_ioctl.c
Diff comments   View file @ a7b1292
1 /* 1 /*
2 * Copyright (C) 1992 obz under the linux copyright 2 * Copyright (C) 1992 obz under the linux copyright
3 * 3 *
4 * Dynamic diacritical handling - aeb@cwi.nl - Dec 1993 4 * Dynamic diacritical handling - aeb@cwi.nl - Dec 1993
5 * Dynamic keymap and string allocation - aeb@cwi.nl - May 1994 5 * Dynamic keymap and string allocation - aeb@cwi.nl - May 1994
6 * Restrict VT switching via ioctl() - grif@cs.ucr.edu - Dec 1995 6 * Restrict VT switching via ioctl() - grif@cs.ucr.edu - Dec 1995
7 * Some code moved for less code duplication - Andi Kleen - Mar 1997 7 * Some code moved for less code duplication - Andi Kleen - Mar 1997
8 * Check put/get_user, cleanups - acme@conectiva.com.br - Jun 2001 8 * Check put/get_user, cleanups - acme@conectiva.com.br - Jun 2001
9 */ 9 */
10 10
11 #include <linux/types.h> 11 #include <linux/types.h>
12 #include <linux/errno.h> 12 #include <linux/errno.h>
13 #include <linux/sched.h> 13 #include <linux/sched.h>
14 #include <linux/tty.h> 14 #include <linux/tty.h>
15 #include <linux/timer.h> 15 #include <linux/timer.h>
16 #include <linux/kernel.h> 16 #include <linux/kernel.h>
17 #include <linux/compat.h> 17 #include <linux/compat.h>
18 #include <linux/module.h> 18 #include <linux/module.h>
19 #include <linux/kd.h> 19 #include <linux/kd.h>
20 #include <linux/vt.h> 20 #include <linux/vt.h>
21 #include <linux/string.h> 21 #include <linux/string.h>
22 #include <linux/slab.h> 22 #include <linux/slab.h>
23 #include <linux/major.h> 23 #include <linux/major.h>
24 #include <linux/fs.h> 24 #include <linux/fs.h>
25 #include <linux/console.h> 25 #include <linux/console.h>
26 #include <linux/consolemap.h> 26 #include <linux/consolemap.h>
27 #include <linux/signal.h> 27 #include <linux/signal.h>
28 #include <linux/timex.h> 28 #include <linux/timex.h>
29 29
30 #include <asm/io.h> 30 #include <asm/io.h>
31 #include <asm/uaccess.h> 31 #include <asm/uaccess.h>
32 32
33 #include <linux/kbd_kern.h> 33 #include <linux/kbd_kern.h>
34 #include <linux/vt_kern.h> 34 #include <linux/vt_kern.h>
35 #include <linux/kbd_diacr.h> 35 #include <linux/kbd_diacr.h>
36 #include <linux/selection.h> 36 #include <linux/selection.h>
37 37
38 char vt_dont_switch; 38 char vt_dont_switch;
39 extern struct tty_driver *console_driver; 39 extern struct tty_driver *console_driver;
40 40
41 #define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count) 41 #define VT_IS_IN_USE(i) (console_driver->ttys[i] && console_driver->ttys[i]->count)
42 #define VT_BUSY(i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons) 42 #define VT_BUSY(i) (VT_IS_IN_USE(i) || i == fg_console || vc_cons[i].d == sel_cons)
43 43
44 /* 44 /*
45 * Console (vt and kd) routines, as defined by USL SVR4 manual, and by 45 * Console (vt and kd) routines, as defined by USL SVR4 manual, and by
46 * experimentation and study of X386 SYSV handling. 46 * experimentation and study of X386 SYSV handling.
47 * 47 *
48 * One point of difference: SYSV vt's are /dev/vtX, which X >= 0, and 48 * One point of difference: SYSV vt's are /dev/vtX, which X >= 0, and
49 * /dev/console is a separate ttyp. Under Linux, /dev/tty0 is /dev/console, 49 * /dev/console is a separate ttyp. Under Linux, /dev/tty0 is /dev/console,
50 * and the vc start at /dev/ttyX, X >= 1. We maintain that here, so we will 50 * and the vc start at /dev/ttyX, X >= 1. We maintain that here, so we will
51 * always treat our set of vt as numbered 1..MAX_NR_CONSOLES (corresponding to 51 * always treat our set of vt as numbered 1..MAX_NR_CONSOLES (corresponding to
52 * ttys 0..MAX_NR_CONSOLES-1). Explicitly naming VT 0 is illegal, but using 52 * ttys 0..MAX_NR_CONSOLES-1). Explicitly naming VT 0 is illegal, but using
53 * /dev/tty0 (fg_console) as a target is legal, since an implicit aliasing 53 * /dev/tty0 (fg_console) as a target is legal, since an implicit aliasing
54 * to the current console is done by the main ioctl code. 54 * to the current console is done by the main ioctl code.
55 */ 55 */
56 56
57 #ifdef CONFIG_X86 57 #ifdef CONFIG_X86
58 #include <linux/syscalls.h> 58 #include <linux/syscalls.h>
59 #endif 59 #endif
60 60
61 static void complete_change_console(struct vc_data *vc); 61 static void complete_change_console(struct vc_data *vc);
62 62
63 /* 63 /*
64 * User space VT_EVENT handlers 64 * User space VT_EVENT handlers
65 */ 65 */
66 66
67 struct vt_event_wait { 67 struct vt_event_wait {
68 struct list_head list; 68 struct list_head list;
69 struct vt_event event; 69 struct vt_event event;
70 int done; 70 int done;
71 }; 71 };
72 72
73 static LIST_HEAD(vt_events); 73 static LIST_HEAD(vt_events);
74 static DEFINE_SPINLOCK(vt_event_lock); 74 static DEFINE_SPINLOCK(vt_event_lock);
75 static DECLARE_WAIT_QUEUE_HEAD(vt_event_waitqueue); 75 static DECLARE_WAIT_QUEUE_HEAD(vt_event_waitqueue);
76 76
77 /** 77 /**
78 * vt_event_post 78 * vt_event_post
79 * @event: the event that occurred 79 * @event: the event that occurred
80 * @old: old console 80 * @old: old console
81 * @new: new console 81 * @new: new console
82 * 82 *
83 * Post an VT event to interested VT handlers 83 * Post an VT event to interested VT handlers
84 */ 84 */
85 85
86 void vt_event_post(unsigned int event, unsigned int old, unsigned int new) 86 void vt_event_post(unsigned int event, unsigned int old, unsigned int new)
87 { 87 {
88 struct list_head *pos, *head; 88 struct list_head *pos, *head;
89 unsigned long flags; 89 unsigned long flags;
90 int wake = 0; 90 int wake = 0;
91 91
92 spin_lock_irqsave(&vt_event_lock, flags); 92 spin_lock_irqsave(&vt_event_lock, flags);
93 head = &vt_events; 93 head = &vt_events;
94 94
95 list_for_each(pos, head) { 95 list_for_each(pos, head) {
96 struct vt_event_wait *ve = list_entry(pos, 96 struct vt_event_wait *ve = list_entry(pos,
97 struct vt_event_wait, list); 97 struct vt_event_wait, list);
98 if (!(ve->event.event & event)) 98 if (!(ve->event.event & event))
99 continue; 99 continue;
100 ve->event.event = event; 100 ve->event.event = event;
101 /* kernel view is consoles 0..n-1, user space view is 101 /* kernel view is consoles 0..n-1, user space view is
102 console 1..n with 0 meaning current, so we must bias */ 102 console 1..n with 0 meaning current, so we must bias */
103 ve->event.oldev = old + 1; 103 ve->event.oldev = old + 1;
104 ve->event.newev = new + 1; 104 ve->event.newev = new + 1;
105 wake = 1; 105 wake = 1;
106 ve->done = 1; 106 ve->done = 1;
107 } 107 }
108 spin_unlock_irqrestore(&vt_event_lock, flags); 108 spin_unlock_irqrestore(&vt_event_lock, flags);
109 if (wake) 109 if (wake)
110 wake_up_interruptible(&vt_event_waitqueue); 110 wake_up_interruptible(&vt_event_waitqueue);
111 } 111 }
112 112
113 /** 113 static void __vt_event_queue(struct vt_event_wait *vw)
114 * vt_event_wait - wait for an event
115 * @vw: our event
116 *
117 * Waits for an event to occur which completes our vt_event_wait
118 * structure. On return the structure has wv->done set to 1 for success
119 * or 0 if some event such as a signal ended the wait.
120 */
121
122 static void vt_event_wait(struct vt_event_wait *vw)
123 { 114 {
124 unsigned long flags; 115 unsigned long flags;
125 /* Prepare the event */ 116 /* Prepare the event */
126 INIT_LIST_HEAD(&vw->list); 117 INIT_LIST_HEAD(&vw->list);
127 vw->done = 0; 118 vw->done = 0;
128 /* Queue our event */ 119 /* Queue our event */
129 spin_lock_irqsave(&vt_event_lock, flags); 120 spin_lock_irqsave(&vt_event_lock, flags);
130 list_add(&vw->list, &vt_events); 121 list_add(&vw->list, &vt_events);
131 spin_unlock_irqrestore(&vt_event_lock, flags); 122 spin_unlock_irqrestore(&vt_event_lock, flags);
123 }
124
125 static void __vt_event_wait(struct vt_event_wait *vw)
126 {
132 /* Wait for it to pass */ 127 /* Wait for it to pass */
133 wait_event_interruptible(vt_event_waitqueue, vw->done); 128 wait_event_interruptible(vt_event_waitqueue, vw->done);
129 }
130
131 static void __vt_event_dequeue(struct vt_event_wait *vw)
132 {
133 unsigned long flags;
134
134 /* Dequeue it */ 135 /* Dequeue it */
135 spin_lock_irqsave(&vt_event_lock, flags); 136 spin_lock_irqsave(&vt_event_lock, flags);
136 list_del(&vw->list); 137 list_del(&vw->list);
137 spin_unlock_irqrestore(&vt_event_lock, flags); 138 spin_unlock_irqrestore(&vt_event_lock, flags);
138 } 139 }
139 140
140 /** 141 /**
142 * vt_event_wait - wait for an event
143 * @vw: our event
144 *
145 * Waits for an event to occur which completes our vt_event_wait
146 * structure. On return the structure has wv->done set to 1 for success
147 * or 0 if some event such as a signal ended the wait.
148 */
149
150 static void vt_event_wait(struct vt_event_wait *vw)
151 {
152 __vt_event_queue(vw);
153 __vt_event_wait(vw);
154 __vt_event_dequeue(vw);
155 }
156
157 /**
141 * vt_event_wait_ioctl - event ioctl handler 158 * vt_event_wait_ioctl - event ioctl handler
142 * @arg: argument to ioctl 159 * @arg: argument to ioctl
143 * 160 *
144 * Implement the VT_WAITEVENT ioctl using the VT event interface 161 * Implement the VT_WAITEVENT ioctl using the VT event interface
145 */ 162 */
146 163
147 static int vt_event_wait_ioctl(struct vt_event __user *event) 164 static int vt_event_wait_ioctl(struct vt_event __user *event)
148 { 165 {
149 struct vt_event_wait vw; 166 struct vt_event_wait vw;
150 167
151 if (copy_from_user(&vw.event, event, sizeof(struct vt_event))) 168 if (copy_from_user(&vw.event, event, sizeof(struct vt_event)))
152 return -EFAULT; 169 return -EFAULT;
153 /* Highest supported event for now */ 170 /* Highest supported event for now */
154 if (vw.event.event & ~VT_MAX_EVENT) 171 if (vw.event.event & ~VT_MAX_EVENT)
155 return -EINVAL; 172 return -EINVAL;
156 173
157 vt_event_wait(&vw); 174 vt_event_wait(&vw);
158 /* If it occurred report it */ 175 /* If it occurred report it */
159 if (vw.done) { 176 if (vw.done) {
160 if (copy_to_user(event, &vw.event, sizeof(struct vt_event))) 177 if (copy_to_user(event, &vw.event, sizeof(struct vt_event)))
161 return -EFAULT; 178 return -EFAULT;
162 return 0; 179 return 0;
163 } 180 }
164 return -EINTR; 181 return -EINTR;
165 } 182 }
166 183
167 /** 184 /**
168 * vt_waitactive - active console wait 185 * vt_waitactive - active console wait
169 * @event: event code 186 * @event: event code
170 * @n: new console 187 * @n: new console
171 * 188 *
172 * Helper for event waits. Used to implement the legacy 189 * Helper for event waits. Used to implement the legacy
173 * event waiting ioctls in terms of events 190 * event waiting ioctls in terms of events
174 */ 191 */
175 192
176 int vt_waitactive(int n) 193 int vt_waitactive(int n)
177 { 194 {
178 struct vt_event_wait vw; 195 struct vt_event_wait vw;
179 do { 196 do {
180 if (n == fg_console + 1)
181 break;
182 vw.event.event = VT_EVENT_SWITCH; 197 vw.event.event = VT_EVENT_SWITCH;
183 vt_event_wait(&vw); 198 __vt_event_queue(&vw);
199 if (n == fg_console + 1) {
200 __vt_event_dequeue(&vw);
201 break;
202 }
203 __vt_event_wait(&vw);
204 __vt_event_dequeue(&vw);
184 if (vw.done == 0) 205 if (vw.done == 0)
185 return -EINTR; 206 return -EINTR;
186 } while (vw.event.newev != n); 207 } while (vw.event.newev != n);
187 return 0; 208 return 0;
188 } 209 }
189 210
190 /* 211 /*
191 * these are the valid i/o ports we're allowed to change. they map all the 212 * these are the valid i/o ports we're allowed to change. they map all the
192 * video ports 213 * video ports
193 */ 214 */
194 #define GPFIRST 0x3b4 215 #define GPFIRST 0x3b4
195 #define GPLAST 0x3df 216 #define GPLAST 0x3df
196 #define GPNUM (GPLAST - GPFIRST + 1) 217 #define GPNUM (GPLAST - GPFIRST + 1)
197 218
198 219
199 220
200 static inline int 221 static inline int
201 do_fontx_ioctl(int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op) 222 do_fontx_ioctl(int cmd, struct consolefontdesc __user *user_cfd, int perm, struct console_font_op *op)
202 { 223 {
203 struct consolefontdesc cfdarg; 224 struct consolefontdesc cfdarg;
204 int i; 225 int i;
205 226
206 if (copy_from_user(&cfdarg, user_cfd, sizeof(struct consolefontdesc))) 227 if (copy_from_user(&cfdarg, user_cfd, sizeof(struct consolefontdesc)))
207 return -EFAULT; 228 return -EFAULT;
208 229
209 switch (cmd) { 230 switch (cmd) {
210 case PIO_FONTX: 231 case PIO_FONTX:
211 if (!perm) 232 if (!perm)
212 return -EPERM; 233 return -EPERM;
213 op->op = KD_FONT_OP_SET; 234 op->op = KD_FONT_OP_SET;
214 op->flags = KD_FONT_FLAG_OLD; 235 op->flags = KD_FONT_FLAG_OLD;
215 op->width = 8; 236 op->width = 8;
216 op->height = cfdarg.charheight; 237 op->height = cfdarg.charheight;
217 op->charcount = cfdarg.charcount; 238 op->charcount = cfdarg.charcount;
218 op->data = cfdarg.chardata; 239 op->data = cfdarg.chardata;
219 return con_font_op(vc_cons[fg_console].d, op); 240 return con_font_op(vc_cons[fg_console].d, op);
220 case GIO_FONTX: { 241 case GIO_FONTX: {
221 op->op = KD_FONT_OP_GET; 242 op->op = KD_FONT_OP_GET;
222 op->flags = KD_FONT_FLAG_OLD; 243 op->flags = KD_FONT_FLAG_OLD;
223 op->width = 8; 244 op->width = 8;
224 op->height = cfdarg.charheight; 245 op->height = cfdarg.charheight;
225 op->charcount = cfdarg.charcount; 246 op->charcount = cfdarg.charcount;
226 op->data = cfdarg.chardata; 247 op->data = cfdarg.chardata;
227 i = con_font_op(vc_cons[fg_console].d, op); 248 i = con_font_op(vc_cons[fg_console].d, op);
228 if (i) 249 if (i)
229 return i; 250 return i;
230 cfdarg.charheight = op->height; 251 cfdarg.charheight = op->height;
231 cfdarg.charcount = op->charcount; 252 cfdarg.charcount = op->charcount;
232 if (copy_to_user(user_cfd, &cfdarg, sizeof(struct consolefontdesc))) 253 if (copy_to_user(user_cfd, &cfdarg, sizeof(struct consolefontdesc)))
233 return -EFAULT; 254 return -EFAULT;
234 return 0; 255 return 0;
235 } 256 }
236 } 257 }
237 return -EINVAL; 258 return -EINVAL;
238 } 259 }
239 260
240 static inline int 261 static inline int
241 do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_data *vc) 262 do_unimap_ioctl(int cmd, struct unimapdesc __user *user_ud, int perm, struct vc_data *vc)
242 { 263 {
243 struct unimapdesc tmp; 264 struct unimapdesc tmp;
244 265
245 if (copy_from_user(&tmp, user_ud, sizeof tmp)) 266 if (copy_from_user(&tmp, user_ud, sizeof tmp))
246 return -EFAULT; 267 return -EFAULT;
247 if (tmp.entries) 268 if (tmp.entries)
248 if (!access_ok(VERIFY_WRITE, tmp.entries, 269 if (!access_ok(VERIFY_WRITE, tmp.entries,
249 tmp.entry_ct*sizeof(struct unipair))) 270 tmp.entry_ct*sizeof(struct unipair)))
250 return -EFAULT; 271 return -EFAULT;
251 switch (cmd) { 272 switch (cmd) {
252 case PIO_UNIMAP: 273 case PIO_UNIMAP:
253 if (!perm) 274 if (!perm)
254 return -EPERM; 275 return -EPERM;
255 return con_set_unimap(vc, tmp.entry_ct, tmp.entries); 276 return con_set_unimap(vc, tmp.entry_ct, tmp.entries);
256 case GIO_UNIMAP: 277 case GIO_UNIMAP:
257 if (!perm && fg_console != vc->vc_num) 278 if (!perm && fg_console != vc->vc_num)
258 return -EPERM; 279 return -EPERM;
259 return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp.entries); 280 return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp.entries);
260 } 281 }
261 return 0; 282 return 0;
262 } 283 }
263 284
264 285
265 286
266 /* 287 /*
267 * We handle the console-specific ioctl's here. We allow the 288 * We handle the console-specific ioctl's here. We allow the
268 * capability to modify any console, not just the fg_console. 289 * capability to modify any console, not just the fg_console.
269 */ 290 */
270 int vt_ioctl(struct tty_struct *tty, 291 int vt_ioctl(struct tty_struct *tty,
271 unsigned int cmd, unsigned long arg) 292 unsigned int cmd, unsigned long arg)
272 { 293 {
273 struct vc_data *vc = tty->driver_data; 294 struct vc_data *vc = tty->driver_data;
274 struct console_font_op op; /* used in multiple places here */ 295 struct console_font_op op; /* used in multiple places here */
275 unsigned int console; 296 unsigned int console;
276 unsigned char ucval; 297 unsigned char ucval;
277 unsigned int uival; 298 unsigned int uival;
278 void __user *up = (void __user *)arg; 299 void __user *up = (void __user *)arg;
279 int i, perm; 300 int i, perm;
280 int ret = 0; 301 int ret = 0;
281 302
282 console = vc->vc_num; 303 console = vc->vc_num;
283 304
284 305
285 if (!vc_cons_allocated(console)) { /* impossible? */ 306 if (!vc_cons_allocated(console)) { /* impossible? */
286 ret = -ENOIOCTLCMD; 307 ret = -ENOIOCTLCMD;
287 goto out; 308 goto out;
288 } 309 }
289 310
290 311
291 /* 312 /*
292 * To have permissions to do most of the vt ioctls, we either have 313 * To have permissions to do most of the vt ioctls, we either have
293 * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG. 314 * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
294 */ 315 */
295 perm = 0; 316 perm = 0;
296 if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG)) 317 if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
297 perm = 1; 318 perm = 1;
298 319
299 switch (cmd) { 320 switch (cmd) {
300 case TIOCLINUX: 321 case TIOCLINUX:
301 ret = tioclinux(tty, arg); 322 ret = tioclinux(tty, arg);
302 break; 323 break;
303 case KIOCSOUND: 324 case KIOCSOUND:
304 if (!perm) 325 if (!perm)
305 return -EPERM; 326 return -EPERM;
306 /* 327 /*
307 * The use of PIT_TICK_RATE is historic, it used to be 328 * The use of PIT_TICK_RATE is historic, it used to be
308 * the platform-dependent CLOCK_TICK_RATE between 2.6.12 329 * the platform-dependent CLOCK_TICK_RATE between 2.6.12
309 * and 2.6.36, which was a minor but unfortunate ABI 330 * and 2.6.36, which was a minor but unfortunate ABI
310 * change. kd_mksound is locked by the input layer. 331 * change. kd_mksound is locked by the input layer.
311 */ 332 */
312 if (arg) 333 if (arg)
313 arg = PIT_TICK_RATE / arg; 334 arg = PIT_TICK_RATE / arg;
314 kd_mksound(arg, 0); 335 kd_mksound(arg, 0);
315 break; 336 break;
316 337
317 case KDMKTONE: 338 case KDMKTONE:
318 if (!perm) 339 if (!perm)
319 return -EPERM; 340 return -EPERM;
320 { 341 {
321 unsigned int ticks, count; 342 unsigned int ticks, count;
322 343
323 /* 344 /*
324 * Generate the tone for the appropriate number of ticks. 345 * Generate the tone for the appropriate number of ticks.
325 * If the time is zero, turn off sound ourselves. 346 * If the time is zero, turn off sound ourselves.
326 */ 347 */
327 ticks = HZ * ((arg >> 16) & 0xffff) / 1000; 348 ticks = HZ * ((arg >> 16) & 0xffff) / 1000;
328 count = ticks ? (arg & 0xffff) : 0; 349 count = ticks ? (arg & 0xffff) : 0;
329 if (count) 350 if (count)
330 count = PIT_TICK_RATE / count; 351 count = PIT_TICK_RATE / count;
331 kd_mksound(count, ticks); 352 kd_mksound(count, ticks);
332 break; 353 break;
333 } 354 }
334 355
335 case KDGKBTYPE: 356 case KDGKBTYPE:
336 /* 357 /*
337 * this is naรฏve. 358 * this is naรฏve.
338 */ 359 */
339 ucval = KB_101; 360 ucval = KB_101;
340 ret = put_user(ucval, (char __user *)arg); 361 ret = put_user(ucval, (char __user *)arg);
341 break; 362 break;
342 363
343 /* 364 /*
344 * These cannot be implemented on any machine that implements 365 * These cannot be implemented on any machine that implements
345 * ioperm() in user level (such as Alpha PCs) or not at all. 366 * ioperm() in user level (such as Alpha PCs) or not at all.
346 * 367 *
347 * XXX: you should never use these, just call ioperm directly.. 368 * XXX: you should never use these, just call ioperm directly..
348 */ 369 */
349 #ifdef CONFIG_X86 370 #ifdef CONFIG_X86
350 case KDADDIO: 371 case KDADDIO:
351 case KDDELIO: 372 case KDDELIO:
352 /* 373 /*
353 * KDADDIO and KDDELIO may be able to add ports beyond what 374 * KDADDIO and KDDELIO may be able to add ports beyond what
354 * we reject here, but to be safe... 375 * we reject here, but to be safe...
355 * 376 *
356 * These are locked internally via sys_ioperm 377 * These are locked internally via sys_ioperm
357 */ 378 */
358 if (arg < GPFIRST || arg > GPLAST) { 379 if (arg < GPFIRST || arg > GPLAST) {
359 ret = -EINVAL; 380 ret = -EINVAL;
360 break; 381 break;
361 } 382 }
362 ret = sys_ioperm(arg, 1, (cmd == KDADDIO)) ? -ENXIO : 0; 383 ret = sys_ioperm(arg, 1, (cmd == KDADDIO)) ? -ENXIO : 0;
363 break; 384 break;
364 385
365 case KDENABIO: 386 case KDENABIO:
366 case KDDISABIO: 387 case KDDISABIO:
367 ret = sys_ioperm(GPFIRST, GPNUM, 388 ret = sys_ioperm(GPFIRST, GPNUM,
368 (cmd == KDENABIO)) ? -ENXIO : 0; 389 (cmd == KDENABIO)) ? -ENXIO : 0;
369 break; 390 break;
370 #endif 391 #endif
371 392
372 /* Linux m68k/i386 interface for setting the keyboard delay/repeat rate */ 393 /* Linux m68k/i386 interface for setting the keyboard delay/repeat rate */
373 394
374 case KDKBDREP: 395 case KDKBDREP:
375 { 396 {
376 struct kbd_repeat kbrep; 397 struct kbd_repeat kbrep;
377 398
378 if (!capable(CAP_SYS_TTY_CONFIG)) 399 if (!capable(CAP_SYS_TTY_CONFIG))
379 return -EPERM; 400 return -EPERM;
380 401
381 if (copy_from_user(&kbrep, up, sizeof(struct kbd_repeat))) { 402 if (copy_from_user(&kbrep, up, sizeof(struct kbd_repeat))) {
382 ret = -EFAULT; 403 ret = -EFAULT;
383 break; 404 break;
384 } 405 }
385 ret = kbd_rate(&kbrep); 406 ret = kbd_rate(&kbrep);
386 if (ret) 407 if (ret)
387 break; 408 break;
388 if (copy_to_user(up, &kbrep, sizeof(struct kbd_repeat))) 409 if (copy_to_user(up, &kbrep, sizeof(struct kbd_repeat)))
389 ret = -EFAULT; 410 ret = -EFAULT;
390 break; 411 break;
391 } 412 }
392 413
393 case KDSETMODE: 414 case KDSETMODE:
394 /* 415 /*
395 * currently, setting the mode from KD_TEXT to KD_GRAPHICS 416 * currently, setting the mode from KD_TEXT to KD_GRAPHICS
396 * doesn't do a whole lot. i'm not sure if it should do any 417 * doesn't do a whole lot. i'm not sure if it should do any
397 * restoration of modes or what... 418 * restoration of modes or what...
398 * 419 *
399 * XXX It should at least call into the driver, fbdev's definitely 420 * XXX It should at least call into the driver, fbdev's definitely
400 * need to restore their engine state. --BenH 421 * need to restore their engine state. --BenH
401 */ 422 */
402 if (!perm) 423 if (!perm)
403 return -EPERM; 424 return -EPERM;
404 switch (arg) { 425 switch (arg) {
405 case KD_GRAPHICS: 426 case KD_GRAPHICS:
406 break; 427 break;
407 case KD_TEXT0: 428 case KD_TEXT0:
408 case KD_TEXT1: 429 case KD_TEXT1:
409 arg = KD_TEXT; 430 arg = KD_TEXT;
410 case KD_TEXT: 431 case KD_TEXT:
411 break; 432 break;
412 default: 433 default:
413 ret = -EINVAL; 434 ret = -EINVAL;
414 goto out; 435 goto out;
415 } 436 }
416 /* FIXME: this needs the console lock extending */ 437 /* FIXME: this needs the console lock extending */
417 if (vc->vc_mode == (unsigned char) arg) 438 if (vc->vc_mode == (unsigned char) arg)
418 break; 439 break;
419 vc->vc_mode = (unsigned char) arg; 440 vc->vc_mode = (unsigned char) arg;
420 if (console != fg_console) 441 if (console != fg_console)
421 break; 442 break;
422 /* 443 /*
423 * explicitly blank/unblank the screen if switching modes 444 * explicitly blank/unblank the screen if switching modes
424 */ 445 */
425 console_lock(); 446 console_lock();
426 if (arg == KD_TEXT) 447 if (arg == KD_TEXT)
427 do_unblank_screen(1); 448 do_unblank_screen(1);
428 else 449 else
429 do_blank_screen(1); 450 do_blank_screen(1);
430 console_unlock(); 451 console_unlock();
431 break; 452 break;
432 453
433 case KDGETMODE: 454 case KDGETMODE:
434 uival = vc->vc_mode; 455 uival = vc->vc_mode;
435 goto setint; 456 goto setint;
436 457
437 case KDMAPDISP: 458 case KDMAPDISP:
438 case KDUNMAPDISP: 459 case KDUNMAPDISP:
439 /* 460 /*
440 * these work like a combination of mmap and KDENABIO. 461 * these work like a combination of mmap and KDENABIO.
441 * this could be easily finished. 462 * this could be easily finished.
442 */ 463 */
443 ret = -EINVAL; 464 ret = -EINVAL;
444 break; 465 break;
445 466
446 case KDSKBMODE: 467 case KDSKBMODE:
447 if (!perm) 468 if (!perm)
448 return -EPERM; 469 return -EPERM;
449 ret = vt_do_kdskbmode(console, arg); 470 ret = vt_do_kdskbmode(console, arg);
450 if (ret == 0) 471 if (ret == 0)
451 tty_ldisc_flush(tty); 472 tty_ldisc_flush(tty);
452 break; 473 break;
453 474
454 case KDGKBMODE: 475 case KDGKBMODE:
455 uival = vt_do_kdgkbmode(console); 476 uival = vt_do_kdgkbmode(console);
456 ret = put_user(uival, (int __user *)arg); 477 ret = put_user(uival, (int __user *)arg);
457 break; 478 break;
458 479
459 /* this could be folded into KDSKBMODE, but for compatibility 480 /* this could be folded into KDSKBMODE, but for compatibility
460 reasons it is not so easy to fold KDGKBMETA into KDGKBMODE */ 481 reasons it is not so easy to fold KDGKBMETA into KDGKBMODE */
461 case KDSKBMETA: 482 case KDSKBMETA:
462 ret = vt_do_kdskbmeta(console, arg); 483 ret = vt_do_kdskbmeta(console, arg);
463 break; 484 break;
464 485
465 case KDGKBMETA: 486 case KDGKBMETA:
466 /* FIXME: should review whether this is worth locking */ 487 /* FIXME: should review whether this is worth locking */
467 uival = vt_do_kdgkbmeta(console); 488 uival = vt_do_kdgkbmeta(console);
468 setint: 489 setint:
469 ret = put_user(uival, (int __user *)arg); 490 ret = put_user(uival, (int __user *)arg);
470 break; 491 break;
471 492
472 case KDGETKEYCODE: 493 case KDGETKEYCODE:
473 case KDSETKEYCODE: 494 case KDSETKEYCODE:
474 if(!capable(CAP_SYS_TTY_CONFIG)) 495 if(!capable(CAP_SYS_TTY_CONFIG))
475 perm = 0; 496 perm = 0;
476 ret = vt_do_kbkeycode_ioctl(cmd, up, perm); 497 ret = vt_do_kbkeycode_ioctl(cmd, up, perm);
477 break; 498 break;
478 499
479 case KDGKBENT: 500 case KDGKBENT:
480 case KDSKBENT: 501 case KDSKBENT:
481 ret = vt_do_kdsk_ioctl(cmd, up, perm, console); 502 ret = vt_do_kdsk_ioctl(cmd, up, perm, console);
482 break; 503 break;
483 504
484 case KDGKBSENT: 505 case KDGKBSENT:
485 case KDSKBSENT: 506 case KDSKBSENT:
486 ret = vt_do_kdgkb_ioctl(cmd, up, perm); 507 ret = vt_do_kdgkb_ioctl(cmd, up, perm);
487 break; 508 break;
488 509
489 /* Diacritical processing. Handled in keyboard.c as it has 510 /* Diacritical processing. Handled in keyboard.c as it has
490 to operate on the keyboard locks and structures */ 511 to operate on the keyboard locks and structures */
491 case KDGKBDIACR: 512 case KDGKBDIACR:
492 case KDGKBDIACRUC: 513 case KDGKBDIACRUC:
493 case KDSKBDIACR: 514 case KDSKBDIACR:
494 case KDSKBDIACRUC: 515 case KDSKBDIACRUC:
495 ret = vt_do_diacrit(cmd, up, perm); 516 ret = vt_do_diacrit(cmd, up, perm);
496 break; 517 break;
497 518
498 /* the ioctls below read/set the flags usually shown in the leds */ 519 /* the ioctls below read/set the flags usually shown in the leds */
499 /* don't use them - they will go away without warning */ 520 /* don't use them - they will go away without warning */
500 case KDGKBLED: 521 case KDGKBLED:
501 case KDSKBLED: 522 case KDSKBLED:
502 case KDGETLED: 523 case KDGETLED:
503 case KDSETLED: 524 case KDSETLED:
504 ret = vt_do_kdskled(console, cmd, arg, perm); 525 ret = vt_do_kdskled(console, cmd, arg, perm);
505 break; 526 break;
506 527
507 /* 528 /*
508 * A process can indicate its willingness to accept signals 529 * A process can indicate its willingness to accept signals
509 * generated by pressing an appropriate key combination. 530 * generated by pressing an appropriate key combination.
510 * Thus, one can have a daemon that e.g. spawns a new console 531 * Thus, one can have a daemon that e.g. spawns a new console
511 * upon a keypress and then changes to it. 532 * upon a keypress and then changes to it.
512 * See also the kbrequest field of inittab(5). 533 * See also the kbrequest field of inittab(5).
513 */ 534 */
514 case KDSIGACCEPT: 535 case KDSIGACCEPT:
515 { 536 {
516 if (!perm || !capable(CAP_KILL)) 537 if (!perm || !capable(CAP_KILL))
517 return -EPERM; 538 return -EPERM;
518 if (!valid_signal(arg) || arg < 1 || arg == SIGKILL) 539 if (!valid_signal(arg) || arg < 1 || arg == SIGKILL)
519 ret = -EINVAL; 540 ret = -EINVAL;
520 else { 541 else {
521 spin_lock_irq(&vt_spawn_con.lock); 542 spin_lock_irq(&vt_spawn_con.lock);
522 put_pid(vt_spawn_con.pid); 543 put_pid(vt_spawn_con.pid);
523 vt_spawn_con.pid = get_pid(task_pid(current)); 544 vt_spawn_con.pid = get_pid(task_pid(current));
524 vt_spawn_con.sig = arg; 545 vt_spawn_con.sig = arg;
525 spin_unlock_irq(&vt_spawn_con.lock); 546 spin_unlock_irq(&vt_spawn_con.lock);
526 } 547 }
527 break; 548 break;
528 } 549 }
529 550
530 case VT_SETMODE: 551 case VT_SETMODE:
531 { 552 {
532 struct vt_mode tmp; 553 struct vt_mode tmp;
533 554
534 if (!perm) 555 if (!perm)
535 return -EPERM; 556 return -EPERM;
536 if (copy_from_user(&tmp, up, sizeof(struct vt_mode))) { 557 if (copy_from_user(&tmp, up, sizeof(struct vt_mode))) {
537 ret = -EFAULT; 558 ret = -EFAULT;
538 goto out; 559 goto out;
539 } 560 }
540 if (tmp.mode != VT_AUTO && tmp.mode != VT_PROCESS) { 561 if (tmp.mode != VT_AUTO && tmp.mode != VT_PROCESS) {
541 ret = -EINVAL; 562 ret = -EINVAL;
542 goto out; 563 goto out;
543 } 564 }
544 console_lock(); 565 console_lock();
545 vc->vt_mode = tmp; 566 vc->vt_mode = tmp;
546 /* the frsig is ignored, so we set it to 0 */ 567 /* the frsig is ignored, so we set it to 0 */
547 vc->vt_mode.frsig = 0; 568 vc->vt_mode.frsig = 0;
548 put_pid(vc->vt_pid); 569 put_pid(vc->vt_pid);
549 vc->vt_pid = get_pid(task_pid(current)); 570 vc->vt_pid = get_pid(task_pid(current));
550 /* no switch is required -- saw@shade.msu.ru */ 571 /* no switch is required -- saw@shade.msu.ru */
551 vc->vt_newvt = -1; 572 vc->vt_newvt = -1;
552 console_unlock(); 573 console_unlock();
553 break; 574 break;
554 } 575 }
555 576
556 case VT_GETMODE: 577 case VT_GETMODE:
557 { 578 {
558 struct vt_mode tmp; 579 struct vt_mode tmp;
559 int rc; 580 int rc;
560 581
561 console_lock(); 582 console_lock();
562 memcpy(&tmp, &vc->vt_mode, sizeof(struct vt_mode)); 583 memcpy(&tmp, &vc->vt_mode, sizeof(struct vt_mode));
563 console_unlock(); 584 console_unlock();
564 585
565 rc = copy_to_user(up, &tmp, sizeof(struct vt_mode)); 586 rc = copy_to_user(up, &tmp, sizeof(struct vt_mode));
566 if (rc) 587 if (rc)
567 ret = -EFAULT; 588 ret = -EFAULT;
568 break; 589 break;
569 } 590 }
570 591
571 /* 592 /*
572 * Returns global vt state. Note that VT 0 is always open, since 593 * Returns global vt state. Note that VT 0 is always open, since
573 * it's an alias for the current VT, and people can't use it here. 594 * it's an alias for the current VT, and people can't use it here.
574 * We cannot return state for more than 16 VTs, since v_state is short. 595 * We cannot return state for more than 16 VTs, since v_state is short.
575 */ 596 */
576 case VT_GETSTATE: 597 case VT_GETSTATE:
577 { 598 {
578 struct vt_stat __user *vtstat = up; 599 struct vt_stat __user *vtstat = up;
579 unsigned short state, mask; 600 unsigned short state, mask;
580 601
581 /* Review: FIXME: Console lock ? */ 602 /* Review: FIXME: Console lock ? */
582 if (put_user(fg_console + 1, &vtstat->v_active)) 603 if (put_user(fg_console + 1, &vtstat->v_active))
583 ret = -EFAULT; 604 ret = -EFAULT;
584 else { 605 else {
585 state = 1; /* /dev/tty0 is always open */ 606 state = 1; /* /dev/tty0 is always open */
586 for (i = 0, mask = 2; i < MAX_NR_CONSOLES && mask; 607 for (i = 0, mask = 2; i < MAX_NR_CONSOLES && mask;
587 ++i, mask <<= 1) 608 ++i, mask <<= 1)
588 if (VT_IS_IN_USE(i)) 609 if (VT_IS_IN_USE(i))
589 state |= mask; 610 state |= mask;
590 ret = put_user(state, &vtstat->v_state); 611 ret = put_user(state, &vtstat->v_state);
591 } 612 }
592 break; 613 break;
593 } 614 }
594 615
595 /* 616 /*
596 * Returns the first available (non-opened) console. 617 * Returns the first available (non-opened) console.
597 */ 618 */
598 case VT_OPENQRY: 619 case VT_OPENQRY:
599 /* FIXME: locking ? - but then this is a stupid API */ 620 /* FIXME: locking ? - but then this is a stupid API */
600 for (i = 0; i < MAX_NR_CONSOLES; ++i) 621 for (i = 0; i < MAX_NR_CONSOLES; ++i)
601 if (! VT_IS_IN_USE(i)) 622 if (! VT_IS_IN_USE(i))
602 break; 623 break;
603 uival = i < MAX_NR_CONSOLES ? (i+1) : -1; 624 uival = i < MAX_NR_CONSOLES ? (i+1) : -1;
604 goto setint; 625 goto setint;
605 626
606 /* 627 /*
607 * ioctl(fd, VT_ACTIVATE, num) will cause us to switch to vt # num, 628 * ioctl(fd, VT_ACTIVATE, num) will cause us to switch to vt # num,
608 * with num >= 1 (switches to vt 0, our console, are not allowed, just 629 * with num >= 1 (switches to vt 0, our console, are not allowed, just
609 * to preserve sanity). 630 * to preserve sanity).
610 */ 631 */
611 case VT_ACTIVATE: 632 case VT_ACTIVATE:
612 if (!perm) 633 if (!perm)
613 return -EPERM; 634 return -EPERM;
614 if (arg == 0 || arg > MAX_NR_CONSOLES) 635 if (arg == 0 || arg > MAX_NR_CONSOLES)
615 ret = -ENXIO; 636 ret = -ENXIO;
616 else { 637 else {
617 arg--; 638 arg--;
618 console_lock(); 639 console_lock();
619 ret = vc_allocate(arg); 640 ret = vc_allocate(arg);
620 console_unlock(); 641 console_unlock();
621 if (ret) 642 if (ret)
622 break; 643 break;
623 set_console(arg); 644 set_console(arg);
624 } 645 }
625 break; 646 break;
626 647
627 case VT_SETACTIVATE: 648 case VT_SETACTIVATE:
628 { 649 {
629 struct vt_setactivate vsa; 650 struct vt_setactivate vsa;
630 651
631 if (!perm) 652 if (!perm)
632 return -EPERM; 653 return -EPERM;
633 654
634 if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg, 655 if (copy_from_user(&vsa, (struct vt_setactivate __user *)arg,
635 sizeof(struct vt_setactivate))) { 656 sizeof(struct vt_setactivate))) {
636 ret = -EFAULT; 657 ret = -EFAULT;
637 goto out; 658 goto out;
638 } 659 }
639 if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES) 660 if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
640 ret = -ENXIO; 661 ret = -ENXIO;
641 else { 662 else {
642 vsa.console--; 663 vsa.console--;
643 console_lock(); 664 console_lock();
644 ret = vc_allocate(vsa.console); 665 ret = vc_allocate(vsa.console);
645 if (ret == 0) { 666 if (ret == 0) {
646 struct vc_data *nvc; 667 struct vc_data *nvc;
647 /* This is safe providing we don't drop the 668 /* This is safe providing we don't drop the
648 console sem between vc_allocate and 669 console sem between vc_allocate and
649 finishing referencing nvc */ 670 finishing referencing nvc */
650 nvc = vc_cons[vsa.console].d; 671 nvc = vc_cons[vsa.console].d;
651 nvc->vt_mode = vsa.mode; 672 nvc->vt_mode = vsa.mode;
652 nvc->vt_mode.frsig = 0; 673 nvc->vt_mode.frsig = 0;
653 put_pid(nvc->vt_pid); 674 put_pid(nvc->vt_pid);
654 nvc->vt_pid = get_pid(task_pid(current)); 675 nvc->vt_pid = get_pid(task_pid(current));
655 } 676 }
656 console_unlock(); 677 console_unlock();
657 if (ret) 678 if (ret)
658 break; 679 break;
659 /* Commence switch and lock */ 680 /* Commence switch and lock */
660 /* Review set_console locks */ 681 /* Review set_console locks */
661 set_console(vsa.console); 682 set_console(vsa.console);
662 } 683 }
663 break; 684 break;
664 } 685 }
665 686
666 /* 687 /*
667 * wait until the specified VT has been activated 688 * wait until the specified VT has been activated
668 */ 689 */
669 case VT_WAITACTIVE: 690 case VT_WAITACTIVE:
670 if (!perm) 691 if (!perm)
671 return -EPERM; 692 return -EPERM;
672 if (arg == 0 || arg > MAX_NR_CONSOLES) 693 if (arg == 0 || arg > MAX_NR_CONSOLES)
673 ret = -ENXIO; 694 ret = -ENXIO;
674 else 695 else
675 ret = vt_waitactive(arg); 696 ret = vt_waitactive(arg);
676 break; 697 break;
677 698
678 /* 699 /*
679 * If a vt is under process control, the kernel will not switch to it 700 * If a vt is under process control, the kernel will not switch to it
680 * immediately, but postpone the operation until the process calls this 701 * immediately, but postpone the operation until the process calls this
681 * ioctl, allowing the switch to complete. 702 * ioctl, allowing the switch to complete.
682 * 703 *
683 * According to the X sources this is the behavior: 704 * According to the X sources this is the behavior:
684 * 0: pending switch-from not OK 705 * 0: pending switch-from not OK
685 * 1: pending switch-from OK 706 * 1: pending switch-from OK
686 * 2: completed switch-to OK 707 * 2: completed switch-to OK
687 */ 708 */
688 case VT_RELDISP: 709 case VT_RELDISP:
689 if (!perm) 710 if (!perm)
690 return -EPERM; 711 return -EPERM;
691 712
692 console_lock(); 713 console_lock();
693 if (vc->vt_mode.mode != VT_PROCESS) { 714 if (vc->vt_mode.mode != VT_PROCESS) {
694 console_unlock(); 715 console_unlock();
695 ret = -EINVAL; 716 ret = -EINVAL;
696 break; 717 break;
697 } 718 }
698 /* 719 /*
699 * Switching-from response 720 * Switching-from response
700 */ 721 */
701 if (vc->vt_newvt >= 0) { 722 if (vc->vt_newvt >= 0) {
702 if (arg == 0) 723 if (arg == 0)
703 /* 724 /*
704 * Switch disallowed, so forget we were trying 725 * Switch disallowed, so forget we were trying
705 * to do it. 726 * to do it.
706 */ 727 */
707 vc->vt_newvt = -1; 728 vc->vt_newvt = -1;
708 729
709 else { 730 else {
710 /* 731 /*
711 * The current vt has been released, so 732 * The current vt has been released, so
712 * complete the switch. 733 * complete the switch.
713 */ 734 */
714 int newvt; 735 int newvt;
715 newvt = vc->vt_newvt; 736 newvt = vc->vt_newvt;
716 vc->vt_newvt = -1; 737 vc->vt_newvt = -1;
717 ret = vc_allocate(newvt); 738 ret = vc_allocate(newvt);
718 if (ret) { 739 if (ret) {
719 console_unlock(); 740 console_unlock();
720 break; 741 break;
721 } 742 }
722 /* 743 /*
723 * When we actually do the console switch, 744 * When we actually do the console switch,
724 * make sure we are atomic with respect to 745 * make sure we are atomic with respect to
725 * other console switches.. 746 * other console switches..
726 */ 747 */
727 complete_change_console(vc_cons[newvt].d); 748 complete_change_console(vc_cons[newvt].d);
728 } 749 }
729 } else { 750 } else {
730 /* 751 /*
731 * Switched-to response 752 * Switched-to response
732 */ 753 */
733 /* 754 /*
734 * If it's just an ACK, ignore it 755 * If it's just an ACK, ignore it
735 */ 756 */
736 if (arg != VT_ACKACQ) 757 if (arg != VT_ACKACQ)
737 ret = -EINVAL; 758 ret = -EINVAL;
738 } 759 }
739 console_unlock(); 760 console_unlock();
740 break; 761 break;
741 762
742 /* 763 /*
743 * Disallocate memory associated to VT (but leave VT1) 764 * Disallocate memory associated to VT (but leave VT1)
744 */ 765 */
745 case VT_DISALLOCATE: 766 case VT_DISALLOCATE:
746 if (arg > MAX_NR_CONSOLES) { 767 if (arg > MAX_NR_CONSOLES) {
747 ret = -ENXIO; 768 ret = -ENXIO;
748 break; 769 break;
749 } 770 }
750 if (arg == 0) { 771 if (arg == 0) {
751 /* deallocate all unused consoles, but leave 0 */ 772 /* deallocate all unused consoles, but leave 0 */
752 console_lock(); 773 console_lock();
753 for (i=1; i<MAX_NR_CONSOLES; i++) 774 for (i=1; i<MAX_NR_CONSOLES; i++)
754 if (! VT_BUSY(i)) 775 if (! VT_BUSY(i))
755 vc_deallocate(i); 776 vc_deallocate(i);
756 console_unlock(); 777 console_unlock();
757 } else { 778 } else {
758 /* deallocate a single console, if possible */ 779 /* deallocate a single console, if possible */
759 arg--; 780 arg--;
760 if (VT_BUSY(arg)) 781 if (VT_BUSY(arg))
761 ret = -EBUSY; 782 ret = -EBUSY;
762 else if (arg) { /* leave 0 */ 783 else if (arg) { /* leave 0 */
763 console_lock(); 784 console_lock();
764 vc_deallocate(arg); 785 vc_deallocate(arg);
765 console_unlock(); 786 console_unlock();
766 } 787 }
767 } 788 }
768 break; 789 break;
769 790
770 case VT_RESIZE: 791 case VT_RESIZE:
771 { 792 {
772 struct vt_sizes __user *vtsizes = up; 793 struct vt_sizes __user *vtsizes = up;
773 struct vc_data *vc; 794 struct vc_data *vc;
774 795
775 ushort ll,cc; 796 ushort ll,cc;
776 if (!perm) 797 if (!perm)
777 return -EPERM; 798 return -EPERM;
778 if (get_user(ll, &vtsizes->v_rows) || 799 if (get_user(ll, &vtsizes->v_rows) ||
779 get_user(cc, &vtsizes->v_cols)) 800 get_user(cc, &vtsizes->v_cols))
780 ret = -EFAULT; 801 ret = -EFAULT;
781 else { 802 else {
782 console_lock(); 803 console_lock();
783 for (i = 0; i < MAX_NR_CONSOLES; i++) { 804 for (i = 0; i < MAX_NR_CONSOLES; i++) {
784 vc = vc_cons[i].d; 805 vc = vc_cons[i].d;
785 806
786 if (vc) { 807 if (vc) {
787 vc->vc_resize_user = 1; 808 vc->vc_resize_user = 1;
788 /* FIXME: review v tty lock */ 809 /* FIXME: review v tty lock */
789 vc_resize(vc_cons[i].d, cc, ll); 810 vc_resize(vc_cons[i].d, cc, ll);
790 } 811 }
791 } 812 }
792 console_unlock(); 813 console_unlock();
793 } 814 }
794 break; 815 break;
795 } 816 }
796 817
797 case VT_RESIZEX: 818 case VT_RESIZEX:
798 { 819 {
799 struct vt_consize __user *vtconsize = up; 820 struct vt_consize __user *vtconsize = up;
800 ushort ll,cc,vlin,clin,vcol,ccol; 821 ushort ll,cc,vlin,clin,vcol,ccol;
801 if (!perm) 822 if (!perm)
802 return -EPERM; 823 return -EPERM;
803 if (!access_ok(VERIFY_READ, vtconsize, 824 if (!access_ok(VERIFY_READ, vtconsize,
804 sizeof(struct vt_consize))) { 825 sizeof(struct vt_consize))) {
805 ret = -EFAULT; 826 ret = -EFAULT;
806 break; 827 break;
807 } 828 }
808 /* FIXME: Should check the copies properly */ 829 /* FIXME: Should check the copies properly */
809 __get_user(ll, &vtconsize->v_rows); 830 __get_user(ll, &vtconsize->v_rows);
810 __get_user(cc, &vtconsize->v_cols); 831 __get_user(cc, &vtconsize->v_cols);
811 __get_user(vlin, &vtconsize->v_vlin); 832 __get_user(vlin, &vtconsize->v_vlin);
812 __get_user(clin, &vtconsize->v_clin); 833 __get_user(clin, &vtconsize->v_clin);
813 __get_user(vcol, &vtconsize->v_vcol); 834 __get_user(vcol, &vtconsize->v_vcol);
814 __get_user(ccol, &vtconsize->v_ccol); 835 __get_user(ccol, &vtconsize->v_ccol);
815 vlin = vlin ? vlin : vc->vc_scan_lines; 836 vlin = vlin ? vlin : vc->vc_scan_lines;
816 if (clin) { 837 if (clin) {
817 if (ll) { 838 if (ll) {
818 if (ll != vlin/clin) { 839 if (ll != vlin/clin) {
819 /* Parameters don't add up */ 840 /* Parameters don't add up */
820 ret = -EINVAL; 841 ret = -EINVAL;
821 break; 842 break;
822 } 843 }
823 } else 844 } else
824 ll = vlin/clin; 845 ll = vlin/clin;
825 } 846 }
826 if (vcol && ccol) { 847 if (vcol && ccol) {
827 if (cc) { 848 if (cc) {
828 if (cc != vcol/ccol) { 849 if (cc != vcol/ccol) {
829 ret = -EINVAL; 850 ret = -EINVAL;
830 break; 851 break;
831 } 852 }
832 } else 853 } else
833 cc = vcol/ccol; 854 cc = vcol/ccol;
834 } 855 }
835 856
836 if (clin > 32) { 857 if (clin > 32) {
837 ret = -EINVAL; 858 ret = -EINVAL;
838 break; 859 break;
839 } 860 }
840 861
841 for (i = 0; i < MAX_NR_CONSOLES; i++) { 862 for (i = 0; i < MAX_NR_CONSOLES; i++) {
842 if (!vc_cons[i].d) 863 if (!vc_cons[i].d)
843 continue; 864 continue;
844 console_lock(); 865 console_lock();
845 if (vlin) 866 if (vlin)
846 vc_cons[i].d->vc_scan_lines = vlin; 867 vc_cons[i].d->vc_scan_lines = vlin;
847 if (clin) 868 if (clin)
848 vc_cons[i].d->vc_font.height = clin; 869 vc_cons[i].d->vc_font.height = clin;
849 vc_cons[i].d->vc_resize_user = 1; 870 vc_cons[i].d->vc_resize_user = 1;
850 vc_resize(vc_cons[i].d, cc, ll); 871 vc_resize(vc_cons[i].d, cc, ll);
851 console_unlock(); 872 console_unlock();
852 } 873 }
853 break; 874 break;
854 } 875 }
855 876
856 case PIO_FONT: { 877 case PIO_FONT: {
857 if (!perm) 878 if (!perm)
858 return -EPERM; 879 return -EPERM;
859 op.op = KD_FONT_OP_SET; 880 op.op = KD_FONT_OP_SET;
860 op.flags = KD_FONT_FLAG_OLD | KD_FONT_FLAG_DONT_RECALC; /* Compatibility */ 881 op.flags = KD_FONT_FLAG_OLD | KD_FONT_FLAG_DONT_RECALC; /* Compatibility */
861 op.width = 8; 882 op.width = 8;
862 op.height = 0; 883 op.height = 0;
863 op.charcount = 256; 884 op.charcount = 256;
864 op.data = up; 885 op.data = up;
865 ret = con_font_op(vc_cons[fg_console].d, &op); 886 ret = con_font_op(vc_cons[fg_console].d, &op);
866 break; 887 break;
867 } 888 }
868 889
869 case GIO_FONT: { 890 case GIO_FONT: {
870 op.op = KD_FONT_OP_GET; 891 op.op = KD_FONT_OP_GET;
871 op.flags = KD_FONT_FLAG_OLD; 892 op.flags = KD_FONT_FLAG_OLD;
872 op.width = 8; 893 op.width = 8;
873 op.height = 32; 894 op.height = 32;
874 op.charcount = 256; 895 op.charcount = 256;
875 op.data = up; 896 op.data = up;
876 ret = con_font_op(vc_cons[fg_console].d, &op); 897 ret = con_font_op(vc_cons[fg_console].d, &op);
877 break; 898 break;
878 } 899 }
879 900
880 case PIO_CMAP: 901 case PIO_CMAP:
881 if (!perm) 902 if (!perm)
882 ret = -EPERM; 903 ret = -EPERM;
883 else 904 else
884 ret = con_set_cmap(up); 905 ret = con_set_cmap(up);
885 break; 906 break;
886 907
887 case GIO_CMAP: 908 case GIO_CMAP:
888 ret = con_get_cmap(up); 909 ret = con_get_cmap(up);
889 break; 910 break;
890 911
891 case PIO_FONTX: 912 case PIO_FONTX:
892 case GIO_FONTX: 913 case GIO_FONTX:
893 ret = do_fontx_ioctl(cmd, up, perm, &op); 914 ret = do_fontx_ioctl(cmd, up, perm, &op);
894 break; 915 break;
895 916
896 case PIO_FONTRESET: 917 case PIO_FONTRESET:
897 { 918 {
898 if (!perm) 919 if (!perm)
899 return -EPERM; 920 return -EPERM;
900 921
901 #ifdef BROKEN_GRAPHICS_PROGRAMS 922 #ifdef BROKEN_GRAPHICS_PROGRAMS
902 /* With BROKEN_GRAPHICS_PROGRAMS defined, the default 923 /* With BROKEN_GRAPHICS_PROGRAMS defined, the default
903 font is not saved. */ 924 font is not saved. */
904 ret = -ENOSYS; 925 ret = -ENOSYS;
905 break; 926 break;
906 #else 927 #else
907 { 928 {
908 op.op = KD_FONT_OP_SET_DEFAULT; 929 op.op = KD_FONT_OP_SET_DEFAULT;
909 op.data = NULL; 930 op.data = NULL;
910 ret = con_font_op(vc_cons[fg_console].d, &op); 931 ret = con_font_op(vc_cons[fg_console].d, &op);
911 if (ret) 932 if (ret)
912 break; 933 break;
913 console_lock(); 934 console_lock();
914 con_set_default_unimap(vc_cons[fg_console].d); 935 con_set_default_unimap(vc_cons[fg_console].d);
915 console_unlock(); 936 console_unlock();
916 break; 937 break;
917 } 938 }
918 #endif 939 #endif
919 } 940 }
920 941
921 case KDFONTOP: { 942 case KDFONTOP: {
922 if (copy_from_user(&op, up, sizeof(op))) { 943 if (copy_from_user(&op, up, sizeof(op))) {
923 ret = -EFAULT; 944 ret = -EFAULT;
924 break; 945 break;
925 } 946 }
926 if (!perm && op.op != KD_FONT_OP_GET) 947 if (!perm && op.op != KD_FONT_OP_GET)
927 return -EPERM; 948 return -EPERM;
928 ret = con_font_op(vc, &op); 949 ret = con_font_op(vc, &op);
929 if (ret) 950 if (ret)
930 break; 951 break;
931 if (copy_to_user(up, &op, sizeof(op))) 952 if (copy_to_user(up, &op, sizeof(op)))
932 ret = -EFAULT; 953 ret = -EFAULT;
933 break; 954 break;
934 } 955 }
935 956
936 case PIO_SCRNMAP: 957 case PIO_SCRNMAP:
937 if (!perm) 958 if (!perm)
938 ret = -EPERM; 959 ret = -EPERM;
939 else 960 else
940 ret = con_set_trans_old(up); 961 ret = con_set_trans_old(up);
941 break; 962 break;
942 963
943 case GIO_SCRNMAP: 964 case GIO_SCRNMAP:
944 ret = con_get_trans_old(up); 965 ret = con_get_trans_old(up);
945 break; 966 break;
946 967
947 case PIO_UNISCRNMAP: 968 case PIO_UNISCRNMAP:
948 if (!perm) 969 if (!perm)
949 ret = -EPERM; 970 ret = -EPERM;
950 else 971 else
951 ret = con_set_trans_new(up); 972 ret = con_set_trans_new(up);
952 break; 973 break;
953 974
954 case GIO_UNISCRNMAP: 975 case GIO_UNISCRNMAP:
955 ret = con_get_trans_new(up); 976 ret = con_get_trans_new(up);
956 break; 977 break;
957 978
958 case PIO_UNIMAPCLR: 979 case PIO_UNIMAPCLR:
959 { struct unimapinit ui; 980 { struct unimapinit ui;
960 if (!perm) 981 if (!perm)
961 return -EPERM; 982 return -EPERM;
962 ret = copy_from_user(&ui, up, sizeof(struct unimapinit)); 983 ret = copy_from_user(&ui, up, sizeof(struct unimapinit));
963 if (ret) 984 if (ret)
964 ret = -EFAULT; 985 ret = -EFAULT;
965 else 986 else
966 con_clear_unimap(vc, &ui); 987 con_clear_unimap(vc, &ui);
967 break; 988 break;
968 } 989 }
969 990
970 case PIO_UNIMAP: 991 case PIO_UNIMAP:
971 case GIO_UNIMAP: 992 case GIO_UNIMAP:
972 ret = do_unimap_ioctl(cmd, up, perm, vc); 993 ret = do_unimap_ioctl(cmd, up, perm, vc);
973 break; 994 break;
974 995
975 case VT_LOCKSWITCH: 996 case VT_LOCKSWITCH:
976 if (!capable(CAP_SYS_TTY_CONFIG)) 997 if (!capable(CAP_SYS_TTY_CONFIG))
977 return -EPERM; 998 return -EPERM;
978 vt_dont_switch = 1; 999 vt_dont_switch = 1;
979 break; 1000 break;
980 case VT_UNLOCKSWITCH: 1001 case VT_UNLOCKSWITCH:
981 if (!capable(CAP_SYS_TTY_CONFIG)) 1002 if (!capable(CAP_SYS_TTY_CONFIG))
982 return -EPERM; 1003 return -EPERM;
983 vt_dont_switch = 0; 1004 vt_dont_switch = 0;
984 break; 1005 break;
985 case VT_GETHIFONTMASK: 1006 case VT_GETHIFONTMASK:
986 ret = put_user(vc->vc_hi_font_mask, 1007 ret = put_user(vc->vc_hi_font_mask,
987 (unsigned short __user *)arg); 1008 (unsigned short __user *)arg);
988 break; 1009 break;
989 case VT_WAITEVENT: 1010 case VT_WAITEVENT:
990 ret = vt_event_wait_ioctl((struct vt_event __user *)arg); 1011 ret = vt_event_wait_ioctl((struct vt_event __user *)arg);
991 break; 1012 break;
992 default: 1013 default:
993 ret = -ENOIOCTLCMD; 1014 ret = -ENOIOCTLCMD;
994 } 1015 }
995 out: 1016 out:
996 return ret; 1017 return ret;
997 } 1018 }
998 1019
999 void reset_vc(struct vc_data *vc) 1020 void reset_vc(struct vc_data *vc)
1000 { 1021 {
1001 vc->vc_mode = KD_TEXT; 1022 vc->vc_mode = KD_TEXT;
1002 vt_reset_unicode(vc->vc_num); 1023 vt_reset_unicode(vc->vc_num);
1003 vc->vt_mode.mode = VT_AUTO; 1024 vc->vt_mode.mode = VT_AUTO;
1004 vc->vt_mode.waitv = 0; 1025 vc->vt_mode.waitv = 0;
1005 vc->vt_mode.relsig = 0; 1026 vc->vt_mode.relsig = 0;
1006 vc->vt_mode.acqsig = 0; 1027 vc->vt_mode.acqsig = 0;
1007 vc->vt_mode.frsig = 0; 1028 vc->vt_mode.frsig = 0;
1008 put_pid(vc->vt_pid); 1029 put_pid(vc->vt_pid);
1009 vc->vt_pid = NULL; 1030 vc->vt_pid = NULL;
1010 vc->vt_newvt = -1; 1031 vc->vt_newvt = -1;
1011 if (!in_interrupt()) /* Via keyboard.c:SAK() - akpm */ 1032 if (!in_interrupt()) /* Via keyboard.c:SAK() - akpm */
1012 reset_palette(vc); 1033 reset_palette(vc);
1013 } 1034 }
1014 1035
1015 void vc_SAK(struct work_struct *work) 1036 void vc_SAK(struct work_struct *work)
1016 { 1037 {
1017 struct vc *vc_con = 1038 struct vc *vc_con =
1018 container_of(work, struct vc, SAK_work); 1039 container_of(work, struct vc, SAK_work);
1019 struct vc_data *vc; 1040 struct vc_data *vc;
1020 struct tty_struct *tty; 1041 struct tty_struct *tty;
1021 1042
1022 console_lock(); 1043 console_lock();
1023 vc = vc_con->d; 1044 vc = vc_con->d;
1024 if (vc) { 1045 if (vc) {
1025 /* FIXME: review tty ref counting */ 1046 /* FIXME: review tty ref counting */
1026 tty = vc->port.tty; 1047 tty = vc->port.tty;
1027 /* 1048 /*
1028 * SAK should also work in all raw modes and reset 1049 * SAK should also work in all raw modes and reset
1029 * them properly. 1050 * them properly.
1030 */ 1051 */
1031 if (tty) 1052 if (tty)
1032 __do_SAK(tty); 1053 __do_SAK(tty);
1033 reset_vc(vc); 1054 reset_vc(vc);
1034 } 1055 }
1035 console_unlock(); 1056 console_unlock();
1036 } 1057 }
1037 1058
1038 #ifdef CONFIG_COMPAT 1059 #ifdef CONFIG_COMPAT
1039 1060
1040 struct compat_consolefontdesc { 1061 struct compat_consolefontdesc {
1041 unsigned short charcount; /* characters in font (256 or 512) */ 1062 unsigned short charcount; /* characters in font (256 or 512) */
1042 unsigned short charheight; /* scan lines per character (1-32) */ 1063 unsigned short charheight; /* scan lines per character (1-32) */
1043 compat_caddr_t chardata; /* font data in expanded form */ 1064 compat_caddr_t chardata; /* font data in expanded form */
1044 }; 1065 };
1045 1066
1046 static inline int 1067 static inline int
1047 compat_fontx_ioctl(int cmd, struct compat_consolefontdesc __user *user_cfd, 1068 compat_fontx_ioctl(int cmd, struct compat_consolefontdesc __user *user_cfd,
1048 int perm, struct console_font_op *op) 1069 int perm, struct console_font_op *op)
1049 { 1070 {
1050 struct compat_consolefontdesc cfdarg; 1071 struct compat_consolefontdesc cfdarg;
1051 int i; 1072 int i;
1052 1073
1053 if (copy_from_user(&cfdarg, user_cfd, sizeof(struct compat_consolefontdesc))) 1074 if (copy_from_user(&cfdarg, user_cfd, sizeof(struct compat_consolefontdesc)))
1054 return -EFAULT; 1075 return -EFAULT;
1055 1076
1056 switch (cmd) { 1077 switch (cmd) {
1057 case PIO_FONTX: 1078 case PIO_FONTX:
1058 if (!perm) 1079 if (!perm)
1059 return -EPERM; 1080 return -EPERM;
1060 op->op = KD_FONT_OP_SET; 1081 op->op = KD_FONT_OP_SET;
1061 op->flags = KD_FONT_FLAG_OLD; 1082 op->flags = KD_FONT_FLAG_OLD;
1062 op->width = 8; 1083 op->width = 8;
1063 op->height = cfdarg.charheight; 1084 op->height = cfdarg.charheight;
1064 op->charcount = cfdarg.charcount; 1085 op->charcount = cfdarg.charcount;
1065 op->data = compat_ptr(cfdarg.chardata); 1086 op->data = compat_ptr(cfdarg.chardata);
1066 return con_font_op(vc_cons[fg_console].d, op); 1087 return con_font_op(vc_cons[fg_console].d, op);
1067 case GIO_FONTX: 1088 case GIO_FONTX:
1068 op->op = KD_FONT_OP_GET; 1089 op->op = KD_FONT_OP_GET;
1069 op->flags = KD_FONT_FLAG_OLD; 1090 op->flags = KD_FONT_FLAG_OLD;
1070 op->width = 8; 1091 op->width = 8;
1071 op->height = cfdarg.charheight; 1092 op->height = cfdarg.charheight;
1072 op->charcount = cfdarg.charcount; 1093 op->charcount = cfdarg.charcount;
1073 op->data = compat_ptr(cfdarg.chardata); 1094 op->data = compat_ptr(cfdarg.chardata);
1074 i = con_font_op(vc_cons[fg_console].d, op); 1095 i = con_font_op(vc_cons[fg_console].d, op);
1075 if (i) 1096 if (i)
1076 return i; 1097 return i;
1077 cfdarg.charheight = op->height; 1098 cfdarg.charheight = op->height;
1078 cfdarg.charcount = op->charcount; 1099 cfdarg.charcount = op->charcount;
1079 if (copy_to_user(user_cfd, &cfdarg, sizeof(struct compat_consolefontdesc))) 1100 if (copy_to_user(user_cfd, &cfdarg, sizeof(struct compat_consolefontdesc)))
1080 return -EFAULT; 1101 return -EFAULT;
1081 return 0; 1102 return 0;
1082 } 1103 }
1083 return -EINVAL; 1104 return -EINVAL;
1084 } 1105 }
1085 1106
1086 struct compat_console_font_op { 1107 struct compat_console_font_op {
1087 compat_uint_t op; /* operation code KD_FONT_OP_* */ 1108 compat_uint_t op; /* operation code KD_FONT_OP_* */
1088 compat_uint_t flags; /* KD_FONT_FLAG_* */ 1109 compat_uint_t flags; /* KD_FONT_FLAG_* */
1089 compat_uint_t width, height; /* font size */ 1110 compat_uint_t width, height; /* font size */
1090 compat_uint_t charcount; 1111 compat_uint_t charcount;
1091 compat_caddr_t data; /* font data with height fixed to 32 */ 1112 compat_caddr_t data; /* font data with height fixed to 32 */
1092 }; 1113 };
1093 1114
1094 static inline int 1115 static inline int
1095 compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop, 1116 compat_kdfontop_ioctl(struct compat_console_font_op __user *fontop,
1096 int perm, struct console_font_op *op, struct vc_data *vc) 1117 int perm, struct console_font_op *op, struct vc_data *vc)
1097 { 1118 {
1098 int i; 1119 int i;
1099 1120
1100 if (copy_from_user(op, fontop, sizeof(struct compat_console_font_op))) 1121 if (copy_from_user(op, fontop, sizeof(struct compat_console_font_op)))
1101 return -EFAULT; 1122 return -EFAULT;
1102 if (!perm && op->op != KD_FONT_OP_GET) 1123 if (!perm && op->op != KD_FONT_OP_GET)
1103 return -EPERM; 1124 return -EPERM;
1104 op->data = compat_ptr(((struct compat_console_font_op *)op)->data); 1125 op->data = compat_ptr(((struct compat_console_font_op *)op)->data);
1105 i = con_font_op(vc, op); 1126 i = con_font_op(vc, op);
1106 if (i) 1127 if (i)
1107 return i; 1128 return i;
1108 ((struct compat_console_font_op *)op)->data = (unsigned long)op->data; 1129 ((struct compat_console_font_op *)op)->data = (unsigned long)op->data;
1109 if (copy_to_user(fontop, op, sizeof(struct compat_console_font_op))) 1130 if (copy_to_user(fontop, op, sizeof(struct compat_console_font_op)))
1110 return -EFAULT; 1131 return -EFAULT;
1111 return 0; 1132 return 0;
1112 } 1133 }
1113 1134
1114 struct compat_unimapdesc { 1135 struct compat_unimapdesc {
1115 unsigned short entry_ct; 1136 unsigned short entry_ct;
1116 compat_caddr_t entries; 1137 compat_caddr_t entries;
1117 }; 1138 };
1118 1139
1119 static inline int 1140 static inline int
1120 compat_unimap_ioctl(unsigned int cmd, struct compat_unimapdesc __user *user_ud, 1141 compat_unimap_ioctl(unsigned int cmd, struct compat_unimapdesc __user *user_ud,
1121 int perm, struct vc_data *vc) 1142 int perm, struct vc_data *vc)
1122 { 1143 {
1123 struct compat_unimapdesc tmp; 1144 struct compat_unimapdesc tmp;
1124 struct unipair __user *tmp_entries; 1145 struct unipair __user *tmp_entries;
1125 1146
1126 if (copy_from_user(&tmp, user_ud, sizeof tmp)) 1147 if (copy_from_user(&tmp, user_ud, sizeof tmp))
1127 return -EFAULT; 1148 return -EFAULT;
1128 tmp_entries = compat_ptr(tmp.entries); 1149 tmp_entries = compat_ptr(tmp.entries);
1129 if (tmp_entries) 1150 if (tmp_entries)
1130 if (!access_ok(VERIFY_WRITE, tmp_entries, 1151 if (!access_ok(VERIFY_WRITE, tmp_entries,
1131 tmp.entry_ct*sizeof(struct unipair))) 1152 tmp.entry_ct*sizeof(struct unipair)))
1132 return -EFAULT; 1153 return -EFAULT;
1133 switch (cmd) { 1154 switch (cmd) {
1134 case PIO_UNIMAP: 1155 case PIO_UNIMAP:
1135 if (!perm) 1156 if (!perm)
1136 return -EPERM; 1157 return -EPERM;
1137 return con_set_unimap(vc, tmp.entry_ct, tmp_entries); 1158 return con_set_unimap(vc, tmp.entry_ct, tmp_entries);
1138 case GIO_UNIMAP: 1159 case GIO_UNIMAP:
1139 if (!perm && fg_console != vc->vc_num) 1160 if (!perm && fg_console != vc->vc_num)
1140 return -EPERM; 1161 return -EPERM;
1141 return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp_entries); 1162 return con_get_unimap(vc, tmp.entry_ct, &(user_ud->entry_ct), tmp_entries);
1142 } 1163 }
1143 return 0; 1164 return 0;
1144 } 1165 }
1145 1166
1146 long vt_compat_ioctl(struct tty_struct *tty, 1167 long vt_compat_ioctl(struct tty_struct *tty,
1147 unsigned int cmd, unsigned long arg) 1168 unsigned int cmd, unsigned long arg)
1148 { 1169 {
1149 struct vc_data *vc = tty->driver_data; 1170 struct vc_data *vc = tty->driver_data;
1150 struct console_font_op op; /* used in multiple places here */ 1171 struct console_font_op op; /* used in multiple places here */
1151 unsigned int console; 1172 unsigned int console;
1152 void __user *up = (void __user *)arg; 1173 void __user *up = (void __user *)arg;
1153 int perm; 1174 int perm;
1154 int ret = 0; 1175 int ret = 0;
1155 1176
1156 console = vc->vc_num; 1177 console = vc->vc_num;
1157 1178
1158 if (!vc_cons_allocated(console)) { /* impossible? */ 1179 if (!vc_cons_allocated(console)) { /* impossible? */
1159 ret = -ENOIOCTLCMD; 1180 ret = -ENOIOCTLCMD;
1160 goto out; 1181 goto out;
1161 } 1182 }
1162 1183
1163 /* 1184 /*
1164 * To have permissions to do most of the vt ioctls, we either have 1185 * To have permissions to do most of the vt ioctls, we either have
1165 * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG. 1186 * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
1166 */ 1187 */
1167 perm = 0; 1188 perm = 0;
1168 if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG)) 1189 if (current->signal->tty == tty || capable(CAP_SYS_TTY_CONFIG))
1169 perm = 1; 1190 perm = 1;
1170 1191
1171 switch (cmd) { 1192 switch (cmd) {
1172 /* 1193 /*
1173 * these need special handlers for incompatible data structures 1194 * these need special handlers for incompatible data structures
1174 */ 1195 */
1175 case PIO_FONTX: 1196 case PIO_FONTX:
1176 case GIO_FONTX: 1197 case GIO_FONTX:
1177 ret = compat_fontx_ioctl(cmd, up, perm, &op); 1198 ret = compat_fontx_ioctl(cmd, up, perm, &op);
1178 break; 1199 break;
1179 1200
1180 case KDFONTOP: 1201 case KDFONTOP:
1181 ret = compat_kdfontop_ioctl(up, perm, &op, vc); 1202 ret = compat_kdfontop_ioctl(up, perm, &op, vc);
1182 break; 1203 break;
1183 1204
1184 case PIO_UNIMAP: 1205 case PIO_UNIMAP:
1185 case GIO_UNIMAP: 1206 case GIO_UNIMAP:
1186 ret = compat_unimap_ioctl(cmd, up, perm, vc); 1207 ret = compat_unimap_ioctl(cmd, up, perm, vc);
1187 break; 1208 break;
1188 1209
1189 /* 1210 /*
1190 * all these treat 'arg' as an integer 1211 * all these treat 'arg' as an integer
1191 */ 1212 */
1192 case KIOCSOUND: 1213 case KIOCSOUND:
1193 case KDMKTONE: 1214 case KDMKTONE:
1194 #ifdef CONFIG_X86 1215 #ifdef CONFIG_X86
1195 case KDADDIO: 1216 case KDADDIO:
1196 case KDDELIO: 1217 case KDDELIO:
1197 #endif 1218 #endif
1198 case KDSETMODE: 1219 case KDSETMODE:
1199 case KDMAPDISP: 1220 case KDMAPDISP:
1200 case KDUNMAPDISP: 1221 case KDUNMAPDISP:
1201 case KDSKBMODE: 1222 case KDSKBMODE:
1202 case KDSKBMETA: 1223 case KDSKBMETA:
1203 case KDSKBLED: 1224 case KDSKBLED:
1204 case KDSETLED: 1225 case KDSETLED:
1205 case KDSIGACCEPT: 1226 case KDSIGACCEPT:
1206 case VT_ACTIVATE: 1227 case VT_ACTIVATE:
1207 case VT_WAITACTIVE: 1228 case VT_WAITACTIVE:
1208 case VT_RELDISP: 1229 case VT_RELDISP:
1209 case VT_DISALLOCATE: 1230 case VT_DISALLOCATE:
1210 case VT_RESIZE: 1231 case VT_RESIZE:
1211 case VT_RESIZEX: 1232 case VT_RESIZEX:
1212 goto fallback; 1233 goto fallback;
1213 1234
1214 /* 1235 /*
1215 * the rest has a compatible data structure behind arg, 1236 * the rest has a compatible data structure behind arg,
1216 * but we have to convert it to a proper 64 bit pointer. 1237 * but we have to convert it to a proper 64 bit pointer.
1217 */ 1238 */
1218 default: 1239 default:
1219 arg = (unsigned long)compat_ptr(arg); 1240 arg = (unsigned long)compat_ptr(arg);
1220 goto fallback; 1241 goto fallback;
1221 } 1242 }
1222 out: 1243 out:
1223 return ret; 1244 return ret;
1224 1245
1225 fallback: 1246 fallback:
1226 return vt_ioctl(tty, cmd, arg); 1247 return vt_ioctl(tty, cmd, arg);
1227 } 1248 }
1228 1249
1229 1250
1230 #endif /* CONFIG_COMPAT */ 1251 #endif /* CONFIG_COMPAT */
1231 1252
1232 1253
1233 /* 1254 /*
1234 * Performs the back end of a vt switch. Called under the console 1255 * Performs the back end of a vt switch. Called under the console
1235 * semaphore. 1256 * semaphore.
1236 */ 1257 */
1237 static void complete_change_console(struct vc_data *vc) 1258 static void complete_change_console(struct vc_data *vc)
1238 { 1259 {
1239 unsigned char old_vc_mode; 1260 unsigned char old_vc_mode;
1240 int old = fg_console; 1261 int old = fg_console;
1241 1262
1242 last_console = fg_console; 1263 last_console = fg_console;
1243 1264
1244 /* 1265 /*
1245 * If we're switching, we could be going from KD_GRAPHICS to 1266 * If we're switching, we could be going from KD_GRAPHICS to
1246 * KD_TEXT mode or vice versa, which means we need to blank or 1267 * KD_TEXT mode or vice versa, which means we need to blank or
1247 * unblank the screen later. 1268 * unblank the screen later.
1248 */ 1269 */
1249 old_vc_mode = vc_cons[fg_console].d->vc_mode; 1270 old_vc_mode = vc_cons[fg_console].d->vc_mode;
1250 switch_screen(vc); 1271 switch_screen(vc);
1251 1272
1252 /* 1273 /*
1253 * This can't appear below a successful kill_pid(). If it did, 1274 * This can't appear below a successful kill_pid(). If it did,
1254 * then the *blank_screen operation could occur while X, having 1275 * then the *blank_screen operation could occur while X, having
1255 * received acqsig, is waking up on another processor. This 1276 * received acqsig, is waking up on another processor. This
1256 * condition can lead to overlapping accesses to the VGA range 1277 * condition can lead to overlapping accesses to the VGA range
1257 * and the framebuffer (causing system lockups). 1278 * and the framebuffer (causing system lockups).
1258 * 1279 *
1259 * To account for this we duplicate this code below only if the 1280 * To account for this we duplicate this code below only if the
1260 * controlling process is gone and we've called reset_vc. 1281 * controlling process is gone and we've called reset_vc.
1261 */ 1282 */
1262 if (old_vc_mode != vc->vc_mode) { 1283 if (old_vc_mode != vc->vc_mode) {
1263 if (vc->vc_mode == KD_TEXT) 1284 if (vc->vc_mode == KD_TEXT)
1264 do_unblank_screen(1); 1285 do_unblank_screen(1);
1265 else 1286 else
1266 do_blank_screen(1); 1287 do_blank_screen(1);
1267 } 1288 }
1268 1289
1269 /* 1290 /*
1270 * If this new console is under process control, send it a signal 1291 * If this new console is under process control, send it a signal
1271 * telling it that it has acquired. Also check if it has died and 1292 * telling it that it has acquired. Also check if it has died and
1272 * clean up (similar to logic employed in change_console()) 1293 * clean up (similar to logic employed in change_console())
1273 */ 1294 */
1274 if (vc->vt_mode.mode == VT_PROCESS) { 1295 if (vc->vt_mode.mode == VT_PROCESS) {
1275 /* 1296 /*
1276 * Send the signal as privileged - kill_pid() will 1297 * Send the signal as privileged - kill_pid() will
1277 * tell us if the process has gone or something else 1298 * tell us if the process has gone or something else
1278 * is awry 1299 * is awry
1279 */ 1300 */
1280 if (kill_pid(vc->vt_pid, vc->vt_mode.acqsig, 1) != 0) { 1301 if (kill_pid(vc->vt_pid, vc->vt_mode.acqsig, 1) != 0) {
1281 /* 1302 /*
1282 * The controlling process has died, so we revert back to 1303 * The controlling process has died, so we revert back to
1283 * normal operation. In this case, we'll also change back 1304 * normal operation. In this case, we'll also change back
1284 * to KD_TEXT mode. I'm not sure if this is strictly correct 1305 * to KD_TEXT mode. I'm not sure if this is strictly correct
1285 * but it saves the agony when the X server dies and the screen 1306 * but it saves the agony when the X server dies and the screen
1286 * remains blanked due to KD_GRAPHICS! It would be nice to do 1307 * remains blanked due to KD_GRAPHICS! It would be nice to do
1287 * this outside of VT_PROCESS but there is no single process 1308 * this outside of VT_PROCESS but there is no single process
1288 * to account for and tracking tty count may be undesirable. 1309 * to account for and tracking tty count may be undesirable.
1289 */ 1310 */
1290 reset_vc(vc); 1311 reset_vc(vc);
1291 1312
1292 if (old_vc_mode != vc->vc_mode) { 1313 if (old_vc_mode != vc->vc_mode) {
1293 if (vc->vc_mode == KD_TEXT) 1314 if (vc->vc_mode == KD_TEXT)
1294 do_unblank_screen(1); 1315 do_unblank_screen(1);
1295 else 1316 else
1296 do_blank_screen(1); 1317 do_blank_screen(1);
1297 } 1318 }
1298 } 1319 }
1299 } 1320 }
1300 1321
1301 /* 1322 /*
1302 * Wake anyone waiting for their VT to activate 1323 * Wake anyone waiting for their VT to activate
1303 */ 1324 */
1304 vt_event_post(VT_EVENT_SWITCH, old, vc->vc_num); 1325 vt_event_post(VT_EVENT_SWITCH, old, vc->vc_num);
1305 return; 1326 return;
1306 } 1327 }
1307 1328
1308 /* 1329 /*
1309 * Performs the front-end of a vt switch 1330 * Performs the front-end of a vt switch
1310 */ 1331 */
1311 void change_console(struct vc_data *new_vc) 1332 void change_console(struct vc_data *new_vc)
1312 { 1333 {
1313 struct vc_data *vc; 1334 struct vc_data *vc;
1314 1335
1315 if (!new_vc || new_vc->vc_num == fg_console || vt_dont_switch) 1336 if (!new_vc || new_vc->vc_num == fg_console || vt_dont_switch)
1316 return; 1337 return;
1317 1338
1318 /* 1339 /*
1319 * If this vt is in process mode, then we need to handshake with 1340 * If this vt is in process mode, then we need to handshake with
1320 * that process before switching. Essentially, we store where that 1341 * that process before switching. Essentially, we store where that
1321 * vt wants to switch to and wait for it to tell us when it's done 1342 * vt wants to switch to and wait for it to tell us when it's done
1322 * (via VT_RELDISP ioctl). 1343 * (via VT_RELDISP ioctl).
1323 * 1344 *
1324 * We also check to see if the controlling process still exists. 1345 * We also check to see if the controlling process still exists.
1325 * If it doesn't, we reset this vt to auto mode and continue. 1346 * If it doesn't, we reset this vt to auto mode and continue.
1326 * This is a cheap way to track process control. The worst thing 1347 * This is a cheap way to track process control. The worst thing
1327 * that can happen is: we send a signal to a process, it dies, and 1348 * that can happen is: we send a signal to a process, it dies, and
1328 * the switch gets "lost" waiting for a response; hopefully, the 1349 * the switch gets "lost" waiting for a response; hopefully, the
1329 * user will try again, we'll detect the process is gone (unless 1350 * user will try again, we'll detect the process is gone (unless
1330 * the user waits just the right amount of time :-) and revert the 1351 * the user waits just the right amount of time :-) and revert the
1331 * vt to auto control. 1352 * vt to auto control.
1332 */ 1353 */
1333 vc = vc_cons[fg_console].d; 1354 vc = vc_cons[fg_console].d;
1334 if (vc->vt_mode.mode == VT_PROCESS) { 1355 if (vc->vt_mode.mode == VT_PROCESS) {
1335 /* 1356 /*
1336 * Send the signal as privileged - kill_pid() will 1357 * Send the signal as privileged - kill_pid() will
1337 * tell us if the process has gone or something else 1358 * tell us if the process has gone or something else
1338 * is awry. 1359 * is awry.
1339 * 1360 *
1340 * We need to set vt_newvt *before* sending the signal or we 1361 * We need to set vt_newvt *before* sending the signal or we
1341 * have a race. 1362 * have a race.
1342 */ 1363 */
1343 vc->vt_newvt = new_vc->vc_num; 1364 vc->vt_newvt = new_vc->vc_num;
1344 if (kill_pid(vc->vt_pid, vc->vt_mode.relsig, 1) == 0) { 1365 if (kill_pid(vc->vt_pid, vc->vt_mode.relsig, 1) == 0) {
1345 /* 1366 /*
1346 * It worked. Mark the vt to switch to and 1367 * It worked. Mark the vt to switch to and
1347 * return. The process needs to send us a 1368 * return. The process needs to send us a
1348 * VT_RELDISP ioctl to complete the switch. 1369 * VT_RELDISP ioctl to complete the switch.
1349 */ 1370 */
1350 return; 1371 return;
1351 } 1372 }
1352 1373
1353 /* 1374 /*
1354 * The controlling process has died, so we revert back to 1375 * The controlling process has died, so we revert back to
1355 * normal operation. In this case, we'll also change back 1376 * normal operation. In this case, we'll also change back
1356 * to KD_TEXT mode. I'm not sure if this is strictly correct 1377 * to KD_TEXT mode. I'm not sure if this is strictly correct
1357 * but it saves the agony when the X server dies and the screen 1378 * but it saves the agony when the X server dies and the screen
1358 * remains blanked due to KD_GRAPHICS! It would be nice to do 1379 * remains blanked due to KD_GRAPHICS! It would be nice to do
1359 * this outside of VT_PROCESS but there is no single process 1380 * this outside of VT_PROCESS but there is no single process
1360 * to account for and tracking tty count may be undesirable. 1381 * to account for and tracking tty count may be undesirable.
1361 */ 1382 */
1362 reset_vc(vc); 1383 reset_vc(vc);
1363 1384
1364 /* 1385 /*
1365 * Fall through to normal (VT_AUTO) handling of the switch... 1386 * Fall through to normal (VT_AUTO) handling of the switch...
1366 */ 1387 */
1367 } 1388 }
1368 1389
1369 /* 1390 /*
1370 * Ignore all switches in KD_GRAPHICS+VT_AUTO mode 1391 * Ignore all switches in KD_GRAPHICS+VT_AUTO mode
1371 */ 1392 */
1372 if (vc->vc_mode == KD_GRAPHICS) 1393 if (vc->vc_mode == KD_GRAPHICS)
1373 return; 1394 return;
1374 1395
1375 complete_change_console(new_vc); 1396 complete_change_console(new_vc);
1376 } 1397 }
1377 1398
1378 /* Perform a kernel triggered VT switch for suspend/resume */ 1399 /* Perform a kernel triggered VT switch for suspend/resume */
1379 1400
1380 static int disable_vt_switch; 1401 static int disable_vt_switch;
1381 1402
1382 int vt_move_to_console(unsigned int vt, int alloc) 1403 int vt_move_to_console(unsigned int vt, int alloc)
1383 { 1404 {
1384 int prev; 1405 int prev;
1385 1406
1386 console_lock(); 1407 console_lock();
1387 /* Graphics mode - up to X */ 1408 /* Graphics mode - up to X */
1388 if (disable_vt_switch) { 1409 if (disable_vt_switch) {
1389 console_unlock(); 1410 console_unlock();
1390 return 0; 1411 return 0;
1391 } 1412 }
1392 prev = fg_console; 1413 prev = fg_console;
1393 1414
1394 if (alloc && vc_allocate(vt)) { 1415 if (alloc && vc_allocate(vt)) {
1395 /* we can't have a free VC for now. Too bad, 1416 /* we can't have a free VC for now. Too bad,
1396 * we don't want to mess the screen for now. */ 1417 * we don't want to mess the screen for now. */
1397 console_unlock(); 1418 console_unlock();
1398 return -ENOSPC; 1419 return -ENOSPC;
1399 } 1420 }
1400 1421
1401 if (set_console(vt)) { 1422 if (set_console(vt)) {
1402 /* 1423 /*
1403 * We're unable to switch to the SUSPEND_CONSOLE. 1424 * We're unable to switch to the SUSPEND_CONSOLE.
1404 * Let the calling function know so it can decide 1425 * Let the calling function know so it can decide
1405 * what to do. 1426 * what to do.
1406 */ 1427 */
1407 console_unlock(); 1428 console_unlock();
1408 return -EIO; 1429 return -EIO;
1409 } 1430 }
1410 console_unlock(); 1431 console_unlock();
1411 if (vt_waitactive(vt + 1)) { 1432 if (vt_waitactive(vt + 1)) {
1412 pr_debug("Suspend: Can't switch VCs."); 1433 pr_debug("Suspend: Can't switch VCs.");
1413 return -EINTR; 1434 return -EINTR;
1414 } 1435 }
1415 return prev; 1436 return prev;
1416 } 1437 }
1417 1438
1418 /* 1439 /*
1419 * Normally during a suspend, we allocate a new console and switch to it. 1440 * Normally during a suspend, we allocate a new console and switch to it.
1420 * When we resume, we switch back to the original console. This switch 1441 * When we resume, we switch back to the original console. This switch
1421 * can be slow, so on systems where the framebuffer can handle restoration 1442 * can be slow, so on systems where the framebuffer can handle restoration