From: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
commit f7d07cd4f77d77f366c8ffbb8ba8b61f614e5fce upstream.
If vmclock_ptp_register() fails during probing, vmclock_remove() is
called to clean up the ptp clock and misc device.
It uses dev_get_drvdata() to access the vmclock state.
However the driver data is not yet set at this point.
Assign the driver data earlier.
Fixes: 205032724226 ("ptp: Add support for the AMZNC10C 'vmclock' device")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@xxxxxxxxxxxxx>
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@xxxxxxxxx>
Acked-by: Richard Cochran <richardcochran@xxxxxxxxx>
Reviewed-by: David Woodhouse <dwmw@xxxxxxxxxxxx>
Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/ptp/ptp_vmclock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -525,6 +525,8 @@ static int vmclock_probe(struct platform
goto out;
}
+ dev_set_drvdata(dev, st);
+
if (le32_to_cpu(st->clk->magic) != VMCLOCK_MAGIC ||
le32_to_cpu(st->clk->size) > resource_size(&st->res) ||
le16_to_cpu(st->clk->version) != 1) {
@@ -589,8 +591,6 @@ static int vmclock_probe(struct platform
(st->miscdev.minor && st->ptp_clock) ? ", " : "",
st->ptp_clock ? "PTP" : "");
- dev_set_drvdata(dev, st);
-
out:
return ret;
}
Patches currently in stable-queue which might be from thomas.weissschuh@xxxxxxxxxxxxx are
queue-6.13/kbuild-userprogs-fix-bitsize-and-target-detection-on-clang.patch
queue-6.13/ptp-vmclock-add-.owner-to-vmclock_miscdev_fops.patch
queue-6.13/ptp-vmclock-don-t-unregister-misc-device-if-it-was-not-registered.patch
queue-6.13/ptp-vmclock-set-driver-data-before-its-usage.patch
