diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 22:40:58 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-25 11:58:51 -0800 |
| commit | 19a5f6631c3b9489fe4a6226e7a5f6f919d3c878 (patch) | |
| tree | 2c5f6950b593127ccbb8c9f09aa11d14bedd599b | |
| parent | b2bead9187c61829d2b78881f1562d8ae11e2169 (diff) | |
| download | lwn-19a5f6631c3b9489fe4a6226e7a5f6f919d3c878.tar.gz lwn-19a5f6631c3b9489fe4a6226e7a5f6f919d3c878.zip | |
staging/speakup: Use tty_ldisc_ref() for paste kworker
commit f4f9edcf9b5289ed96113e79fa65a7bf27ecb096 upstream.
As the function documentation for tty_ldisc_ref_wait() notes, it is
only callable from a tty file_operations routine; otherwise there
is no guarantee the ref won't be NULL.
The key difference with the VT's paste_selection() is that is an ioctl,
where __speakup_paste_selection() is completely async kworker, kicked
off from interrupt context.
Fixes: 28a821c30688 ("Staging: speakup: Update __speakup_paste_selection()
tty (ab)usage to match vt")
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/speakup/selection.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c index ca04d3669acc..34a6deef1d6c 100644 --- a/drivers/staging/speakup/selection.c +++ b/drivers/staging/speakup/selection.c @@ -140,7 +140,9 @@ static void __speakup_paste_selection(struct work_struct *work) struct tty_ldisc *ld; DECLARE_WAITQUEUE(wait, current); - ld = tty_ldisc_ref_wait(tty); + ld = tty_ldisc_ref(tty); + if (!ld) + goto tty_unref; tty_buffer_lock_exclusive(&vc->port); add_wait_queue(&vc->paste_wait, &wait); @@ -160,6 +162,7 @@ static void __speakup_paste_selection(struct work_struct *work) tty_buffer_unlock_exclusive(&vc->port); tty_ldisc_deref(ld); +tty_unref: tty_kref_put(tty); } |