aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPali Rohár <pali.rohar@gmail.com>2014-09-29 09:10:51 -0400
committerDarren Hart <dvhart@linux.intel.com>2014-09-29 17:54:27 -0400
commita666b6ffbc9b6705a3ced704f52c3fe9ea8bf959 (patch)
treee185e11600a42879f790594f44c76ef39036005c
parent557b4549714536b161522960a36f0aa7f527418c (diff)
dell-wmi: Fix access out of memory
Without this patch, dell-wmi is trying to access elements of dynamically allocated array without checking the array size. This can lead to memory corruption or a kernel panic. This patch adds the missing checks for array size. Signed-off-by: Pali Rohár <pali.rohar@gmail.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--drivers/platform/x86/dell-wmi.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 390e8e33d5e3..25721bf20092 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -163,18 +163,24 @@ static void dell_wmi_notify(u32 value, void *context)
163 const struct key_entry *key; 163 const struct key_entry *key;
164 int reported_key; 164 int reported_key;
165 u16 *buffer_entry = (u16 *)obj->buffer.pointer; 165 u16 *buffer_entry = (u16 *)obj->buffer.pointer;
166 int buffer_size = obj->buffer.length/2;
166 167
167 if (dell_new_hk_type && (buffer_entry[1] != 0x10)) { 168 if (buffer_size >= 2 && dell_new_hk_type && buffer_entry[1] != 0x10) {
168 pr_info("Received unknown WMI event (0x%x)\n", 169 pr_info("Received unknown WMI event (0x%x)\n",
169 buffer_entry[1]); 170 buffer_entry[1]);
170 kfree(obj); 171 kfree(obj);
171 return; 172 return;
172 } 173 }
173 174
174 if (dell_new_hk_type || buffer_entry[1] == 0x0) 175 if (buffer_size >= 3 && (dell_new_hk_type || buffer_entry[1] == 0x0))
175 reported_key = (int)buffer_entry[2]; 176 reported_key = (int)buffer_entry[2];
176 else 177 else if (buffer_size >= 2)
177 reported_key = (int)buffer_entry[1] & 0xffff; 178 reported_key = (int)buffer_entry[1] & 0xffff;
179 else {
180 pr_info("Received unknown WMI event\n");
181 kfree(obj);
182 return;
183 }
178 184
179 key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev, 185 key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev,
180 reported_key); 186 reported_key);