From: Jakub Kicinski <kuba@kernel.org>
To: Tim Hostetler <thostet@google.com>
Cc: netdev@vger.kernel.org, richardcochran@gmail.com,
andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
pabeni@redhat.com, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, Kuniyuki Iwashima <kuniyu@google.com>,
Harshitha Ramamurthy <hramamurthy@google.com>
Subject: Re: [PATCH net] ptp: Return -EINVAL on ptp_clock_register if required ops are NULL
Date: Fri, 31 Oct 2025 17:38:11 -0700 [thread overview]
Message-ID: <20251031173811.63bfb9e0@kernel.org> (raw)
In-Reply-To: <20251030180832.388729-1-thostet@google.com>
On Thu, 30 Oct 2025 11:08:32 -0700 Tim Hostetler wrote:
> ptp_clock should never be registered unless it stubs one of gettimex64()
> or gettime64() and settime64(). WARN_ON_ONCE and error out if either set
> of function pointers is null.
>
> Cc: stable@vger.kernel.org
> Fixes: d7d38f5bd7be ("ptp: use the 64 bit get/set time methods for the posix clock.")
This needs to go to net-next without the tags above.
The check can only help with new drivers, old ones _must_ be fixed
like gve was. Not registering a driver is a regression.
> Suggested-by: Kuniyuki Iwashima <kuniyu@google.com>
> Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
> Reviewed-by: Harshitha Ramamurthy <hramamurthy@google.com>
> Signed-off-by: Tim Hostetler <thostet@google.com>
> ---
> drivers/ptp/ptp_clock.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
> index ef020599b771..0bc79076771b 100644
> --- a/drivers/ptp/ptp_clock.c
> +++ b/drivers/ptp/ptp_clock.c
> @@ -325,6 +325,10 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
> if (info->n_alarm > PTP_MAX_ALARMS)
->n_alarm check is also input validation, you should probably fold it
into your new WARN_ON_ONCE(). Either that or remove the WARN_ON_ONCE()
annotation below. As is the checks are inconsistent.
> return ERR_PTR(-EINVAL);
>
> + if (WARN_ON_ONCE((!info->gettimex64 && !info->gettime64) ||
> + !info->settime64))
> + return ERR_PTR(-EINVAL);
> +
next prev parent reply other threads:[~2025-11-01 0:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-30 18:08 [PATCH net] ptp: Return -EINVAL on ptp_clock_register if required ops are NULL Tim Hostetler
2025-11-01 0:38 ` Jakub Kicinski [this message]
2025-11-04 11:31 ` Vadim Fedorenko
2025-11-04 17:47 ` Tim Hostetler
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=20251031173811.63bfb9e0@kernel.org \
--to=kuba@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hramamurthy@google.com \
--cc=kuniyu@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=stable@vger.kernel.org \
--cc=thostet@google.com \
/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;
as well as URLs for NNTP newsgroup(s).