forked from Minki/linux
640969a69c
speakup_cut() calls speakup_clear_selection() which calls console_lock.
Problem is: speakup_cut() is called from a keyboard interrupt
context. This would hang if speakup_cut is pressed while the console
lock is unfortunately already held.
We can however as well just defer calling clear_selection() until the
already-deferred set_selection_kernel() call.
This was spotted by the lock hardener:
Possible unsafe locking scenario:\x0a
CPU0
----
lock(console_lock);
<Interrupt>
lock(console_lock);
\x0a *** DEADLOCK ***\x0a
[...]
Call Trace:
<IRQ>
dump_stack+0xc2/0x11a
print_usage_bug.cold+0x3e0/0x4b1
mark_lock+0xd95/0x1390
? print_irq_inversion_bug+0xa0/0xa0
__lock_acquire+0x21eb/0x5730
? __kasan_check_read+0x11/0x20
? check_chain_key+0x215/0x5e0
? register_lock_class+0x1580/0x1580
? lock_downgrade+0x7a0/0x7a0
? __rwlock_init+0x140/0x140
lock_acquire+0x13f/0x370
? speakup_clear_selection+0xe/0x20 [speakup]
console_lock+0x33/0x50
? speakup_clear_selection+0xe/0x20 [speakup]
speakup_clear_selection+0xe/0x20 [speakup]
speakup_cut+0x19e/0x4b0 [speakup]
keyboard_notifier_call+0x1f04/0x4a40 [speakup]
? read_all_doc+0x240/0x240 [speakup]
notifier_call_chain+0xbf/0x130
__atomic_notifier_call_chain+0x80/0x130
atomic_notifier_call_chain+0x16/0x20
kbd_event+0x7d7/0x3b20
? k_pad+0x850/0x850
? sysrq_filter+0x450/0xd40
input_to_handler+0x362/0x4b0
? rcu_read_lock_sched_held+0xe0/0xe0
input_pass_values+0x408/0x5a0
? __rwlock_init+0x140/0x140
? lock_acquire+0x13f/0x370
input_handle_event+0x70e/0x1380
input_event+0x67/0x90
atkbd_interrupt+0xe62/0x1d4e [atkbd]
? __kasan_check_write+0x14/0x20
? atkbd_event_work+0x130/0x130 [atkbd]
? _raw_spin_lock_irqsave+0x26/0x70
serio_interrupt+0x93/0x120 [serio]
i8042_interrupt+0x232/0x510 [i8042]
? rcu_read_lock_bh_held+0xd0/0xd0
? handle_irq_event+0xa5/0x13a
? i8042_remove+0x1f0/0x1f0 [i8042]
__handle_irq_event_percpu+0xe6/0x6c0
handle_irq_event_percpu+0x71/0x150
? __handle_irq_event_percpu+0x6c0/0x6c0
? __kasan_check_read+0x11/0x20
? do_raw_spin_unlock+0x5c/0x240
handle_irq_event+0xad/0x13a
handle_edge_irq+0x233/0xa90
do_IRQ+0x10b/0x310
common_interrupt+0xf/0xf
</IRQ>
Cc: stable@vger.kernel.org
Reported-by: Jookia <contact@jookia.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Link: https://lore.kernel.org/r/20201107233310.7iisvaozpiqj3yvy@function
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
121 lines
3.9 KiB
C
121 lines
3.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _SPEAKUP_H
|
|
#define _SPEAKUP_H
|
|
|
|
#include "spk_types.h"
|
|
#include "i18n.h"
|
|
|
|
#define SPEAKUP_VERSION "3.1.6"
|
|
#define KEY_MAP_VER 119
|
|
#define SHIFT_TBL_SIZE 64
|
|
#define MAX_DESC_LEN 72
|
|
|
|
#define TOGGLE_0 .u.n = {NULL, 0, 0, 1, 0, 0, NULL }
|
|
#define TOGGLE_1 .u.n = {NULL, 1, 0, 1, 0, 0, NULL }
|
|
#define MAXVARLEN 15
|
|
|
|
#define SYNTH_OK 0x0001
|
|
#define B_ALPHA 0x0002
|
|
#define ALPHA 0x0003
|
|
#define B_CAP 0x0004
|
|
#define A_CAP 0x0007
|
|
#define B_NUM 0x0008
|
|
#define NUM 0x0009
|
|
#define ALPHANUM (B_ALPHA | B_NUM)
|
|
#define SOME 0x0010
|
|
#define MOST 0x0020
|
|
#define PUNC 0x0040
|
|
#define A_PUNC 0x0041
|
|
#define B_WDLM 0x0080
|
|
#define WDLM 0x0081
|
|
#define B_EXNUM 0x0100
|
|
#define CH_RPT 0x0200
|
|
#define B_CTL 0x0400
|
|
#define A_CTL (B_CTL + SYNTH_OK)
|
|
#define B_SYM 0x0800
|
|
#define B_CAPSYM (B_CAP | B_SYM)
|
|
|
|
/* FIXME: u16 */
|
|
#define IS_WDLM(x) (spk_chartab[((u_char)x)] & B_WDLM)
|
|
#define IS_CHAR(x, type) (spk_chartab[((u_char)x)] & type)
|
|
#define IS_TYPE(x, type) ((spk_chartab[((u_char)x)] & type) == type)
|
|
|
|
int speakup_thread(void *data);
|
|
void spk_reset_default_chars(void);
|
|
void spk_reset_default_chartab(void);
|
|
void synth_start(void);
|
|
void synth_insert_next_index(int sent_num);
|
|
void spk_reset_index_count(int sc);
|
|
void spk_get_index_count(int *linecount, int *sentcount);
|
|
int spk_set_key_info(const u_char *key_info, u_char *k_buffer);
|
|
char *spk_strlwr(char *s);
|
|
char *spk_s2uchar(char *start, char *dest);
|
|
int speakup_kobj_init(void);
|
|
void speakup_kobj_exit(void);
|
|
int spk_chartab_get_value(char *keyword);
|
|
void speakup_register_var(struct var_t *var);
|
|
void speakup_unregister_var(enum var_id_t var_id);
|
|
struct st_var_header *spk_get_var_header(enum var_id_t var_id);
|
|
struct st_var_header *spk_var_header_by_name(const char *name);
|
|
struct punc_var_t *spk_get_punc_var(enum var_id_t var_id);
|
|
int spk_set_num_var(int val, struct st_var_header *var, int how);
|
|
int spk_set_string_var(const char *page, struct st_var_header *var, int len);
|
|
int spk_set_mask_bits(const char *input, const int which, const int how);
|
|
extern special_func spk_special_handler;
|
|
int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key);
|
|
int synth_init(char *name);
|
|
void synth_release(void);
|
|
|
|
void spk_do_flush(void);
|
|
void speakup_start_ttys(void);
|
|
void synth_buffer_add(u16 ch);
|
|
void synth_buffer_clear(void);
|
|
int speakup_set_selection(struct tty_struct *tty);
|
|
void speakup_cancel_selection(void);
|
|
int speakup_paste_selection(struct tty_struct *tty);
|
|
void speakup_cancel_paste(void);
|
|
void speakup_register_devsynth(void);
|
|
void speakup_unregister_devsynth(void);
|
|
void synth_write(const char *buf, size_t count);
|
|
int synth_supports_indexing(void);
|
|
|
|
extern struct vc_data *spk_sel_cons;
|
|
extern unsigned short spk_xs, spk_ys, spk_xe, spk_ye; /* our region points */
|
|
|
|
extern wait_queue_head_t speakup_event;
|
|
extern struct kobject *speakup_kobj;
|
|
extern struct task_struct *speakup_task;
|
|
extern const u_char spk_key_defaults[];
|
|
|
|
/* Protect speakup synthesizer list */
|
|
extern struct mutex spk_mutex;
|
|
extern struct st_spk_t *speakup_console[];
|
|
extern struct spk_synth *synth;
|
|
extern char spk_pitch_buff[];
|
|
extern u_char *spk_our_keys[];
|
|
extern short spk_punc_masks[];
|
|
extern char spk_str_caps_start[], spk_str_caps_stop[], spk_str_pause[];
|
|
extern bool spk_paused;
|
|
extern const struct st_bits_data spk_punc_info[];
|
|
extern u_char spk_key_buf[600];
|
|
extern char *spk_characters[];
|
|
extern char *spk_default_chars[];
|
|
extern u_short spk_chartab[];
|
|
extern int spk_no_intr, spk_say_ctrl, spk_say_word_ctl, spk_punc_level;
|
|
extern int spk_reading_punc, spk_attrib_bleep, spk_bleeps;
|
|
extern int spk_bleep_time, spk_bell_pos;
|
|
extern int spk_spell_delay, spk_key_echo;
|
|
extern short spk_punc_mask;
|
|
extern short spk_pitch_shift, synth_flags;
|
|
extern bool spk_quiet_boot;
|
|
extern char *synth_name;
|
|
extern struct bleep spk_unprocessed_sound;
|
|
|
|
/* Prototypes from fakekey.c. */
|
|
int speakup_add_virtual_keyboard(void);
|
|
void speakup_remove_virtual_keyboard(void);
|
|
void speakup_fake_down_arrow(void);
|
|
bool speakup_fake_key_pressed(void);
|
|
|
|
#endif
|