diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2008-06-23 16:23:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-26 14:21:22 -0400 |
commit | 4081f00dc45abce6bdac352a6354c07ce15db45b (patch) | |
tree | 5c1c239eb0e0cfdedf9fdfd0d82bf36c03bfdd99 | |
parent | fbc6af2f3c46df4722f5161d0ad20dd87cd7dfa9 (diff) |
rfkill: do not allow userspace to override ALL RADIOS OFF
SW_RFKILL_ALL is the "emergency power-off all radios" input event. It must
be handled, and must always do the same thing as far as the rfkill system
is concerned: all transmitters are to go *immediately* offline.
For safety, do NOT allow userspace to override EV_SW SW_RFKILL_ALL OFF. As
long as rfkill-input is loaded, that event will *always* be processed, and
it will *always* force all rfkill switches to disable all wireless
transmitters, regardless of user_claim attribute or anything else.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | net/rfkill/rfkill-input.c | 47 | ||||
-rw-r--r-- | net/rfkill/rfkill-input.h | 1 | ||||
-rw-r--r-- | net/rfkill/rfkill.c | 18 |
3 files changed, 51 insertions, 15 deletions
diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c index d285f9a9d829..5d4c8b2446f7 100644 --- a/net/rfkill/rfkill-input.c +++ b/net/rfkill/rfkill-input.c | |||
@@ -43,11 +43,26 @@ static void rfkill_task_handler(struct work_struct *work) | |||
43 | mutex_unlock(&task->mutex); | 43 | mutex_unlock(&task->mutex); |
44 | } | 44 | } |
45 | 45 | ||
46 | static void rfkill_task_epo_handler(struct work_struct *work) | ||
47 | { | ||
48 | rfkill_epo(); | ||
49 | } | ||
50 | |||
51 | static DECLARE_WORK(epo_work, rfkill_task_epo_handler); | ||
52 | |||
53 | static void rfkill_schedule_epo(void) | ||
54 | { | ||
55 | schedule_work(&epo_work); | ||
56 | } | ||
57 | |||
46 | static void rfkill_schedule_set(struct rfkill_task *task, | 58 | static void rfkill_schedule_set(struct rfkill_task *task, |
47 | enum rfkill_state desired_state) | 59 | enum rfkill_state desired_state) |
48 | { | 60 | { |
49 | unsigned long flags; | 61 | unsigned long flags; |
50 | 62 | ||
63 | if (unlikely(work_pending(&epo_work))) | ||
64 | return; | ||
65 | |||
51 | spin_lock_irqsave(&task->lock, flags); | 66 | spin_lock_irqsave(&task->lock, flags); |
52 | 67 | ||
53 | if (time_after(jiffies, task->last + msecs_to_jiffies(200))) { | 68 | if (time_after(jiffies, task->last + msecs_to_jiffies(200))) { |
@@ -63,6 +78,9 @@ static void rfkill_schedule_toggle(struct rfkill_task *task) | |||
63 | { | 78 | { |
64 | unsigned long flags; | 79 | unsigned long flags; |
65 | 80 | ||
81 | if (unlikely(work_pending(&epo_work))) | ||
82 | return; | ||
83 | |||
66 | spin_lock_irqsave(&task->lock, flags); | 84 | spin_lock_irqsave(&task->lock, flags); |
67 | 85 | ||
68 | if (time_after(jiffies, task->last + msecs_to_jiffies(200))) { | 86 | if (time_after(jiffies, task->last + msecs_to_jiffies(200))) { |
@@ -114,21 +132,20 @@ static void rfkill_event(struct input_handle *handle, unsigned int type, | |||
114 | switch (code) { | 132 | switch (code) { |
115 | case SW_RFKILL_ALL: | 133 | case SW_RFKILL_ALL: |
116 | /* EVERY radio type. data != 0 means radios ON */ | 134 | /* EVERY radio type. data != 0 means radios ON */ |
117 | rfkill_schedule_set(&rfkill_wwan, | 135 | /* handle EPO (emergency power off) through shortcut */ |
118 | (data)? RFKILL_STATE_ON: | 136 | if (data) { |
119 | RFKILL_STATE_OFF); | 137 | rfkill_schedule_set(&rfkill_wwan, |
120 | rfkill_schedule_set(&rfkill_wimax, | 138 | RFKILL_STATE_ON); |
121 | (data)? RFKILL_STATE_ON: | 139 | rfkill_schedule_set(&rfkill_wimax, |
122 | RFKILL_STATE_OFF); | 140 | RFKILL_STATE_ON); |
123 | rfkill_schedule_set(&rfkill_uwb, | 141 | rfkill_schedule_set(&rfkill_uwb, |
124 | (data)? RFKILL_STATE_ON: | 142 | RFKILL_STATE_ON); |
125 | RFKILL_STATE_OFF); | 143 | rfkill_schedule_set(&rfkill_bt, |
126 | rfkill_schedule_set(&rfkill_bt, | 144 | RFKILL_STATE_ON); |
127 | (data)? RFKILL_STATE_ON: | 145 | rfkill_schedule_set(&rfkill_wlan, |
128 | RFKILL_STATE_OFF); | 146 | RFKILL_STATE_ON); |
129 | rfkill_schedule_set(&rfkill_wlan, | 147 | } else |
130 | (data)? RFKILL_STATE_ON: | 148 | rfkill_schedule_epo(); |
131 | RFKILL_STATE_OFF); | ||
132 | break; | 149 | break; |
133 | default: | 150 | default: |
134 | break; | 151 | break; |
diff --git a/net/rfkill/rfkill-input.h b/net/rfkill/rfkill-input.h index 4dae5006fc77..f63d05045685 100644 --- a/net/rfkill/rfkill-input.h +++ b/net/rfkill/rfkill-input.h | |||
@@ -12,5 +12,6 @@ | |||
12 | #define __RFKILL_INPUT_H | 12 | #define __RFKILL_INPUT_H |
13 | 13 | ||
14 | void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state); | 14 | void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state); |
15 | void rfkill_epo(void); | ||
15 | 16 | ||
16 | #endif /* __RFKILL_INPUT_H */ | 17 | #endif /* __RFKILL_INPUT_H */ |
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index dd1c3f18f31d..7d07175c407f 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
@@ -182,6 +182,24 @@ void rfkill_switch_all(enum rfkill_type type, enum rfkill_state state) | |||
182 | EXPORT_SYMBOL(rfkill_switch_all); | 182 | EXPORT_SYMBOL(rfkill_switch_all); |
183 | 183 | ||
184 | /** | 184 | /** |
185 | * rfkill_epo - emergency power off all transmitters | ||
186 | * | ||
187 | * This kicks all rfkill devices to RFKILL_STATE_OFF, ignoring | ||
188 | * everything in its path but rfkill_mutex. | ||
189 | */ | ||
190 | void rfkill_epo(void) | ||
191 | { | ||
192 | struct rfkill *rfkill; | ||
193 | |||
194 | mutex_lock(&rfkill_mutex); | ||
195 | list_for_each_entry(rfkill, &rfkill_list, node) { | ||
196 | rfkill_toggle_radio(rfkill, RFKILL_STATE_OFF, 1); | ||
197 | } | ||
198 | mutex_unlock(&rfkill_mutex); | ||
199 | } | ||
200 | EXPORT_SYMBOL_GPL(rfkill_epo); | ||
201 | |||
202 | /** | ||
185 | * rfkill_force_state - Force the internal rfkill radio state | 203 | * rfkill_force_state - Force the internal rfkill radio state |
186 | * @rfkill: pointer to the rfkill class to modify. | 204 | * @rfkill: pointer to the rfkill class to modify. |
187 | * @state: the current radio state the class should be forced to. | 205 | * @state: the current radio state the class should be forced to. |