diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-11-18 12:54:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-14 16:10:14 +0100 |
| commit | ef9ffc1e5f1ac73ecd2fb3b70db2a3b2472ff2f7 (patch) | |
| tree | 665062d54bf2357791e2b889f05252724f3efbdd | |
| parent | drivers/component: remove modular code (diff) | |
| download | linux-ef9ffc1e5f1ac73ecd2fb3b70db2a3b2472ff2f7.tar.xz linux-ef9ffc1e5f1ac73ecd2fb3b70db2a3b2472ff2f7.zip | |
component: do not dereference opaque pointer in debugfs
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>
| -rw-r--r-- | drivers/base/component.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/component.c b/drivers/base/component.c index 3a09036e772a..c7879f5ae2fb 100644 --- a/drivers/base/component.c +++ b/drivers/base/component.c @@ -101,11 +101,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); |