Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28a821c3 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

Staging: speakup: Update __speakup_paste_selection() tty (ab)usage to match vt 

This function is largely a duplicate of paste_selection() in
drivers/tty/vt/selection.c, but with its own selection state.  The
speakup selection mechanism should really be merged with vt.

For now, apply the changes from 'TTY: vt, fix paste_selection ldisc
handling', 'tty: Make ldisc input flow control concurrency-friendly',
and 'tty: Fix unsafe vt paste_selection()'.

References: https://bugs.debian.org/735202
References: https://bugs.debian.org/744015


Reported-by: default avatarPaul Gevers <elbrus@debian.org>
Reported-and-tested-by: default avatarJarek Czekalski <jarekczek@poczta.onet.pl>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: <stable@vger.kernel.org> # v3.8 but needs backporting for < 3.12
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7500135

drivers/staging/speakup/selection.c

+11 −3
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <linux/device.h> /* for dev_warn */

#include <linux/selection.h>

#include <linux/workqueue.h>

#include <linux/tty.h>

#include <linux/tty_flip.h>

#include <asm/cmpxchg.h>



#include "speakup.h"
@@ -135,8 +137,12 @@ static void __speakup_paste_selection(struct work_struct *work) 
	struct tty_struct *tty = xchg(&spw->tty, NULL);

	struct vc_data *vc = (struct vc_data *) tty->driver_data;

	int pasted = 0, count;

	struct tty_ldisc *ld;

	DECLARE_WAITQUEUE(wait, current);



	ld = tty_ldisc_ref_wait(tty);

	tty_buffer_lock_exclusive(&vc->port);



	add_wait_queue(&vc->paste_wait, &wait);

	while (sel_buffer && sel_buffer_lth > pasted) {

		set_current_state(TASK_INTERRUPTIBLE);
@@ -145,13 +151,15 @@ static void __speakup_paste_selection(struct work_struct *work) 
			continue;

		}

		count = sel_buffer_lth - pasted;

		count = min_t(int, count, tty->receive_room);

		tty->ldisc->ops->receive_buf(tty, sel_buffer + pasted,

			NULL, count);

		count = tty_ldisc_receive_buf(ld, sel_buffer + pasted, NULL,

					      count);

		pasted += count;

	}

	remove_wait_queue(&vc->paste_wait, &wait);

	current->state = TASK_RUNNING;



	tty_buffer_unlock_exclusive(&vc->port);

	tty_ldisc_deref(ld);

	tty_kref_put(tty);

}

drivers/tty/tty_buffer.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ void tty_buffer_lock_exclusive(struct tty_port *port) 
	atomic_inc(&buf->priority);

	mutex_lock(&buf->lock);

}

EXPORT_SYMBOL_GPL(tty_buffer_lock_exclusive);



void tty_buffer_unlock_exclusive(struct tty_port *port)

{
@@ -73,6 +74,7 @@ void tty_buffer_unlock_exclusive(struct tty_port *port) 
	if (restart)

		queue_work(system_unbound_wq, &buf->work);

}

EXPORT_SYMBOL_GPL(tty_buffer_unlock_exclusive);



/**

 *	tty_buffer_space_avail	-	return unused buffer space