diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2020-03-16 09:45:44 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-16 10:39:47 +0300 |
| commit | 5b30dee6cc07fd91eedcb3a1ba1b81af8512c011 (patch) | |
| tree | 3fcf50a7d98dc78d9751902d786d71cc0f7864f0 /drivers/tty/vt/selection.c | |
| parent | d49e7953f9b9f5e50c12dda95f4041fb877cdc71 (diff) | |
| download | linux-5b30dee6cc07fd91eedcb3a1ba1b81af8512c011.tar.xz | |
vt: selection, fix double lock introduced by a merge
The merge commit cb05c6c82fb0 (Merge 5.6-rc5 into tty-next) introduced a
double lock to set_selection_kernel. vc_sel.lock is locked both in
set_selection_kernel and its callee __set_selection_kernel now.
Remove the latter.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20200316064544.4799-1-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt/selection.c')
| -rw-r--r-- | drivers/tty/vt/selection.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c index 1a069979866c..582184dd386c 100644 --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c @@ -219,7 +219,6 @@ static int __set_selection_kernel(struct tiocl_selection *v, struct tty_struct * if (ps > pe) /* make vc_sel.start <= vc_sel.end */ swap(ps, pe); - mutex_lock(&vc_sel.lock); if (vc_sel.cons != vc_cons[fg_console].d) { clear_selection(); vc_sel.cons = vc_cons[fg_console].d; |