From: "Thomas Weißschuh" <thomas.weissschuh@linutronix.de>
To: David Woodhouse <dwmw2@infradead.org>,
Richard Cochran <richardcochran@gmail.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: "Mateusz Polchlopek" <mateusz.polchlopek@intel.com>,
"David Woodhouse" <dwmw@amazon.co.uk>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>,
stable@vger.kernel.org
Subject: [PATCH net v2 2/5] ptp: vmclock: Set driver data before its usage
Date: Fri, 07 Feb 2025 10:39:03 +0100 [thread overview]
Message-ID: <20250207-vmclock-probe-v2-2-bc2fce0bdf07@linutronix.de> (raw)
In-Reply-To: <20250207-vmclock-probe-v2-0-bc2fce0bdf07@linutronix.de>
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@vger.kernel.org
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
---
drivers/ptp/ptp_vmclock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c
index dbc73e5382935dcbc799ea608b87f5ff51044ebc..1ba30a2da570fb4d1ec9db72820bf1781dfa9655 100644
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -525,6 +525,8 @@ static int vmclock_probe(struct platform_device *pdev)
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) {
@@ -588,8 +590,6 @@ static int vmclock_probe(struct platform_device *pdev)
(st->miscdev.minor && st->ptp_clock) ? ", " : "",
st->ptp_clock ? "PTP" : "");
- dev_set_drvdata(dev, st);
-
out:
return ret;
}
--
2.48.1
next prev parent reply other threads:[~2025-02-07 9:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-07 9:39 [PATCH net v2 0/5] ptp: vmclock: bugfixes and cleanups for error handling Thomas Weißschuh
2025-02-07 9:39 ` [PATCH net v2 1/5] ptp: vmclock: Add .owner to vmclock_miscdev_fops Thomas Weißschuh
2025-02-07 9:39 ` Thomas Weißschuh [this message]
2025-02-07 9:39 ` [PATCH net v2 3/5] ptp: vmclock: Don't unregister misc device if it was not registered Thomas Weißschuh
2025-02-07 9:39 ` [PATCH net v2 4/5] ptp: vmclock: Clean up miscdev and ptp clock through devres Thomas Weißschuh
2025-02-07 9:39 ` [PATCH net v2 5/5] ptp: vmclock: Remove goto-based cleanup logic Thomas Weißschuh
2025-02-11 9:40 ` [PATCH net v2 0/5] ptp: vmclock: bugfixes and cleanups for error handling patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250207-vmclock-probe-v2-2-bc2fce0bdf07@linutronix.de \
--to=thomas.weissschuh@linutronix.de \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=dwmw2@infradead.org \
--cc=dwmw@amazon.co.uk \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mateusz.polchlopek@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox