| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <3892df796d90f3568be48b85498a7819711323db.1507589249.git.mario.limonciello@dell.com>
Date: Mon, 9 Oct 2017 17:51:48 -0500
From: Mario Limonciello <mario.limonciello@...l.com>
To: dvhart@...radead.org, Andy Shevchenko <andy.shevchenko@...il.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
platform-driver-x86@...r.kernel.org,
Andy Lutomirski <luto@...nel.org>, quasisec@...gle.com,
pali.rohar@...il.com, rjw@...ysocki.net, mjg59@...gle.com,
hch@....de, Greg KH <greg@...ah.com>,
Mario Limonciello <mario.limonciello@...l.com>
Subject: [PATCH v6 10/14] platform/x86: dell-smbios: add filtering capability for requests
There are some categories of tokens and SMBIOS calls that it makes
sense to protect userspace from accessing. These are calls that
may write to one time use fields or activate hardware debugging
capabilities. They are not intended for general purpose use.
This same functionality may be be later extended to also intercept
calls that may cause kernel functionality to get out of sync if
the same functions are used by other drivers.
Signed-off-by: Mario Limonciello <mario.limonciello@...l.com>
---
drivers/platform/x86/dell-smbios.c | 123 +++++++++++++++++++++++++++++++++++++
drivers/platform/x86/dell-smbios.h | 2 +
2 files changed, 125 insertions(+)
diff --git a/drivers/platform/x86/dell-smbios.c b/drivers/platform/x86/dell-smbios.c
index 386130811a34..3279d3f07be8 100644
--- a/drivers/platform/x86/dell-smbios.c
+++ b/drivers/platform/x86/dell-smbios.c
@@ -32,6 +32,7 @@ struct calling_interface_structure {
struct calling_interface_token tokens[];
} __packed;
+static u32 da_supported_commands;
static int da_command_address;
static int da_command_code;
static int da_num_tokens;
@@ -48,6 +49,54 @@ struct smbios_device {
int (*call_fn)(struct calling_interface_buffer *);
};
+
+/* calls that should be blacklisted. may contain diagnostics,
+ * debugging information or are write once functions
+ */
+struct smbios_call {
+ int class;
+ int select;
+};
+
+static struct smbios_call call_blacklist[] = {
+ {01, 07},
+ {06, 05},
+ {11, 03},
+ {11, 07},
+ {11, 11},
+ {19, -1},
+};
+
+/* tokens corresponding to diagnostics or write once locations */
+struct token_range {
+ u16 exact_value;
+ u16 min;
+ u16 max;
+};
+
+static struct token_range token_blacklist[] = {
+ {0x0000, 0x0175, 0x0176},
+ {0x0000, 0x0195, 0x0197},
+ {0x0000, 0x01DC, 0x01DD},
+ {0x0000, 0x027D, 0x0284},
+ {0x02E3, 0x0000, 0x0000},
+ {0x02FF, 0x0000, 0x0000},
+ {0x0000, 0x0300, 0x0302},
+ {0x0000, 0x0325, 0x0326},
+ {0x0000, 0x0332, 0x0335},
+ {0x0350, 0x0000, 0x0000},
+ {0x0363, 0x0000, 0x0000},
+ {0x0368, 0x0000, 0x0000},
+ {0x0000, 0x03F6, 0x03F7},
+ {0x0000, 0x049E, 0x049F},
+ {0x0000, 0x04A0, 0x04A3},
+ {0x0000, 0x04E6, 0x04E7},
+ {0x0000, 0x4000, 0x7FFF},
+ {0x0000, 0x9000, 0x9001},
+ {0x0000, 0xA000, 0xBFFF},
+ {0x0000, 0xEFF0, 0xEFFF},
+};
+
static LIST_HEAD(smbios_device_list);
void dell_smbios_get_smm_address(int *address, int *code)
@@ -107,6 +156,72 @@ void dell_smbios_unregister_device(struct device *d)
}
EXPORT_SYMBOL_GPL(dell_smbios_unregister_device);
+int dell_smbios_call_filter(struct device *d,
+ struct calling_interface_buffer *buffer)
+{
+ int i;
+ u16 t = 0;
+
+ /* can't make calls over 30 */
+ if (buffer->class > 30) {
+ dev_dbg(d, "buffer->class too big: %d\n", buffer->class);
+ return -EINVAL;
+ }
+
+ /* supported calls on the particular system */
+ if (!(da_supported_commands & (1 << buffer->class))) {
+ dev_dbg(d, "invalid command, supported commands: 0x%8x\n",
+ da_supported_commands);
+ return -EINVAL;
+ }
+
+ /* match against call blacklist */
+ for (i = 0; i < ARRAY_SIZE(call_blacklist); i++) {
+ if (buffer->class != call_blacklist[i].class)
+ continue;
+ if (buffer->select != call_blacklist[i].select &&
+ call_blacklist[i].select != -1)
+ continue;
+ dev_dbg(d, "blacklisted command: %d/%d\n",
+ buffer->class, buffer->select);
+ return -EINVAL;
+ }
+
+ /* if a token call, find token ID */
+ if ((buffer->class == 0 && buffer->select < 3) ||
+ (buffer->class == 1 && buffer->select < 3)) {
+ for (i = 0; i < da_num_tokens; i++) {
+ /* find the matching token ID */
+ if (da_tokens[i].location != buffer->input[0])
+ continue;
+ t = da_tokens[i].tokenID;
+ break;
+ }
+ /* not a token call */
+ } else
+ return 0;
+
+ /* token call; but token didn't exist */
+ if (!t) {
+ dev_dbg(d, "token at location %u doesn't exist\n",
+ buffer->input[0]);
+ return -EINVAL;
+ }
+ /* match against token blacklist */
+ for (i = 0; i < ARRAY_SIZE(token_blacklist); i++) {
+ if (token_blacklist[i].exact_value &&
+ t == token_blacklist[i].exact_value)
+ return -EINVAL;
+ if (!token_blacklist[i].min || !token_blacklist[i].max)
+ continue;
+ if (t >= token_blacklist[i].min && t <= token_blacklist[i].max)
+ return -EINVAL;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(dell_smbios_call_filter);
+
int dell_smbios_call(struct calling_interface_buffer *buffer)
{
int (*call_fn)(struct calling_interface_buffer *) = NULL;
@@ -130,6 +245,13 @@ int dell_smbios_call(struct calling_interface_buffer *buffer)
goto out_smbios_call;
}
+ if (dell_smbios_call_filter(selected_dev, buffer)) {
+ ret = -EINVAL;
+ dev_err(selected_dev, "Invalid call %d/%d:%8x\n",
+ buffer->class, buffer->select, buffer->input[0]);
+ goto out_smbios_call;
+ }
+
ret = call_fn(buffer);
out_smbios_call:
@@ -187,6 +309,7 @@ static void __init parse_da_table(const struct dmi_header *dm)
da_command_address = table->cmdIOAddress;
da_command_code = table->cmdIOCode;
+ da_supported_commands = table->supportedCmds;
new_da_tokens = krealloc(da_tokens, (da_num_tokens + tokens) *
sizeof(struct calling_interface_token),
diff --git a/drivers/platform/x86/dell-smbios.h b/drivers/platform/x86/dell-smbios.h
index fe28964da499..c743c58831e5 100644
--- a/drivers/platform/x86/dell-smbios.h
+++ b/drivers/platform/x86/dell-smbios.h
@@ -45,6 +45,8 @@ void dell_smbios_unregister_device(struct device *d);
void dell_smbios_get_smm_address(int *address, int *command);
int dell_smbios_error(int value);
+int dell_smbios_call_filter(struct device *d,
+ struct calling_interface_buffer *buffer);
int dell_smbios_call(struct calling_interface_buffer *buffer);
struct calling_interface_token *dell_smbios_find_token(int tokenid);
--
2.14.1
Powered by blists - more mailing lists