vt: Make vt_pid a struct pid (making it pid wrap around safe).
Subsystems (2)
PATCH 1/1 vt: Make vt_pid a struct pid (making it pid wrap around safe).
I took a good hard look at the locking and it appears the locking on vt_pid is the console semaphore. Every modified path is called under the console semaphore except reset_vc when it is called from fn_SAK or do_SAK both of which appear to be in interrupt context. In addition I need to be careful because in the presence of an oops the console_sem may be arbitrarily dropped.
Which leads me to conclude the current locking is inadequate for my needs.
Given the weird cases we could hit because of oops printing instead of introducing an extra spin lock to protect the data and keep the pid to signal and the signal to send in sync, I have opted to use xchg on just the struct pid * pointer instead.
Due to console_sem we will stay in sync between vt_pid and vt_mode except for a small window during a SAK, or oops handling. SAK handling should kill any user space process that care, and oops handling we are broken anyway. Besides the worst that can happen is that I try to send the wrong signal.
--- drivers/char/vt.c | 1 + drivers/char/vt_ioctl.c | 8 ++++---- include/linux/console_struct.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)
drivers/char/vt.c +1 -0
@@ -896,6 +896,7 @@ void vc_deallocate(unsigned int currconsif (vc_cons_allocated (currcons)) {struct vc_data *vc = vc_cons[currcons].d; vc->vc_sw->con_deinit (vc); +put_pid (vc->vt_pid);module_put (vc->vc_sw->owner);if (vc->vc_kmalloced)kfree (vc->vc_screenbuf);
drivers/char/vt_ioctl.c +4 -4
@@ -672,7 +672,7 @@ #endif vc->vt_mode = tmp;/* the frsig is ignored, so we set it to 0 */ vc->vt_mode.frsig =0 ; - vc->vt_pid = current->pid; +put_pid (xchg (&vc->vt_pid,get_pid (task_pid (current))));/* no switch is required -- [email protected] */ vc->vt_newvt =-1 ;release_console_sem ();
@@ -1063,7 +1063,7 @@ void reset_vc(struct vc_data *vc) vc->vt_mode.relsig =0 ; vc->vt_mode.acqsig =0 ; vc->vt_mode.frsig =0 ; - vc->vt_pid =-1 ; +put_pid (xchg (&vc->vt_pid,NULL )); vc->vt_newvt =-1 ;if (!in_interrupt ())/* Via keyboard.c:SAK() - akpm */ reset_palette (vc);
@@ -1114,7 +1114,7 @@ static void complete_change_console(stru* tell us if the process has gone or something else * is awry */ -if (kill_proc (vc->vt_pid, vc->vt_mode.acqsig,1 ) !=0 ) { +if (kill_pid (vc->vt_pid, vc->vt_mode.acqsig,1 ) !=0 ) {/* * The controlling process has died, so we revert back to * normal operation. In this case, we'll also change back
@@ -1174,7 +1174,7 @@ void change_console(struct vc_data *new_* tell us if the process has gone or something else * is awry */ -if (kill_proc (vc->vt_pid, vc->vt_mode.relsig,1 ) ==0 ) { +if (kill_pid (vc->vt_pid, vc->vt_mode.relsig,1 ) ==0 ) {/* * It worked. Mark the vt to switch to and * return. The process needs to send us a
include/linux/console_struct.h +1 -1
@@ -54,7 +54,7 @@ struct vc_data {struct tty_struct *vc_tty;/* TTY we are attached to */ /* data for manual vt switching */ struct vt_mode vt_mode; -int vt_pid; +struct pid *vt_pid;int vt_newvt;wait_queue_head_t paste_wait;/* mode flags */
Signature · 1 line
1.4.2.rc3.g7e18e-dirty
Grr. Here is the other half of my confusion.
The patch:
[PATCH] vt: Rework the console spawning variables. is fine.
The patch:
[PATCH] vt: Make vt_pid a struct pid (making it pid wrap around safe). which uses xchg() is racy, and needs to be fixed.
Oleg could you confirm that quick analysis.
Thanks,
Eric
Quoted 8 lines · Eric W. Biederman
The patch:
[PATCH] vt: Rework the console spawning variables. is fine.The patch:
[PATCH] vt: Makevt_pida struct pid (making it pid wrap around safe). which usesxchg()is racy, and needs to be fixed.
Yes, I think so.
Oleg.
drivers/char/vt_ioctl.c #endif · line 675
Quoted 3 lines · Eric W. Biederman
drivers/char/vt_ioctl.c +1
-1- vc->vt_pid = current->pid; +put_pid (xchg (&vc->vt_pid,get_pid (task_pid (current))));
Would it make any sense to have a get_current_pid()? It might reduce the horribly confusing number of parenthesis there.
-- Dave