| From 6b8a6da589c522c7b9901e0afe50431cbfe7ddf8 Mon Sep 17 00:00:00 2001 |
| From: Lubomir Rintel <lkundrak@v3.sk> |
| Date: Mon, 18 Nov 2019 12:54:31 +0100 |
| Subject: [PATCH] component: do not dereference opaque pointer in debugfs |
| |
| commit ef9ffc1e5f1ac73ecd2fb3b70db2a3b2472ff2f7 upstream. |
| |
| The match data does not have to be a struct device pointer, and indeed |
| very often is not. Attempt to treat it as such easily results in a |
| crash. |
| |
| For the components that are not registered, we don't know which device |
| is missing. Once it it is there, we can use the struct component to get |
| the device and whether it's bound or not. |
| |
| Fixes: 59e73854b5fd ('component: add debugfs support') |
| Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> |
| Cc: stable <stable@vger.kernel.org> |
| Cc: Arnaud Pouliquen <arnaud.pouliquen@st.com> |
| Link: https://lore.kernel.org/r/20191118115431.63626-1-lkundrak@v3.sk |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/base/component.c b/drivers/base/component.c |
| index 532a3a5d8f63..1fdbd6ff2058 100644 |
| --- a/drivers/base/component.c |
| +++ b/drivers/base/component.c |
| @@ -102,11 +102,11 @@ static int component_devices_show(struct seq_file *s, void *data) |
| seq_printf(s, "%-40s %20s\n", "device name", "status"); |
| seq_puts(s, "-------------------------------------------------------------\n"); |
| for (i = 0; i < match->num; i++) { |
| - struct device *d = (struct device *)match->compare[i].data; |
| + struct component *component = match->compare[i].component; |
| |
| - seq_printf(s, "%-40s %20s\n", dev_name(d), |
| - match->compare[i].component ? |
| - "registered" : "not registered"); |
| + seq_printf(s, "%-40s %20s\n", |
| + component ? dev_name(component->dev) : "(unknown)", |
| + component ? (component->bound ? "bound" : "not bound") : "not registered"); |
| } |
| mutex_unlock(&component_mutex); |
| |
| -- |
| 2.7.4 |
| |
