From: Sudeep Holla <sudeep.holla(a)arm.com>
[ Upstream commit 5e469dac326555d2038d199a6329458cc82a34e5 ]
The bus probe callback calls the driver callback without further
checking. Better be safe than sorry and refuse registration of a driver
without a probe function to prevent a NULL pointer exception.
Cc: <stable(a)vger.kernel.org> # v4.19+
Link: https://lore.kernel.org/r/20210624095059.4010157-2-sudeep.holla@arm.com
Fixes: 933c504424a2 ("firmware: arm_scmi: add scmi protocol bus to enumerate protocol devices")
Reported-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
Tested-by: Cristian Marussi <cristian.marussi(a)arm.com>
Reviewed-by: Cristian Marussi <cristian.marussi(a)arm.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de>
Signed-off-by: Sudeep Holla <sudeep.holla(a)arm.com>
---
Upstream commit 5e469dac326555d2038d199a6329458cc82a34e5 has been already
applied to stable/linux-5.13.y, this is a backport with conflicts resolved
for v4.19, v5.4 and v5.10. (SCMI stack did not even exist before 4.19)
---
drivers/firmware/arm_scmi/bus.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 7a30952b463d..66d445b14e51 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -100,6 +100,9 @@ int scmi_driver_register(struct scmi_driver *driver, struct module *owner,
{
int retval;
+ if (!driver->probe)
+ return -EINVAL;
+
driver->driver.bus = &scmi_bus_type;
driver->driver.name = driver->name;
driver->driver.owner = owner;
--
2.17.1
From: Petko Manolov <petkan(a)nucleusys.com>
v3:
Pavel Skripkin again: make sure -ETIMEDOUT is returned by __mii_op() on timeout
condition;
v2:
Special thanks to Pavel Skripkin for the review and who caught a few bugs.
setup_pegasus_II() would not print an erroneous message on the success path.
v1:
Add error checking for get_registers() and derivatives. If the usb transfer
fail then just don't use the buffer where the legal data should have been
returned.
Remove DRIVER_VERSION per Greg KH request.
Petko Manolov (2):
Check the return value of get_geristers() and friends;
Remove the changelog and DRIVER_VERSION.
drivers/net/usb/pegasus.c | 138 +++++++++++++++++++++-----------------
1 file changed, 77 insertions(+), 61 deletions(-)
--
2.30.2